@plumeria/compiler 19.1.6 → 19.1.8

package/dist/index.js

@@ -270,6 +270,7 @@ function compileCSS(options) {
         const plumeriaAliases = {};
         const localImports = {};
         const localStyleAliases = {};
+        const registeredStyleCalls = new Set();
         (0, utils_1.traverse)(ast, {
             ImportDeclaration({ node }) {
                 const sourcePath = node.source.value;
@@ -292,6 +293,13 @@ function compileCSS(options) {
                 const actualPath = (0, utils_1.resolveImportPath)(sourcePath, resourcePath);
                 if (actualPath) {
                     node.specifiers.forEach((specifier) => {
+                        if (specifier.type === 'ImportNamespaceSpecifier') {
+                            localImports[specifier.local.value] = {
+                                actualPath,
+                                importedName: '*',
+                            };
+                            return;
+                        }
                         if (specifier.type === 'ImportSpecifier' ||
                             specifier.type === 'ImportDefaultSpecifier') {
                             const importedName = specifier.type === 'ImportDefaultSpecifier'
@@ -507,7 +515,7 @@ function compileCSS(options) {
             const records = (0, utils_1.getStyleRecords)(style);
             records.forEach((r) => extractedSheets.push(r.sheet));
         };
-        const extractAndProcessConditionals = (args) => {
+        const extractAndProcessConditionals = (args, isStyleProp) => {
             args.forEach((arg) => {
                 arg.expression = resolveLocalStyleAlias(localStyleAliases, arg.expression);
             });
@@ -591,10 +599,7 @@ function compileCSS(options) {
                         (ctx.localCreateStyles[rootId] !== undefined ||
                             ctx.mergedCreateTable[rootId] !== undefined);
                     if (!isPlumeriaStyle) {
-                        const origin = rootId ? localImports[rootId] : undefined;
-                        const failure = origin
-                            ? (0, utils_1.resolveFileError)(origin.actualPath, origin.importedName)
-                            : undefined;
+                        const failure = (0, utils_1.resolveOriginError)(node, rootId, localImports);
                         throw new Error(failure
                             ? `[plumeria] ${failure.message} (${path.basename(failure.filePath)})`
                             : `[plumeria] Dynamic or unresolvable style object "${getSource(node)}" is not supported. (${path.basename(resourcePath)})`);
@@ -764,6 +769,14 @@ function compileCSS(options) {
                     return true;
                 return Boolean(isPropsMember || (owner && declaredProps.get(owner)?.has(propName)));
             };
+            const resolveDynamicStyleHere = (node) => {
+                const dynamic = resolveDynamicCall(node);
+                if (dynamic && !isStyleProp) {
+                    throw new Error(`[plumeria] css.use(${getSource(node)}) does not support dynamic function keys. ` +
+                        `(${path.basename(resourcePath)})`);
+                }
+                return dynamic;
+            };
             const collectConditions = (node, currentTestStrings = []) => {
                 node = resolveLocalStyleAlias(localStyleAliases, (0, utils_1.unwrapExpression)(node));
                 if (node.type === 'ArrayExpression') {
@@ -814,7 +827,7 @@ function compileCSS(options) {
                 }
                 if (collectPropStyles(node))
                     return true;
-                const staticStyle = resolveStyleObject(node) ?? resolveDynamicCall(node);
+                const staticStyle = resolveStyleObject(node) ?? resolveDynamicStyleHere(node);
                 if (staticStyle) {
                     if (currentTestStrings.length === 0) {
                         baseStyle = (0, utils_1.deepMerge)(baseStyle, staticStyle);
@@ -850,7 +863,7 @@ function compileCSS(options) {
                 const expr = arg.expression;
                 if (collectPropStyles(expr))
                     continue;
-                const dynamicStyle = resolveDynamicCall(expr);
+                const dynamicStyle = resolveDynamicStyleHere(expr);
                 if (dynamicStyle) {
                     baseStyle = (0, utils_1.deepMerge)(baseStyle, dynamicStyle);
                     continue;
@@ -891,9 +904,32 @@ function compileCSS(options) {
                     propName = originalName;
             }
             if (propName) {
+                if (['create', 'createTheme', 'createStatic'].includes(propName) &&
+                    !registeredStyleCalls.has(node.span.start)) {
+                    throw new Error(`[plumeria] css.${propName} must be assigned to a named top-level variable. ` +
+                        `Destructuring, assignment statements, and default-exported calls cannot be compiled. ` +
+                        `(${path.basename(resourcePath)})`);
+                }
                 const args = node.arguments;
                 if (propName === 'use') {
-                    extractAndProcessConditionals(args);
+                    const namesStyleFunction = (expr) => {
+                        const node = (0, utils_1.unwrapExpression)(expr);
+                        if (node.type === 'ArrayExpression') {
+                            return (node.elements ?? []).some((element) => !!element && namesStyleFunction(element.expression));
+                        }
+                        if (!utils_1.t.isMemberExpression(node) ||
+                            !utils_1.t.isIdentifier(node.object) ||
+                            !utils_1.t.isIdentifier(node.property)) {
+                            return false;
+                        }
+                        return Boolean(ctx.localCreateStyles[node.object.value]?.functions?.[node.property.value] ??
+                            ctx.createFunctionImportMap[node.object.value]?.[node.property.value]);
+                    };
+                    if (args.some((arg) => namesStyleFunction(arg.expression))) {
+                        throw new Error(`[plumeria] Dynamic or unresolvable style object "${sourceOf(node, sourceBuffer, baseByteOffset)}" is not supported. ` +
+                            `(${path.basename(resourcePath)})`);
+                    }
+                    extractAndProcessConditionals(args, false);
                 }
                 else if (propName === 'keyframes' &&
                     args.length > 0 &&
@@ -976,6 +1012,7 @@ function compileCSS(options) {
                             utils_1.t.isObjectExpression(unwrappedDefinitionArg) &&
                             ((!isTheme && init.arguments.length === 1) ||
                                 (isTheme && init.arguments.length >= 2))) {
+                            registeredStyleCalls.add(init.span.start);
                             const arg = unwrappedDefinitionArg;
                             const resolveVariable = (name) => ctx.localCreateStyles[name]?.obj ||
                                 (ctx.mergedCreateThemeHashTable[name]
@@ -1116,7 +1153,7 @@ function compileCSS(options) {
                     }
                 };
                 addArgs(expr);
-                extractAndProcessConditionals(args);
+                extractAndProcessConditionals(args, true);
             },
         });
         return extractedSheets;

package/package.json

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