Merge pull request #22 from szhsin/fix/persist-catch

fix: persist exceptions
szhsin · Jan 28, 2023 · e2a0acb · e2a0acb
2 parents 43aae5f + 3343dd6
commit e2a0acb
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 29 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -42,8 +42,6 @@ module.exports = {
         'plugin:@typescript-eslint/recommended-requiring-type-checking'
       ],
       rules: {
-        'prefer-spread': 0,
-        'prefer-rest-params': 0,
         '@typescript-eslint/no-non-null-assertion': 0
       }
     }

diff --git a/babel.config.js b/babel.config.js
@@ -14,15 +14,19 @@ module.exports = {
     setSpreadProperties: true,
     skipForOfIteratorClosing: true
   },
-  plugins: ['pure-annotations'],
+  plugins: [
+    'pure-annotations',
+    ['@babel/plugin-proposal-object-rest-spread', { useBuiltIns: true }]
+  ],
   presets: [
     [
       '@babel/preset-env',
       {
         bugfixes: true,
         include: [
           '@babel/plugin-proposal-optional-chaining',
-          '@babel/plugin-proposal-nullish-coalescing-operator'
+          '@babel/plugin-proposal-nullish-coalescing-operator',
+          '@babel/plugin-proposal-optional-catch-binding'
         ],
         exclude: ['@babel/plugin-transform-typeof-symbol']
       }

diff --git a/dist/middleware/cjs/index.js b/dist/middleware/cjs/index.js
@@ -2,10 +2,9 @@
 
 const applyMiddleware = (middlewares, {
   fromRight
-} = {}) => (api, config) => middlewares[fromRight ? 'reduceRight' : 'reduce']((set, middleware) => middleware ? middleware({
-  ...api,
+} = {}) => (api, config) => middlewares[fromRight ? 'reduceRight' : 'reduce']((set, middleware) => middleware ? middleware(Object.assign({}, api, {
   set
-}, config) : set, api.set);
+}), config) : set, api.set);
 
 const persist = ({
   prefix,
@@ -22,13 +21,21 @@ const persist = ({
     states.push([key, set]);
     return (...args) => {
       set(...args);
-      getStorage().setItem(key, JSON.stringify(get()));
+      try {
+        getStorage().setItem(key, JSON.stringify(get()));
+      } catch (_unused) {
+        /* continue regardless of error */
+      }
     };
   };
   middleware.hydrate = () => {
     states.forEach(([key, set]) => {
-      const value = getStorage().getItem(key);
-      value != null && set(value !== 'undefined' ? JSON.parse(value) : undefined, `HYDRATE_${key}`);
+      try {
+        const value = getStorage().getItem(key);
+        value != null && set(value !== 'undefined' ? JSON.parse(value) : undefined, `HYDRATE_${key}`);
+      } catch (_unused2) {
+        /* continue regardless of error */
+      }
     });
     states.length = 0;
   };
@@ -52,8 +59,9 @@ const reduxDevtools = ({
     if (!key) throw new Error('[reactish-state] state should be provided with a string `key` in the config object when the `reduxDevtools` middleware is used.');
     mergedState[key] = get();
     devtools.init(mergedState);
-    return function (value, action) {
-      set.apply(null, arguments);
+    return (...args) => {
+      const [value, action] = args;
+      set(...args);
       mergedState[key] = get();
       devtools.send(typeof action === 'string' ? {
         type: action

diff --git a/dist/middleware/esm/applyMiddleware.js b/dist/middleware/esm/applyMiddleware.js
@@ -1,8 +1,7 @@
 const applyMiddleware = (middlewares, {
   fromRight
-} = {}) => (api, config) => middlewares[fromRight ? 'reduceRight' : 'reduce']((set, middleware) => middleware ? middleware({
-  ...api,
+} = {}) => (api, config) => middlewares[fromRight ? 'reduceRight' : 'reduce']((set, middleware) => middleware ? middleware(Object.assign({}, api, {
   set
-}, config) : set, api.set);
+}), config) : set, api.set);
 
 export { applyMiddleware };
diff --git a/dist/middleware/esm/persist.js b/dist/middleware/esm/persist.js
@@ -13,13 +13,21 @@ const persist = ({
     states.push([key, set]);
     return (...args) => {
       set(...args);
-      getStorage().setItem(key, JSON.stringify(get()));
+      try {
+        getStorage().setItem(key, JSON.stringify(get()));
+      } catch (_unused) {
+        /* continue regardless of error */
+      }
     };
   };
   middleware.hydrate = () => {
     states.forEach(([key, set]) => {
-      const value = getStorage().getItem(key);
-      value != null && set(value !== 'undefined' ? JSON.parse(value) : undefined, `HYDRATE_${key}`);
+      try {
+        const value = getStorage().getItem(key);
+        value != null && set(value !== 'undefined' ? JSON.parse(value) : undefined, `HYDRATE_${key}`);
+      } catch (_unused2) {
+        /* continue regardless of error */
+      }
     });
     states.length = 0;
   };

diff --git a/dist/middleware/esm/reduxDevtools.js b/dist/middleware/esm/reduxDevtools.js
@@ -15,8 +15,9 @@ const reduxDevtools = ({
     if (!key) throw new Error('[reactish-state] state should be provided with a string `key` in the config object when the `reduxDevtools` middleware is used.');
     mergedState[key] = get();
     devtools.init(mergedState);
-    return function (value, action) {
-      set.apply(null, arguments);
+    return (...args) => {
+      const [value, action] = args;
+      set(...args);
       mergedState[key] = get();
       devtools.send(typeof action === 'string' ? {
         type: action

diff --git a/examples/package-lock.json b/examples/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactish-state",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Simple, decentralized state management for React.",
   "author": "Zheng Song",
   "license": "MIT",

diff --git a/src/middleware/persist.ts b/src/middleware/persist.ts
@@ -23,14 +23,23 @@ const persist: Persist = ({ prefix, getStorage = () => localStorage } = {}) => {
 
     return (...args) => {
       set(...args);
-      getStorage().setItem(key, JSON.stringify(get()));
+      try {
+        getStorage().setItem(key, JSON.stringify(get()));
+      } catch {
+        /* continue regardless of error */
+      }
     };
   };
 
   middleware.hydrate = () => {
     states.forEach(([key, set]) => {
-      const value = getStorage().getItem(key);
-      value != null && set(value !== 'undefined' ? JSON.parse(value) : undefined, `HYDRATE_${key}`);
+      try {
+        const value = getStorage().getItem(key);
+        value != null &&
+          set(value !== 'undefined' ? JSON.parse(value) : undefined, `HYDRATE_${key}`);
+      } catch {
+        /* continue regardless of error */
+      }
     });
     states.length = 0;
   };

diff --git a/src/middleware/reduxDevtools.ts b/src/middleware/reduxDevtools.ts
@@ -24,8 +24,9 @@ const reduxDevtools: ReduxDevtools = ({ name } = {}) => {
     mergedState[key] = get();
     devtools.init(mergedState);
 
-    return function (value, action) {
-      set.apply(null, arguments as unknown as Parameters<typeof set>);
+    return (...args) => {
+      const [value, action] = args;
+      set(...args);
       mergedState[key] = get();
       devtools.send(
         typeof action === 'string' ? { type: action } : action || { type: `SET_${key}`, value },