@cabloy/utils 1.0.10 → 1.0.11

package/dist/utils.d.ts

@@ -8,5 +8,9 @@ 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 combineParamsAndQuery(path: string, options?: {
+    params?: object;
+    query?: object;
+}): 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,6 +90,9 @@ export function evaluateSimple(expression) {
 export function getRandomInt(size, start = 0) {
     return Math.floor(Math.random() * size) + start;
 }
+export function combineParamsAndQuery(path, options) {
+    return combineQueries(defaultPathSerializer(path, options?.params), options?.query);
+}
 export function combineQueries(pagePath, queries) {
     pagePath = pagePath ?? '/';
     //
@@ -126,16 +129,20 @@ export function combineQueries(pagePath, queries) {
     return `${pagePath}&${str}`;
 }
 const PATH_PARAM_RE = /\{([^{}/]+)\}/g;
+const PATH_PARAM_RE2 = /:([^/]+)/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);
-    });
+    for (const item of [PATH_PARAM_RE, PATH_PARAM_RE2]) {
+        pathName = pathName.replace(item, (_, _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);
+        });
+    }
+    return pathName;
 }

package/package.json

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