npm - @common-stack/rollup-vite-utils - Versions diffs - 6.0.6-alpha.54 → 6.0.6-alpha.56 - Mend

@common-stack/rollup-vite-utils 6.0.6-alpha.54 → 6.0.6-alpha.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/lib/vite-wrappers/custom-routes.cjs CHANGED Viewed

@@ -1,5 +1,4 @@
-'use strict';var fs=require('fs'),path=require('path'),handleComponentOrDialog=require('../rollup/modifyLibFiles/handleComponentOrDialog.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var fs__namespace=/*#__PURE__*/_interopNamespaceDefault(fs);var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);// import { getHash } from './json-wrappers';
-function getRootPath() {
+'use strict';var fs=require('fs'),path=require('path'),handleComponentOrDialog=require('../rollup/modifyLibFiles/handleComponentOrDialog.cjs'),jsonWrappers=require('./json-wrappers.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var fs__namespace=/*#__PURE__*/_interopNamespaceDefault(fs);var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);function getRootPath() {
     return process.cwd();
 }
 function generateRoute(filePath) {
@@ -7,7 +6,7 @@ function generateRoute(filePath) {
     return { loaderInfo };
 }
 function createDummyFile(route) {
-    const routeStr = `${route.id}/${route.path}`;
+    const routeStr = jsonWrappers.getHash(`${route.id}/${route.path}`);
     const fileName = `DummyRoute-${routeStr}.tsx`;
     const newFilePath = path__namespace.join(getRootPath(), 'app', fileName);
     const dummyComponent = createDummyComponent(route);

package/lib/vite-wrappers/custom-routes.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"custom-routes.cjs","sources":["../../src/vite-wrappers/custom-routes.ts"],"sourcesContent":[null],"names":["extractLoaderInfoFromFile","path","fs"],"mappings":"~~yiBAGA;AAEA~~,SAAS,WAAW,GAAA;AAChB,IAAA,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;AACzB,CAAC;AAEK,SAAU,aAAa,CAAC,QAAgB,EAAA;IAC1C,MAAM,EAAE,UAAU,EAAE,GAAGA,iDAAyB,CAAC,QAAQ,CAAC,CAAC;IAC3D,OAAO,EAAE,UAAU,EAAE,CAAC;AAC1B,CAAC;AAEK,SAAU,eAAe,CAAC,KAAU,EAAA;~~IACtC~~,MAAM,QAAQ,~~GAAG~~,~~CAAA~~,~~EAAG~~,KAAK,CAAC,EAAE,CAAA,CAAA,EAAI,KAAK,CAAC,IAAI,CAAA,CAAE,CAAC;~~AAC7C~~,IAAA,MAAM,QAAQ,GAAG,CAAc,WAAA,EAAA,QAAQ,MAAM,CAAC;AAC9C,IAAA,MAAM,WAAW,GAAGC,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC9D,IAAA,MAAM,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAEnD,IAAAC,aAAE,CAAC,aAAa,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;AAC/E,IAAA,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAY,EAAA;AACtC,IAAA,MAAM,QAAQ,GAAG,CAAA;;;;;cAKP,OAAO,CAAC,IAAI,IAAI,gBAAgB,CAAA;;;;;;;;;;;;;;;;;;KAkBzC,CAAC;AAEF,IAAA,OAAO,QAAQ,CAAC;AACpB"}
1	+ {"version":3,"file":"custom-routes.cjs","sources":["../../src/vite-wrappers/custom-routes.ts"],"sourcesContent":[null],"names":["extractLoaderInfoFromFile","getHash","path","fs"],"mappings":"qlBAKA,SAAS,WAAW,GAAA;AAChB,IAAA,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;AACzB,CAAC;AAEK,SAAU,aAAa,CAAC,QAAgB,EAAA;IAC1C,MAAM,EAAE,UAAU,EAAE,GAAGA,iDAAyB,CAAC,QAAQ,CAAC,CAAC;IAC3D,OAAO,EAAE,UAAU,EAAE,CAAC;AAC1B,CAAC;AAEK,SAAU,eAAe,CAAC,KAAU,EAAA;AACtC,IAAA,MAAM,QAAQ,GAAGC,oBAAO,CAAC,GAAG,KAAK,CAAC,EAAE,CAAA,CAAA,EAAI,KAAK,CAAC,IAAI,CAAA,CAAE,CAAC,CAAC;AACtD,IAAA,MAAM,QAAQ,GAAG,CAAc,WAAA,EAAA,QAAQ,MAAM,CAAC;AAC9C,IAAA,MAAM,WAAW,GAAGC,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC9D,IAAA,MAAM,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAEnD,IAAAC,aAAE,CAAC,aAAa,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;AAC/E,IAAA,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAY,EAAA;AACtC,IAAA,MAAM,QAAQ,GAAG,CAAA;;;;;cAKP,OAAO,CAAC,IAAI,IAAI,gBAAgB,CAAA;;;;;;;;;;;;;;;;;;KAkBzC,CAAC;AAEF,IAAA,OAAO,QAAQ,CAAC;AACpB"}

package/lib/vite-wrappers/custom-routes.js CHANGED Viewed

@@ -1,5 +1,4 @@
-import*as fs from'fs';import*as path from'path';import {extractLoaderInfoFromFile}from'../rollup/modifyLibFiles/handleComponentOrDialog.js';// import { getHash } from './json-wrappers';
-function getRootPath() {
+import*as fs from'fs';import*as path from'path';import {extractLoaderInfoFromFile}from'../rollup/modifyLibFiles/handleComponentOrDialog.js';import {getHash}from'./json-wrappers.js';function getRootPath() {
     return process.cwd();
 }
 function generateRoute(filePath) {
@@ -7,7 +6,7 @@ function generateRoute(filePath) {
     return { loaderInfo };
 }
 function createDummyFile(route) {
-    const routeStr = `${route.id}/${route.path}`;
+    const routeStr = getHash(`${route.id}/${route.path}`);
     const fileName = `DummyRoute-${routeStr}.tsx`;
     const newFilePath = path.join(getRootPath(), 'app', fileName);
     const dummyComponent = createDummyComponent(route);

package/lib/vite-wrappers/custom-routes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"custom-routes.js","sources":["../../src/vite-wrappers/custom-routes.ts"],"sourcesContent":[null],"names":[],"mappings":"~~4IAGA;AAEA~~,SAAS,WAAW,GAAA;AAChB,IAAA,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;AACzB,CAAC;AAEK,SAAU,aAAa,CAAC,QAAgB,EAAA;IAC1C,MAAM,EAAE,UAAU,EAAE,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC3D,OAAO,EAAE,UAAU,EAAE,CAAC;AAC1B,CAAC;AAEK,SAAU,eAAe,CAAC,KAAU,EAAA;~~IACtC~~,MAAM,QAAQ,GAAG,~~CAAA~~,~~EAAG~~,KAAK,CAAC,EAAE,CAAA,CAAA,EAAI,KAAK,CAAC,IAAI,CAAA,CAAE,CAAC;~~AAC7C~~,IAAA,MAAM,QAAQ,GAAG,CAAc,WAAA,EAAA,QAAQ,MAAM,CAAC;AAC9C,IAAA,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC9D,IAAA,MAAM,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAEnD,IAAA,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;AAC/E,IAAA,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAY,EAAA;AACtC,IAAA,MAAM,QAAQ,GAAG,CAAA;;;;;cAKP,OAAO,CAAC,IAAI,IAAI,gBAAgB,CAAA;;;;;;;;;;;;;;;;;;KAkBzC,CAAC;AAEF,IAAA,OAAO,QAAQ,CAAC;AACpB"}
1	+ {"version":3,"file":"custom-routes.js","sources":["../../src/vite-wrappers/custom-routes.ts"],"sourcesContent":[null],"names":[],"mappings":"qLAKA,SAAS,WAAW,GAAA;AAChB,IAAA,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;AACzB,CAAC;AAEK,SAAU,aAAa,CAAC,QAAgB,EAAA;IAC1C,MAAM,EAAE,UAAU,EAAE,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC3D,OAAO,EAAE,UAAU,EAAE,CAAC;AAC1B,CAAC;AAEK,SAAU,eAAe,CAAC,KAAU,EAAA;AACtC,IAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC,EAAE,CAAA,CAAA,EAAI,KAAK,CAAC,IAAI,CAAA,CAAE,CAAC,CAAC;AACtD,IAAA,MAAM,QAAQ,GAAG,CAAc,WAAA,EAAA,QAAQ,MAAM,CAAC;AAC9C,IAAA,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC9D,IAAA,MAAM,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAEnD,IAAA,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;AAC/E,IAAA,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAY,EAAA;AACtC,IAAA,MAAM,QAAQ,GAAG,CAAA;;;;;cAKP,OAAO,CAAC,IAAI,IAAI,gBAAgB,CAAA;;;;;;;;;;;;;;;;;;KAkBzC,CAAC;AAEF,IAAA,OAAO,QAAQ,CAAC;AACpB"}

package/lib/vite-wrappers/generators/utils/resourceParams.cjs CHANGED Viewed

@@ -1,36 +1,58 @@
-'use strict';/**
+'use strict';/* eslint-disable default-param-last */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/**
  * Recursively process the resourceParams object and replace any placeholder values starting with `$params.`.
  * If the `path` is empty or matches `IConfigCollectionName.Organization`, ensure it provides a default query
- * with `{ name: $params.orgName }`.
+ * with `{ name: $params.orgName }`, but only if `query` is not already defined.
  *
  * @param resourceParams - The nested resourceParams object containing placeholders.
  * @param params - The params object from which values are extracted.
  * @param defaultPath - Optional default path to be assigned when `path` is empty or a specific condition is met.
+ * @param defaultFragment - Optional default fragment to be assigned when `fragment` is missing.
  * @returns The processed resourceParams object with replaced values.
  */
-function resolveResourceParamsPlaceholders(resourceParams, params, defaultPath = 'IConfigCollectionName.Organization') {
-    if (!resourceParams || typeof resourceParams !== 'object')
-        return resourceParams;
+function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultPath = 'organizations', defaultFragment = 'settings') {
     const resolvedParams = {};
+    if (!resourceParams || typeof resourceParams !== 'object') {
+        return resolvedParams;
+    }
+    // Recursively resolve the object and handle placeholders
     Object.entries(resourceParams).forEach(([key, value]) => {
         if (typeof value === 'string' && value.startsWith('$params.')) {
-            // Replace placeholder with actual value from params
             const paramKey = value.split('$params.')[1];
             resolvedParams[key] = params[paramKey];
         }
-        else if (typeof value === 'object' && value !== null) {
-            // Recursively resolve nested objects
-            resolvedParams[key] = resolveResourceParamsPlaceholders(value, params, defaultPath);
+        else if (typeof value === 'object' && value !== null && key !== 'query') {
+            // Only recurse if we're not inside a 'query' to avoid nesting issues
+            resolvedParams[key] = resolveResourceParamsPlaceholders(value, params, defaultPath, defaultFragment);
         }
         else {
-            // Direct assignment for other values
             resolvedParams[key] = value;
         }
     });
-    // If the path is missing or matches `IConfigCollectionName.Organization`, ensure query is set
-    if (!resolvedParams.path || resolvedParams.path === defaultPath) {
+    // Only add path and query if they don't exist at the root level
+    if (!resourceParams.path && !resolvedParams.path) {
         resolvedParams.path = defaultPath;
-        resolvedParams.query = { name: params.orgName }; // Assuming `orgName` exists in params
+    }
+    // Only set the query if it's not already defined at the root level
+    if (!resourceParams.query && !resolvedParams.query) {
+        resolvedParams.query = { name: params.name };
+    }
+    else if (typeof resourceParams.query === 'object') {
+        resolvedParams.query = {};
+        Object.entries(resourceParams.query).forEach(([key, value]) => {
+            if (typeof value === 'string' && value.startsWith('$params.')) {
+                const paramKey = value.split('$params.')[1];
+                resolvedParams.query[key] = params[paramKey];
+            }
+            else {
+                resolvedParams.query[key] = value;
+            }
+        });
+    }
+    // Add fragment only if it doesn't exist at the root level
+    if (!resourceParams.fragment && !resolvedParams.fragment) {
+        resolvedParams.fragment = defaultFragment;
     }
     return resolvedParams;
 }exports.resolveResourceParamsPlaceholders=resolveResourceParamsPlaceholders;//# sourceMappingURL=resourceParams.cjs.map

package/lib/vite-wrappers/generators/utils/resourceParams.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"resourceParams.cjs","sources":["../../../../src/vite-wrappers/generators/utils/resourceParams.ts"],"sourcesContent":[null],"names":[],"mappings":"aAAA~~;;;;;;;;;AASG~~;~~AACG~~,~~SAAU~~,iCAAiC,CAC7C,~~cAAmC~~,~~EACnC~~,MAA2B,EAC3B,~~cAAsB~~,~~oCAAoC~~,EAAA;~~AAE1D~~,~~IAAA~~,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ;~~AAAE~~,QAAA,OAAO,cAAc,CAAC;~~IAEjF~~,~~MAAM,cAAc,GAAwB,EAAE,CAAC;AAE/C,~~IAAA,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AACpD,QAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE~~;;YAE3D~~,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;SAC1C;~~aAAM~~,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;;~~AAEpD~~,YAAA,cAAc,CAAC,GAAG,CAAC,GAAG,iCAAiC,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;~~SACvF~~;aAAM~~;;AAEH~~,YAAA,cAAc,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAC/B;AACL,KAAC,CAAC,CAAC;;IAGH,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,~~KAAK~~,WAAW,EAAE;~~AAC7D~~,QAAA,cAAc,CAAC,~~IAAI~~,GAAG,~~WAAW~~,CAAC;~~AAClC~~,QAAA,cAAc,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,~~OAAO~~,EAAE,CAAC;~~KACnD~~;AAED,IAAA,OAAO,cAAc,CAAC;AAC1B"}
1	+ {"version":3,"file":"resourceParams.cjs","sources":["../../../../src/vite-wrappers/generators/utils/resourceParams.ts"],"sourcesContent":[null],"names":[],"mappings":"aAAA;AACA;AACA;;;;;;;;;;AAUG;AACa,SAAA,iCAAiC,CAC7C,cAAA,GAAsC,EAAE,EACxC,MAA2B,EAC3B,WAAsB,GAAA,eAAe,EACrC,eAAA,GAA0B,UAAU,EAAA;IAEpC,MAAM,cAAc,GAAwB,EAAE,CAAC;IAE/C,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;AACvD,QAAA,OAAO,cAAc,CAAC;KACzB;;AAGD,IAAA,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AACpD,QAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC3D,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;SAC1C;AAAM,aAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,GAAG,KAAK,OAAO,EAAE;;AAEvE,YAAA,cAAc,CAAC,GAAG,CAAC,GAAG,iCAAiC,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;SACxG;aAAM;AACH,YAAA,cAAc,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAC/B;AACL,KAAC,CAAC,CAAC;;IAGH,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE;AAC9C,QAAA,cAAc,CAAC,IAAI,GAAG,WAAW,CAAC;KACrC;;IAGD,IAAI,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;QAChD,cAAc,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;KAChD;AAAM,SAAA,IAAI,OAAO,cAAc,CAAC,KAAK,KAAK,QAAQ,EAAE;AACjD,QAAA,cAAc,CAAC,KAAK,GAAG,EAAE,CAAC;AAC1B,QAAA,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AAC1D,YAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC3D,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;aAChD;iBAAM;AACH,gBAAA,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACrC;AACL,SAAC,CAAC,CAAC;KACN;;IAGD,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;AACtD,QAAA,cAAc,CAAC,QAAQ,GAAG,eAAe,CAAC;KAC7C;AAED,IAAA,OAAO,cAAc,CAAC;AAC1B"}

package/lib/vite-wrappers/generators/utils/resourceParams.d.ts CHANGED Viewed

@@ -1,11 +1,12 @@
 /**
  * Recursively process the resourceParams object and replace any placeholder values starting with `$params.`.
  * If the `path` is empty or matches `IConfigCollectionName.Organization`, ensure it provides a default query
- * with `{ name: $params.orgName }`.
+ * with `{ name: $params.orgName }`, but only if `query` is not already defined.
  *
  * @param resourceParams - The nested resourceParams object containing placeholders.
  * @param params - The params object from which values are extracted.
  * @param defaultPath - Optional default path to be assigned when `path` is empty or a specific condition is met.
+ * @param defaultFragment - Optional default fragment to be assigned when `fragment` is missing.
  * @returns The processed resourceParams object with replaced values.
  */
-export declare function resolveResourceParamsPlaceholders(resourceParams: Record<string, any>, params: Record<string, any>, defaultPath?: string): Record<string, any>;
+export declare function resolveResourceParamsPlaceholders(resourceParams: Record<string, any>, params: Record<string, any>, defaultPath?: string, defaultFragment?: string): Record<string, any>;

package/lib/vite-wrappers/generators/utils/resourceParams.js CHANGED Viewed

@@ -1,36 +1,58 @@
+/* eslint-disable default-param-last */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * Recursively process the resourceParams object and replace any placeholder values starting with `$params.`.
  * If the `path` is empty or matches `IConfigCollectionName.Organization`, ensure it provides a default query
- * with `{ name: $params.orgName }`.
+ * with `{ name: $params.orgName }`, but only if `query` is not already defined.
  *
  * @param resourceParams - The nested resourceParams object containing placeholders.
  * @param params - The params object from which values are extracted.
  * @param defaultPath - Optional default path to be assigned when `path` is empty or a specific condition is met.
+ * @param defaultFragment - Optional default fragment to be assigned when `fragment` is missing.
  * @returns The processed resourceParams object with replaced values.
  */
-function resolveResourceParamsPlaceholders(resourceParams, params, defaultPath = 'IConfigCollectionName.Organization') {
-    if (!resourceParams || typeof resourceParams !== 'object')
-        return resourceParams;
+function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultPath = 'organizations', defaultFragment = 'settings') {
     const resolvedParams = {};
+    if (!resourceParams || typeof resourceParams !== 'object') {
+        return resolvedParams;
+    }
+    // Recursively resolve the object and handle placeholders
     Object.entries(resourceParams).forEach(([key, value]) => {
         if (typeof value === 'string' && value.startsWith('$params.')) {
-            // Replace placeholder with actual value from params
             const paramKey = value.split('$params.')[1];
             resolvedParams[key] = params[paramKey];
         }
-        else if (typeof value === 'object' && value !== null) {
-            // Recursively resolve nested objects
-            resolvedParams[key] = resolveResourceParamsPlaceholders(value, params, defaultPath);
+        else if (typeof value === 'object' && value !== null && key !== 'query') {
+            // Only recurse if we're not inside a 'query' to avoid nesting issues
+            resolvedParams[key] = resolveResourceParamsPlaceholders(value, params, defaultPath, defaultFragment);
         }
         else {
-            // Direct assignment for other values
             resolvedParams[key] = value;
         }
     });
-    // If the path is missing or matches `IConfigCollectionName.Organization`, ensure query is set
-    if (!resolvedParams.path || resolvedParams.path === defaultPath) {
+    // Only add path and query if they don't exist at the root level
+    if (!resourceParams.path && !resolvedParams.path) {
         resolvedParams.path = defaultPath;
-        resolvedParams.query = { name: params.orgName }; // Assuming `orgName` exists in params
+    }
+    // Only set the query if it's not already defined at the root level
+    if (!resourceParams.query && !resolvedParams.query) {
+        resolvedParams.query = { name: params.name };
+    }
+    else if (typeof resourceParams.query === 'object') {
+        resolvedParams.query = {};
+        Object.entries(resourceParams.query).forEach(([key, value]) => {
+            if (typeof value === 'string' && value.startsWith('$params.')) {
+                const paramKey = value.split('$params.')[1];
+                resolvedParams.query[key] = params[paramKey];
+            }
+            else {
+                resolvedParams.query[key] = value;
+            }
+        });
+    }
+    // Add fragment only if it doesn't exist at the root level
+    if (!resourceParams.fragment && !resolvedParams.fragment) {
+        resolvedParams.fragment = defaultFragment;
     }
     return resolvedParams;
 }export{resolveResourceParamsPlaceholders};//# sourceMappingURL=resourceParams.js.map

package/lib/vite-wrappers/generators/utils/resourceParams.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"resourceParams.js","sources":["../../../../src/vite-wrappers/generators/utils/resourceParams.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA~~;;;;;;;;;AASG~~;~~AACG~~,~~SAAU~~,iCAAiC,CAC7C,~~cAAmC~~,~~EACnC~~,MAA2B,EAC3B,~~cAAsB~~,~~oCAAoC~~,EAAA;~~AAE1D~~,~~IAAA~~,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ;~~AAAE~~,QAAA,OAAO,cAAc,CAAC;~~IAEjF~~,~~MAAM,cAAc,GAAwB,EAAE,CAAC;AAE/C,~~IAAA,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AACpD,QAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE~~;;YAE3D~~,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;SAC1C;~~aAAM~~,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;;~~AAEpD~~,YAAA,cAAc,CAAC,GAAG,CAAC,GAAG,iCAAiC,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;~~SACvF~~;aAAM~~;;AAEH~~,YAAA,cAAc,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAC/B;AACL,KAAC,CAAC,CAAC;;IAGH,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,~~KAAK~~,WAAW,EAAE;~~AAC7D~~,QAAA,cAAc,CAAC,~~IAAI~~,GAAG,~~WAAW~~,CAAC;~~AAClC~~,QAAA,cAAc,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,~~OAAO~~,EAAE,CAAC;~~KACnD~~;AAED,IAAA,OAAO,cAAc,CAAC;AAC1B"}
1	+ {"version":3,"file":"resourceParams.js","sources":["../../../../src/vite-wrappers/generators/utils/resourceParams.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;AACA;AACA;;;;;;;;;;AAUG;AACa,SAAA,iCAAiC,CAC7C,cAAA,GAAsC,EAAE,EACxC,MAA2B,EAC3B,WAAsB,GAAA,eAAe,EACrC,eAAA,GAA0B,UAAU,EAAA;IAEpC,MAAM,cAAc,GAAwB,EAAE,CAAC;IAE/C,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;AACvD,QAAA,OAAO,cAAc,CAAC;KACzB;;AAGD,IAAA,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AACpD,QAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC3D,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;SAC1C;AAAM,aAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,GAAG,KAAK,OAAO,EAAE;;AAEvE,YAAA,cAAc,CAAC,GAAG,CAAC,GAAG,iCAAiC,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;SACxG;aAAM;AACH,YAAA,cAAc,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAC/B;AACL,KAAC,CAAC,CAAC;;IAGH,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE;AAC9C,QAAA,cAAc,CAAC,IAAI,GAAG,WAAW,CAAC;KACrC;;IAGD,IAAI,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;QAChD,cAAc,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;KAChD;AAAM,SAAA,IAAI,OAAO,cAAc,CAAC,KAAK,KAAK,QAAQ,EAAE;AACjD,QAAA,cAAc,CAAC,KAAK,GAAG,EAAE,CAAC;AAC1B,QAAA,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,KAAI;AAC1D,YAAA,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC3D,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;aAChD;iBAAM;AACH,gBAAA,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACrC;AACL,SAAC,CAAC,CAAC;KACN;;IAGD,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;AACtD,QAAA,cAAc,CAAC,QAAQ,GAAG,eAAe,CAAC;KAC7C;AAED,IAAA,OAAO,cAAc,CAAC;AAC1B"}

package/lib/vite-wrappers/generators/utils/resourceParams.test.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/rollup-vite-utils",
-    "version": "6.0.6-alpha.54",
+    "version": "6.0.6-alpha.56",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -59,5 +59,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "aa9a34ecbdf6f9ef6b630293477461cd503439db"
+    "gitHead": "8615905937caf01fe3e74c87a8aa54ad04dacd26"
 }