@plumeria/turbopack-loader 18.3.11 → 18.3.13

package/dist/index.js

@@ -79,6 +79,18 @@ const ensureProductionCss = (virtualFilePath, options) => {
     }
     return productionCss;
 };
+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' ||
@@ -303,9 +315,12 @@ async function loader(source) {
         }
         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) {
@@ -819,30 +834,26 @@ async function loader(source) {
         });
         const jsxOpeningElementMap = new Map();
         const componentParamNames = new Set();
-        for (const node of ast.body) {
-            let declarations = [];
-            if (utils_1.t.isVariableDeclaration(node)) {
-                declarations = node.declarations;
+        const addFirstParamName = (fn) => {
+            const p = fn.params[0];
+            if (utils_1.t.isIdentifier(p)) {
+                componentParamNames.add(p.value);
             }
-            else if (utils_1.t.isExportDeclaration(node) &&
-                utils_1.t.isVariableDeclaration(node.declaration)) {
-                declarations = node.declaration.declarations;
+            else if (p?.pat && 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 (p.pat && 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);
                 }
             }
         }
@@ -1249,14 +1260,16 @@ async function loader(source) {
                     ? scannedTables.componentPropsTable?.[`${resourcePath}-${owner}`]?.[varName]
                     : undefined;
                 if (!possibilities) {
+                    const candidates = [];
                     for (const key of Object.keys(scannedTables.componentPropsTable || {})) {
                         if (!key.startsWith(`${resourcePath}-`))
                             continue;
-                        if (scannedTables.componentPropsTable?.[key]?.[varName]) {
-                            possibilities = scannedTables.componentPropsTable[key][varName];
-                            break;
-                        }
+                        const entries = scannedTables.componentPropsTable?.[key]?.[varName];
+                        if (entries)
+                            candidates.push(...entries);
                     }
+                    if (candidates.length > 0)
+                        possibilities = candidates;
                 }
                 if (!possibilities || possibilities.length === 0)
                     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/turbopack-loader",
-  "version": "18.3.11",
+  "version": "18.3.13",
   "description": "Plumeria Turbopack-loader",
   "author": "Refirst 11",
   "license": "MIT",
@@ -29,8 +29,8 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/compiler": "^18.3.11",
-    "@plumeria/utils": "^18.3.11"
+    "@plumeria/compiler": "^18.3.13",
+    "@plumeria/utils": "^18.3.13"
   },
   "devDependencies": {
     "@swc/core": "1.15.47",