@evlop/commons 1.0.195 → 1.0.196

package/dist/src/helpers/pathHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pathHelper.d.ts","sourceRoot":"","sources":["../../../src/helpers/pathHelper.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,UA4B7D"}
+{"version":3,"file":"pathHelper.d.ts","sourceRoot":"","sources":["../../../src/helpers/pathHelper.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,UA0B7D"}

package/dist/src/helpers/pathHelper.js

@@ -4,33 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePath = void 0;
-const lodash_1 = require("lodash");
 const query_string_1 = __importDefault(require("query-string"));
 function generatePath(pathTemplate, params) {
-    const parts = lodash_1.compact(lodash_1.split(pathTemplate, '/'));
-    const { pathSegments, usedParams } = lodash_1.reduce(parts, ({ pathSegments, usedParams }, part) => {
-        const isOptional = part[part.length - 1] === '?';
-        if (isOptional)
-            part = part.slice(0, -1);
-        if (part[0] === ':') {
-            const key = part.slice(1);
-            if (lodash_1.has(params, [key])) {
-                pathSegments.push(encodeURIComponent(params[key]));
-                usedParams[key] = true;
-            }
-            else if (!isOptional) {
-                pathSegments.push(part);
-            }
+    if (!pathTemplate || !params)
+        return pathTemplate;
+    const paramsCopy = Object.assign({}, params);
+    // Replace placeholders in the path
+    let path = String(pathTemplate).replace(/:\w+/g, (match) => {
+        const paramKey = match.substring(1); // Remove the ':' prefix
+        if (paramsCopy[paramKey] !== undefined) {
+            const value = paramsCopy[paramKey];
+            delete paramsCopy[paramKey]; // Remove the param from the copy to avoid duplicating in the query string
+            return encodeURIComponent(value);
         }
-        else {
-            pathSegments.push(part);
-        }
-        return { pathSegments, usedParams };
-    }, { pathSegments: [], usedParams: {} });
-    const remainingParams = lodash_1.omit(params, Object.keys(usedParams));
-    const query = query_string_1.default.stringify(remainingParams);
-    const path = '/' + pathSegments.join('/');
-    return path + (query ? '?' + query : '');
+        return match;
+    });
+    // Use query-string to stringify the remaining params from the copy
+    const query = query_string_1.default.stringify(paramsCopy);
+    // Append query string if it's not empty
+    if (query) {
+        path += `?${query}`;
+    }
+    return path;
 }
 exports.generatePath = generatePath;
 //# sourceMappingURL=pathHelper.js.map

package/dist/src/helpers/pathHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"pathHelper.js","sourceRoot":"","sources":["../../../src/helpers/pathHelper.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA2D;AAC3D,gEAAuC;AAEvC,SAAgB,YAAY,CAAC,YAAoB,EAAE,MAAW;IAC1D,MAAM,KAAK,GAAG,gBAAO,CAAC,cAAK,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;IAEhD,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,eAAM,CAAC,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE;QACtF,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC;QACjD,IAAI,UAAU;YAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEzC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACjB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,YAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;gBACpB,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACnD,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;aAC1B;iBAAM,IAAI,CAAC,UAAU,EAAE;gBACpB,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC3B;SACJ;aAAM;YACH,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC3B;QAED,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;IACxC,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IAEzC,MAAM,eAAe,GAAG,aAAI,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,sBAAW,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAErD,MAAM,IAAI,GAAG,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAC7C,CAAC;AA5BD,oCA4BC"}
+{"version":3,"file":"pathHelper.js","sourceRoot":"","sources":["../../../src/helpers/pathHelper.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAuC;AAEvC,SAAgB,YAAY,CAAC,YAAoB,EAAE,MAAW;IAE1D,IAAI,CAAC,YAAY,IAAI,CAAC,MAAM;QAAE,OAAO,YAAY,CAAC;IAElD,MAAM,UAAU,qBAAQ,MAAM,CAAE,CAAC;IAEjC,mCAAmC;IACnC,IAAI,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,wBAAwB;QAC7D,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE;YACpC,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YACnC,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,0EAA0E;YACvG,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;SACpC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,MAAM,KAAK,GAAG,sBAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAEhD,wCAAwC;IACxC,IAAI,KAAK,EAAE;QACP,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;KACvB;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AA1BD,oCA0BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evlop/commons",
-  "version": "1.0.195",
+  "version": "1.0.196",
   "description": "",
   "main": "dist/main.js",
   "peerDependencies": {