@plumeria/turbopack-loader 18.2.2 → 18.2.4

package/dist/index.js

@@ -238,6 +238,30 @@ async function loader(source) {
                 this.addDependency(parentFile);
             }
         }
+        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 });
+            }
+            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 });
+                    }
+                }
+            }
+        }
+        const appliedStyleProps = new Set();
+        const markStylePropApplied = (name, at) => {
+            const owner = components.find((c) => at.span.start >= c.node.span.start &&
+                at.span.start <= c.node.span.end);
+            if (owner) {
+                appliedStyleProps.add(`${owner.name}:${name}`);
+            }
+        };
         const extractedSheets = [];
         const addSheet = (sheet) => {
             if (!extractedSheets.includes(sheet)) {
@@ -1147,56 +1171,68 @@ async function loader(source) {
                 else if (node.type === 'ParenthesisExpression') {
                     return collectConditions(node.expression, currentTestStrings, argOrder);
                 }
+                if (pushPropPossibilities(node, currentTestStrings))
+                    return true;
                 assertResolvable(node);
                 return false;
             };
-            for (const arg of args) {
-                const expr = arg.expression;
-                if (utils_1.t.isIdentifier(expr) ||
-                    (utils_1.t.isMemberExpression(expr) &&
-                        utils_1.t.isIdentifier(expr.object) &&
-                        componentParamNames.has(expr.object.value) &&
-                        utils_1.t.isIdentifier(expr.property))) {
-                    const varName = utils_1.t.isIdentifier(expr)
-                        ? expr.value
-                        : expr.property.value;
-                    const testLHS = utils_1.t.isIdentifier(expr) ? varName : getSource(expr);
-                    let propPossibilities;
-                    for (const key of Object.keys(scannedTables.componentPropsTable || {})) {
-                        if (key.startsWith(`${resourcePath}-`)) {
-                            if (scannedTables.componentPropsTable?.[key]?.[varName]) {
-                                propPossibilities =
-                                    scannedTables.componentPropsTable?.[key]?.[varName];
-                                break;
-                            }
-                        }
-                    }
-                    if (propPossibilities && propPossibilities.length > 0) {
-                        const currentGroupId = ++groupIdCounter;
-                        const currentOrder = sourceOrder++;
-                        const uniqueEntries = [];
-                        propPossibilities.forEach((entry) => {
-                            if (!uniqueEntries.some((x) => x.key === entry.key)) {
-                                uniqueEntries.push(entry);
-                            }
-                        });
-                        uniqueEntries.forEach((entry) => {
-                            conditionals.push({
-                                test: expr,
-                                testLHS,
-                                testString: `${testLHS} === ${JSON.stringify(entry.key)}`,
-                                truthy: entry.styleObj,
-                                falsy: {},
-                                groupId: currentGroupId,
-                                order: currentOrder,
-                                groupName: undefined,
-                                valueName: entry.key,
-                                varName,
-                            });
-                        });
+            const pushPropPossibilities = (expr, gates) => {
+                const isParamMember = utils_1.t.isMemberExpression(expr) &&
+                    utils_1.t.isIdentifier(expr.object) &&
+                    componentParamNames.has(expr.object.value) &&
+                    utils_1.t.isIdentifier(expr.property);
+                if (!utils_1.t.isIdentifier(expr) && !isParamMember)
+                    return false;
+                const varName = utils_1.t.isIdentifier(expr)
+                    ? expr.value
+                    : expr.property.value;
+                const source = utils_1.t.isIdentifier(expr) ? varName : getSource(expr);
+                markStylePropApplied(varName, expr);
+                let possibilities;
+                for (const key of Object.keys(scannedTables.componentPropsTable || {})) {
+                    if (!key.startsWith(`${resourcePath}-`))
                         continue;
+                    if (scannedTables.componentPropsTable?.[key]?.[varName]) {
+                        possibilities = scannedTables.componentPropsTable[key][varName];
+                        break;
                     }
                 }
+                if (!possibilities || possibilities.length === 0)
+                    return false;
+                const testLHS = gates.length
+                    ? `((${gates.join(' && ')}) ? ${source} : "")`
+                    : source;
+                const currentGroupId = ++groupIdCounter;
+                const currentOrder = sourceOrder++;
+                const seen = new Set();
+                const pushOption = (valueName, style) => {
+                    conditionals.push({
+                        test: expr,
+                        testLHS,
+                        testString: `${testLHS} === ${JSON.stringify(valueName)}`,
+                        truthy: style,
+                        falsy: {},
+                        groupId: currentGroupId,
+                        order: currentOrder,
+                        groupName: undefined,
+                        valueName,
+                        varName,
+                    });
+                };
+                possibilities.forEach((entry) => {
+                    if (seen.has(entry.key))
+                        return;
+                    seen.add(entry.key);
+                    pushOption(entry.key, entry.styleObj);
+                });
+                if (gates.length)
+                    pushOption('', {});
+                return true;
+            };
+            for (const arg of args) {
+                const expr = arg.expression;
+                if (pushPropPossibilities(expr, []))
+                    continue;
                 if (utils_1.t.isCallExpression(expr) && utils_1.t.isIdentifier(expr.callee)) {
                     const varName = expr.callee.value;
                     const uniqueKey = `${resourcePath}-${varName}`;
@@ -2033,6 +2069,17 @@ async function loader(source) {
                 }
             },
         });
+        for (const { name, node } of components) {
+            const props = scannedTables.componentPropsTable?.[`${resourcePath}-${name}`];
+            for (const propName of Object.keys(props ?? {})) {
+                if (appliedStyleProps.has(`${name}:${propName}`)) {
+                    continue;
+                }
+                throwCompilationError(`Plumeria: "${propName}" is a style received through a prop but is never applied ` +
+                    `to ${styleProp} or css.use() here. Apply it on an element this component renders; ` +
+                    `a style prop cannot be passed on to another component.`, node);
+            }
+        }
         const buildExportedInit = (info) => {
             const keys = Object.keys(info.obj);
             if (isProduction || keys.length === 0) {

package/package.json

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