@plumeria/utils 18.5.0 → 18.5.2

package/dist/dynamicKey.d.ts

@@ -36,4 +36,4 @@ export type DynamicStyleResult = {
         prop: string;
     }>>;
 };
-export declare const resolveDynamicStyle: (func: StyleFunction, runtimeParams: string[], staticTable: StaticTable, tables: DynamicStyleTables) => DynamicStyleResult | null;
+export declare const resolveDynamicStyle: (func: StyleFunction, runtimeParams: string[], staticTable: StaticTable, tables: DynamicStyleTables, providedParams?: ReadonlySet<string>) => DynamicStyleResult | null;

package/dist/dynamicKey.js

@@ -143,12 +143,14 @@ const applyVarFallback = (style, cssVar, literal) => {
     }
 };
 exports.applyVarFallback = applyVarFallback;
-const resolveDynamicStyle = (func, runtimeParams, staticTable, tables) => {
+const resolveDynamicStyle = (func, runtimeParams, staticTable, tables, providedParams) => {
     if (func.unsupportedParams)
         throw new Error('[plumeria] Dynamic styles require named parameters or object destructuring; array and rest parameters are not supported.');
     const tempStaticTable = { ...staticTable };
     const resolveBody = () => (0, parser_1.objectExpressionToObject)(func.body, tempStaticTable, tables.keyframesHashTable, tables.viewTransitionHashTable, tables.createThemeHashTable, tables.createThemeObjectTable, tables.createHashTable, tables.createStaticHashTable, tables.createStaticObjectTable, tables.variantsHashTable);
-    const withDefault = Object.entries(func.defaults ?? {}).filter(([param]) => tempStaticTable[param] === undefined);
+    const withDefault = Object.entries(func.defaults ?? {}).filter(([param]) => providedParams
+        ? !providedParams.has(param)
+        : tempStaticTable[param] === undefined);
     const cssVars = {};
     const varParams = Array.from(new Set([...runtimeParams, ...withDefault.map(([param]) => param)]));
     if (varParams.length > 0) {

package/dist/parser.d.ts

@@ -42,7 +42,7 @@ export declare function resolveFileError(actualPath: string, importedName: strin
     filePath: string;
     message: string;
 } | undefined;
-export declare function scanAll(): Tables;
+export declare function scanAll(scanCwd?: string): Tables;
 export declare function getFileDependencies(filePath: string): string[];
 export declare function resolveExport(filePath: string, exportName: string, visited?: Set<string>): {
     filePath: string;

package/dist/parser.js

@@ -95,9 +95,6 @@ const getRootIdentifier = (node) => {
             return (0, exports.getRootIdentifier)(callee);
         }
     }
-    if (node.type === 'ParenthesisExpression') {
-        return (0, exports.getRootIdentifier)(node.expression);
-    }
     return null;
 };
 exports.getRootIdentifier = getRootIdentifier;
@@ -358,6 +355,9 @@ function collectLocalConsts(ast) {
                 exports.t.isBooleanLiteral(init)) {
                 result = init.value;
             }
+            else if (exports.t.isIdentifier(init)) {
+                result = resolveValue(init.value);
+            }
             else if (exports.t.isObjectExpression(init)) {
                 result = objectExpressionToObject(init, localConsts, {}, {}, {}, {}, {}, {}, {}, {}, resolveValue);
             }
@@ -1024,6 +1024,7 @@ const globalAgregatedTables = {
 };
 let hasComputedOnce = false;
 let resolutionConfigStamp;
+let scannedCwd;
 const objectTableOwners = new Map();
 const fileObjectContributions = new Map();
 function snapshotTables() {
@@ -1152,12 +1153,16 @@ function stripFileContributions(filePath, cached) {
         }
     }
 }
-function scanAll() {
-    if (hasComputedOnce && process.env.NODE_ENV === 'production') {
+function scanAll(scanCwd = process.cwd()) {
+    const cwd = path.resolve(scanCwd);
+    if (hasComputedOnce &&
+        process.env.NODE_ENV === 'production' &&
+        scannedCwd === cwd) {
         return snapshotTables();
     }
     const localTables = globalAgregatedTables;
-    const configPath = path.join(process.cwd(), 'tsconfig.json');
+    scannedCwd = cwd;
+    const configPath = path.join(cwd, 'tsconfig.json');
     let configStamp = configPath;
     try {
         configStamp += `:${fs.statSync(configPath).mtimeMs}`;
@@ -1166,10 +1171,9 @@ function scanAll() {
     }
     const resolutionChanged = resolutionConfigStamp !== undefined &&
         resolutionConfigStamp !== configStamp;
-    if (resolutionChanged)
-        (0, resolver_1.resetImportResolutionCache)();
+    if (resolutionConfigStamp !== configStamp)
+        (0, resolver_1.resetImportResolutionCache)(cwd);
     resolutionConfigStamp = configStamp;
-    const cwd = process.cwd();
     const segments = cwd.split(path.sep);
     const dependencyDirectory = segments.indexOf('node_modules');
     const root = dependencyDirectory < 0
@@ -1771,7 +1775,7 @@ function scanAll() {
                             runtime.push(param);
                     });
                 }
-                const resolved = (0, dynamicKey_1.resolveDynamicStyle)(func, runtime, dynamicStaticTable, dynamicStyleTables);
+                const resolved = (0, dynamicKey_1.resolveDynamicStyle)(func, runtime, dynamicStaticTable, dynamicStyleTables, new Set());
                 if (!resolved)
                     return null;
                 const hasVars = runtime.some((param) => (resolved.varGroups.get(param) ?? []).length > 0);
@@ -1786,6 +1790,8 @@ function scanAll() {
                     let hasVars = false;
                     for (const el of expr.elements) {
                         if (el && el.expression) {
+                            if (el.spread)
+                                return null;
                             const res = resolveCallStylePropInScan(el.expression);
                             if (!res)
                                 continue;
@@ -1829,9 +1835,6 @@ function scanAll() {
                         }
                     }
                 }
-                if (expr.type === 'ParenthesisExpression') {
-                    return resolveCallStylePropInScan(expr.expression);
-                }
                 if (expr.type === 'MemberExpression' &&
                     expr.object.type === 'Identifier') {
                     const varName = expr.object.value;
@@ -1965,6 +1968,8 @@ function scanAll() {
                     if (!alternatives) {
                         if (!containsStyleReference(node))
                             return;
+                        if (node.elements.some((element) => element?.spread))
+                            throw new Error('[plumeria] Spread elements in a style array are not supported. List each style explicitly.');
                         throw new Error('[plumeria] A style prop array contains an unsupported style expression. Use defined styles, null, false, undefined, or conditional branches of defined styles.');
                     }
                     if (!containsStyleReference(node))

package/dist/resolver.d.ts

@@ -1,2 +1,2 @@
-export declare function resetImportResolutionCache(): void;
+export declare function resetImportResolutionCache(cwd?: string): void;
 export declare function resolveImportPath(importPath: string, importerPath: string): string | null;

package/dist/resolver.js

@@ -38,8 +38,8 @@ exports.resolveImportPath = resolveImportPath;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 let cachedTsConfig = undefined;
-function resetImportResolutionCache() {
-    const configPath = path.join(process.cwd(), 'tsconfig.json');
+function resetImportResolutionCache(cwd = process.cwd()) {
+    const configPath = path.join(cwd, 'tsconfig.json');
     try {
         const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
         cachedTsConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "18.5.0",
+  "version": "18.5.2",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",