@cabloy/utils 1.0.8 → 1.0.10

package/dist/utils.d.ts

@@ -8,4 +8,5 @@ export declare function getPropertyObject<T>(obj: object, name: string, sep?: st
 export declare function createFunction(expression: string, scopeKeys?: string[]): Function;
 export declare function evaluateSimple(expression: string): any;
 export declare function getRandomInt(size: number, start?: number): number;
-export declare function combineQueries(url?: string, queries?: Record<string, any>): string;
+export declare function combineQueries(pagePath?: string, queries?: Record<string, any>): string;
+export declare function defaultPathSerializer(pathName: string, pathParams?: Record<string, any>): string;

package/dist/utils.js

@@ -90,27 +90,52 @@ export function evaluateSimple(expression) {
 export function getRandomInt(size, start = 0) {
     return Math.floor(Math.random() * size) + start;
 }
-export function combineQueries(url, queries) {
+export function combineQueries(pagePath, queries) {
+    pagePath = pagePath ?? '/';
     //
     if (!queries)
-        return url || '';
+        return pagePath;
     //
+    const query2 = [];
     const parts = [];
-    for (const key of Object.keys(queries)) {
-        parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(queries[key])}`);
+    if (queries) {
+        for (const key in queries) {
+            const value = queries[key];
+            if (value && typeof value === 'object') {
+                query2.push([key, value]);
+            }
+            else {
+                parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+            }
+        }
+    }
+    // query2
+    for (const [key, value] of query2) {
+        parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(JSON.stringify(value))}`);
     }
     if (parts.length === 0)
-        return url || '';
+        return pagePath;
     //
     const str = parts.join('&');
     //
-    if (!url)
-        return `?${str}`;
-    //
-    const pos = url.indexOf('?');
+    const pos = pagePath.indexOf('?');
     if (pos === -1)
-        return `${url}?${str}`;
-    if (pos === url.length - 1)
-        return `${url}${str}`;
-    return `${url}&${str}`;
+        return `${pagePath}?${str}`;
+    if (pos === pagePath.length - 1)
+        return `${pagePath}${str}`;
+    return `${pagePath}&${str}`;
+}
+const PATH_PARAM_RE = /\{([^{}/]+)\}/g;
+export function defaultPathSerializer(pathName, pathParams) {
+    pathParams = pathParams ?? {};
+    return pathName.replace(PATH_PARAM_RE, (_, _part) => {
+        if (_part.includes('?'))
+            _part = _part.substring(0, _part.length - 1);
+        const value = pathParams?.[_part];
+        if (value === undefined || value === null)
+            return '';
+        if (typeof value === 'object')
+            return encodeURIComponent(JSON.stringify(value));
+        return encodeURIComponent(value);
+    });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/utils",
   "type": "module",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "cabloy utils",
   "publishConfig": {
     "access": "public"