@furystack/rest 5.0.8 → 5.0.10

package/esm/deserialize-query-string.d.ts

@@ -1,3 +1,9 @@
-export declare const tryDecodeQueryParam: (queryParam: any) => any;
+/**
+ *
+ * Decoding steps: See the encoding steps in reverse order
+ * @param value The value to decode
+ * @returns The decoded value
+ */
+export declare const decode: <T>(value: string) => T;
 export declare const deserializeQueryString: (fullQueryString: string) => any;
 //# sourceMappingURL=deserialize-query-string.d.ts.map

package/esm/deserialize-query-string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deserialize-query-string.d.ts","sourceRoot":"","sources":["../src/deserialize-query-string.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,eAAgB,GAAG,QAclD,CAAA;AAED,eAAO,MAAM,sBAAsB,oBAAqB,MAAM,QAiC7D,CAAA"}
+{"version":3,"file":"deserialize-query-string.d.ts","sourceRoot":"","sources":["../src/deserialize-query-string.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,MAAM,aAAc,MAAM,MAAiF,CAAA;AAExH,eAAO,MAAM,sBAAsB,oBAAqB,MAAM,QAM7D,CAAA"}

package/esm/deserialize-query-string.js

@@ -1,43 +1,14 @@
-export const tryDecodeQueryParam = (queryParam) => {
-    try {
-        return JSON.parse(decodeURIComponent(queryParam.toString()));
-    }
-    catch {
-        try {
-            return JSON.parse(queryParam.toString());
-        }
-        catch {
-            try {
-                return decodeURIComponent(queryParam.toString());
-            }
-            catch {
-                return queryParam;
-            }
-        }
-    }
-};
+/**
+ *
+ * Decoding steps: See the encoding steps in reverse order
+ * @param value The value to decode
+ * @returns The decoded value
+ */
+export const decode = (value) => JSON.parse(decodeURIComponent(escape(atob(decodeURIComponent(value)))));
 export const deserializeQueryString = (fullQueryString) => {
-    const queryString = fullQueryString?.replace?.('?', ''); // trim starting ?
-    if (!queryString) {
-        return {};
-    }
-    const entries = queryString
-        .split('&')
-        .map((value) => value.split('='))
-        .filter(([key, value]) => key?.length && value?.length); // filter out empty keys
-    const dedupedValues = entries
-        .reduce((prev, current) => {
-        const currentKey = current[0];
-        const currentValue = tryDecodeQueryParam(current[1]);
-        const existing = prev.find(([key]) => key === currentKey);
-        if (existing) {
-            existing[1] instanceof Array ? existing[1].push(currentValue) : (existing[1] = currentValue);
-            return [...prev];
-        }
-        const newValue = [currentKey, currentKey.includes('[]') ? [currentValue] : currentValue];
-        return [...prev, newValue];
-    }, [])
-        .map(([key, value]) => [key.replace('[]', ''), value]);
-    return Object.fromEntries(dedupedValues);
+    const params = [...new URLSearchParams(fullQueryString).entries()]
+        .filter(([key, value]) => key && value)
+        .map(([key, value]) => [key, decode(value)]);
+    return Object.fromEntries(params);
 };
 //# sourceMappingURL=deserialize-query-string.js.map

package/esm/deserialize-query-string.js.map

@@ -1 +1 @@
-{"version":3,"file":"deserialize-query-string.js","sourceRoot":"","sources":["../src/deserialize-query-string.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,UAAe,EAAE,EAAE;IACrD,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAE,UAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;KACtE;IAAC,MAAM;QACN,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;SACzC;QAAC,MAAM;YACN,IAAI;gBACF,OAAO,kBAAkB,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;aACjD;YAAC,MAAM;gBACN,OAAO,UAAU,CAAA;aAClB;SACF;KACF;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,eAAuB,EAAE,EAAE;IAChE,MAAM,WAAW,GAAG,eAAe,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA,CAAC,kBAAkB;IAE1E,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,EAAE,CAAA;KACV;IAED,MAAM,OAAO,GAAG,WAAW;SACxB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAChC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK,EAAE,MAAM,CAAC,CAAA,CAAC,wBAAwB;IAElF,MAAM,aAAa,GAAG,OAAO;SAC1B,MAAM,CACL,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QAC7B,MAAM,YAAY,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,CAAC,CAAA;QACzD,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAA;YAC5F,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;SACjB;QACD,MAAM,QAAQ,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAGtF,CAAA;QACD,OAAO,CAAC,GAAG,IAAI,EAAE,QAAQ,CAAC,CAAA;IAC5B,CAAC,EACD,EAAwC,CACzC;SACA,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;IAExD,OAAO,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;AAC1C,CAAC,CAAA"}
+{"version":3,"file":"deserialize-query-string.js","sourceRoot":"","sources":["../src/deserialize-query-string.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAI,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAM,CAAA;AAExH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,eAAuB,EAAE,EAAE;IAChE,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,eAAe,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,CAAC;SAC/D,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,CAAC;SACtC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAE9C,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;AACnC,CAAC,CAAA"}

package/esm/serialize-to-query-string.d.ts

@@ -1,3 +1,13 @@
-export declare const serializeValue: ([key, value]: [key: string, value: any]) => string;
-export declare const serializeToQueryString: <T extends object>(query: T) => string;
+/**
+ * Serialize steps:
+ * 1. Stringify the value (even primitives, ensure type safety), e.g.: { foo: 'bar😉' } => '{"foo":"bar😉"}'
+ * 2. Encode as an URI Component, e.g.: ''{"foo":"bar😉"}'' => '%7B%22foo%22%3A%22bar%F0%9F%98%89%22%7D'
+ * 3. Unescape the URI Component, e.g.: '%7B%22foo%22%3A%22bar%F0%9F%98%89%22%7D' => '{"foo":"barð\x9F\x98\x89"}' - This and the first encodeURIComponent is needed because btoa only supports ASCII characters. We also don't want to encode the whole JSON string to keep a reasonable string length
+ * 4. Encode the string as base64, e.g.: '{"foo":"barð\x9F\x98\x89"}' => 'eyJmb28iOiJiYXLwn5iJIn0='
+ * 5. Encode as an URL Param: 'eyJmb28iOiJiYXLwn5iJIn0=' => 'eyJmb28iOiJiYXLwn5iJIn0%3D'
+ * @param value The value to encode
+ * @returns The encoded value that can be used as an URL search parameter
+ */
+export declare const serializeValue: (value: any) => string;
+export declare const serializeToQueryString: <T extends object>(queryObject: T) => string;
 //# sourceMappingURL=serialize-to-query-string.d.ts.map

package/esm/serialize-to-query-string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serialize-to-query-string.d.ts","sourceRoot":"","sources":["../src/serialize-to-query-string.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,qDAU1B,CAAA;AAED,eAAO,MAAM,sBAAsB,kCAAiC,MAKnE,CAAA"}
+{"version":3,"file":"serialize-to-query-string.d.ts","sourceRoot":"","sources":["../src/serialize-to-query-string.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,UAAW,GAAG,WACsC,CAAA;AAE/E,eAAO,MAAM,sBAAsB,wCAAuC,MAQzE,CAAA"}

package/esm/serialize-to-query-string.js

@@ -1,18 +1,17 @@
-export const serializeValue = ([key, value]) => {
-    if (typeof value === 'object') {
-        if (value instanceof Array) {
-            if (!value.some((v) => typeof v === 'object')) {
-                return value.map((val) => `${key}[]=${encodeURIComponent(val)}`).join('&');
-            }
-        }
-        return `${key}=${encodeURIComponent(JSON.stringify(value))}`;
-    }
-    return `${key}=${encodeURIComponent(value)}`;
-};
-export const serializeToQueryString = (query) => {
-    return Object.entries(query)
+/**
+ * Serialize steps:
+ * 1. Stringify the value (even primitives, ensure type safety), e.g.: { foo: 'bar😉' } => '{"foo":"bar😉"}'
+ * 2. Encode as an URI Component, e.g.: ''{"foo":"bar😉"}'' => '%7B%22foo%22%3A%22bar%F0%9F%98%89%22%7D'
+ * 3. Unescape the URI Component, e.g.: '%7B%22foo%22%3A%22bar%F0%9F%98%89%22%7D' => '{"foo":"barð\x9F\x98\x89"}' - This and the first encodeURIComponent is needed because btoa only supports ASCII characters. We also don't want to encode the whole JSON string to keep a reasonable string length
+ * 4. Encode the string as base64, e.g.: '{"foo":"barð\x9F\x98\x89"}' => 'eyJmb28iOiJiYXLwn5iJIn0='
+ * 5. Encode as an URL Param: 'eyJmb28iOiJiYXLwn5iJIn0=' => 'eyJmb28iOiJiYXLwn5iJIn0%3D'
+ * @param value The value to encode
+ * @returns The encoded value that can be used as an URL search parameter
+ */
+export const serializeValue = (value) => encodeURIComponent(btoa(unescape(encodeURIComponent(JSON.stringify(value)))));
+export const serializeToQueryString = (queryObject) => {
+    return new URLSearchParams(Object.fromEntries(Object.entries(queryObject)
         .filter(([, value]) => value !== undefined)
-        .map(serializeValue)
-        .join('&');
+        .map(([key, value]) => [key, serializeValue(value)]))).toString();
 };
 //# sourceMappingURL=serialize-to-query-string.js.map

package/esm/serialize-to-query-string.js.map

@@ -1 +1 @@
-{"version":3,"file":"serialize-to-query-string.js","sourceRoot":"","sources":["../src/serialize-to-query-string.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,CAA4B,EAAE,EAAE;IACxE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,IAAI,KAAK,YAAY,KAAK,EAAE;YAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,EAAE;gBAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aAC3E;SACF;QACD,OAAO,GAAG,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAA;KAC7D;IACD,OAAO,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAA;AAC9C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAmB,KAAQ,EAAU,EAAE;IAC3E,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;SACzB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC1C,GAAG,CAAC,cAAc,CAAC;SACnB,IAAI,CAAC,GAAG,CAAC,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"serialize-to-query-string.js","sourceRoot":"","sources":["../src/serialize-to-query-string.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE,CAC3C,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/E,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAmB,WAAc,EAAU,EAAE;IACjF,OAAO,IAAI,eAAe,CACxB,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;SACxB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CACvD,CACF,CAAC,QAAQ,EAAE,CAAA;AACd,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@furystack/rest",
-  "version": "5.0.8",
+  "version": "5.0.10",
   "description": "Generic REST package",
   "type": "module",
   "scripts": {
@@ -37,13 +37,13 @@
   },
   "homepage": "https://github.com/furystack/furystack",
   "dependencies": {
-    "@furystack/core": "^12.0.8",
-    "@furystack/inject": "^8.0.7"
+    "@furystack/core": "^12.0.9",
+    "@furystack/inject": "^8.0.8"
   },
   "devDependencies": {
-    "@types/node": "^20.5.0",
+    "@types/node": "^20.5.3",
     "typescript": "^5.1.6",
-    "vitest": "^0.34.1"
+    "vitest": "^0.34.2"
   },
   "gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
 }

package/src/deserialize-query-string.spec.ts

@@ -1,42 +1,50 @@
 import { deserializeQueryString } from './deserialize-query-string'
-import { serializeToQueryString } from './serialize-to-query-string'
+import { serializeToQueryString, serializeValue } from './serialize-to-query-string'
 import { describe, it, expect } from 'vitest'
 
 describe('deserializeQueryString', () => {
-  it('Should serialize a null value', () => {
+  it('Should deserialize a null value', () => {
     expect(deserializeQueryString(null as any)).toEqual({})
   })
 
-  it('Should serialize an undefined value', () => {
+  it('Should deserialize an undefined value', () => {
     expect(deserializeQueryString(undefined as any)).toEqual({})
   })
 
-  it('Should serialize an empty string value', () => {
+  it('Should deserialize an empty string value', () => {
     expect(deserializeQueryString('')).toEqual({})
   })
 
-  it('Should serialize a string value with no keys / values', () => {
+  it('Should deserialize a string value with no keys / values', () => {
     expect(deserializeQueryString('?')).toEqual({})
   })
 
-  it('Should serialize a string with given value but empty key', () => {
+  it('Should deserialize a string with given value but empty key', () => {
     expect(deserializeQueryString('?=alma')).toEqual({})
   })
 
-  it('Should serialize a string with given key but empty value', () => {
+  it('Should deserialize a string with given key but empty value', () => {
     expect(deserializeQueryString('?alma=')).toEqual({})
   })
 
-  it('Should serialize a list of primitive values', () => {
-    expect(deserializeQueryString('?foo=value&bar=2&baz=false')).toEqual({ foo: 'value', bar: 2, baz: false })
-  })
-
-  it('Should serialize an array', () => {
-    expect(deserializeQueryString('?foo[]=value&foo[]=2&foo[]=false')).toEqual({ foo: ['value', 2, false] })
+  it('Should deserialize a list of primitive values', () => {
+    expect(
+      deserializeQueryString(`?foo=${serializeValue('value')}&bar=${serializeValue(2)}&baz=${serializeValue(false)}`),
+    ).toEqual({
+      foo: 'value',
+      bar: 2,
+      baz: false,
+    })
   })
 
   it('Should override a value if not specified as an array', () => {
-    expect(deserializeQueryString('?foo=value&foo=2&foo=false&foo=bar')).toEqual({ foo: 'bar' })
+    expect(
+      deserializeQueryString(
+        `?foo=${serializeValue('value')}&foo=${serializeValue(2)}&foo=${serializeValue(false)}&foo=${serializeValue(
+          'bar',
+        )}`,
+      ),
+    ).toEqual({ foo: 'bar' })
   })
 
   it('Should serialize and deserialize an object with primitives', () => {
@@ -60,6 +68,6 @@ describe('deserializeQueryString', () => {
   })
 
   it('Should deserialize escaped values', () => {
-    expect(deserializeQueryString('?alma=asd%2F*-%40')).toEqual({ alma: 'asd/*-@' })
+    expect(deserializeQueryString(`?alma=${serializeValue('asd/*-@?')}`)).toEqual({ alma: 'asd/*-@?' })
   })
 })

package/src/deserialize-query-string.ts

@@ -1,50 +1,15 @@
-export const tryDecodeQueryParam = (queryParam: any) => {
-  try {
-    return JSON.parse(decodeURIComponent((queryParam as any).toString()))
-  } catch {
-    try {
-      return JSON.parse(queryParam.toString())
-    } catch {
-      try {
-        return decodeURIComponent(queryParam.toString())
-      } catch {
-        return queryParam
-      }
-    }
-  }
-}
+/**
+ *
+ * Decoding steps: See the encoding steps in reverse order
+ * @param value The value to decode
+ * @returns The decoded value
+ */
+export const decode = <T>(value: string) => JSON.parse(decodeURIComponent(escape(atob(decodeURIComponent(value))))) as T
 
 export const deserializeQueryString = (fullQueryString: string) => {
-  const queryString = fullQueryString?.replace?.('?', '') // trim starting ?
-
-  if (!queryString) {
-    return {}
-  }
-
-  const entries = queryString
-    .split('&')
-    .map((value) => value.split('='))
-    .filter(([key, value]) => key?.length && value?.length) // filter out empty keys
-
-  const dedupedValues = entries
-    .reduce(
-      (prev, current) => {
-        const currentKey = current[0]
-        const currentValue = tryDecodeQueryParam(current[1])
-        const existing = prev.find(([key]) => key === currentKey)
-        if (existing) {
-          existing[1] instanceof Array ? existing[1].push(currentValue) : (existing[1] = currentValue)
-          return [...prev]
-        }
-        const newValue = [currentKey, currentKey.includes('[]') ? [currentValue] : currentValue] as [
-          string,
-          string | string[],
-        ]
-        return [...prev, newValue]
-      },
-      [] as Array<[string, string | string[]]>,
-    )
-    .map(([key, value]) => [key.replace('[]', ''), value])
+  const params = [...new URLSearchParams(fullQueryString).entries()]
+    .filter(([key, value]) => key && value)
+    .map(([key, value]) => [key, decode(value)])
 
-  return Object.fromEntries(dedupedValues)
+  return Object.fromEntries(params)
 }

package/src/serialize-to-query-string.spec.ts

@@ -3,25 +3,29 @@ import { describe, it, expect } from 'vitest'
 
 describe('serializeToQueryString', () => {
   it('Should serialize primitive values', () => {
-    expect(serializeToQueryString({ a: 1, b: false, c: 'foo', d: 0, e: null })).toBe('a=1&b=false&c=foo&d=0&e=null')
+    expect(serializeToQueryString({ a: 1, b: false, c: 'foo', d: 0, e: null })).toMatchInlineSnapshot(
+      '"a=MQ%253D%253D&b=ZmFsc2U%253D&c=ImZvbyI%253D&d=MA%253D%253D&e=bnVsbA%253D%253D"',
+    )
   })
 
   it('Should exclude explicit undefined', () => {
-    expect(serializeToQueryString({ a: 1, b: false, c: 'foo', d: undefined })).toBe('a=1&b=false&c=foo')
+    expect(serializeToQueryString({ a: 1, b: false, c: 'foo', d: undefined })).toMatchInlineSnapshot(
+      '"a=MQ%253D%253D&b=ZmFsc2U%253D&c=ImZvbyI%253D"',
+    )
   })
 
   it('Should serialize primitive arrays', () => {
-    expect(serializeToQueryString({ array: [1, 2, 3, 4] })).toBe('array[]=1&array[]=2&array[]=3&array[]=4')
+    expect(serializeToQueryString({ array: [1, 2, 3, 4] })).toMatchInlineSnapshot('"array=WzEsMiwzLDRd"')
   })
 
   it('Should serialize objects', () => {
-    expect(serializeToQueryString({ foo: { a: 1, b: 'value' } })).toBe(
-      `foo=${encodeURIComponent('{"a":1,"b":"value"}')}`,
+    expect(serializeToQueryString({ foo: { a: 1, b: 'value' } })).toMatchInlineSnapshot(
+      '"foo=eyJhIjoxLCJiIjoidmFsdWUifQ%253D%253D"',
     )
   })
 
   it('Should serialize an array that contains a non-primitive entry', () => {
     const array = [1, 2, 3, { foo: 1 }]
-    expect(serializeToQueryString({ array })).toBe(`array=${encodeURIComponent(JSON.stringify(array))}`)
+    expect(serializeToQueryString({ array })).toMatchInlineSnapshot('"array=WzEsMiwzLHsiZm9vIjoxfV0%253D"')
   })
 })

package/src/serialize-to-query-string.ts

@@ -1,18 +1,22 @@
-export const serializeValue = ([key, value]: [key: string, value: any]) => {
-  if (typeof value === 'object') {
-    if (value instanceof Array) {
-      if (!value.some((v) => typeof v === 'object')) {
-        return value.map((val) => `${key}[]=${encodeURIComponent(val)}`).join('&')
-      }
-    }
-    return `${key}=${encodeURIComponent(JSON.stringify(value))}`
-  }
-  return `${key}=${encodeURIComponent(value)}`
-}
+/**
+ * Serialize steps:
+ * 1. Stringify the value (even primitives, ensure type safety), e.g.: { foo: 'bar😉' } => '{"foo":"bar😉"}'
+ * 2. Encode as an URI Component, e.g.: ''{"foo":"bar😉"}'' => '%7B%22foo%22%3A%22bar%F0%9F%98%89%22%7D'
+ * 3. Unescape the URI Component, e.g.: '%7B%22foo%22%3A%22bar%F0%9F%98%89%22%7D' => '{"foo":"barð\x9F\x98\x89"}' - This and the first encodeURIComponent is needed because btoa only supports ASCII characters. We also don't want to encode the whole JSON string to keep a reasonable string length
+ * 4. Encode the string as base64, e.g.: '{"foo":"barð\x9F\x98\x89"}' => 'eyJmb28iOiJiYXLwn5iJIn0='
+ * 5. Encode as an URL Param: 'eyJmb28iOiJiYXLwn5iJIn0=' => 'eyJmb28iOiJiYXLwn5iJIn0%3D'
+ * @param value The value to encode
+ * @returns The encoded value that can be used as an URL search parameter
+ */
+export const serializeValue = (value: any) =>
+  encodeURIComponent(btoa(unescape(encodeURIComponent(JSON.stringify(value)))))
 
-export const serializeToQueryString = <T extends object>(query: T): string => {
-  return Object.entries(query)
-    .filter(([, value]) => value !== undefined)
-    .map(serializeValue)
-    .join('&')
+export const serializeToQueryString = <T extends object>(queryObject: T): string => {
+  return new URLSearchParams(
+    Object.fromEntries(
+      Object.entries(queryObject)
+        .filter(([, value]) => value !== undefined)
+        .map(([key, value]) => [key, serializeValue(value)]),
+    ),
+  ).toString()
 }