zustand-querystring 0.0.13 → 0.0.15

package/README.md

@@ -7,7 +7,7 @@ Try on [StackBlitz](https://stackblitz.com/github/nitedani/zustand-querystring/t
 Examples:
 - [React](./examples/react/)
 - [NextJS](./examples/next/)
-- [Rakkas](./example/rakkas/)
+- [Rakkas](./examples/rakkas/)
 
 Quickstart:
 ```ts

package/lib/middleware.js

@@ -1,5 +1,5 @@
 import { parse, stringify } from './parser.js';
-import { mergeWith, isEqual } from 'lodash-es';
+import { mergeWith, isEqual, cloneDeep } from 'lodash-es';
 const compact = (newState, initialState) => {
     const output = {};
     Object.keys(newState).forEach(key => {
@@ -51,12 +51,13 @@ const queryStringImpl = (fn, options) => (set, get, api) => {
         key: '$',
         ...options,
     };
-    const stateMatcher = new RegExp(`${escapeStringRegexp(defaultedOptions.key)}=(.*);;`);
-    const splitMatcher = new RegExp(`${escapeStringRegexp(defaultedOptions.key)}=.*;;`);
-    const parseQueryString = querystring => {
+    const escapedKey = escapeStringRegexp(defaultedOptions.key);
+    const stateMatcher = new RegExp(`${escapedKey}=(.*);;|${escapedKey}=(.*)$`);
+    const splitMatcher = new RegExp(`${escapedKey}=.*;;|${escapedKey}=.*$`);
+    const parseQueryString = (querystring) => {
         const match = querystring.match(stateMatcher);
         if (match) {
-            let m = match[1];
+            let m = match[1] ?? match[2];
             if (!m.startsWith('$')) {
                 m = '$' + m;
             }
@@ -65,7 +66,6 @@ const queryStringImpl = (fn, options) => (set, get, api) => {
         return null;
     };
     const url = defaultedOptions.url;
-    const initialState = get() ?? fn(set, get, api);
     const getSelectedState = (state, pathname) => {
         if (defaultedOptions.select) {
             const selection = defaultedOptions.select(pathname);
@@ -75,29 +75,31 @@ const queryStringImpl = (fn, options) => (set, get, api) => {
         }
         return state ?? {};
     };
-    const initialize = (url, _set = set) => {
-        const fallback = () => fn(_set, get, api);
+    const initialize = (url, initialState) => {
         try {
             const queryString = url.search.substring(1);
             const pathname = url.pathname;
             if (!queryString) {
-                return fallback();
+                return initialState;
             }
             const parsed = parseQueryString(queryString);
             if (!parsed) {
-                return fallback();
+                return initialState;
             }
-            const currentValue = get() ?? fn(_set, get, api);
-            const merged = mergeWith(currentValue, getSelectedState(parsed, pathname));
+            const merged = mergeWith(cloneDeep(initialState), getSelectedState(parsed, pathname));
             set(merged, true);
             return merged;
         }
         catch (error) {
             console.error(error);
-            return fn(_set, get, api);
+            return initialState;
         }
     };
     if (typeof window !== 'undefined') {
+        const initialState = cloneDeep(fn((...args) => {
+            set(...args);
+            setQuery();
+        }, get, api));
         const setQuery = () => {
             const selectedState = getSelectedState(get(), location.pathname);
             const currentQueryString = location.search;
@@ -159,13 +161,10 @@ const queryStringImpl = (fn, options) => (set, get, api) => {
             originalSetState(...args);
             setQuery();
         };
-        return initialize(new URL(location.href), (...args) => {
-            set(...args);
-            setQuery();
-        });
+        return initialize(new URL(location.href), initialState);
     }
     else if (url) {
-        return initialize(new URL(decodeURIComponent(url), 'http://localhost'));
+        return initialize(new URL(decodeURIComponent(url), 'http://localhost'), fn(set, get, api));
     }
     return fn(set, get, api);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zustand-querystring",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "license": "MIT",
   "type": "module",
   "keywords": [
@@ -35,7 +35,7 @@
     "@types/lodash-es": "^4.17.6",
     "rimraf": "^3.0.2",
     "typescript": "^4.9.3",
-    "zustand": "^4.3.2"
+    "zustand": "^4.3.8"
   },
   "scripts": {
     "dev": "tsc -b --watch",