@plumeria/turbopack-loader 18.3.12 → 18.3.14

package/dist/index.js

@@ -91,6 +91,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' ||
@@ -322,13 +334,18 @@ async function loader(source) {
                     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 });
                 }
             }
         }
@@ -848,12 +865,18 @@ async function loader(source) {
             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);
                 }
             }
         }
@@ -1260,14 +1283,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.12",
+  "version": "18.3.14",
   "description": "Plumeria Turbopack-loader",
   "author": "Refirst 11",
   "license": "MIT",
@@ -29,8 +29,8 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/compiler": "^18.3.12",
-    "@plumeria/utils": "^18.3.12"
+    "@plumeria/compiler": "^18.3.14",
+    "@plumeria/utils": "^18.3.14"
   },
   "devDependencies": {
     "@swc/core": "1.15.47",