@common-stack/rollup-vite-utils 8.0.2-alpha.0 → 8.1.1-alpha.0

package/lib/vite-wrappers/generators/loaderGenerator.js

@@ -30,39 +30,30 @@ ${deferredAssignments}
  * @returns The return statement string for the loader function.
  */
 function generateReturnStatement(options, hasMiddleware) {
-    const { loaderReturnInfo, isResourceRoute, queries, hasLoader } = options;
+    const { loaderReturnInfo, queries, hasLoader } = options;
     const hasQueries = Object.keys(queries ?? {}).length > 0;
-    let responseKey = '';
-    if (isResourceRoute) {
-        responseKey = 'json';
-    }
-    else if (loaderReturnInfo?.keys?.length > 0 || hasQueries) {
-        responseKey = 'defer';
-    }
-    else {
-        responseKey = loaderReturnInfo?.returnType || '';
-    }
     const defaultLoaderData = hasQueries ? 'defaultLoaderData' : '{}';
     const middlewareData = hasMiddleware ? '{ permissions, dataContext: rest, configurations }' : '{}';
     const respondOptions = loaderReturnInfo?.hasOptions ? 'respondOptions' : '';
+    // Return raw objects directly (Single Fetch compatible)
     if (loaderReturnInfo?.keys?.length > 0) {
-        return `return ${responseKey}({
+        return `return {
             ...returnObject, 
             ...${defaultLoaderData},
             ...${middlewareData},
             errors: loaderErrors
-        }${respondOptions ? `, ${respondOptions}` : ''});`;
+        }${respondOptions ? `, ${respondOptions}` : ''};`;
     }
     if (hasLoader && !hasMiddleware && !hasQueries) {
         return 'return loaderData;';
     }
     const loaderDataSpread = hasLoader ? '...loaderData, ' : '';
-    return `return ${responseKey}({
+    return `return {
             ${loaderDataSpread}
             ...${defaultLoaderData},
             ...${middlewareData},
             errors: loaderErrors
-        }${respondOptions ? `, ${respondOptions}` : ''});`;
+        }${respondOptions ? `, ${respondOptions}` : ''};`;
 }
 function generateMiddlewarePushes(options) {
     return (options.middlewares ?? [])
@@ -102,7 +93,7 @@ function generateLoaderExports(options, hasMiddleware = false, hasQueries = fals
         ? 'middlewareStack.push({ name: "lifecycle", func: lifecycleMiddleware });\n'
         : ''}
       ${options.authority?.length > 0 || options.extraPermissions?.length > 0 ? 'middlewareStack.push({ name: "permission", func: permissionMiddleware });\n' : ''}
-      ${options.configurations.length > 0 ? 'middlewareStack.push({ name: "configurations", func: configurationMiddleware });\n' : ''}
+      ${options.configurations?.length > 0 ? 'middlewareStack.push({ name: "configurations", func: configurationMiddleware });\n' : ''}
 
         // Create resourceParams from extraParams if available, with dynamic resolution of path parameters.
         const resourceParams = ${options.configurations?.length > 0 || options.authority?.length > 0 || options.extraPermissions?.length > 0

package/lib/vite-wrappers/generators/loaderGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"loaderGenerator.js","sources":["../../../src/vite-wrappers/generators/loaderGenerator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"loaderGenerator.js","sources":["../../../src/vite-wrappers/generators/loaderGenerator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

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

@@ -1,30 +1,51 @@
 '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.`.
+ * Recursively process the resourceParams object(s) 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 }`, but only if `query` is not already defined.
  *
- * @param resourceParams - The nested resourceParams object containing placeholders.
+ * This function now supports both single resourceParams objects and arrays of resourceParams objects.
+ * It also supports extensionName and schemaId for dataLoader configuration and permissions.
+ * A default schemaId will always be added if none is provided (defaults to 'configuration').
+ *
+ * @param resourceParams - The resourceParams object or array 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.
+ * @param defaultExtensionName - Optional default extension name for dataLoader context.
+ * @param defaultSchemaId - Optional default schema ID for configuration and preferences. Defaults to 'configuration' if not provided.
+ * @returns The processed resourceParams object(s) with replaced values.
  */
-function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultPath = 'organizations', defaultFragment = 'settings') {
+function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultPath = 'organizations', defaultFragment = 'settings', defaultSchemaId = 'configuration', defaultExtensionName) {
+    // Handle array of resourceParams
+    if (Array.isArray(resourceParams)) {
+        return resourceParams.map((param) => resolveResourceParamsPlaceholders(param, params, defaultPath, defaultFragment, defaultSchemaId, defaultExtensionName));
+    }
     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.')) {
-            const paramKey = value.split('$params.')[1];
-            resolvedParams[key] = params[paramKey];
+        // Handle placeholder resolution for strings
+        if (typeof value === 'string') {
+            if (value.startsWith('$params.')) {
+                // Handle simple placeholder: $params.orgName
+                const paramKey = value.split('$params.')[1];
+                resolvedParams[key] = params[paramKey];
+            }
+            else if (value.includes('$params.')) {
+                // Handle embedded placeholder: name:$params.orgName
+                resolvedParams[key] = value.replace(/\$params\.(\w+)/g, (match, paramKey) => params[paramKey] || match);
+            }
+            else {
+                resolvedParams[key] = value;
+            }
         }
         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);
+            resolvedParams[key] = resolveResourceParamsPlaceholders(value, params, defaultPath, defaultFragment, defaultSchemaId, defaultExtensionName);
         }
         else {
             resolvedParams[key] = value;
@@ -41,9 +62,17 @@ function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultP
     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];
+            if (typeof value === 'string') {
+                if (value.startsWith('$params.')) {
+                    const paramKey = value.split('$params.')[1];
+                    resolvedParams.query[key] = params[paramKey];
+                }
+                else if (value.includes('$params.')) {
+                    resolvedParams.query[key] = value.replace(/\$params\.(\w+)/g, (match, paramKey) => params[paramKey] || match);
+                }
+                else {
+                    resolvedParams.query[key] = value;
+                }
             }
             else {
                 resolvedParams.query[key] = value;
@@ -54,5 +83,13 @@ function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultP
     if (!resourceParams.fragment && !resolvedParams.fragment) {
         resolvedParams.fragment = defaultFragment;
     }
+    // Add extensionName only if it doesn't exist at the root level and a default is provided
+    if (!resourceParams.extensionName && !resolvedParams.extensionName && defaultExtensionName) {
+        resolvedParams.extensionName = defaultExtensionName;
+    }
+    // Add schemaId - use provided default or fallback to 'configuration' as default
+    if (!resourceParams.schemaId && !resolvedParams.schemaId) {
+        resolvedParams.schemaId = defaultSchemaId || 'configuration';
+    }
     return resolvedParams;
 }exports.resolveResourceParamsPlaceholders=resolveResourceParamsPlaceholders;//# sourceMappingURL=resourceParams.cjs.map

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

@@ -1 +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"}
+{"version":3,"file":"resourceParams.cjs","sources":["../../../../src/vite-wrappers/generators/utils/resourceParams.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

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

@@ -1,12 +1,18 @@
 /**
- * Recursively process the resourceParams object and replace any placeholder values starting with `$params.`.
+ * Recursively process the resourceParams object(s) 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 }`, but only if `query` is not already defined.
  *
- * @param resourceParams - The nested resourceParams object containing placeholders.
+ * This function now supports both single resourceParams objects and arrays of resourceParams objects.
+ * It also supports extensionName and schemaId for dataLoader configuration and permissions.
+ * A default schemaId will always be added if none is provided (defaults to 'configuration').
+ *
+ * @param resourceParams - The resourceParams object or array 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.
+ * @param defaultExtensionName - Optional default extension name for dataLoader context.
+ * @param defaultSchemaId - Optional default schema ID for configuration and preferences. Defaults to 'configuration' if not provided.
+ * @returns The processed resourceParams object(s) with replaced values.
  */
-export declare function resolveResourceParamsPlaceholders(resourceParams: Record<string, any>, params: Record<string, any>, defaultPath?: string, defaultFragment?: string): Record<string, any>;
+export declare function resolveResourceParamsPlaceholders(resourceParams: Record<string, any> | Record<string, any>[], params: Record<string, any>, defaultPath?: string, defaultFragment?: string, defaultSchemaId?: string, defaultExtensionName?: string): Record<string, any> | Record<string, any>[];

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

@@ -1,30 +1,51 @@
 /* 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.`.
+ * Recursively process the resourceParams object(s) 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 }`, but only if `query` is not already defined.
  *
- * @param resourceParams - The nested resourceParams object containing placeholders.
+ * This function now supports both single resourceParams objects and arrays of resourceParams objects.
+ * It also supports extensionName and schemaId for dataLoader configuration and permissions.
+ * A default schemaId will always be added if none is provided (defaults to 'configuration').
+ *
+ * @param resourceParams - The resourceParams object or array 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.
+ * @param defaultExtensionName - Optional default extension name for dataLoader context.
+ * @param defaultSchemaId - Optional default schema ID for configuration and preferences. Defaults to 'configuration' if not provided.
+ * @returns The processed resourceParams object(s) with replaced values.
  */
-function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultPath = 'organizations', defaultFragment = 'settings') {
+function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultPath = 'organizations', defaultFragment = 'settings', defaultSchemaId = 'configuration', defaultExtensionName) {
+    // Handle array of resourceParams
+    if (Array.isArray(resourceParams)) {
+        return resourceParams.map((param) => resolveResourceParamsPlaceholders(param, params, defaultPath, defaultFragment, defaultSchemaId, defaultExtensionName));
+    }
     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.')) {
-            const paramKey = value.split('$params.')[1];
-            resolvedParams[key] = params[paramKey];
+        // Handle placeholder resolution for strings
+        if (typeof value === 'string') {
+            if (value.startsWith('$params.')) {
+                // Handle simple placeholder: $params.orgName
+                const paramKey = value.split('$params.')[1];
+                resolvedParams[key] = params[paramKey];
+            }
+            else if (value.includes('$params.')) {
+                // Handle embedded placeholder: name:$params.orgName
+                resolvedParams[key] = value.replace(/\$params\.(\w+)/g, (match, paramKey) => params[paramKey] || match);
+            }
+            else {
+                resolvedParams[key] = value;
+            }
         }
         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);
+            resolvedParams[key] = resolveResourceParamsPlaceholders(value, params, defaultPath, defaultFragment, defaultSchemaId, defaultExtensionName);
         }
         else {
             resolvedParams[key] = value;
@@ -41,9 +62,17 @@ function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultP
     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];
+            if (typeof value === 'string') {
+                if (value.startsWith('$params.')) {
+                    const paramKey = value.split('$params.')[1];
+                    resolvedParams.query[key] = params[paramKey];
+                }
+                else if (value.includes('$params.')) {
+                    resolvedParams.query[key] = value.replace(/\$params\.(\w+)/g, (match, paramKey) => params[paramKey] || match);
+                }
+                else {
+                    resolvedParams.query[key] = value;
+                }
             }
             else {
                 resolvedParams.query[key] = value;
@@ -54,5 +83,13 @@ function resolveResourceParamsPlaceholders(resourceParams = {}, params, defaultP
     if (!resourceParams.fragment && !resolvedParams.fragment) {
         resolvedParams.fragment = defaultFragment;
     }
+    // Add extensionName only if it doesn't exist at the root level and a default is provided
+    if (!resourceParams.extensionName && !resolvedParams.extensionName && defaultExtensionName) {
+        resolvedParams.extensionName = defaultExtensionName;
+    }
+    // Add schemaId - use provided default or fallback to 'configuration' as default
+    if (!resourceParams.schemaId && !resolvedParams.schemaId) {
+        resolvedParams.schemaId = defaultSchemaId || 'configuration';
+    }
     return resolvedParams;
 }export{resolveResourceParamsPlaceholders};//# sourceMappingURL=resourceParams.js.map

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

@@ -1 +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"}
+{"version":3,"file":"resourceParams.js","sources":["../../../../src/vite-wrappers/generators/utils/resourceParams.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/vite-wrappers/icon-switch.cjs

@@ -1,4 +1,4 @@
-'use strict';var fs=require('fs'),path=require('path'),wrapperComponent=require('./wrapperComponent.cjs'),utils=require('../utils/utils.cjs');require('ajv');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 writeIconsSwitch(names, svgPaths, files, iconsRepository) {
+'use strict';var fs=require('fs'),path=require('path'),wrapperComponent=require('./wrapperComponent.cjs'),utils=require('../utils/utils.cjs'),packageUtils=require('../utils/packageUtils.cjs');require('ajv');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 writeIconsSwitch(names, svgPaths, files, iconsRepository) {
     copySVGFiles(svgPaths);
     let content = `
   function __variableDynamicIcon(icon) {
@@ -13,7 +13,7 @@
             const importPath = iconsRepository[prefix].replace('{iconName}', iconName);
             // prefix = prefix.charAt(0).toUpperCase() + prefix.slice(1).toLowerCase();
             content += `
-    case '${prefix + "." + iconName}':
+    case '${prefix + '.' + iconName}':
         return import('${importPath}');
     `;
         }
@@ -21,7 +21,7 @@
             const group = name.slice(0, 2).toLocaleLowerCase();
             content += `
     case '${name}':
-        return import('@react-icons/all-files/${group}/${name}.js');
+        return import('react-icons/${group}').then(mod => ({ default: mod.${name} }));
     `;
         }
     });
@@ -40,8 +40,8 @@
     });
     content += `
   default:
-    console.warn('Sorry, the icon named "', icon, '" could not be found in "@react-icon/all-files" and "@app/icons". Please check again.');
-    return import('@react-icons/all-files/bi/BiError.js');
+    console.warn('Sorry, the icon named "', icon, '" could not be found in "react-icons" and "@app/icons". Please check again.');
+    return import('react-icons/bi').then(mod => ({ default: mod.BiError }));
   }
   }
   export default function(icon) {
@@ -57,10 +57,6 @@
     }
     fs__namespace.writeFileSync(newFilePath, content, 'utf8');
 }
-function getPackageName(filePath) {
-    const match = filePath.match(/^(@[^/]+\/[^/]+)/);
-    return match ? match[1] : null;
-}
 function copySVGFiles(svgPaths) {
     if (svgPaths.length == 0)
         return;
@@ -76,7 +72,7 @@ function copySVGFiles(svgPaths) {
     const packageJson = JSON.parse(fs__namespace.readFileSync(packageJsonPath, 'utf8'));
     const dependencies = packageJson.dependencies;
     svgPaths.forEach((svgFile) => {
-        const packageName = getPackageName(svgFile);
+        const packageName = packageUtils.getPackageName(svgFile);
         if (packageName) {
             const packageDir = utils.findPackageDir(wrapperComponent.getRootPath(), packageName);
             if (packageDir) {
@@ -100,4 +96,4 @@ function copySVGFiles(svgPaths) {
             }
         }
     });
-}exports.copySVGFiles=copySVGFiles;exports.getPackageName=getPackageName;exports.writeIconsSwitch=writeIconsSwitch;//# sourceMappingURL=icon-switch.cjs.map
+}exports.copySVGFiles=copySVGFiles;exports.writeIconsSwitch=writeIconsSwitch;//# sourceMappingURL=icon-switch.cjs.map

package/lib/vite-wrappers/icon-switch.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"icon-switch.cjs","sources":["../../src/vite-wrappers/icon-switch.ts"],"sourcesContent":[null],"names":["path","fs","getRootPath","findPackageDir"],"mappings":"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"}
+{"version":3,"file":"icon-switch.cjs","sources":["../../src/vite-wrappers/icon-switch.ts"],"sourcesContent":[null],"names":["path","fs","getRootPath","getPackageName","findPackageDir"],"mappings":"ymBAMM,SAAU,gBAAgB,CAAC,KAAe,EAAE,QAAkB,EAAE,KAAe,EAAE,eAAoB,EAAA;IACvG,YAAY,CAAC,QAAQ,CAAC,CAAC;AAEvB,IAAA,IAAI,OAAO,GAAG,CAAA;;;CAGjB,CAAC;AACE,IAAA,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,KAAI;QACnB,IAAI,MAAM,EAAE,QAAQ,CAAC;AACrB,QAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACpB,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACxC;AACD,QAAA,IAAI,MAAM,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE;AACnC,YAAA,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;;AAE3E,YAAA,OAAO,IAAI,CAAA;YACX,MAAM,GAAG,GAAG,GAAG,QAAQ,CAAA;yBACV,UAAU,CAAA;KAC9B,CAAC;SACG;aAAM;AACH,YAAA,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC;AACnD,YAAA,OAAO,IAAI,CAAA;YACX,IAAI,CAAA;AACqB,mCAAA,EAAA,KAAK,kCAAkC,IAAI,CAAA;KAC3E,CAAC;SACG;AACL,KAAC,CAAC,CAAC;AACH,IAAA,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,KAAI;QACzB,MAAM,WAAW,GAAGA,eAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC3C,QAAA,OAAO,IAAI,CAAA;UACT,OAAO,CAAA;gCACe,WAAW,CAAA;GACxC,CAAC;AACA,KAAC,CAAC,CAAC;AACH,IAAA,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,KAAI;AACnB,QAAA,OAAO,IAAI,CAAA;UACT,IAAI,CAAA;qBACO,IAAI,CAAA;GACtB,CAAC;AACA,KAAC,CAAC,CAAC;AACH,IAAA,OAAO,IAAI,CAAA;;;;;;;;;CASd,CAAC;AACE,IAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,CAAA,iBAAA,CAAmB,CAAC;AACrC,IAAA,MAAM,WAAW,GAAGA,eAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;;AAEzD,IAAA,IAAI,CAACC,aAAE,CAAC,UAAU,CAACD,eAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,EAAE;AAC3C,QAAAC,aAAE,CAAC,SAAS,CAACD,eAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KAChE;IACDC,aAAE,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AAEK,SAAU,YAAY,CAAC,QAAkB,EAAA;AAC3C,IAAA,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO;AAEjC,IAAA,MAAM,OAAO,GAAGD,eAAI,CAAC,IAAI,CAACE,4BAAW,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,CAACD,aAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QACzBA,aAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KAC9C;AAED,IAAA,MAAM,UAAU,GAAGC,4BAAW,EAAE,CAAC;IACjC,MAAM,eAAe,GAAGF,eAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAE9D,IAAI,CAACC,aAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;AACjC,QAAA,MAAM,IAAI,KAAK,CAAC,iCAAiC,UAAU,CAAA,CAAE,CAAC,CAAC;KAClE;AAED,IAAA,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAACA,aAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,IAAA,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;AAE9C,IAAA,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,KAAI;AACzB,QAAA,MAAM,WAAW,GAAGE,2BAAc,CAAC,OAAO,CAAC,CAAC;QAE5C,IAAI,WAAW,EAAE;YACb,MAAM,UAAU,GAAGC,oBAAc,CAACF,4BAAW,EAAE,EAAE,WAAW,CAAC,CAAC;YAE9D,IAAI,UAAU,EAAE;AACZ,gBAAA,IAAI,OAAO,GAAGF,eAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;gBAE5E,IAAI,CAACC,aAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;AACzB,oBAAA,IAAI,cAAc,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;oBAE/C,IAAI,cAAc,EAAE;wBAChB,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBACrD,OAAO,GAAGD,eAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;qBAC9F;iBACJ;gBACD,IAAI,CAACC,aAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;AACzB,oBAAA,OAAO,CAAC,IAAI,CAAC,2BAA2B,OAAO,CAAA,CAAA,CAAG,CAAC,CAAC;iBACvD;qBAAM;oBACH,MAAM,WAAW,GAAGD,eAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC3C,MAAM,QAAQ,GAAGA,eAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACpD,oBAAAC,aAAE,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;oBACnC,OAAO,CAAC,GAAG,CAAC,CAAA,qBAAA,EAAwB,OAAO,CAAO,IAAA,EAAA,QAAQ,CAAG,CAAA,CAAA,CAAC,CAAC;iBAClE;aACJ;SACJ;AACL,KAAC,CAAC,CAAC;AACP"}

package/lib/vite-wrappers/icon-switch.d.ts

@@ -1,3 +1,2 @@
 export declare function writeIconsSwitch(names: string[], svgPaths: string[], files: string[], iconsRepository: any): void;
-export declare function getPackageName(filePath: any): any;
 export declare function copySVGFiles(svgPaths: string[]): void;

package/lib/vite-wrappers/icon-switch.js

@@ -1,4 +1,4 @@
-import*as fs from'fs';import*as path from'path';import {getRootPath}from'./wrapperComponent.js';import {findPackageDir}from'../utils/utils.js';import'ajv';function writeIconsSwitch(names, svgPaths, files, iconsRepository) {
+import*as fs from'fs';import*as path from'path';import {getRootPath}from'./wrapperComponent.js';import {findPackageDir}from'../utils/utils.js';import {getPackageName}from'../utils/packageUtils.js';import'ajv';function writeIconsSwitch(names, svgPaths, files, iconsRepository) {
     copySVGFiles(svgPaths);
     let content = `
   function __variableDynamicIcon(icon) {
@@ -13,7 +13,7 @@ import*as fs from'fs';import*as path from'path';import {getRootPath}from'./wrapp
             const importPath = iconsRepository[prefix].replace('{iconName}', iconName);
             // prefix = prefix.charAt(0).toUpperCase() + prefix.slice(1).toLowerCase();
             content += `
-    case '${prefix + "." + iconName}':
+    case '${prefix + '.' + iconName}':
         return import('${importPath}');
     `;
         }
@@ -21,7 +21,7 @@ import*as fs from'fs';import*as path from'path';import {getRootPath}from'./wrapp
             const group = name.slice(0, 2).toLocaleLowerCase();
             content += `
     case '${name}':
-        return import('@react-icons/all-files/${group}/${name}.js');
+        return import('react-icons/${group}').then(mod => ({ default: mod.${name} }));
     `;
         }
     });
@@ -40,8 +40,8 @@ import*as fs from'fs';import*as path from'path';import {getRootPath}from'./wrapp
     });
     content += `
   default:
-    console.warn('Sorry, the icon named "', icon, '" could not be found in "@react-icon/all-files" and "@app/icons". Please check again.');
-    return import('@react-icons/all-files/bi/BiError.js');
+    console.warn('Sorry, the icon named "', icon, '" could not be found in "react-icons" and "@app/icons". Please check again.');
+    return import('react-icons/bi').then(mod => ({ default: mod.BiError }));
   }
   }
   export default function(icon) {
@@ -57,10 +57,6 @@ import*as fs from'fs';import*as path from'path';import {getRootPath}from'./wrapp
     }
     fs.writeFileSync(newFilePath, content, 'utf8');
 }
-function getPackageName(filePath) {
-    const match = filePath.match(/^(@[^/]+\/[^/]+)/);
-    return match ? match[1] : null;
-}
 function copySVGFiles(svgPaths) {
     if (svgPaths.length == 0)
         return;
@@ -100,4 +96,4 @@ function copySVGFiles(svgPaths) {
             }
         }
     });
-}export{copySVGFiles,getPackageName,writeIconsSwitch};//# sourceMappingURL=icon-switch.js.map
+}export{copySVGFiles,writeIconsSwitch};//# sourceMappingURL=icon-switch.js.map

package/lib/vite-wrappers/icon-switch.js.map

@@ -1 +1 @@
-{"version":3,"file":"icon-switch.js","sources":["../../src/vite-wrappers/icon-switch.ts"],"sourcesContent":[null],"names":[],"mappings":"2JAKM,SAAU,gBAAgB,CAAC,KAAe,EAAE,QAAkB,EAAE,KAAe,EAAE,eAAmB,EAAA;IACxG,YAAY,CAAC,QAAQ,CAAC,CAAC;AAEvB,IAAA,IAAI,OAAO,GAAG,CAAA;;;CAGf,CAAC;AACA,IAAA,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,KAAI;QACrB,IAAI,MAAM,EAAE,QAAQ,CAAC;AACrB,QAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACpB,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACxC;AACD,QAAA,IAAI,MAAM,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE;AACnC,YAAA,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;;AAE3E,YAAA,OAAO,IAAI,CAAA;YACP,MAAM,GAAC,GAAG,GAAC,QAAQ,CAAA;yBACN,UAAU,CAAA;KAC9B,CAAC;SACO;aAAM;AACH,YAAA,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC;AACnD,YAAA,OAAO,IAAI,CAAA;YACf,IAAI,CAAA;AACgC,8CAAA,EAAA,KAAK,IAAI,IAAI,CAAA;KACxD,CAAC;SACO;AACX,KAAC,CAAC,CAAC;AACH,IAAA,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,KAAI;QAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC3C,QAAA,OAAO,IAAI,CAAA;UACL,OAAO,CAAA;gCACe,WAAW,CAAA;GACxC,CAAC;AACF,KAAC,CAAC,CAAC;AACH,IAAA,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,KAAI;AACrB,QAAA,OAAO,IAAI,CAAA;UACL,IAAI,CAAA;qBACO,IAAI,CAAA;GACtB,CAAC;AACF,KAAC,CAAC,CAAC;AACH,IAAA,OAAO,IAAI,CAAA;;;;;;;;;CASZ,CAAC;AACA,IAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,CAAA,iBAAA,CAAmB,CAAC;AACrC,IAAA,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;;AAEzD,IAAA,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,EAAE;AAC7C,QAAA,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KAC9D;IACD,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AACjD,CAAC;AAEK,SAAU,cAAc,CAAC,QAAQ,EAAA;IACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;AACjD,IAAA,OAAO,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;AACjC,CAAC;AAEK,SAAU,YAAY,CAAC,QAAkB,EAAA;AAC7C,IAAA,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC;QACtB,OAAO;AAET,IAAA,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC3B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KAC5C;AAED,IAAA,MAAM,UAAU,GAAG,WAAW,EAAE,CAAC;IACjC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAE9D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;AACnC,QAAA,MAAM,IAAI,KAAK,CAAC,iCAAiC,UAAU,CAAA,CAAE,CAAC,CAAC;KAChE;AAED,IAAA,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,IAAA,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;AAE9C,IAAA,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,KAAI;AAC3B,QAAA,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;QAE5C,IAAI,WAAW,EAAE;YACf,MAAM,UAAU,GAAG,cAAc,CAAC,WAAW,EAAE,EAAE,WAAW,CAAC,CAAC;YAE9D,IAAI,UAAU,EAAE;AACd,gBAAA,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;gBAE5E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;AAC3B,oBAAA,IAAI,cAAc,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;oBAE/C,IAAI,cAAc,EAAE;wBAClB,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBACrD,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;qBAC5F;iBACF;gBACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;AAC3B,oBAAA,OAAO,CAAC,IAAI,CAAC,2BAA2B,OAAO,CAAA,CAAA,CAAG,CAAC,CAAC;iBACrD;qBAAM;oBACL,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACpD,oBAAA,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;oBACnC,OAAO,CAAC,GAAG,CAAC,CAAA,qBAAA,EAAwB,OAAO,CAAO,IAAA,EAAA,QAAQ,CAAG,CAAA,CAAA,CAAC,CAAC;iBAChE;aACF;SACF;AACH,KAAC,CAAC,CAAC;AACL"}
+{"version":3,"file":"icon-switch.js","sources":["../../src/vite-wrappers/icon-switch.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}