@plumeria/compiler 18.3.13 → 18.3.15

package/dist/index.js

@@ -53,6 +53,18 @@ const unwrapExport = (node) => {
 const isFunctionNode = (node) => node?.type === 'FunctionDeclaration' ||
     node?.type === 'FunctionExpression' ||
     node?.type === 'ArrowFunctionExpression';
+const componentFunctionOf = (node) => {
+    if (isFunctionNode(node))
+        return node;
+    if (node?.type === 'CallExpression') {
+        for (const arg of node.arguments ?? []) {
+            const fn = componentFunctionOf(arg.expression);
+            if (fn)
+                return fn;
+        }
+    }
+    return undefined;
+};
 const isStaticArgValue = (node) => node.type === 'StringLiteral' ||
     node.type === 'NumericLiteral' ||
     node.type === 'BooleanLiteral' ||
@@ -455,12 +467,18 @@ function compileCSS(options) {
             if (isFunctionNode(statement)) {
                 addFirstParamName(statement);
             }
+            else if (statement?.type === 'CallExpression') {
+                const fn = componentFunctionOf(statement);
+                if (fn)
+                    addFirstParamName(fn);
+            }
             else if (utils_1.t.isVariableDeclaration(statement)) {
                 for (const decl of statement.declarations) {
                     if (!utils_1.t.isIdentifier(decl.id) || !decl.init)
                         continue;
-                    if (isFunctionNode(decl.init))
-                        addFirstParamName(decl.init);
+                    const fn = componentFunctionOf(decl.init);
+                    if (fn)
+                        addFirstParamName(fn);
                 }
             }
         }
@@ -473,13 +491,18 @@ function compileCSS(options) {
                     node: statement,
                 });
             }
+            else if (statement?.type === 'CallExpression') {
+                const fn = componentFunctionOf(statement);
+                if (fn)
+                    components.push({ name: 'default', node: fn });
+            }
             else if (utils_1.t.isVariableDeclaration(statement)) {
                 for (const decl of statement.declarations) {
-                    if (utils_1.t.isIdentifier(decl.id) &&
-                        (decl.init?.type === 'ArrowFunctionExpression' ||
-                            decl.init?.type === 'FunctionExpression')) {
-                        components.push({ name: decl.id.value, node: decl.init });
-                    }
+                    if (!utils_1.t.isIdentifier(decl.id))
+                        continue;
+                    const fn = componentFunctionOf(decl.init);
+                    if (fn)
+                        components.push({ name: decl.id.value, node: fn });
                 }
             }
         }
@@ -565,7 +588,13 @@ function compileCSS(options) {
                             ctx.mergedCreateTable[rootId] !== undefined ||
                             ctx.mergedVariantsTable[rootId] !== undefined);
                     if (!isPlumeriaStyle) {
-                        throw new Error(`[plumeria] Dynamic or unresolvable style object "${getSource(node)}" is not supported. (${path.basename(resourcePath)})`);
+                        const origin = rootId ? localImports[rootId] : undefined;
+                        const failure = origin
+                            ? (0, utils_1.resolveFileError)(origin.actualPath, origin.importedName)
+                            : undefined;
+                        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)})`);
                     }
                 }
             };

package/package.json

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