@plumeria/compiler 18.1.5 → 18.1.7

package/dist/index.js

@@ -41,6 +41,37 @@ const path = __importStar(require("path"));
 const rs = __importStar(require("@rust-gear/glob"));
 const utils_1 = require("@plumeria/utils");
 const utils_2 = require("@plumeria/utils");
+const isStaticArgValue = (node) => node.type === 'StringLiteral' ||
+    node.type === 'NumericLiteral' ||
+    node.type === 'BooleanLiteral' ||
+    (node.type === 'TemplateLiteral' && node.expressions.length === 0) ||
+    utils_1.t.isIdentifier(node) ||
+    utils_1.t.isMemberExpression(node);
+const namedParamsOf = (params) => {
+    if (params.length !== 1)
+        return undefined;
+    const first = params[0];
+    const pattern = (first?.pat ?? first);
+    if (pattern?.type !== 'ObjectPattern')
+        return undefined;
+    const named = [];
+    for (const prop of pattern.properties ?? []) {
+        if (prop.type === 'AssignmentPatternProperty' &&
+            utils_1.t.isIdentifier(prop.key) &&
+            !prop.value) {
+            named.push({ key: prop.key.value, local: prop.key.value });
+        }
+        else if (prop.type === 'KeyValuePatternProperty' &&
+            utils_1.t.isIdentifier(prop.key) &&
+            utils_1.t.isIdentifier(prop.value)) {
+            named.push({ key: prop.key.value, local: prop.value.value });
+        }
+        else {
+            return undefined;
+        }
+    }
+    return named.length > 0 ? named : undefined;
+};
 function extractStylesFromExpression(expression, ctx) {
     let expr = expression;
     if (ctx.localStyleAliases &&
@@ -464,6 +495,74 @@ function compileCSS(options) {
                     return null;
                 return Object.values(obj).filter((v) => typeof v === 'object' && v !== null);
             };
+            const resolveDynamicCall = (expr) => {
+                if (!utils_1.t.isCallExpression(expr) || !utils_1.t.isMemberExpression(expr.callee))
+                    return null;
+                const callee = expr.callee;
+                if (!utils_1.t.isIdentifier(callee.object) || !utils_1.t.isIdentifier(callee.property))
+                    return null;
+                const styleInfo = ctx.localCreateStyles[callee.object.value];
+                const func = styleInfo?.functions?.[callee.property.value];
+                if (!func)
+                    return null;
+                const callArgs = expr.arguments;
+                if (callArgs.some((a) => a.spread) || callArgs.length === 0)
+                    return null;
+                const tempStaticTable = { ...ctx.mergedStaticTable };
+                const runtime = [];
+                if (func.named) {
+                    const argExpr = callArgs[0].expression;
+                    if (callArgs.length !== 1 || argExpr.type !== 'ObjectExpression') {
+                        throw new Error(`[plumeria] ${getSource(expr)} takes one object argument, because ${callee.property.value} destructures its parameter.\n`);
+                    }
+                    const given = new Map();
+                    argExpr.properties.forEach((prop) => {
+                        if (prop.type === 'Identifier') {
+                            given.set(prop.value, prop);
+                        }
+                        else if (prop.type === 'KeyValueProperty' &&
+                            (utils_1.t.isIdentifier(prop.key) || utils_1.t.isStringLiteral(prop.key))) {
+                            given.set(String(prop.key.value), prop.value);
+                        }
+                    });
+                    const argObj = (0, utils_1.objectExpressionToObject)(argExpr, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable, ctx.mergedVariantsTable) ?? {};
+                    func.named.forEach(({ key, local }) => {
+                        const source = given.get(key);
+                        if (!source) {
+                            throw new Error(`[plumeria] ${getSource(expr)} leaves "${key}" unset, and a dynamic style function has no value to fall back on.\n`);
+                        }
+                        if (isStaticArgValue(source) && argObj[key] !== undefined)
+                            tempStaticTable[local] = argObj[key];
+                        else
+                            runtime.push(local);
+                    });
+                }
+                else if (callArgs.length === 1 &&
+                    callArgs[0].expression.type === 'ObjectExpression') {
+                    const argObj = (0, utils_1.objectExpressionToObject)(callArgs[0].expression, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable, ctx.mergedVariantsTable);
+                    func.params.forEach((p) => {
+                        if (argObj[p] !== undefined)
+                            tempStaticTable[p] = argObj[p];
+                    });
+                }
+                else {
+                    callArgs.forEach((_callArg, i) => {
+                        const p = func.params[i];
+                        if (!p)
+                            return;
+                        runtime.push(p);
+                    });
+                }
+                if (runtime.length > 0) {
+                    runtime.forEach((p) => (tempStaticTable[p] = p));
+                    const probe = (0, utils_1.objectExpressionToObject)(func.body, tempStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable, ctx.mergedVariantsTable);
+                    const hash = (0, zss_engine_1.genBase36Hash)(probe ?? {}, 1, 8);
+                    runtime.forEach((p) => {
+                        tempStaticTable[p] = `var(--${hash}-${p})`;
+                    });
+                }
+                return ((0, utils_1.objectExpressionToObject)(func.body, tempStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable, ctx.mergedVariantsTable) ?? null);
+            };
             const collectConditions = (node, currentTestStrings = []) => {
                 if (node.type === 'ConditionalExpression') {
                     const testSource = getSource(node.test);
@@ -501,7 +600,7 @@ function compileCSS(options) {
                 else if (node.type === 'ParenthesisExpression') {
                     return collectConditions(node.expression, currentTestStrings);
                 }
-                const staticStyle = resolveStyleObject(node);
+                const staticStyle = resolveStyleObject(node) ?? resolveDynamicCall(node);
                 if (staticStyle) {
                     if (currentTestStrings.length === 0) {
                         baseStyle = (0, utils_1.deepMerge)(baseStyle, staticStyle);
@@ -605,44 +704,10 @@ function compileCSS(options) {
                         continue;
                     }
                 }
-                if (utils_1.t.isCallExpression(expr)) {
-                    if (utils_1.t.isMemberExpression(expr.callee)) {
-                        const callee = expr.callee;
-                        if (utils_1.t.isIdentifier(callee.object) &&
-                            utils_1.t.isIdentifier(callee.property)) {
-                            const varName = callee.object.value;
-                            const propName = callee.property.value;
-                            const styleInfo = ctx.localCreateStyles[varName];
-                            if (styleInfo && styleInfo.functions?.[propName]) {
-                                const func = styleInfo.functions[propName];
-                                const callArgs = expr.arguments;
-                                const hasSpread = callArgs.some((a) => a.spread);
-                                if (!hasSpread && callArgs.length >= 1) {
-                                    const tempStaticTable = { ...ctx.mergedStaticTable };
-                                    if (callArgs.length === 1 &&
-                                        callArgs[0].expression.type === 'ObjectExpression') {
-                                        const argObj = (0, utils_1.objectExpressionToObject)(callArgs[0].expression, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable, ctx.mergedVariantsTable);
-                                        func.params.forEach((p) => {
-                                            if (argObj[p] !== undefined)
-                                                tempStaticTable[p] = argObj[p];
-                                        });
-                                    }
-                                    else {
-                                        callArgs.forEach((_callArg, i) => {
-                                            const p = func.params[i];
-                                            if (!p)
-                                                return;
-                                            tempStaticTable[p] = `var(--${propName}-${p})`;
-                                        });
-                                    }
-                                    const resolved = (0, utils_1.objectExpressionToObject)(func.body, tempStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable, ctx.mergedVariantsTable);
-                                    if (resolved)
-                                        baseStyle = (0, utils_1.deepMerge)(baseStyle, resolved);
-                                    continue;
-                                }
-                            }
-                        }
-                    }
+                const dynamicStyle = resolveDynamicCall(expr);
+                if (dynamicStyle) {
+                    baseStyle = (0, utils_1.deepMerge)(baseStyle, dynamicStyle);
+                    continue;
                 }
                 if (collectConditions(arg.expression))
                     continue;
@@ -799,6 +864,7 @@ function compileCSS(options) {
                                         if (actualBody && actualBody.type === 'ObjectExpression') {
                                             styleFunctions[prop.key.value] = {
                                                 params,
+                                                named: namedParamsOf(func.params),
                                                 body: actualBody,
                                             };
                                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "18.1.5",
+  "version": "18.1.7",
   "description": "Plumeria swc based compiler for statically extracting css",
   "author": "Refirst 11",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@plumeria/utils": "^18.1.5"
+    "@plumeria/utils": "^18.1.7"
   },
   "devDependencies": {
     "@rust-gear/glob": "1.1.0",