@plumeria/compiler 18.3.10 → 18.3.12

package/dist/index.js

@@ -41,6 +41,18 @@ 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 unwrapExport = (node) => {
+    if (node?.type === 'ExportDeclaration')
+        return node.declaration;
+    if (node?.type === 'ExportDefaultDeclaration')
+        return node.decl;
+    if (node?.type === 'ExportDefaultExpression')
+        return node.expression;
+    return node;
+};
+const isFunctionNode = (node) => node?.type === 'FunctionDeclaration' ||
+    node?.type === 'FunctionExpression' ||
+    node?.type === 'ArrowFunctionExpression';
 const isStaticArgValue = (node) => node.type === 'StringLiteral' ||
     node.type === 'NumericLiteral' ||
     node.type === 'BooleanLiteral' ||
@@ -241,7 +253,8 @@ function compileCSS(options) {
     });
     const scannedTables = (0, utils_1.scanAll)();
     const processFile = (filePath) => {
-        const source = fs.readFileSync(filePath, 'utf-8');
+        const resourcePath = path.resolve(cwd, filePath);
+        const source = fs.readFileSync(resourcePath, 'utf-8');
         const extractedSheets = [];
         const ast = (0, core_1.parseSync)(source, {
             syntax: 'typescript',
@@ -253,7 +266,6 @@ function compileCSS(options) {
         const leadingBytes = Buffer.byteLength(source.slice(0, leadingLen), 'utf-8');
         const baseByteOffset = ast.span.start - leadingBytes;
         const localConsts = (0, utils_1.collectLocalConsts)(ast);
-        const resourcePath = path.resolve(cwd, filePath);
         const importMap = {};
         const keyframesImportMap = {};
         const viewTransitionImportMap = {};
@@ -426,41 +438,40 @@ function compileCSS(options) {
             localStyleAliases,
         };
         const componentParamNames = new Set();
-        for (const node of ast.body) {
-            let declarations = [];
-            if (node.type === 'VariableDeclaration') {
-                declarations = node.declarations;
+        const addFirstParamName = (fn) => {
+            const p = fn.params[0];
+            if (utils_1.t.isIdentifier(p)) {
+                componentParamNames.add(p.value);
             }
-            else if (node.type === 'ExportDeclaration' &&
-                node.declaration.type === 'VariableDeclaration') {
-                declarations = node.declaration.declarations;
+            else if (typeof p === 'object' &&
+                p !== null &&
+                'pat' in p &&
+                utils_1.t.isIdentifier(p.pat)) {
+                componentParamNames.add(p.pat.value);
             }
-            for (const decl of declarations) {
-                if (!utils_1.t.isIdentifier(decl.id) || !decl.init)
-                    continue;
-                const init = decl.init;
-                if (init.type !== 'ArrowFunctionExpression' &&
-                    init.type !== 'FunctionExpression')
-                    continue;
-                if (init.params.length > 0) {
-                    const p = init.params[0];
-                    if (utils_1.t.isIdentifier(p)) {
-                        componentParamNames.add(p.value);
-                    }
-                    else if (typeof p === 'object' &&
-                        p !== null &&
-                        'pat' in p &&
-                        utils_1.t.isIdentifier(p.pat)) {
-                        componentParamNames.add(p.pat.value);
-                    }
+        };
+        for (const node of ast.body) {
+            const statement = unwrapExport(node);
+            if (isFunctionNode(statement)) {
+                addFirstParamName(statement);
+            }
+            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 components = [];
         for (const node of ast.body) {
-            const statement = utils_1.t.isExportDeclaration(node) ? node.declaration : node;
-            if (statement.type === 'FunctionDeclaration' && statement.identifier) {
-                components.push({ name: statement.identifier.value, node: statement });
+            const statement = unwrapExport(node);
+            if (isFunctionNode(statement)) {
+                components.push({
+                    name: statement.identifier?.value ?? 'default',
+                    node: statement,
+                });
             }
             else if (utils_1.t.isVariableDeclaration(statement)) {
                 for (const decl of statement.declarations) {
@@ -797,7 +808,7 @@ function compileCSS(options) {
                         if (entries)
                             propPossibilities.push(...entries);
                     }
-                    else {
+                    if (propPossibilities.length === 0) {
                         const filePrefix = `${resourcePath}-`;
                         for (const key of Object.keys(ctx.scannedTables.componentPropsTable || {})) {
                             if (!key.startsWith(filePrefix))

package/package.json

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