zustand-querystring 0.5.0 → 0.6.0

package/README.md

@@ -171,12 +171,15 @@ Dot notation for nesting, comma-separated arrays.
 import { createFormat } from 'zustand-querystring/format/plain';
 
 const format = createFormat({
-  entrySeparator: ',',      // between entries in namespaced mode
-  nestingSeparator: '.',    // for nested keys
-  arraySeparator: ',',      // or 'repeat' for ?tags=a&tags=b&tags=c
+  entrySeparator: ',',           // between entries in namespaced mode
+  nestingSeparator: '.',         // for nested keys
+  arraySeparator: ',',           // or 'repeat' for ?tags=a&tags=b&tags=c
   escapeChar: '_',
   nullString: 'null',
   undefinedString: 'undefined',
+  infinityString: 'Infinity',    // string representation of Infinity
+  negativeInfinityString: '-Infinity',
+  nanString: 'NaN',
 });
 ```
 

package/dist/format/plain.d.mts

@@ -31,6 +31,12 @@ interface PlainFormatOptions {
     nullString?: string;
     /** String representation of undefined @default 'undefined' */
     undefinedString?: string;
+    /** String representation of Infinity @default 'Infinity' */
+    infinityString?: string;
+    /** String representation of -Infinity @default '-Infinity' */
+    negativeInfinityString?: string;
+    /** String representation of NaN @default 'NaN' */
+    nanString?: string;
 }
 /**
  * Create a plain format with custom configuration.
@@ -41,7 +47,7 @@ declare function createFormat(options?: PlainFormatOptions): QueryStringFormat;
  *
  * - Entry separator: `,`
  * - Nesting separator: `.`
- * - Array separator: `,` (comma-separated values)
+ * - Array separator: `repeat` (repeated keys, e.g. `?tag=a&tag=b`)
  * - Escape character: `_`
  */
 declare const plain: QueryStringFormat;

package/dist/format/plain.d.ts

@@ -31,6 +31,12 @@ interface PlainFormatOptions {
     nullString?: string;
     /** String representation of undefined @default 'undefined' */
     undefinedString?: string;
+    /** String representation of Infinity @default 'Infinity' */
+    infinityString?: string;
+    /** String representation of -Infinity @default '-Infinity' */
+    negativeInfinityString?: string;
+    /** String representation of NaN @default 'NaN' */
+    nanString?: string;
 }
 /**
  * Create a plain format with custom configuration.
@@ -41,7 +47,7 @@ declare function createFormat(options?: PlainFormatOptions): QueryStringFormat;
  *
  * - Entry separator: `,`
  * - Nesting separator: `.`
- * - Array separator: `,` (comma-separated values)
+ * - Array separator: `repeat` (repeated keys, e.g. `?tag=a&tag=b`)
  * - Escape character: `_`
  */
 declare const plain: QueryStringFormat;

package/dist/format/plain.js

@@ -24,14 +24,17 @@ __export(plain_exports, {
 });
 module.exports = __toCommonJS(plain_exports);
 function resolveOptions(opts = {}) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   return {
     entrySep: (_a = opts.entrySeparator) != null ? _a : ",",
     nestingSep: (_b = opts.nestingSeparator) != null ? _b : ".",
-    arraySep: (_c = opts.arraySeparator) != null ? _c : ",",
+    arraySep: (_c = opts.arraySeparator) != null ? _c : "repeat",
     escape: (_d = opts.escapeChar) != null ? _d : "_",
     nullStr: (_e = opts.nullString) != null ? _e : "null",
-    undefStr: (_f = opts.undefinedString) != null ? _f : "undefined"
+    undefStr: (_f = opts.undefinedString) != null ? _f : "undefined",
+    infStr: (_g = opts.infinityString) != null ? _g : "Infinity",
+    negInfStr: (_h = opts.negativeInfinityString) != null ? _h : "-Infinity",
+    nanStr: (_i = opts.nanString) != null ? _i : "NaN"
   };
 }
 function validateOptions(opts) {
@@ -89,13 +92,16 @@ function isObject(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) && !isDate(value);
 }
 var ISO_DATE_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/;
-var NUMBER_RE = /^-?\d+(\.\d+)?$/;
+var NUMBER_RE = /^-?(\d+\.?\d*|\d*\.?\d+)([eE][+-]?\d+)?$/;
 function tryParseBoolean(str) {
   if (str === "true") return true;
   if (str === "false") return false;
   return null;
 }
-function tryParseNumber(str) {
+function tryParseNumber(str, opts) {
+  if (str === opts.infStr) return Infinity;
+  if (str === opts.negInfStr) return -Infinity;
+  if (str === opts.nanStr) return NaN;
   if (!NUMBER_RE.test(str)) return null;
   const n = parseFloat(str);
   return isFinite(n) ? n : null;
@@ -109,7 +115,12 @@ function serializeValue(value, opts) {
   if (value === null) return opts.nullStr;
   if (value === void 0) return opts.undefStr;
   if (typeof value === "boolean") return String(value);
-  if (typeof value === "number") return String(value);
+  if (typeof value === "number") {
+    if (Number.isNaN(value)) return opts.nanStr;
+    if (value === Infinity) return opts.infStr;
+    if (value === -Infinity) return opts.negInfStr;
+    return String(value);
+  }
   if (isDate(value)) return value.toISOString();
   return String(value);
 }
@@ -120,8 +131,8 @@ function parseValue(str, hint, opts) {
   if (hint !== null && hint !== void 0) {
     if (typeof hint === "string") return str;
     if (typeof hint === "number") {
-      const n2 = tryParseNumber(str);
-      if (n2 !== null) return n2;
+      const n2 = tryParseNumber(str, opts);
+      if (n2 !== null || Number.isNaN(n2)) return n2;
     }
     if (typeof hint === "boolean") {
       const b2 = tryParseBoolean(str);
@@ -139,8 +150,8 @@ function parseValue(str, hint, opts) {
   if (b !== null) return b;
   const d = tryParseDate(str);
   if (d !== null) return d;
-  const n = tryParseNumber(str);
-  if (n !== null) return n;
+  const n = tryParseNumber(str, opts);
+  if (n !== null || Number.isNaN(n)) return n;
   return str;
 }
 function escape(str, chars, esc) {
@@ -334,22 +345,25 @@ function unflatten(entries, initialState, opts) {
     if (opts.arraySep !== "repeat") {
       valueSpecials.push(opts.arraySep);
     }
-    let values = rawValues.map((v) => unescape(v, opts.escape, valueSpecials));
+    const unescapeValue = (v) => unescape(v, opts.escape, valueSpecials);
+    let values;
+    if (opts.arraySep !== "repeat" && rawValues.length === 1) {
+      const parts = splitEscaped(rawValues[0], opts.arraySep, opts.escape);
+      const isArray = parts.length > 1 || isArrayHint;
+      values = isArray ? parts.map(unescapeValue) : [unescapeValue(rawValues[0])];
+    } else {
+      values = rawValues.map(unescapeValue);
+    }
     if (values.length === 1 && values[0] === "" && isArrayHint) {
       setAtPath(result, path, []);
       continue;
     }
-    if (opts.arraySep !== "repeat" && isArrayHint && values.length === 1) {
-      values = splitEscaped(values[0], opts.arraySep, opts.escape).map((v) => unescape(v, opts.escape, valueSpecials));
-    }
     if (values.length === 1 && !isArrayHint) {
-      const parsed = parseValue(values[0], hint, opts);
-      setAtPath(result, path, parsed);
+      setAtPath(result, path, parseValue(values[0], hint, opts));
       continue;
     }
-    const elementHint = Array.isArray(hint) ? hint[0] : void 0;
-    const parsedArray = values.map((v) => parseValue(v, elementHint, opts));
-    setAtPath(result, path, parsedArray);
+    const elementHint = isArrayHint ? hint[0] : void 0;
+    setAtPath(result, path, values.map((v) => parseValue(v, elementHint, opts)));
   }
   return result;
 }
@@ -441,6 +455,5 @@ var plain = createFormat();
   createFormat,
   plain
 });
-/* v8 ignore next -- @preserve: defensive - regex already filters non-finite number strings */
 /* v8 ignore next 3 -- @preserve: defensive code - unflatten always extracts hint[0] before calling parseValue */
 /* v8 ignore next 3 -- @preserve: defensive - handles non-serializable types like Symbol, Set, Map */

package/dist/format/plain.mjs

@@ -1,13 +1,16 @@
 // src/format/plain.ts
 function resolveOptions(opts = {}) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   return {
     entrySep: (_a = opts.entrySeparator) != null ? _a : ",",
     nestingSep: (_b = opts.nestingSeparator) != null ? _b : ".",
-    arraySep: (_c = opts.arraySeparator) != null ? _c : ",",
+    arraySep: (_c = opts.arraySeparator) != null ? _c : "repeat",
     escape: (_d = opts.escapeChar) != null ? _d : "_",
     nullStr: (_e = opts.nullString) != null ? _e : "null",
-    undefStr: (_f = opts.undefinedString) != null ? _f : "undefined"
+    undefStr: (_f = opts.undefinedString) != null ? _f : "undefined",
+    infStr: (_g = opts.infinityString) != null ? _g : "Infinity",
+    negInfStr: (_h = opts.negativeInfinityString) != null ? _h : "-Infinity",
+    nanStr: (_i = opts.nanString) != null ? _i : "NaN"
   };
 }
 function validateOptions(opts) {
@@ -65,13 +68,16 @@ function isObject(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) && !isDate(value);
 }
 var ISO_DATE_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/;
-var NUMBER_RE = /^-?\d+(\.\d+)?$/;
+var NUMBER_RE = /^-?(\d+\.?\d*|\d*\.?\d+)([eE][+-]?\d+)?$/;
 function tryParseBoolean(str) {
   if (str === "true") return true;
   if (str === "false") return false;
   return null;
 }
-function tryParseNumber(str) {
+function tryParseNumber(str, opts) {
+  if (str === opts.infStr) return Infinity;
+  if (str === opts.negInfStr) return -Infinity;
+  if (str === opts.nanStr) return NaN;
   if (!NUMBER_RE.test(str)) return null;
   const n = parseFloat(str);
   return isFinite(n) ? n : null;
@@ -85,7 +91,12 @@ function serializeValue(value, opts) {
   if (value === null) return opts.nullStr;
   if (value === void 0) return opts.undefStr;
   if (typeof value === "boolean") return String(value);
-  if (typeof value === "number") return String(value);
+  if (typeof value === "number") {
+    if (Number.isNaN(value)) return opts.nanStr;
+    if (value === Infinity) return opts.infStr;
+    if (value === -Infinity) return opts.negInfStr;
+    return String(value);
+  }
   if (isDate(value)) return value.toISOString();
   return String(value);
 }
@@ -96,8 +107,8 @@ function parseValue(str, hint, opts) {
   if (hint !== null && hint !== void 0) {
     if (typeof hint === "string") return str;
     if (typeof hint === "number") {
-      const n2 = tryParseNumber(str);
-      if (n2 !== null) return n2;
+      const n2 = tryParseNumber(str, opts);
+      if (n2 !== null || Number.isNaN(n2)) return n2;
     }
     if (typeof hint === "boolean") {
       const b2 = tryParseBoolean(str);
@@ -115,8 +126,8 @@ function parseValue(str, hint, opts) {
   if (b !== null) return b;
   const d = tryParseDate(str);
   if (d !== null) return d;
-  const n = tryParseNumber(str);
-  if (n !== null) return n;
+  const n = tryParseNumber(str, opts);
+  if (n !== null || Number.isNaN(n)) return n;
   return str;
 }
 function escape(str, chars, esc) {
@@ -310,22 +321,25 @@ function unflatten(entries, initialState, opts) {
     if (opts.arraySep !== "repeat") {
       valueSpecials.push(opts.arraySep);
     }
-    let values = rawValues.map((v) => unescape(v, opts.escape, valueSpecials));
+    const unescapeValue = (v) => unescape(v, opts.escape, valueSpecials);
+    let values;
+    if (opts.arraySep !== "repeat" && rawValues.length === 1) {
+      const parts = splitEscaped(rawValues[0], opts.arraySep, opts.escape);
+      const isArray = parts.length > 1 || isArrayHint;
+      values = isArray ? parts.map(unescapeValue) : [unescapeValue(rawValues[0])];
+    } else {
+      values = rawValues.map(unescapeValue);
+    }
     if (values.length === 1 && values[0] === "" && isArrayHint) {
       setAtPath(result, path, []);
       continue;
     }
-    if (opts.arraySep !== "repeat" && isArrayHint && values.length === 1) {
-      values = splitEscaped(values[0], opts.arraySep, opts.escape).map((v) => unescape(v, opts.escape, valueSpecials));
-    }
     if (values.length === 1 && !isArrayHint) {
-      const parsed = parseValue(values[0], hint, opts);
-      setAtPath(result, path, parsed);
+      setAtPath(result, path, parseValue(values[0], hint, opts));
       continue;
     }
-    const elementHint = Array.isArray(hint) ? hint[0] : void 0;
-    const parsedArray = values.map((v) => parseValue(v, elementHint, opts));
-    setAtPath(result, path, parsedArray);
+    const elementHint = isArrayHint ? hint[0] : void 0;
+    setAtPath(result, path, values.map((v) => parseValue(v, elementHint, opts)));
   }
   return result;
 }
@@ -416,6 +430,5 @@ export {
   createFormat,
   plain
 };
-/* v8 ignore next -- @preserve: defensive - regex already filters non-finite number strings */
 /* v8 ignore next 3 -- @preserve: defensive code - unflatten always extracts hint[0] before calling parseValue */
 /* v8 ignore next 3 -- @preserve: defensive - handles non-serializable types like Symbol, Set, Map */

package/dist/index.js

@@ -520,6 +520,7 @@ var queryStringImpl = (fn, options) => (set, get, api) => {
       get,
       api
     );
+    let previouslyManagedKeys = /* @__PURE__ */ new Set();
     const setQuery = () => {
       const url = new URL(window.location.href);
       const selectedState = getSelectedState(get(), url.pathname);
@@ -534,7 +535,9 @@ var queryStringImpl = (fn, options) => (set, get, api) => {
       let managedKeys;
       if (standalone) {
         const allParams = format.stringifyStandalone(selectedState);
-        managedKeys = new Set(Object.keys(allParams).map((k) => defaultedOptions.prefix + k));
+        const currentKeys = new Set(Object.keys(allParams).map((k) => defaultedOptions.prefix + k));
+        managedKeys = /* @__PURE__ */ new Set([...Array.from(currentKeys), ...Array.from(previouslyManagedKeys)]);
+        previouslyManagedKeys = currentKeys;
         const compactedParams = format.stringifyStandalone(newCompacted);
         stateParams = {};
         for (const [key, values] of Object.entries(compactedParams)) {
@@ -600,6 +603,11 @@ var queryStringImpl = (fn, options) => (set, get, api) => {
       setQuery();
     };
     const initialized = initialize(new URL(window.location.href), initialState);
+    if (standalone) {
+      const initSelected = getSelectedState(initialized, new URL(window.location.href).pathname);
+      const initParams = format.stringifyStandalone(initSelected);
+      previouslyManagedKeys = new Set(Object.keys(initParams).map((k) => defaultedOptions.prefix + k));
+    }
     api.getInitialState = () => initialized;
     return initialized;
   } else if (defaultedOptions.url) {

package/dist/index.mjs

@@ -141,6 +141,7 @@ var queryStringImpl = (fn, options) => (set, get, api) => {
       get,
       api
     );
+    let previouslyManagedKeys = /* @__PURE__ */ new Set();
     const setQuery = () => {
       const url = new URL(window.location.href);
       const selectedState = getSelectedState(get(), url.pathname);
@@ -155,7 +156,9 @@ var queryStringImpl = (fn, options) => (set, get, api) => {
       let managedKeys;
       if (standalone) {
         const allParams = format.stringifyStandalone(selectedState);
-        managedKeys = new Set(Object.keys(allParams).map((k) => defaultedOptions.prefix + k));
+        const currentKeys = new Set(Object.keys(allParams).map((k) => defaultedOptions.prefix + k));
+        managedKeys = /* @__PURE__ */ new Set([...Array.from(currentKeys), ...Array.from(previouslyManagedKeys)]);
+        previouslyManagedKeys = currentKeys;
         const compactedParams = format.stringifyStandalone(newCompacted);
         stateParams = {};
         for (const [key, values] of Object.entries(compactedParams)) {
@@ -221,6 +224,11 @@ var queryStringImpl = (fn, options) => (set, get, api) => {
       setQuery();
     };
     const initialized = initialize(new URL(window.location.href), initialState);
+    if (standalone) {
+      const initSelected = getSelectedState(initialized, new URL(window.location.href).pathname);
+      const initParams = format.stringifyStandalone(initSelected);
+      previouslyManagedKeys = new Set(Object.keys(initParams).map((k) => defaultedOptions.prefix + k));
+    }
     api.getInitialState = () => initialized;
     return initialized;
   } else if (defaultedOptions.url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zustand-querystring",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",