@ngxs/storage-plugin 3.7.4-dev.master-a6cc926 → 3.7.4-dev.master-817c422

package/esm2015/src/storage.plugin.js

@@ -18,6 +18,11 @@ export class NgxsStoragePlugin {
         this._options = _options;
         this._engine = _engine;
         this._platformId = _platformId;
+        // We cast to `string[]` here as we're sure that this option has been
+        // transformed by the `storageOptionsFactory` function that provided token.
+        this._keys = (/** @type {?} */ (this._options.key));
+        // We default to `[DEFAULT_STATE_KEY]` if the user explicitly does not provide the `key` option.
+        this._usesDefaultStateKey = this._keys.length === 1 && this._keys[0] === DEFAULT_STATE_KEY;
     }
     /**
      * @param {?} state
@@ -29,10 +34,6 @@ export class NgxsStoragePlugin {
         if (isPlatformServer(this._platformId) && this._engine === null) {
             return next(state, event);
         }
-        // We cast to `string[]` here as we're sure that this option has been
-        // transformed by the `storageOptionsFactory` function that provided token
-        /** @type {?} */
-        const keys = (/** @type {?} */ (this._options.key));
         /** @type {?} */
         const matches = actionMatcher(event);
         /** @type {?} */
@@ -44,30 +45,31 @@ export class NgxsStoragePlugin {
         /** @type {?} */
         let hasMigration = false;
         if (isInitOrUpdateAction) {
-            for (const key of keys) {
+            /** @type {?} */
+            const addedStates = isUpdateAction && event.addedStates;
+            for (const key of this._keys) {
                 // We're checking what states have been added by NGXS and if any of these states should be handled by
                 // the storage plugin. For instance, we only want to deserialize the `auth` state, NGXS has added
                 // the `user` state, the storage plugin will be rerun and will do redundant deserialization.
-                if (isUpdateAction && event.addedStates && !event.addedStates.hasOwnProperty(key)) {
+                // `usesDefaultStateKey` is necessary to check since `event.addedStates` never contains `@@STATE`.
+                if (!this._usesDefaultStateKey && addedStates && !addedStates.hasOwnProperty(key)) {
                     continue;
                 }
                 /** @type {?} */
-                const isMaster = key === DEFAULT_STATE_KEY;
-                /** @type {?} */
-                let val = this._engine.getItem((/** @type {?} */ (key)));
-                if (val !== 'undefined' && val != null) {
+                let storedValue = this._engine.getItem((/** @type {?} */ (key)));
+                if (storedValue !== 'undefined' && storedValue != null) {
                     try {
                         /** @type {?} */
-                        const newVal = (/** @type {?} */ (this._options.deserialize))(val);
-                        val = (/** @type {?} */ (this._options.afterDeserialize))(newVal, key);
+                        const newVal = (/** @type {?} */ (this._options.deserialize))(storedValue);
+                        storedValue = (/** @type {?} */ (this._options.afterDeserialize))(newVal, key);
                     }
-                    catch (e) {
+                    catch (_a) {
                         // Caretaker note: we have still left the `typeof` condition in order to avoid
                         // creating a breaking change for projects that still use the View Engine.
                         if (typeof ngDevMode === 'undefined' || ngDevMode) {
-                            console.error(`Error ocurred while deserializing the ${key} store value, falling back to empty object, the value obtained from the store: `, val);
+                            console.error(`Error ocurred while deserializing the ${key} store value, falling back to empty object, the value obtained from the store: `, storedValue);
                         }
-                        val = {};
+                        storedValue = {};
                     }
                     if (this._options.migrations) {
                         this._options.migrations.forEach((/**
@@ -76,20 +78,49 @@ export class NgxsStoragePlugin {
                          */
                         strategy => {
                             /** @type {?} */
-                            const versionMatch = strategy.version === getValue(val, strategy.versionKey || 'version');
+                            const versionMatch = strategy.version === getValue(storedValue, strategy.versionKey || 'version');
                             /** @type {?} */
-                            const keyMatch = (!strategy.key && isMaster) || strategy.key === key;
+                            const keyMatch = (!strategy.key && this._usesDefaultStateKey) || strategy.key === key;
                             if (versionMatch && keyMatch) {
-                                val = strategy.migrate(val);
+                                storedValue = strategy.migrate(storedValue);
                                 hasMigration = true;
                             }
                         }));
                     }
-                    if (!isMaster) {
-                        state = setValue(state, (/** @type {?} */ (key)), val);
+                    if (!this._usesDefaultStateKey) {
+                        state = setValue(state, (/** @type {?} */ (key)), storedValue);
                     }
                     else {
-                        state = Object.assign({}, state, val);
+                        // The `UpdateState` action is dispatched whenever the feature state is added.
+                        // The below condition is met only when the `UpdateState` is dispatched.
+                        // Let's assume that we have 2 states `counter` and `@ngxs/router-plugin` state.
+                        // `CounterState` is provided on the root level when calling `NgxsModule.forRoot()`
+                        // and `@ngxs/router-plugin` is provided as a feature state.
+                        // The storage plugin may save the `counter` state value as `10` before.
+                        // The `CounterState` may implement the `ngxsOnInit` hook and call `ctx.setState(999)`.
+                        // The storage plugin will re-hydrate the whole state when the `RouterState` is registered,
+                        // and the `counter` state will again equal `10` (not `999`).
+                        if (storedValue && addedStates && Object.keys(addedStates).length > 0) {
+                            storedValue = Object.keys(addedStates).reduce((/**
+                             * @param {?} accumulator
+                             * @param {?} addedState
+                             * @return {?}
+                             */
+                            (accumulator, addedState) => {
+                                // The `storedValue` may equal the whole state (when the default state key is used).
+                                // If `addedStates` contains only `router` then we want to merge the state only
+                                // with the `router` value.
+                                // Let's assume that the `storedValue` is an object:
+                                // `{ counter: 10, router: {...} }`
+                                // This will pick only the `router` object from the `storedValue` and `counter`
+                                // state will not be re-hydrated unnecessary.
+                                if (storedValue.hasOwnProperty(addedState)) {
+                                    accumulator[addedState] = storedValue[addedState];
+                                }
+                                return accumulator;
+                            }), (/** @type {?} */ ({})));
+                        }
+                        state = Object.assign({}, state, storedValue);
                     }
                 }
             }
@@ -100,7 +131,7 @@ export class NgxsStoragePlugin {
          */
         nextState => {
             if (!isInitOrUpdateAction || (isInitOrUpdateAction && hasMigration)) {
-                for (const key of keys) {
+                for (const key of this._keys) {
                     /** @type {?} */
                     let val = nextState;
                     if (key !== DEFAULT_STATE_KEY) {
@@ -140,6 +171,16 @@ NgxsStoragePlugin.ctorParameters = () => [
     { type: String, decorators: [{ type: Inject, args: [PLATFORM_ID,] }] }
 ];
 if (false) {
+    /**
+     * @type {?}
+     * @private
+     */
+    NgxsStoragePlugin.prototype._keys;
+    /**
+     * @type {?}
+     * @private
+     */
+    NgxsStoragePlugin.prototype._usesDefaultStateKey;
     /**
      * @type {?}
      * @private
@@ -156,4 +197,4 @@ if (false) {
      */
     NgxsStoragePlugin.prototype._platformId;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storage.plugin.js","sourceRoot":"ng://@ngxs/storage-plugin/","sources":["src/storage.plugin.ts"],"names":[],"mappings":"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","sourcesContent":["import { PLATFORM_ID, Inject, Injectable } from '@angular/core';\nimport { isPlatformServer } from '@angular/common';\nimport {\n  NgxsPlugin,\n  setValue,\n  getValue,\n  InitState,\n  UpdateState,\n  actionMatcher,\n  NgxsNextPluginFn\n} from '@ngxs/store';\nimport { tap } from 'rxjs/operators';\n\nimport {\n  StorageEngine,\n  NgxsStoragePluginOptions,\n  STORAGE_ENGINE,\n  NGXS_STORAGE_PLUGIN_OPTIONS\n} from './symbols';\nimport { DEFAULT_STATE_KEY } from './internals';\n\n/**\n * @description Will be provided through Terser global definitions by Angular CLI\n * during the production build. This is how Angular does tree-shaking internally.\n */\ndeclare const ngDevMode: boolean;\n\n@Injectable()\nexport class NgxsStoragePlugin implements NgxsPlugin {\n  constructor(\n    @Inject(NGXS_STORAGE_PLUGIN_OPTIONS) private _options: NgxsStoragePluginOptions,\n    @Inject(STORAGE_ENGINE) private _engine: StorageEngine,\n    @Inject(PLATFORM_ID) private _platformId: string\n  ) {}\n\n  handle(state: any, event: any, next: NgxsNextPluginFn) {\n    if (isPlatformServer(this._platformId) && this._engine === null) {\n      return next(state, event);\n    }\n\n    // We cast to `string[]` here as we're sure that this option has been\n    // transformed by the `storageOptionsFactory` function that provided token\n    const keys = this._options.key as string[];\n    const matches = actionMatcher(event);\n    const isInitAction = matches(InitState);\n    const isUpdateAction = matches(UpdateState);\n    const isInitOrUpdateAction = isInitAction || isUpdateAction;\n    let hasMigration = false;\n\n    if (isInitOrUpdateAction) {\n      for (const key of keys) {\n        // We're checking what states have been added by NGXS and if any of these states should be handled by\n        // the storage plugin. For instance, we only want to deserialize the `auth` state, NGXS has added\n        // the `user` state, the storage plugin will be rerun and will do redundant deserialization.\n        if (isUpdateAction && event.addedStates && !event.addedStates.hasOwnProperty(key)) {\n          continue;\n        }\n\n        const isMaster = key === DEFAULT_STATE_KEY;\n        let val: any = this._engine.getItem(key!);\n\n        if (val !== 'undefined' && val != null) {\n          try {\n            const newVal = this._options.deserialize!(val);\n            val = this._options.afterDeserialize!(newVal, key);\n          } catch (e) {\n            // Caretaker note: we have still left the `typeof` condition in order to avoid\n            // creating a breaking change for projects that still use the View Engine.\n            if (typeof ngDevMode === 'undefined' || ngDevMode) {\n              console.error(\n                `Error ocurred while deserializing the ${key} store value, falling back to empty object, the value obtained from the store: `,\n                val\n              );\n            }\n            val = {};\n          }\n\n          if (this._options.migrations) {\n            this._options.migrations.forEach(strategy => {\n              const versionMatch =\n                strategy.version === getValue(val, strategy.versionKey || 'version');\n              const keyMatch = (!strategy.key && isMaster) || strategy.key === key;\n              if (versionMatch && keyMatch) {\n                val = strategy.migrate(val);\n                hasMigration = true;\n              }\n            });\n          }\n\n          if (!isMaster) {\n            state = setValue(state, key!, val);\n          } else {\n            state = { ...state, ...val };\n          }\n        }\n      }\n    }\n\n    return next(state, event).pipe(\n      tap(nextState => {\n        if (!isInitOrUpdateAction || (isInitOrUpdateAction && hasMigration)) {\n          for (const key of keys) {\n            let val = nextState;\n\n            if (key !== DEFAULT_STATE_KEY) {\n              val = getValue(nextState, key!);\n            }\n\n            try {\n              const newVal = this._options.beforeSerialize!(val, key);\n              this._engine.setItem(key!, this._options.serialize!(newVal));\n            } catch (error) {\n              // Caretaker note: we have still left the `typeof` condition in order to avoid\n              // creating a breaking change for projects that still use the View Engine.\n              if (typeof ngDevMode === 'undefined' || ngDevMode) {\n                if (\n                  error &&\n                  (error.name === 'QuotaExceededError' ||\n                    error.name === 'NS_ERROR_DOM_QUOTA_REACHED')\n                ) {\n                  console.error(\n                    `The ${key} store value exceeds the browser storage quota: `,\n                    val\n                  );\n                } else {\n                  console.error(\n                    `Error ocurred while serializing the ${key} store value, value not updated, the value obtained from the store: `,\n                    val\n                  );\n                }\n              }\n            }\n          }\n        }\n      })\n    );\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storage.plugin.js","sourceRoot":"ng://@ngxs/storage-plugin/","sources":["src/storage.plugin.ts"],"names":[],"mappings":"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","sourcesContent":["import { PLATFORM_ID, Inject, Injectable } from '@angular/core';\nimport { isPlatformServer } from '@angular/common';\nimport { PlainObject } from '@ngxs/store/internals';\nimport {\n  NgxsPlugin,\n  setValue,\n  getValue,\n  InitState,\n  UpdateState,\n  actionMatcher,\n  NgxsNextPluginFn\n} from '@ngxs/store';\nimport { tap } from 'rxjs/operators';\n\nimport {\n  StorageEngine,\n  NgxsStoragePluginOptions,\n  STORAGE_ENGINE,\n  NGXS_STORAGE_PLUGIN_OPTIONS\n} from './symbols';\nimport { DEFAULT_STATE_KEY } from './internals';\n\n/**\n * @description Will be provided through Terser global definitions by Angular CLI\n * during the production build. This is how Angular does tree-shaking internally.\n */\ndeclare const ngDevMode: boolean;\n\n@Injectable()\nexport class NgxsStoragePlugin implements NgxsPlugin {\n  // We cast to `string[]` here as we're sure that this option has been\n  // transformed by the `storageOptionsFactory` function that provided token.\n  private _keys = this._options.key as string[];\n  // We default to `[DEFAULT_STATE_KEY]` if the user explicitly does not provide the `key` option.\n  private _usesDefaultStateKey =\n    this._keys.length === 1 && this._keys[0] === DEFAULT_STATE_KEY;\n\n  constructor(\n    @Inject(NGXS_STORAGE_PLUGIN_OPTIONS) private _options: NgxsStoragePluginOptions,\n    @Inject(STORAGE_ENGINE) private _engine: StorageEngine,\n    @Inject(PLATFORM_ID) private _platformId: string\n  ) {}\n\n  handle(state: any, event: any, next: NgxsNextPluginFn) {\n    if (isPlatformServer(this._platformId) && this._engine === null) {\n      return next(state, event);\n    }\n\n    const matches = actionMatcher(event);\n    const isInitAction = matches(InitState);\n    const isUpdateAction = matches(UpdateState);\n    const isInitOrUpdateAction = isInitAction || isUpdateAction;\n    let hasMigration = false;\n\n    if (isInitOrUpdateAction) {\n      const addedStates = isUpdateAction && event.addedStates;\n\n      for (const key of this._keys) {\n        // We're checking what states have been added by NGXS and if any of these states should be handled by\n        // the storage plugin. For instance, we only want to deserialize the `auth` state, NGXS has added\n        // the `user` state, the storage plugin will be rerun and will do redundant deserialization.\n        // `usesDefaultStateKey` is necessary to check since `event.addedStates` never contains `@@STATE`.\n        if (!this._usesDefaultStateKey && addedStates && !addedStates.hasOwnProperty(key)) {\n          continue;\n        }\n\n        let storedValue: any = this._engine.getItem(key!);\n\n        if (storedValue !== 'undefined' && storedValue != null) {\n          try {\n            const newVal = this._options.deserialize!(storedValue);\n            storedValue = this._options.afterDeserialize!(newVal, key);\n          } catch {\n            // Caretaker note: we have still left the `typeof` condition in order to avoid\n            // creating a breaking change for projects that still use the View Engine.\n            if (typeof ngDevMode === 'undefined' || ngDevMode) {\n              console.error(\n                `Error ocurred while deserializing the ${key} store value, falling back to empty object, the value obtained from the store: `,\n                storedValue\n              );\n            }\n            storedValue = {};\n          }\n\n          if (this._options.migrations) {\n            this._options.migrations.forEach(strategy => {\n              const versionMatch =\n                strategy.version === getValue(storedValue, strategy.versionKey || 'version');\n              const keyMatch =\n                (!strategy.key && this._usesDefaultStateKey) || strategy.key === key;\n              if (versionMatch && keyMatch) {\n                storedValue = strategy.migrate(storedValue);\n                hasMigration = true;\n              }\n            });\n          }\n\n          if (!this._usesDefaultStateKey) {\n            state = setValue(state, key!, storedValue);\n          } else {\n            // The `UpdateState` action is dispatched whenever the feature state is added.\n            // The below condition is met only when the `UpdateState` is dispatched.\n            // Let's assume that we have 2 states `counter` and `@ngxs/router-plugin` state.\n            // `CounterState` is provided on the root level when calling `NgxsModule.forRoot()`\n            // and `@ngxs/router-plugin` is provided as a feature state.\n            // The storage plugin may save the `counter` state value as `10` before.\n            // The `CounterState` may implement the `ngxsOnInit` hook and call `ctx.setState(999)`.\n            // The storage plugin will re-hydrate the whole state when the `RouterState` is registered,\n            // and the `counter` state will again equal `10` (not `999`).\n            if (storedValue && addedStates && Object.keys(addedStates).length > 0) {\n              storedValue = Object.keys(addedStates).reduce((accumulator, addedState) => {\n                // The `storedValue` may equal the whole state (when the default state key is used).\n                // If `addedStates` contains only `router` then we want to merge the state only\n                // with the `router` value.\n                // Let's assume that the `storedValue` is an object:\n                // `{ counter: 10, router: {...} }`\n                // This will pick only the `router` object from the `storedValue` and `counter`\n                // state will not be re-hydrated unnecessary.\n                if (storedValue.hasOwnProperty(addedState)) {\n                  accumulator[addedState] = storedValue[addedState];\n                }\n                return accumulator;\n              }, <PlainObject>{});\n            }\n\n            state = { ...state, ...storedValue };\n          }\n        }\n      }\n    }\n\n    return next(state, event).pipe(\n      tap(nextState => {\n        if (!isInitOrUpdateAction || (isInitOrUpdateAction && hasMigration)) {\n          for (const key of this._keys) {\n            let val = nextState;\n\n            if (key !== DEFAULT_STATE_KEY) {\n              val = getValue(nextState, key!);\n            }\n\n            try {\n              const newVal = this._options.beforeSerialize!(val, key);\n              this._engine.setItem(key!, this._options.serialize!(newVal));\n            } catch (error) {\n              // Caretaker note: we have still left the `typeof` condition in order to avoid\n              // creating a breaking change for projects that still use the View Engine.\n              if (typeof ngDevMode === 'undefined' || ngDevMode) {\n                if (\n                  error &&\n                  (error.name === 'QuotaExceededError' ||\n                    error.name === 'NS_ERROR_DOM_QUOTA_REACHED')\n                ) {\n                  console.error(\n                    `The ${key} store value exceeds the browser storage quota: `,\n                    val\n                  );\n                } else {\n                  console.error(\n                    `Error ocurred while serializing the ${key} store value, value not updated, the value obtained from the store: `,\n                    val\n                  );\n                }\n              }\n            }\n          }\n        }\n      })\n    );\n  }\n}\n"]}

package/esm5/src/storage.plugin.js

@@ -14,6 +14,11 @@ var NgxsStoragePlugin = /** @class */ (function () {
         this._options = _options;
         this._engine = _engine;
         this._platformId = _platformId;
+        // We cast to `string[]` here as we're sure that this option has been
+        // transformed by the `storageOptionsFactory` function that provided token.
+        this._keys = (/** @type {?} */ (this._options.key));
+        // We default to `[DEFAULT_STATE_KEY]` if the user explicitly does not provide the `key` option.
+        this._usesDefaultStateKey = this._keys.length === 1 && this._keys[0] === DEFAULT_STATE_KEY;
     }
     /**
      * @param {?} state
@@ -33,10 +38,6 @@ var NgxsStoragePlugin = /** @class */ (function () {
         if (isPlatformServer(this._platformId) && this._engine === null) {
             return next(state, event);
         }
-        // We cast to `string[]` here as we're sure that this option has been
-        // transformed by the `storageOptionsFactory` function that provided token
-        /** @type {?} */
-        var keys = (/** @type {?} */ (this._options.key));
         /** @type {?} */
         var matches = actionMatcher(event);
         /** @type {?} */
@@ -48,30 +49,31 @@ var NgxsStoragePlugin = /** @class */ (function () {
         /** @type {?} */
         var hasMigration = false;
         if (isInitOrUpdateAction) {
+            /** @type {?} */
+            var addedStates = isUpdateAction && event.addedStates;
             var _loop_1 = function (key) {
                 // We're checking what states have been added by NGXS and if any of these states should be handled by
                 // the storage plugin. For instance, we only want to deserialize the `auth` state, NGXS has added
                 // the `user` state, the storage plugin will be rerun and will do redundant deserialization.
-                if (isUpdateAction && event.addedStates && !event.addedStates.hasOwnProperty(key)) {
+                // `usesDefaultStateKey` is necessary to check since `event.addedStates` never contains `@@STATE`.
+                if (!this_1._usesDefaultStateKey && addedStates && !addedStates.hasOwnProperty(key)) {
                     return "continue";
                 }
                 /** @type {?} */
-                var isMaster = key === DEFAULT_STATE_KEY;
-                /** @type {?} */
-                var val = this_1._engine.getItem((/** @type {?} */ (key)));
-                if (val !== 'undefined' && val != null) {
+                var storedValue = this_1._engine.getItem((/** @type {?} */ (key)));
+                if (storedValue !== 'undefined' && storedValue != null) {
                     try {
                         /** @type {?} */
-                        var newVal = (/** @type {?} */ (this_1._options.deserialize))(val);
-                        val = (/** @type {?} */ (this_1._options.afterDeserialize))(newVal, key);
+                        var newVal = (/** @type {?} */ (this_1._options.deserialize))(storedValue);
+                        storedValue = (/** @type {?} */ (this_1._options.afterDeserialize))(newVal, key);
                     }
-                    catch (e) {
+                    catch (_a) {
                         // Caretaker note: we have still left the `typeof` condition in order to avoid
                         // creating a breaking change for projects that still use the View Engine.
                         if (typeof ngDevMode === 'undefined' || ngDevMode) {
-                            console.error("Error ocurred while deserializing the " + key + " store value, falling back to empty object, the value obtained from the store: ", val);
+                            console.error("Error ocurred while deserializing the " + key + " store value, falling back to empty object, the value obtained from the store: ", storedValue);
                         }
-                        val = {};
+                        storedValue = {};
                     }
                     if (this_1._options.migrations) {
                         this_1._options.migrations.forEach((/**
@@ -80,34 +82,63 @@ var NgxsStoragePlugin = /** @class */ (function () {
                          */
                         function (strategy) {
                             /** @type {?} */
-                            var versionMatch = strategy.version === getValue(val, strategy.versionKey || 'version');
+                            var versionMatch = strategy.version === getValue(storedValue, strategy.versionKey || 'version');
                             /** @type {?} */
-                            var keyMatch = (!strategy.key && isMaster) || strategy.key === key;
+                            var keyMatch = (!strategy.key && _this._usesDefaultStateKey) || strategy.key === key;
                             if (versionMatch && keyMatch) {
-                                val = strategy.migrate(val);
+                                storedValue = strategy.migrate(storedValue);
                                 hasMigration = true;
                             }
                         }));
                     }
-                    if (!isMaster) {
-                        state = setValue(state, (/** @type {?} */ (key)), val);
+                    if (!this_1._usesDefaultStateKey) {
+                        state = setValue(state, (/** @type {?} */ (key)), storedValue);
                     }
                     else {
-                        state = tslib_1.__assign({}, state, val);
+                        // The `UpdateState` action is dispatched whenever the feature state is added.
+                        // The below condition is met only when the `UpdateState` is dispatched.
+                        // Let's assume that we have 2 states `counter` and `@ngxs/router-plugin` state.
+                        // `CounterState` is provided on the root level when calling `NgxsModule.forRoot()`
+                        // and `@ngxs/router-plugin` is provided as a feature state.
+                        // The storage plugin may save the `counter` state value as `10` before.
+                        // The `CounterState` may implement the `ngxsOnInit` hook and call `ctx.setState(999)`.
+                        // The storage plugin will re-hydrate the whole state when the `RouterState` is registered,
+                        // and the `counter` state will again equal `10` (not `999`).
+                        if (storedValue && addedStates && Object.keys(addedStates).length > 0) {
+                            storedValue = Object.keys(addedStates).reduce((/**
+                             * @param {?} accumulator
+                             * @param {?} addedState
+                             * @return {?}
+                             */
+                            function (accumulator, addedState) {
+                                // The `storedValue` may equal the whole state (when the default state key is used).
+                                // If `addedStates` contains only `router` then we want to merge the state only
+                                // with the `router` value.
+                                // Let's assume that the `storedValue` is an object:
+                                // `{ counter: 10, router: {...} }`
+                                // This will pick only the `router` object from the `storedValue` and `counter`
+                                // state will not be re-hydrated unnecessary.
+                                if (storedValue.hasOwnProperty(addedState)) {
+                                    accumulator[addedState] = storedValue[addedState];
+                                }
+                                return accumulator;
+                            }), (/** @type {?} */ ({})));
+                        }
+                        state = tslib_1.__assign({}, state, storedValue);
                     }
                 }
             };
             var this_1 = this;
             try {
-                for (var keys_1 = tslib_1.__values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
-                    var key = keys_1_1.value;
+                for (var _b = tslib_1.__values(this._keys), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var key = _c.value;
                     _loop_1(key);
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -120,8 +151,8 @@ var NgxsStoragePlugin = /** @class */ (function () {
             var e_2, _a;
             if (!isInitOrUpdateAction || (isInitOrUpdateAction && hasMigration)) {
                 try {
-                    for (var keys_2 = tslib_1.__values(keys), keys_2_1 = keys_2.next(); !keys_2_1.done; keys_2_1 = keys_2.next()) {
-                        var key = keys_2_1.value;
+                    for (var _b = tslib_1.__values(_this._keys), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var key = _c.value;
                         /** @type {?} */
                         var val = nextState;
                         if (key !== DEFAULT_STATE_KEY) {
@@ -151,7 +182,7 @@ var NgxsStoragePlugin = /** @class */ (function () {
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (keys_2_1 && !keys_2_1.done && (_a = keys_2.return)) _a.call(keys_2);
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
@@ -171,6 +202,16 @@ var NgxsStoragePlugin = /** @class */ (function () {
 }());
 export { NgxsStoragePlugin };
 if (false) {
+    /**
+     * @type {?}
+     * @private
+     */
+    NgxsStoragePlugin.prototype._keys;
+    /**
+     * @type {?}
+     * @private
+     */
+    NgxsStoragePlugin.prototype._usesDefaultStateKey;
     /**
      * @type {?}
      * @private
@@ -187,4 +228,4 @@ if (false) {
      */
     NgxsStoragePlugin.prototype._platformId;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storage.plugin.js","sourceRoot":"ng://@ngxs/storage-plugin/","sources":["src/storage.plugin.ts"],"names":[],"mappings":"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","sourcesContent":["import { PLATFORM_ID, Inject, Injectable } from '@angular/core';\nimport { isPlatformServer } from '@angular/common';\nimport {\n  NgxsPlugin,\n  setValue,\n  getValue,\n  InitState,\n  UpdateState,\n  actionMatcher,\n  NgxsNextPluginFn\n} from '@ngxs/store';\nimport { tap } from 'rxjs/operators';\n\nimport {\n  StorageEngine,\n  NgxsStoragePluginOptions,\n  STORAGE_ENGINE,\n  NGXS_STORAGE_PLUGIN_OPTIONS\n} from './symbols';\nimport { DEFAULT_STATE_KEY } from './internals';\n\n/**\n * @description Will be provided through Terser global definitions by Angular CLI\n * during the production build. This is how Angular does tree-shaking internally.\n */\ndeclare const ngDevMode: boolean;\n\n@Injectable()\nexport class NgxsStoragePlugin implements NgxsPlugin {\n  constructor(\n    @Inject(NGXS_STORAGE_PLUGIN_OPTIONS) private _options: NgxsStoragePluginOptions,\n    @Inject(STORAGE_ENGINE) private _engine: StorageEngine,\n    @Inject(PLATFORM_ID) private _platformId: string\n  ) {}\n\n  handle(state: any, event: any, next: NgxsNextPluginFn) {\n    if (isPlatformServer(this._platformId) && this._engine === null) {\n      return next(state, event);\n    }\n\n    // We cast to `string[]` here as we're sure that this option has been\n    // transformed by the `storageOptionsFactory` function that provided token\n    const keys = this._options.key as string[];\n    const matches = actionMatcher(event);\n    const isInitAction = matches(InitState);\n    const isUpdateAction = matches(UpdateState);\n    const isInitOrUpdateAction = isInitAction || isUpdateAction;\n    let hasMigration = false;\n\n    if (isInitOrUpdateAction) {\n      for (const key of keys) {\n        // We're checking what states have been added by NGXS and if any of these states should be handled by\n        // the storage plugin. For instance, we only want to deserialize the `auth` state, NGXS has added\n        // the `user` state, the storage plugin will be rerun and will do redundant deserialization.\n        if (isUpdateAction && event.addedStates && !event.addedStates.hasOwnProperty(key)) {\n          continue;\n        }\n\n        const isMaster = key === DEFAULT_STATE_KEY;\n        let val: any = this._engine.getItem(key!);\n\n        if (val !== 'undefined' && val != null) {\n          try {\n            const newVal = this._options.deserialize!(val);\n            val = this._options.afterDeserialize!(newVal, key);\n          } catch (e) {\n            // Caretaker note: we have still left the `typeof` condition in order to avoid\n            // creating a breaking change for projects that still use the View Engine.\n            if (typeof ngDevMode === 'undefined' || ngDevMode) {\n              console.error(\n                `Error ocurred while deserializing the ${key} store value, falling back to empty object, the value obtained from the store: `,\n                val\n              );\n            }\n            val = {};\n          }\n\n          if (this._options.migrations) {\n            this._options.migrations.forEach(strategy => {\n              const versionMatch =\n                strategy.version === getValue(val, strategy.versionKey || 'version');\n              const keyMatch = (!strategy.key && isMaster) || strategy.key === key;\n              if (versionMatch && keyMatch) {\n                val = strategy.migrate(val);\n                hasMigration = true;\n              }\n            });\n          }\n\n          if (!isMaster) {\n            state = setValue(state, key!, val);\n          } else {\n            state = { ...state, ...val };\n          }\n        }\n      }\n    }\n\n    return next(state, event).pipe(\n      tap(nextState => {\n        if (!isInitOrUpdateAction || (isInitOrUpdateAction && hasMigration)) {\n          for (const key of keys) {\n            let val = nextState;\n\n            if (key !== DEFAULT_STATE_KEY) {\n              val = getValue(nextState, key!);\n            }\n\n            try {\n              const newVal = this._options.beforeSerialize!(val, key);\n              this._engine.setItem(key!, this._options.serialize!(newVal));\n            } catch (error) {\n              // Caretaker note: we have still left the `typeof` condition in order to avoid\n              // creating a breaking change for projects that still use the View Engine.\n              if (typeof ngDevMode === 'undefined' || ngDevMode) {\n                if (\n                  error &&\n                  (error.name === 'QuotaExceededError' ||\n                    error.name === 'NS_ERROR_DOM_QUOTA_REACHED')\n                ) {\n                  console.error(\n                    `The ${key} store value exceeds the browser storage quota: `,\n                    val\n                  );\n                } else {\n                  console.error(\n                    `Error ocurred while serializing the ${key} store value, value not updated, the value obtained from the store: `,\n                    val\n                  );\n                }\n              }\n            }\n          }\n        }\n      })\n    );\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storage.plugin.js","sourceRoot":"ng://@ngxs/storage-plugin/","sources":["src/storage.plugin.ts"],"names":[],"mappings":"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","sourcesContent":["import { PLATFORM_ID, Inject, Injectable } from '@angular/core';\nimport { isPlatformServer } from '@angular/common';\nimport { PlainObject } from '@ngxs/store/internals';\nimport {\n  NgxsPlugin,\n  setValue,\n  getValue,\n  InitState,\n  UpdateState,\n  actionMatcher,\n  NgxsNextPluginFn\n} from '@ngxs/store';\nimport { tap } from 'rxjs/operators';\n\nimport {\n  StorageEngine,\n  NgxsStoragePluginOptions,\n  STORAGE_ENGINE,\n  NGXS_STORAGE_PLUGIN_OPTIONS\n} from './symbols';\nimport { DEFAULT_STATE_KEY } from './internals';\n\n/**\n * @description Will be provided through Terser global definitions by Angular CLI\n * during the production build. This is how Angular does tree-shaking internally.\n */\ndeclare const ngDevMode: boolean;\n\n@Injectable()\nexport class NgxsStoragePlugin implements NgxsPlugin {\n  // We cast to `string[]` here as we're sure that this option has been\n  // transformed by the `storageOptionsFactory` function that provided token.\n  private _keys = this._options.key as string[];\n  // We default to `[DEFAULT_STATE_KEY]` if the user explicitly does not provide the `key` option.\n  private _usesDefaultStateKey =\n    this._keys.length === 1 && this._keys[0] === DEFAULT_STATE_KEY;\n\n  constructor(\n    @Inject(NGXS_STORAGE_PLUGIN_OPTIONS) private _options: NgxsStoragePluginOptions,\n    @Inject(STORAGE_ENGINE) private _engine: StorageEngine,\n    @Inject(PLATFORM_ID) private _platformId: string\n  ) {}\n\n  handle(state: any, event: any, next: NgxsNextPluginFn) {\n    if (isPlatformServer(this._platformId) && this._engine === null) {\n      return next(state, event);\n    }\n\n    const matches = actionMatcher(event);\n    const isInitAction = matches(InitState);\n    const isUpdateAction = matches(UpdateState);\n    const isInitOrUpdateAction = isInitAction || isUpdateAction;\n    let hasMigration = false;\n\n    if (isInitOrUpdateAction) {\n      const addedStates = isUpdateAction && event.addedStates;\n\n      for (const key of this._keys) {\n        // We're checking what states have been added by NGXS and if any of these states should be handled by\n        // the storage plugin. For instance, we only want to deserialize the `auth` state, NGXS has added\n        // the `user` state, the storage plugin will be rerun and will do redundant deserialization.\n        // `usesDefaultStateKey` is necessary to check since `event.addedStates` never contains `@@STATE`.\n        if (!this._usesDefaultStateKey && addedStates && !addedStates.hasOwnProperty(key)) {\n          continue;\n        }\n\n        let storedValue: any = this._engine.getItem(key!);\n\n        if (storedValue !== 'undefined' && storedValue != null) {\n          try {\n            const newVal = this._options.deserialize!(storedValue);\n            storedValue = this._options.afterDeserialize!(newVal, key);\n          } catch {\n            // Caretaker note: we have still left the `typeof` condition in order to avoid\n            // creating a breaking change for projects that still use the View Engine.\n            if (typeof ngDevMode === 'undefined' || ngDevMode) {\n              console.error(\n                `Error ocurred while deserializing the ${key} store value, falling back to empty object, the value obtained from the store: `,\n                storedValue\n              );\n            }\n            storedValue = {};\n          }\n\n          if (this._options.migrations) {\n            this._options.migrations.forEach(strategy => {\n              const versionMatch =\n                strategy.version === getValue(storedValue, strategy.versionKey || 'version');\n              const keyMatch =\n                (!strategy.key && this._usesDefaultStateKey) || strategy.key === key;\n              if (versionMatch && keyMatch) {\n                storedValue = strategy.migrate(storedValue);\n                hasMigration = true;\n              }\n            });\n          }\n\n          if (!this._usesDefaultStateKey) {\n            state = setValue(state, key!, storedValue);\n          } else {\n            // The `UpdateState` action is dispatched whenever the feature state is added.\n            // The below condition is met only when the `UpdateState` is dispatched.\n            // Let's assume that we have 2 states `counter` and `@ngxs/router-plugin` state.\n            // `CounterState` is provided on the root level when calling `NgxsModule.forRoot()`\n            // and `@ngxs/router-plugin` is provided as a feature state.\n            // The storage plugin may save the `counter` state value as `10` before.\n            // The `CounterState` may implement the `ngxsOnInit` hook and call `ctx.setState(999)`.\n            // The storage plugin will re-hydrate the whole state when the `RouterState` is registered,\n            // and the `counter` state will again equal `10` (not `999`).\n            if (storedValue && addedStates && Object.keys(addedStates).length > 0) {\n              storedValue = Object.keys(addedStates).reduce((accumulator, addedState) => {\n                // The `storedValue` may equal the whole state (when the default state key is used).\n                // If `addedStates` contains only `router` then we want to merge the state only\n                // with the `router` value.\n                // Let's assume that the `storedValue` is an object:\n                // `{ counter: 10, router: {...} }`\n                // This will pick only the `router` object from the `storedValue` and `counter`\n                // state will not be re-hydrated unnecessary.\n                if (storedValue.hasOwnProperty(addedState)) {\n                  accumulator[addedState] = storedValue[addedState];\n                }\n                return accumulator;\n              }, <PlainObject>{});\n            }\n\n            state = { ...state, ...storedValue };\n          }\n        }\n      }\n    }\n\n    return next(state, event).pipe(\n      tap(nextState => {\n        if (!isInitOrUpdateAction || (isInitOrUpdateAction && hasMigration)) {\n          for (const key of this._keys) {\n            let val = nextState;\n\n            if (key !== DEFAULT_STATE_KEY) {\n              val = getValue(nextState, key!);\n            }\n\n            try {\n              const newVal = this._options.beforeSerialize!(val, key);\n              this._engine.setItem(key!, this._options.serialize!(newVal));\n            } catch (error) {\n              // Caretaker note: we have still left the `typeof` condition in order to avoid\n              // creating a breaking change for projects that still use the View Engine.\n              if (typeof ngDevMode === 'undefined' || ngDevMode) {\n                if (\n                  error &&\n                  (error.name === 'QuotaExceededError' ||\n                    error.name === 'NS_ERROR_DOM_QUOTA_REACHED')\n                ) {\n                  console.error(\n                    `The ${key} store value exceeds the browser storage quota: `,\n                    val\n                  );\n                } else {\n                  console.error(\n                    `Error ocurred while serializing the ${key} store value, value not updated, the value obtained from the store: `,\n                    val\n                  );\n                }\n              }\n            }\n          }\n        }\n      })\n    );\n  }\n}\n"]}

package/fesm2015/ngxs-storage-plugin.js

@@ -182,6 +182,11 @@ class NgxsStoragePlugin {
         this._options = _options;
         this._engine = _engine;
         this._platformId = _platformId;
+        // We cast to `string[]` here as we're sure that this option has been
+        // transformed by the `storageOptionsFactory` function that provided token.
+        this._keys = (/** @type {?} */ (this._options.key));
+        // We default to `[DEFAULT_STATE_KEY]` if the user explicitly does not provide the `key` option.
+        this._usesDefaultStateKey = this._keys.length === 1 && this._keys[0] === DEFAULT_STATE_KEY;
     }
     /**
      * @param {?} state
@@ -193,10 +198,6 @@ class NgxsStoragePlugin {
         if (isPlatformServer(this._platformId) && this._engine === null) {
             return next(state, event);
         }
-        // We cast to `string[]` here as we're sure that this option has been
-        // transformed by the `storageOptionsFactory` function that provided token
-        /** @type {?} */
-        const keys = (/** @type {?} */ (this._options.key));
         /** @type {?} */
         const matches = actionMatcher(event);
         /** @type {?} */
@@ -208,30 +209,31 @@ class NgxsStoragePlugin {
         /** @type {?} */
         let hasMigration = false;
         if (isInitOrUpdateAction) {
-            for (const key of keys) {
+            /** @type {?} */
+            const addedStates = isUpdateAction && event.addedStates;
+            for (const key of this._keys) {
                 // We're checking what states have been added by NGXS and if any of these states should be handled by
                 // the storage plugin. For instance, we only want to deserialize the `auth` state, NGXS has added
                 // the `user` state, the storage plugin will be rerun and will do redundant deserialization.
-                if (isUpdateAction && event.addedStates && !event.addedStates.hasOwnProperty(key)) {
+                // `usesDefaultStateKey` is necessary to check since `event.addedStates` never contains `@@STATE`.
+                if (!this._usesDefaultStateKey && addedStates && !addedStates.hasOwnProperty(key)) {
                     continue;
                 }
                 /** @type {?} */
-                const isMaster = key === DEFAULT_STATE_KEY;
-                /** @type {?} */
-                let val = this._engine.getItem((/** @type {?} */ (key)));
-                if (val !== 'undefined' && val != null) {
+                let storedValue = this._engine.getItem((/** @type {?} */ (key)));
+                if (storedValue !== 'undefined' && storedValue != null) {
                     try {
                         /** @type {?} */
-                        const newVal = (/** @type {?} */ (this._options.deserialize))(val);
-                        val = (/** @type {?} */ (this._options.afterDeserialize))(newVal, key);
+                        const newVal = (/** @type {?} */ (this._options.deserialize))(storedValue);
+                        storedValue = (/** @type {?} */ (this._options.afterDeserialize))(newVal, key);
                     }
-                    catch (e) {
+                    catch (_a) {
                         // Caretaker note: we have still left the `typeof` condition in order to avoid
                         // creating a breaking change for projects that still use the View Engine.
                         if (typeof ngDevMode === 'undefined' || ngDevMode) {
-                            console.error(`Error ocurred while deserializing the ${key} store value, falling back to empty object, the value obtained from the store: `, val);
+                            console.error(`Error ocurred while deserializing the ${key} store value, falling back to empty object, the value obtained from the store: `, storedValue);
                         }
-                        val = {};
+                        storedValue = {};
                     }
                     if (this._options.migrations) {
                         this._options.migrations.forEach((/**
@@ -240,20 +242,49 @@ class NgxsStoragePlugin {
                          */
                         strategy => {
                             /** @type {?} */
-                            const versionMatch = strategy.version === getValue(val, strategy.versionKey || 'version');
+                            const versionMatch = strategy.version === getValue(storedValue, strategy.versionKey || 'version');
                             /** @type {?} */
-                            const keyMatch = (!strategy.key && isMaster) || strategy.key === key;
+                            const keyMatch = (!strategy.key && this._usesDefaultStateKey) || strategy.key === key;
                             if (versionMatch && keyMatch) {
-                                val = strategy.migrate(val);
+                                storedValue = strategy.migrate(storedValue);
                                 hasMigration = true;
                             }
                         }));
                     }
-                    if (!isMaster) {
-                        state = setValue(state, (/** @type {?} */ (key)), val);
+                    if (!this._usesDefaultStateKey) {
+                        state = setValue(state, (/** @type {?} */ (key)), storedValue);
                     }
                     else {
-                        state = Object.assign({}, state, val);
+                        // The `UpdateState` action is dispatched whenever the feature state is added.
+                        // The below condition is met only when the `UpdateState` is dispatched.
+                        // Let's assume that we have 2 states `counter` and `@ngxs/router-plugin` state.
+                        // `CounterState` is provided on the root level when calling `NgxsModule.forRoot()`
+                        // and `@ngxs/router-plugin` is provided as a feature state.
+                        // The storage plugin may save the `counter` state value as `10` before.
+                        // The `CounterState` may implement the `ngxsOnInit` hook and call `ctx.setState(999)`.
+                        // The storage plugin will re-hydrate the whole state when the `RouterState` is registered,
+                        // and the `counter` state will again equal `10` (not `999`).
+                        if (storedValue && addedStates && Object.keys(addedStates).length > 0) {
+                            storedValue = Object.keys(addedStates).reduce((/**
+                             * @param {?} accumulator
+                             * @param {?} addedState
+                             * @return {?}
+                             */
+                            (accumulator, addedState) => {
+                                // The `storedValue` may equal the whole state (when the default state key is used).
+                                // If `addedStates` contains only `router` then we want to merge the state only
+                                // with the `router` value.
+                                // Let's assume that the `storedValue` is an object:
+                                // `{ counter: 10, router: {...} }`
+                                // This will pick only the `router` object from the `storedValue` and `counter`
+                                // state will not be re-hydrated unnecessary.
+                                if (storedValue.hasOwnProperty(addedState)) {
+                                    accumulator[addedState] = storedValue[addedState];
+                                }
+                                return accumulator;
+                            }), (/** @type {?} */ ({})));
+                        }
+                        state = Object.assign({}, state, storedValue);
                     }
                 }
             }
@@ -264,7 +295,7 @@ class NgxsStoragePlugin {
          */
         nextState => {
             if (!isInitOrUpdateAction || (isInitOrUpdateAction && hasMigration)) {
-                for (const key of keys) {
+                for (const key of this._keys) {
                     /** @type {?} */
                     let val = nextState;
                     if (key !== DEFAULT_STATE_KEY) {
@@ -304,6 +335,16 @@ NgxsStoragePlugin.ctorParameters = () => [
     { type: String, decorators: [{ type: Inject, args: [PLATFORM_ID,] }] }
 ];
 if (false) {
+    /**
+     * @type {?}
+     * @private
+     */
+    NgxsStoragePlugin.prototype._keys;
+    /**
+     * @type {?}
+     * @private
+     */
+    NgxsStoragePlugin.prototype._usesDefaultStateKey;
     /**
      * @type {?}
      * @private