react-use-query-params - npm Package Compare versions

Comparing version 1.0.3 to 2.0.1

dist/index.d.ts

@@ -1,2 +0,2 @@
-export { useQueryParams, appendQueryParamsToURL, makeLocation, ParamValuesArray, DefaultParamsObject, AllParams, InputParams, } from './useQueryParams';
+export { useQueryParams, type TDefaultParamsObject, type TAllParams, } from './useQueryParams';
 //# sourceMappingURL=index.d.ts.map

dist/index.js

@@ -1,6 +0,2 @@
-export { useQueryParams, 
-//
-appendQueryParamsToURL, makeLocation, 
-//
-ParamValuesArray, } from './useQueryParams';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiLi9zcmMvIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0gsY0FBYztBQUNkLEVBQUU7QUFDRixzQkFBc0IsRUFDdEIsWUFBWTtBQUNaLEVBQUU7QUFDRixnQkFBZ0IsR0FJbkIsTUFBTSxrQkFBa0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCB7XG4gICAgdXNlUXVlcnlQYXJhbXMsXG4gICAgLy9cbiAgICBhcHBlbmRRdWVyeVBhcmFtc1RvVVJMLFxuICAgIG1ha2VMb2NhdGlvbixcbiAgICAvL1xuICAgIFBhcmFtVmFsdWVzQXJyYXksXG4gICAgRGVmYXVsdFBhcmFtc09iamVjdCxcbiAgICBBbGxQYXJhbXMsXG4gICAgSW5wdXRQYXJhbXMsXG59IGZyb20gJy4vdXNlUXVlcnlQYXJhbXMnO1xuIl19
+export { useQueryParams, } from './useQueryParams';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiLi9zcmMvIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0gsY0FBYyxHQUlqQixNQUFNLGtCQUFrQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IHtcbiAgICB1c2VRdWVyeVBhcmFtcyxcbiAgICAvL1xuICAgIHR5cGUgVERlZmF1bHRQYXJhbXNPYmplY3QsXG4gICAgdHlwZSBUQWxsUGFyYW1zLFxufSBmcm9tICcuL3VzZVF1ZXJ5UGFyYW1zJztcbiJdfQ==

dist/useQueryParams.d.ts

@@ -1,24 +0,7 @@
-export declare class ParamValuesArray extends Array<string> {
-    toString(): string;
-}
-export type DefaultParamsObject = Record<string, any>;
-export type AllParams<PARAMS extends DefaultParamsObject> = Partial<Record<keyof PARAMS, ParamValuesArray>>;
-export type InputParams<PARAMS extends DefaultParamsObject> = Partial<{
-    [KEY in keyof PARAMS]: PARAMS[KEY] extends string[] ? string[] : [string] | string;
-}>;
-export declare function appendQueryParamsToURL<PARAMS extends DefaultParamsObject>(url: URL, queryParams: InputParams<PARAMS>): void;
-export declare function makeLocation<PARAMS extends DefaultParamsObject = DefaultParamsObject>(url: string, queryParams?: InputParams<PARAMS>): URL;
-export declare function useQueryParams<PARAMS extends DefaultParamsObject = DefaultParamsObject>(): {
-    location: string;
-    getParam: <KEY extends keyof PARAMS>(paramKey: PARAMS[KEY] extends string ? KEY : never) => string | undefined;
-    getParams: <KEY_1 extends keyof PARAMS>(paramKey: PARAMS[KEY_1] extends string[] ? KEY_1 : never) => string[];
-    hasParam: (paramKey: keyof PARAMS) => boolean;
-    setLocation: (url: string | URL, queryParams?: InputParams<PARAMS>, replace?: boolean) => void;
-    makeLocation: (url: string, queryParams: InputParams<PARAMS>) => URL;
-    mergeParams: (queryParams: InputParams<PARAMS>, replace?: boolean) => void;
-    setParams: (queryParams: InputParams<PARAMS>, replace?: boolean) => void;
-    removeParam: (paramKeys: keyof PARAMS | Partial<{ [key in keyof PARAMS]: boolean; }> | (keyof PARAMS)[], replace?: boolean) => void;
-    removeParams: (paramKeys: keyof PARAMS | Partial<{ [key in keyof PARAMS]: boolean; }> | (keyof PARAMS)[], replace?: boolean) => void;
-    readonly allParams: Partial<Record<keyof PARAMS, ParamValuesArray>>;
+export type TDefaultParamsObject = Record<string, any>;
+export type TAllParams<PARAMS extends TDefaultParamsObject> = {
+    [key in keyof PARAMS]: string[];
 };
+export declare function applyQueryParams<PARAMS extends TDefaultParamsObject>(target: URL | URLSearchParams, queryParams: TAllParams<PARAMS>, removeExtras?: boolean): URL | URLSearchParams;
+export declare function useQueryParams<PARAMS extends TDefaultParamsObject = TDefaultParamsObject>(): readonly [TAllParams<PARAMS>, (nextParams: TAllParams<PARAMS> | ((current: TAllParams<PARAMS>) => TAllParams<PARAMS>), replace?: boolean) => void];
 //# sourceMappingURL=useQueryParams.d.ts.map

dist/useQueryParams.js

@@ -23,52 +23,20 @@ import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react';
 })(window.history);
-// Exactly the same as Array<string> but with a custom toString
-// method that always returns the first value
-export class ParamValuesArray extends Array {
-    toString() {
-        if (this.length > 0) {
-            return `${this[0]}`;
-        }
-        return '';
+export function applyQueryParams(target, queryParams, removeExtras = false) {
+    const params = target instanceof URL ? target.searchParams : target;
+    if (removeExtras) {
+        params.forEach((value, key) => {
+            if (!(key in queryParams)) {
+                params.delete(key);
+            }
+        });
     }
-}
-export function appendQueryParamsToURL(url, queryParams) {
     for (const [key, values] of Object.entries(queryParams)) {
         const usableValues = Array.isArray(values) ? values : [values];
-        url.searchParams.delete(key);
+        params.delete(key);
         for (const value of usableValues) {
-            url.searchParams.append(key, value);
+            params.append(key, value);
         }
     }
+    return target;
 }
-export function makeLocation(url, queryParams = {}) {
-    const isFullURL = url.includes('http://') || url.includes('https://');
-    const isAbsolute = !isFullURL && url.startsWith('/');
-    const nextURL = (() => {
-        if (isFullURL) {
-            return new URL(url);
-        }
-        else {
-            const nextURL = new URL(window.location.href);
-            if (isAbsolute) {
-                const [pathname, query] = url.split('?');
-                nextURL.pathname = pathname;
-                nextURL.search = query !== null && query !== void 0 ? query : '';
-            }
-            else {
-                const [pathname, query] = url.split('?');
-                const urlSegments = nextURL.pathname.split('/');
-                nextURL.pathname = [
-                    ...urlSegments.slice(0, -1),
-                    pathname.trim()
-                        ? pathname
-                        : urlSegments[urlSegments.length - 1],
-                ].join('/');
-                nextURL.search = query !== null && query !== void 0 ? query : '';
-            }
-            return nextURL;
-        }
-    })();
-    appendQueryParamsToURL(nextURL, queryParams);
-    return nextURL;
-}
 export function useQueryParams() {
@@ -80,10 +48,10 @@ const currentLocation = window.location.href;
     const watching = useRef({});
+    const pauseWatch = useRef(false);
     // stores both the key and the values as an array
     // of the params that are being watched
     const watch = useCallback((key) => {
-        if (key in watching.current) {
+        if (key in watching.current || pauseWatch.current) {
             return;
         }
-        const values = urlSearchParams.getAll(String(key));
-        watching.current[key] = values;
+        watching.current[key] = urlSearchParams.getAll(String(key));
     }, [urlSearchParams, watching]);
@@ -95,2 +63,3 @@ const clearWatch = useCallback(() => {
     const [, rerender] = useReducer((state) => state + 1, 0);
+    // Handles location changes via listener mechanism above.
     const handle = useCallback(() => {
@@ -126,82 +95,47 @@ const currentParams = new URLSearchParams(window.location.search);
     }, [handle]);
-    const getParam = (paramKey) => {
-        var _a;
-        watch(paramKey);
-        return (_a = urlSearchParams.get(String(paramKey))) !== null && _a !== void 0 ? _a : undefined;
-    };
-    const getParams = (paramKey) => {
-        watch(paramKey);
-        return urlSearchParams.getAll(String(paramKey));
-    };
-    const hasParam = (paramKey) => {
-        watch(paramKey);
-        return urlSearchParams.has(String(paramKey));
-    };
-    const setLocation = (url, queryParams = {}, replace = false) => {
-        const nextURL = url instanceof URL ? url : makeLocation(url, queryParams);
-        const sameOrigin = nextURL.host === window.location.host &&
-            nextURL.protocol === window.location.protocol;
-        // History API only supports same origin URLs
-        if (sameOrigin) {
+    const params = useMemo(() => {
+        return new Proxy({}, {
+            get(target, key) {
+                watch(key);
+                return urlSearchParams.getAll(key);
+            },
+            ownKeys(target) {
+                const keys = new Set();
+                urlSearchParams.forEach((value, key) => {
+                    keys.add(key);
+                });
+                return [...keys];
+            },
+            getOwnPropertyDescriptor(target, prop) {
+                return { configurable: true, enumerable: true, writable: false };
+            },
+            has(target, key) {
+                watch(key);
+                return urlSearchParams.has(key);
+            },
+        });
+    }, [urlSearchParams]);
+    const setParams = useCallback((nextParams, replace = false) => {
+        try {
+            const nextURL = new URL(window.location.href);
+            pauseWatch.current = true;
+            const nextParamsObject = nextParams instanceof Function
+                ? nextParams(params)
+                : nextParams;
+            pauseWatch.current = false;
+            applyQueryParams(nextURL, nextParamsObject);
             if (replace) {
-                window.history.replaceState(null, '', nextURL.href);
+                window.history.replaceState(null, '', nextURL);
             }
             else {
-                window.history.pushState(null, '', nextURL.href);
+                window.history.pushState(null, '', nextURL);
             }
         }
-        else {
-            window.location.href = nextURL.href;
+        catch (error) {
+            console.error('Error while setting query params', error);
         }
-    };
-    const mergeParams = (queryParams, replace = false) => {
-        // merging is the default behaviour of the setLocation
-        setLocation(window.location.href, queryParams, replace);
-    };
-    const setParams = (queryParams, replace = false) => {
-        const url = new URL(window.location.href);
-        // must clear the search params first as
-        // expected behaviour is replacement
-        url.search = '';
-        setLocation(url.href, queryParams, replace);
-    };
-    const removeParams = (paramKeys, replace = false) => {
-        const url = new URL(window.location.href);
-        const usableKeys = Array.isArray(paramKeys)
-            ? paramKeys
-            : paramKeys instanceof Object
-                ? Object.entries(paramKeys)
-                    .filter(([, value]) => value)
-                    .map(([key]) => key)
-                : [paramKeys];
-        for (const key of usableKeys) {
-            url.searchParams.delete(key);
-        }
-        setLocation(url, {}, replace);
-    };
-    return {
-        location: currentLocation,
-        getParam: getParam,
-        getParams: getParams,
-        hasParam: hasParam,
-        setLocation: setLocation,
-        makeLocation: (url, queryParams) => makeLocation(url, queryParams),
-        mergeParams: mergeParams,
-        setParams: setParams,
-        removeParam: removeParams,
-        removeParams: removeParams,
-        get allParams() {
-            const keys = new Set();
-            urlSearchParams.forEach((_, key) => {
-                keys.add(key);
-            });
-            const allParams = {};
-            for (const key of keys) {
-                watch(key);
-                allParams[key] = ParamValuesArray.from(urlSearchParams.getAll(String(key)));
-            }
-            return allParams;
-        },
-    };
+        pauseWatch.current = false;
+    }, [params]);
+    return [params, setParams];
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"useQueryParams.js","sourceRoot":"./src/","sources":["useQueryParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAE1E,MAAM,SAAS,GAAG,IAAI,GAAG,EAAc,CAAC;AAExC,SAAS,YAAY;IACjB,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC3B,QAAQ,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC;AAED,CAAC,UAAU,OAAO;IACd,SAAS,SAAS,CAAC,IAAS;QACxB,OAAO,UAAU,GAAG,IAAW;YAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAChD,YAAY,EAAE,CAAC;YAEf,OAAO,aAAa,CAAC;QACzB,CAAC,CAAC;IACN,CAAC;IAED,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACjD,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAEvD,gEAAgE;IAChE,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE;QACrC,YAAY,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAEnB,+DAA+D;AAC/D,6CAA6C;AAC7C,MAAM,OAAO,gBAAiB,SAAQ,KAAa;IAC/C,QAAQ;QACJ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACjB,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;SACvB;QAED,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AAgBD,MAAM,UAAU,sBAAsB,CAClC,GAAQ,EACR,WAAgC;IAEhC,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QACrD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC/D,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAE7B,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;YAC9B,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACvC;KACJ;AACL,CAAC;AAED,MAAM,UAAU,YAAY,CAE1B,GAAW,EAAE,cAAmC,EAAE;IAChD,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAErD,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE;QAClB,IAAI,SAAS,EAAE;YACX,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;SACvB;aAAM;YACH,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE9C,IAAI,UAAU,EAAE;gBACZ,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEzC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAC5B,OAAO,CAAC,MAAM,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC;aAChC;iBAAM;gBACH,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEzC,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEhD,OAAO,CAAC,QAAQ,GAAG;oBACf,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC3B,QAAQ,CAAC,IAAI,EAAE;wBACX,CAAC,CAAC,QAAQ;wBACV,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;iBAC5C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAEZ,OAAO,CAAC,MAAM,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC;aAChC;YAED,OAAO,OAAO,CAAC;SAClB;IACL,CAAC,CAAC,EAAE,CAAC;IAEL,sBAAsB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAE7C,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,cAAc;IAG1B,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;IAE7C,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE;QACjC,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,MAAM,QAAQ,GAAG,MAAM,CAEpB,EAAE,CAAC,CAAC;IAEP,iDAAiD;IACjD,uCAAuC;IACvC,MAAM,KAAK,GAAG,WAAW,CACrB,CAAC,GAAiB,EAAE,EAAE;QAClB,IAAI,GAAG,IAAI,QAAQ,CAAC,OAAO,EAAE;YACzB,OAAO;SACV;QAED,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACnD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;IACnC,CAAC,EACD,CAAC,eAAe,EAAE,QAAQ,CAAC,CAC9B,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;QAChC,QAAQ,CAAC,OAAO,GAAG,EAAE,CAAC;IAC1B,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,2DAA2D;IAC3D,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE;QAC5B,MAAM,aAAa,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAElE,IAAI,cAAc,GAAG,KAAK,CAAC;QAE3B,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC1D,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAEhD,IAAI,aAAa,CAAC,MAAM,MAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,EAAE;gBACzC,cAAc,GAAG,IAAI,CAAC;gBACtB,MAAM;aACT;YAED,uDAAuD;YACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC3C,IAAI,aAAa,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE;oBAChC,cAAc,GAAG,IAAI,CAAC;oBACtB,MAAM;iBACT;aACJ;SACJ;QAED,IAAI,cAAc,EAAE;YAChB,UAAU,EAAE,CAAC;YACb,QAAQ,EAAE,CAAC;SACd;IACL,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;IAErC,SAAS,CAAC,GAAG,EAAE;QACX,wCAAwC;QACxC,mCAAmC;QACnC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEtB,OAAO,GAAG,EAAE;YACR,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,MAAM,QAAQ,GAAG,CACb,QAAkD,EAChC,EAAE;;QACpB,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,OAAO,MAAA,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,mCAAI,SAAS,CAAC;IAC9D,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CACd,QAAoD,EAC5C,EAAE;QACV,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,OAAO,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,QAAsB,EAAW,EAAE;QACjD,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,OAAO,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAChB,GAAiB,EACjB,cAAmC,EAAE,EACrC,UAAmB,KAAK,EAC1B,EAAE;QACA,MAAM,OAAO,GACT,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAE9D,MAAM,UAAU,GACZ,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,QAAQ,CAAC,IAAI;YACrC,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAElD,6CAA6C;QAC7C,IAAI,UAAU,EAAE;YACZ,IAAI,OAAO,EAAE;gBACT,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;aACvD;iBAAM;gBACH,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;aACpD;SACJ;aAAM;YACH,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;SACvC;IACL,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAChB,WAAgC,EAChC,UAAmB,KAAK,EAC1B,EAAE;QACA,sDAAsD;QACtD,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CACd,WAAgC,EAChC,UAAmB,KAAK,EAC1B,EAAE;QACA,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE1C,wCAAwC;QACxC,oCAAoC;QACpC,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;QAEhB,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,CACjB,SAKQ,EACR,UAAmB,KAAK,EAC1B,EAAE;QACA,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE1C,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;YACvC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,YAAY,MAAM;gBAC7B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;qBACpB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;qBAC5B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;gBAC1B,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAElB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;YAC1B,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAa,CAAC,CAAC;SAC1C;QAED,WAAW,CAAC,GAAG,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC,CAAC;IAEF,OAAO;QACH,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,QAAQ;QAClB,WAAW,EAAE,WAAW;QACxB,YAAY,EAAE,CAAC,GAAW,EAAE,WAAgC,EAAE,EAAE,CAC5D,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC;QAClC,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE,SAAS;QACpB,WAAW,EAAE,YAAY;QACzB,YAAY,EAAE,YAAY;QAC1B,IAAI,SAAS;YACT,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;YAE/B,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;gBAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,MAAM,SAAS,GAAsB,EAAE,CAAC;YAExC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;gBACpB,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEX,SAAS,CAAC,GAAmB,CAAC,GAAG,gBAAgB,CAAC,IAAI,CAClD,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CACtC,CAAC;aACL;YAED,OAAO,SAAS,CAAC;QACrB,CAAC;KACJ,CAAC;AACN,CAAC","sourcesContent":["import {useCallback, useEffect, useMemo, useReducer, useRef} from 'react';\n\nconst listeners = new Set<() => void>();\n\nfunction runListeners() {\n    listeners.forEach((listener) => {\n        listener();\n    });\n}\n\n(function (history) {\n    function intercept(func: any) {\n        return function (...args: any[]) {\n            const returnedValue = func.apply(history, args);\n            runListeners();\n\n            return returnedValue;\n        };\n    }\n\n    history.pushState = intercept(history.pushState);\n    history.replaceState = intercept(history.replaceState);\n\n    // to handle browser's native backward and forward functionality\n    window.addEventListener('popstate', () => {\n        runListeners();\n    });\n})(window.history);\n\n// Exactly the same as Array<string> but with a custom toString\n// method that always returns the first value\nexport class ParamValuesArray extends Array<string> {\n    toString() {\n        if (this.length > 0) {\n            return `${this[0]}`;\n        }\n\n        return '';\n    }\n}\n\nexport type DefaultParamsObject = Record<string, any>;\n\nexport type AllParams<PARAMS extends DefaultParamsObject> = Partial<\n    Record<keyof PARAMS, ParamValuesArray>\n>;\n\n// string or string[] with single value for properties\n// defined as just `string` string[] for properties defined as `string[]`\nexport type InputParams<PARAMS extends DefaultParamsObject> = Partial<{\n    [KEY in keyof PARAMS]: PARAMS[KEY] extends string[]\n        ? string[]\n        : [string] | string;\n}>;\n\nexport function appendQueryParamsToURL<PARAMS extends DefaultParamsObject>(\n    url: URL,\n    queryParams: InputParams<PARAMS>,\n) {\n    for (const [key, values] of Object.entries(queryParams)) {\n        const usableValues = Array.isArray(values) ? values : [values];\n        url.searchParams.delete(key);\n\n        for (const value of usableValues) {\n            url.searchParams.append(key, value);\n        }\n    }\n}\n\nexport function makeLocation<\n    PARAMS extends DefaultParamsObject = DefaultParamsObject,\n>(url: string, queryParams: InputParams<PARAMS> = {}) {\n    const isFullURL = url.includes('http://') || url.includes('https://');\n    const isAbsolute = !isFullURL && url.startsWith('/');\n\n    const nextURL = (() => {\n        if (isFullURL) {\n            return new URL(url);\n        } else {\n            const nextURL = new URL(window.location.href);\n\n            if (isAbsolute) {\n                const [pathname, query] = url.split('?');\n\n                nextURL.pathname = pathname;\n                nextURL.search = query ?? '';\n            } else {\n                const [pathname, query] = url.split('?');\n\n                const urlSegments = nextURL.pathname.split('/');\n\n                nextURL.pathname = [\n                    ...urlSegments.slice(0, -1),\n                    pathname.trim()\n                        ? pathname\n                        : urlSegments[urlSegments.length - 1],\n                ].join('/');\n\n                nextURL.search = query ?? '';\n            }\n\n            return nextURL;\n        }\n    })();\n\n    appendQueryParamsToURL(nextURL, queryParams);\n\n    return nextURL;\n}\n\nexport function useQueryParams<\n    PARAMS extends DefaultParamsObject = DefaultParamsObject,\n>() {\n    const currentLocation = window.location.href;\n\n    const urlSearchParams = useMemo(() => {\n        return new URLSearchParams(window.location.search);\n    }, [currentLocation]);\n\n    const watching = useRef<{\n        [key in keyof PARAMS]?: string[];\n    }>({});\n\n    // stores both the key and the values as an array\n    // of the params that are being watched\n    const watch = useCallback(\n        (key: keyof PARAMS) => {\n            if (key in watching.current) {\n                return;\n            }\n\n            const values = urlSearchParams.getAll(String(key));\n            watching.current[key] = values;\n        },\n        [urlSearchParams, watching],\n    );\n\n    const clearWatch = useCallback(() => {\n        watching.current = {};\n    }, [watching]);\n\n    // React's officially recommended way of forcing a rerender\n    const [, rerender] = useReducer((state) => state + 1, 0);\n\n    const handle = useCallback(() => {\n        const currentParams = new URLSearchParams(window.location.search);\n\n        let shouldRerender = false;\n\n        for (const [key, values] of Object.entries(watching.current)) {\n            const currentValues = currentParams.getAll(key);\n\n            if (currentValues.length !== values?.length) {\n                shouldRerender = true;\n                break;\n            }\n\n            // the first mismatched value means we need to rerender\n            for (let i = 0; i < currentValues.length; i++) {\n                if (currentValues[i] !== values[i]) {\n                    shouldRerender = true;\n                    break;\n                }\n            }\n        }\n\n        if (shouldRerender) {\n            clearWatch();\n            rerender();\n        }\n    }, [watching, clearWatch, rerender]);\n\n    useEffect(() => {\n        // listening on the global window object\n        // via interceptions and listeners.\n        listeners.add(handle);\n\n        return () => {\n            listeners.delete(handle);\n        };\n    }, [handle]);\n\n    const getParam = <KEY extends keyof PARAMS>(\n        paramKey: PARAMS[KEY] extends string ? KEY : never,\n    ): string | undefined => {\n        watch(paramKey);\n        return urlSearchParams.get(String(paramKey)) ?? undefined;\n    };\n\n    const getParams = <KEY extends keyof PARAMS>(\n        paramKey: PARAMS[KEY] extends string[] ? KEY : never,\n    ): string[] => {\n        watch(paramKey);\n        return urlSearchParams.getAll(String(paramKey));\n    };\n\n    const hasParam = (paramKey: keyof PARAMS): boolean => {\n        watch(paramKey);\n        return urlSearchParams.has(String(paramKey));\n    };\n\n    const setLocation = (\n        url: string | URL,\n        queryParams: InputParams<PARAMS> = {},\n        replace: boolean = false,\n    ) => {\n        const nextURL =\n            url instanceof URL ? url : makeLocation(url, queryParams);\n\n        const sameOrigin =\n            nextURL.host === window.location.host &&\n            nextURL.protocol === window.location.protocol;\n\n        // History API only supports same origin URLs\n        if (sameOrigin) {\n            if (replace) {\n                window.history.replaceState(null, '', nextURL.href);\n            } else {\n                window.history.pushState(null, '', nextURL.href);\n            }\n        } else {\n            window.location.href = nextURL.href;\n        }\n    };\n\n    const mergeParams = (\n        queryParams: InputParams<PARAMS>,\n        replace: boolean = false,\n    ) => {\n        // merging is the default behaviour of the setLocation\n        setLocation(window.location.href, queryParams, replace);\n    };\n\n    const setParams = (\n        queryParams: InputParams<PARAMS>,\n        replace: boolean = false,\n    ) => {\n        const url = new URL(window.location.href);\n\n        // must clear the search params first as\n        // expected behaviour is replacement\n        url.search = '';\n\n        setLocation(url.href, queryParams, replace);\n    };\n\n    const removeParams = (\n        paramKeys:\n            | keyof PARAMS\n            | (keyof PARAMS)[]\n            | Partial<{\n                  [key in keyof PARAMS]: boolean;\n              }>,\n        replace: boolean = false,\n    ) => {\n        const url = new URL(window.location.href);\n\n        const usableKeys = Array.isArray(paramKeys)\n            ? paramKeys\n            : paramKeys instanceof Object\n            ? Object.entries(paramKeys)\n                  .filter(([, value]) => value)\n                  .map(([key]) => key)\n            : [paramKeys];\n\n        for (const key of usableKeys) {\n            url.searchParams.delete(key as string);\n        }\n\n        setLocation(url, {}, replace);\n    };\n\n    return {\n        location: currentLocation,\n        getParam: getParam,\n        getParams: getParams,\n        hasParam: hasParam,\n        setLocation: setLocation,\n        makeLocation: (url: string, queryParams: InputParams<PARAMS>) =>\n            makeLocation(url, queryParams),\n        mergeParams: mergeParams,\n        setParams: setParams,\n        removeParam: removeParams,\n        removeParams: removeParams,\n        get allParams() {\n            const keys = new Set<string>();\n\n            urlSearchParams.forEach((_, key) => {\n                keys.add(key);\n            });\n\n            const allParams: AllParams<PARAMS> = {};\n\n            for (const key of keys) {\n                watch(key);\n\n                allParams[key as keyof PARAMS] = ParamValuesArray.from(\n                    urlSearchParams.getAll(String(key)),\n                );\n            }\n\n            return allParams;\n        },\n    };\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"useQueryParams.js","sourceRoot":"./src/","sources":["useQueryParams.ts"],"names":[],"mappings":"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","sourcesContent":["import {useCallback, useEffect, useMemo, useReducer, useRef} from 'react';\n\nconst listeners = new Set<() => void>();\n\nfunction runListeners() {\n    listeners.forEach((listener) => {\n        listener();\n    });\n}\n\n(function (history) {\n    function intercept(func: any) {\n        return function (...args: any[]) {\n            const returnedValue = func.apply(history, args);\n            runListeners();\n\n            return returnedValue;\n        };\n    }\n\n    history.pushState = intercept(history.pushState);\n    history.replaceState = intercept(history.replaceState);\n\n    // to handle browser's native backward and forward functionality\n    window.addEventListener('popstate', () => {\n        runListeners();\n    });\n})(window.history);\n\nexport type TDefaultParamsObject = Record<string, any>;\n\nexport type TAllParams<PARAMS extends TDefaultParamsObject> = {\n    [key in keyof PARAMS]: string[];\n};\n\nexport function applyQueryParams<PARAMS extends TDefaultParamsObject>(\n    target: URL | URLSearchParams,\n    queryParams: TAllParams<PARAMS>,\n    removeExtras: boolean = false,\n) {\n    const params = target instanceof URL ? target.searchParams : target;\n\n    if (removeExtras) {\n        params.forEach((value, key) => {\n            if (!(key in queryParams)) {\n                params.delete(key);\n            }\n        });\n    }\n\n    for (const [key, values] of Object.entries(queryParams)) {\n        const usableValues = Array.isArray(values) ? values : [values];\n        params.delete(key);\n\n        for (const value of usableValues) {\n            params.append(key, value);\n        }\n    }\n\n    return target;\n}\n\nexport function useQueryParams<\n    PARAMS extends TDefaultParamsObject = TDefaultParamsObject,\n>() {\n    const currentLocation = window.location.href;\n\n    const urlSearchParams = useMemo(() => {\n        return new URLSearchParams(window.location.search);\n    }, [currentLocation]);\n\n    const watching = useRef<{\n        [key in keyof PARAMS]?: string[];\n    }>({});\n\n    const pauseWatch = useRef<boolean>(false);\n\n    // stores both the key and the values as an array\n    // of the params that are being watched\n    const watch = useCallback(\n        (key: keyof PARAMS) => {\n            if (key in watching.current || pauseWatch.current) {\n                return;\n            }\n\n            watching.current[key] = urlSearchParams.getAll(String(key));\n        },\n        [urlSearchParams, watching],\n    );\n\n    const clearWatch = useCallback(() => {\n        watching.current = {};\n    }, [watching]);\n\n    // React's officially recommended way of forcing a rerender\n    const [, rerender] = useReducer((state) => state + 1, 0);\n\n    // Handles location changes via listener mechanism above.\n    const handle = useCallback(() => {\n        const currentParams = new URLSearchParams(window.location.search);\n\n        let shouldRerender = false;\n\n        for (const [key, values] of Object.entries(watching.current)) {\n            const currentValues = currentParams.getAll(key);\n\n            if (currentValues.length !== values?.length) {\n                shouldRerender = true;\n                break;\n            }\n\n            // the first mismatched value means we need to rerender\n            for (let i = 0; i < currentValues.length; i++) {\n                if (currentValues[i] !== values[i]) {\n                    shouldRerender = true;\n                    break;\n                }\n            }\n        }\n\n        if (shouldRerender) {\n            clearWatch();\n            rerender();\n        }\n    }, [watching, clearWatch, rerender]);\n\n    useEffect(() => {\n        // listening on the global window object\n        // via interceptions and listeners.\n        listeners.add(handle);\n\n        return () => {\n            listeners.delete(handle);\n        };\n    }, [handle]);\n\n    const params = useMemo(() => {\n        return new Proxy({} as TAllParams<PARAMS>, {\n            get(target, key: string): string[] {\n                watch(key);\n                return urlSearchParams.getAll(key);\n            },\n            ownKeys(target) {\n                const keys = new Set<string>();\n\n                urlSearchParams.forEach((value, key) => {\n                    keys.add(key);\n                });\n\n                return [...keys];\n            },\n            getOwnPropertyDescriptor(target, prop) {\n                return {configurable: true, enumerable: true, writable: false};\n            },\n            has(target, key: string) {\n                watch(key);\n                return urlSearchParams.has(key);\n            },\n        });\n    }, [urlSearchParams]);\n\n    const setParams = useCallback(\n        (\n            nextParams:\n                | TAllParams<PARAMS>\n                | ((current: TAllParams<PARAMS>) => TAllParams<PARAMS>),\n            replace: boolean = false,\n        ) => {\n            try {\n                const nextURL = new URL(window.location.href);\n\n                pauseWatch.current = true;\n\n                const nextParamsObject =\n                    nextParams instanceof Function\n                        ? nextParams(params)\n                        : nextParams;\n\n                pauseWatch.current = false;\n\n                applyQueryParams(nextURL, nextParamsObject);\n\n                if (replace) {\n                    window.history.replaceState(null, '', nextURL);\n                } else {\n                    window.history.pushState(null, '', nextURL);\n                }\n            } catch (error) {\n                console.error('Error while setting query params', error);\n            }\n\n            pauseWatch.current = false;\n        },\n        [params],\n    );\n\n    return [params, setParams] as const;\n}\n"]}

package.json

 {
   "name": "react-use-query-params",
-  "version": "1.0.3",
+  "version": "2.0.1",
   "description": "Strongly typed, routing-library agnostic react hook to use and manipulate query params",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

22945

decreased by-34.27%

Lines of code

151

decreased by-36.55%

Number of medium supply chain risk alerts

1

increased byInfinity%

No dependency changes