@plumeria/turbopack-loader 18.4.1 → 18.4.2

package/dist/index.js

@@ -105,12 +105,37 @@ const componentFunctionOf = (node) => {
     }
     return undefined;
 };
+const unwrapPatternDefault = (pattern) => pattern?.type === 'AssignmentPattern' ? pattern.left : pattern;
+const destructuredPropAliases = (fn) => {
+    const aliases = new Map();
+    const first = fn.params[0];
+    const pattern = unwrapPatternDefault(first?.pat ?? first);
+    if (pattern?.type !== 'ObjectPattern')
+        return aliases;
+    for (const item of pattern.properties ?? []) {
+        if (item.type !== 'KeyValuePatternProperty')
+            continue;
+        const local = unwrapPatternDefault(item.value);
+        const key = item.key;
+        if (!utils_1.t.isIdentifier(local))
+            continue;
+        if (!utils_1.t.isIdentifier(key) && !utils_1.t.isStringLiteral(key))
+            continue;
+        const name = String(key.value);
+        if (name !== local.value)
+            aliases.set(local.value, name);
+    }
+    return aliases;
+};
 const isStaticArgValue = (node) => node.type === 'StringLiteral' ||
     node.type === 'NumericLiteral' ||
     node.type === 'BooleanLiteral' ||
     (node.type === 'TemplateLiteral' && node.expressions.length === 0) ||
     utils_1.t.isIdentifier(node) ||
     utils_1.t.isMemberExpression(node);
+const isNoOpStyle = (node) => utils_1.t.isNullLiteral(node) ||
+    (utils_1.t.isBooleanLiteral(node) && node.value === false) ||
+    (utils_1.t.isIdentifier(node) && node.value === 'undefined');
 const foldDynamicVars = (vars) => {
     const grouped = new Map();
     [...vars]
@@ -237,18 +262,22 @@ async function loader(source) {
             }
         }
         const components = [];
+        const propAliases = new Map();
+        const addComponent = (name, fn) => {
+            components.push({ name, node: fn });
+            const aliases = destructuredPropAliases(fn);
+            if (aliases.size > 0)
+                propAliases.set(name, aliases);
+        };
         for (const node of ast.body) {
             const statement = unwrapExport(node);
             if (isFunctionNode(statement)) {
-                components.push({
-                    name: statement.identifier?.value ?? 'default',
-                    node: statement,
-                });
+                addComponent(statement.identifier?.value ?? 'default', statement);
             }
             else if (statement?.type === 'CallExpression') {
                 const fn = componentFunctionOf(statement);
                 if (fn)
-                    components.push({ name: 'default', node: fn });
+                    addComponent('default', fn);
             }
             else if (utils_1.t.isVariableDeclaration(statement)) {
                 for (const decl of statement.declarations) {
@@ -256,7 +285,7 @@ async function loader(source) {
                         continue;
                     const fn = componentFunctionOf(decl.init);
                     if (fn)
-                        components.push({ name: decl.id.value, node: fn });
+                        addComponent(decl.id.value, fn);
                 }
             }
         }
@@ -1105,6 +1134,8 @@ async function loader(source) {
                 return buildDecision(node, prefix, off, { n: 0 }, scoped);
             };
             const collectConditions = (node, currentTestStrings = [], argOrder) => {
+                if (isNoOpStyle(node))
+                    return true;
                 let branchStyle = resolveStyleObject(node);
                 if (!branchStyle) {
                     const dynamic = resolveDynamicCall(node);
@@ -1184,17 +1215,20 @@ async function loader(source) {
                     ? expr.value
                     : expr.property.value;
                 const source = utils_1.t.isIdentifier(expr) ? varName : getSource(expr);
-                markStylePropApplied(varName, expr);
                 const owner = ownerComponentOf(expr);
+                const propName = (utils_1.t.isIdentifier(expr) && owner
+                    ? propAliases.get(owner)?.get(varName)
+                    : undefined) ?? varName;
+                markStylePropApplied(propName, expr);
                 let possibilities = owner
-                    ? scannedTables.componentPropsTable?.[`${resourcePath}-${owner}`]?.[varName]
+                    ? scannedTables.componentPropsTable?.[`${resourcePath}-${owner}`]?.[propName]
                     : undefined;
                 if (!possibilities) {
                     const candidates = [];
                     for (const key of Object.keys(scannedTables.componentPropsTable || {})) {
                         if (!key.startsWith(`${resourcePath}-`))
                             continue;
-                        const entries = scannedTables.componentPropsTable?.[key]?.[varName];
+                        const entries = scannedTables.componentPropsTable?.[key]?.[propName];
                         if (entries)
                             candidates.push(...entries);
                     }
@@ -1249,6 +1283,8 @@ async function loader(source) {
             };
             for (const arg of args) {
                 const expr = arg.expression;
+                if (isNoOpStyle(expr))
+                    continue;
                 if (pushPropPossibilities(expr, []))
                     continue;
                 if (utils_1.t.isCallExpression(expr) && utils_1.t.isIdentifier(expr.callee)) {
@@ -2073,10 +2109,13 @@ async function loader(source) {
                     });
                 }
                 else {
+                    const keptClass = existingClassExpr
+                        ? `className={${existingClassExpr}}`
+                        : '';
                     replacements.push({
                         start: node.span.start - baseByteOffset,
                         end: node.span.end - baseByteOffset,
-                        content: styleAttr || '',
+                        content: `${keptClass}${styleAttr}`,
                     });
                 }
             },

package/package.json

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