fix(Decorator): read value from first storage decorator and save to f…

…ollowing ones in order to keep consistent data

package.json

@@ -1,7 +1,7 @@
 {
     "name": "ngx-store",
     "private": true,
-    "version": "1.4.0-RC2",
+    "version": "1.4.0-RC4",
     "description": "Angular decorators to automagically keep variables in HTML5 LocalStorage, SessionStorage, cookies; injectable services for managing and listening to data changes and a bit more.",
     "main": "./ngx-store.js",
     "main for angular5": "./bundles/ngx-store.umd.js",

src/decorator/cache-item.ts

@@ -12,6 +12,7 @@ export interface CacheItemInterface {
     targets: Array<Object>;
     services: Array<WebStorageServiceInterface>;
     utilities: Array<WebStorageUtility>;
+    config?: DecoratorConfig;
 }
 
 export class CacheItem implements CacheItemInterface {
@@ -148,10 +149,11 @@ export class CacheItem implements CacheItemInterface {
         });
     }
 
-    public addUtilities(utilities: Array<WebStorageUtility>): void {
+    public addUtilities(utilities: Array<WebStorageUtility>, config?: DecoratorConfig): void {
         utilities.forEach(utility => {
             if (this.utilities.indexOf(utility) === -1) {
                 this.utilities.push(utility);
+                utility.set(this.key, this.readValue(config));
             }
         });
     }

src/decorator/cache.ts

@@ -12,10 +12,10 @@ export class Cache {
             Cache.set(cacheItem);
             return cacheItem;
         }
-        debug.log(`Loaded prior CacheItem of ${cacheItem.name} for ${cacheItem.utilities[0].getStorageName()}`);
+        debug.log(`Loaded prior CacheItem of ${cacheItem.name} for ${cacheCandidate.utilities[0].getStorageName()}`);
         cacheItem.addTargets(cacheCandidate.targets);
         cacheItem.addServices(cacheCandidate.services);
-        cacheItem.addUtilities(cacheCandidate.utilities);
+        cacheItem.addUtilities(cacheCandidate.utilities, cacheCandidate.config);
         Cache.set(cacheItem);
         return cacheItem;
     }

src/decorator/webstorage.ts

@@ -48,7 +48,7 @@ function WebStorage(
     config: DecoratorConfig = {}
 ) {
     return (target: any, propertyName: string): void => {
-        let key;
+        let key: string;
         if (typeof keyOrConfig === 'object') {
             key = keyOrConfig.key;
             config = keyOrConfig;
@@ -62,7 +62,8 @@ function WebStorage(
             name: propertyName,
             targets: [ target ],
             services: [ service ],
-            utilities: [ webStorageUtility ]
+            utilities: [ webStorageUtility ],
+            config: config,
         });
 
         Object.defineProperty(target, propertyName, {

src/utility/webstorage.utility.ts

@@ -92,7 +92,8 @@ export class WebStorageUtility {
             this._storage.setItem(storageKey, storable, config.expires);
             const cacheItem = Cache.get(key);
             if (cacheItem) {
-                cacheItem.saveValue(value, config, this);
+                debug.log(`updating following CacheItem from ${this.constructor.name}:`, cacheItem);
+                cacheItem.resetProxy();
             }
         } catch (error) {
             console.warn(`[ngx-store] ${this.getStorageName()}: following error occurred while trying to save ${key} =`, value);