@plumeria/turbopack-loader 13.2.3 → 14.1.0

package/dist/index.js

@@ -39,6 +39,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const zss_engine_1 = require("zss-engine");
 const utils_1 = require("@plumeria/utils");
+const split_css_rules_1 = require("./split-css-rules");
 let lastValidCss = '';
 async function loader(source) {
     const callback = this.async();
@@ -69,6 +70,25 @@ async function loader(source) {
         const sourceBuffer = Buffer.from(source, 'utf-8');
         const leadingBytes = Buffer.byteLength(source.slice(0, leadingLen), 'utf-8');
         const baseByteOffset = ast.span.start - leadingBytes;
+        const throwCompilationError = (message, node) => {
+            let suffix = '';
+            if (node) {
+                const offset = node.span.start - baseByteOffset;
+                let line = 1;
+                let colStart = 0;
+                for (let i = 0; i < offset && i < sourceBuffer.length; i++) {
+                    if (sourceBuffer[i] === 10) {
+                        line++;
+                        colStart = i + 1;
+                    }
+                }
+                const col = offset - colStart + 1;
+                suffix = ` (${path.basename(resourcePath)}:${line}:${col})`;
+            }
+            const err = new Error(`${message}${suffix}`);
+            err.stack = err.message;
+            throw err;
+        };
         for (const node of ast.body) {
             if (node.type === 'ImportDeclaration') {
                 const sourcePath = node.source.value;
@@ -257,7 +277,7 @@ async function loader(source) {
                 if ((localCreateStyles[varName] &&
                     localCreateStyles[varName].type === 'variant') ||
                     mergedVariantsTable[varName]) {
-                    throw new Error(`Plumeria: Assigning the return value of "css.variants" to a variable is not supported.\nPlease pass the variant function directly to "css.use". Found assignment to: ${utils_1.t.isIdentifier(decl.id) ? decl.id.value : 'unknown'}`);
+                    throwCompilationError(`Plumeria: Assigning the return value of css.variants() to a variable is not supported.\nPlease pass the variant function directly to styleName or css.use(). Found assignment to: ${utils_1.t.isIdentifier(decl.id) ? decl.id.value : 'unknown'}`, init);
                 }
             }
         };
@@ -410,7 +430,7 @@ async function loader(source) {
                         selector = selectorExpr.value;
                     }
                     if (selector.startsWith('@') && !(0, zss_engine_1.isAtRule)(selector)) {
-                        throw new Error(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`);
+                        throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
                     }
                     const obj = (0, utils_1.objectExpressionToObject)(init.arguments[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
                     const hash = (0, zss_engine_1.genBase36Hash)({ _themeSelector: selector, ...obj }, 1, 8);
@@ -591,7 +611,7 @@ async function loader(source) {
                             selector = selectorExpr.value;
                         }
                         if (selector.startsWith('@') && !(0, zss_engine_1.isAtRule)(selector)) {
-                            throw new Error(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`);
+                            throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
                         }
                         const obj = (0, utils_1.objectExpressionToObject)(args[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
                         const hash = (0, zss_engine_1.genBase36Hash)({ _themeSelector: selector, ...obj }, 1, 8);
@@ -672,6 +692,24 @@ async function loader(source) {
             let groupIdCounter = 0;
             let baseStyle = {};
             let isOptimizable = true;
+            const getRootIdentifier = (node) => {
+                if (utils_1.t.isIdentifier(node)) {
+                    return node.value;
+                }
+                if (utils_1.t.isMemberExpression(node)) {
+                    return getRootIdentifier(node.object);
+                }
+                if (utils_1.t.isCallExpression(node)) {
+                    const callee = node.callee;
+                    if (callee.type !== 'Super' && callee.type !== 'Import') {
+                        return getRootIdentifier(callee);
+                    }
+                }
+                if (node.type === 'ParenthesisExpression') {
+                    return getRootIdentifier(node.expression);
+                }
+                return null;
+            };
             const collectConditions = (node, currentTestStrings = []) => {
                 const staticStyle = resolveStyleObject(node);
                 if (staticStyle) {
@@ -742,6 +780,21 @@ async function loader(source) {
                         variantObj = localCreateStyles[varName].obj;
                     if (variantObj) {
                         const callArgs = expr.arguments;
+                        const hasSpread = callArgs.some((a) => {
+                            if (a.spread)
+                                return true;
+                            if (a.expression.type === 'ObjectExpression') {
+                                return a.expression.properties.some((p) => p.type === 'SpreadElement');
+                            }
+                            return false;
+                        });
+                        if (hasSpread) {
+                            throwCompilationError(`Plumeria: Spread operator in ${getSource(expr)} is not supported. ` +
+                                `Please pass specific variant options directly.`, expr);
+                        }
+                        if (callArgs.length !== 1) {
+                            throwCompilationError(`Plumeria: Variant function "${varName}" expects exactly 1 argument, found ${callArgs.length}.`, expr);
+                        }
                         if (callArgs.length === 1 && !callArgs[0].spread) {
                             const arg = callArgs[0].expression;
                             if (arg.type === 'ObjectExpression') {
@@ -848,6 +901,17 @@ async function loader(source) {
                 const handled = collectConditions(expr);
                 if (handled)
                     continue;
+                if (utils_1.t.isMemberExpression(expr) || utils_1.t.isIdentifier(expr)) {
+                    const rootId = getRootIdentifier(expr);
+                    const isPlumeriaStyle = rootId &&
+                        ((localCreateStyles[rootId] !== undefined &&
+                            localCreateStyles[rootId].type !== 'constant') ||
+                            mergedCreateTable[rootId] !== undefined ||
+                            mergedVariantsTable[rootId] !== undefined);
+                    if (!isPlumeriaStyle) {
+                        throwCompilationError(`Plumeria: Dynamic or unresolvable style object "${getSource(expr)}" is not supported.`, expr);
+                    }
+                }
                 isOptimizable = false;
                 break;
             }
@@ -1420,7 +1484,7 @@ async function loader(source) {
                     const propKey = callee.property.value;
                     const styleInfo = localCreateStyles[varName];
                     if (styleInfo?.functions?.[propKey]) {
-                        throw new Error(`Plumeria: css.use(${getSource(expr)}) does not support dynamic function keys.\n`);
+                        throwCompilationError(`Plumeria: css.use(${getSource(expr)}) does not support dynamic function keys.`, expr);
                     }
                 }
                 const { classParts, isOptimizable, baseStyle } = buildClassParts(args);
@@ -1477,15 +1541,24 @@ async function loader(source) {
             return callback(null, transformedSource);
         }
         if (extractedSheets.length > 0 && process.env.NODE_ENV === 'development') {
-            const newCss = optInCSS + '\n';
             let currentCss = '';
             try {
                 currentCss = fs.readFileSync(VIRTUAL_FILE_PATH, 'utf-8');
             }
             catch (e) {
             }
-            if (!currentCss.includes(optInCSS) || isThemeCSS) {
-                const nextCss = currentCss + '\n' + newCss;
+            const currentRules = (0, split_css_rules_1.splitCssRules)(currentCss);
+            const newRules = (0, split_css_rules_1.splitCssRules)(optInCSS);
+            const ruleSet = new Set(currentRules);
+            let hasNewRule = false;
+            for (const rule of newRules) {
+                if (!ruleSet.has(rule)) {
+                    ruleSet.add(rule);
+                    hasNewRule = true;
+                }
+            }
+            if (hasNewRule || isThemeCSS) {
+                const nextCss = Array.from(ruleSet).join('\n\n') + '\n';
                 fs.writeFileSync(VIRTUAL_FILE_PATH, nextCss, 'utf-8');
                 lastValidCss = nextCss;
             }

package/dist/split-css-rules.d.ts

@@ -0,0 +1 @@
+export declare function splitCssRules(css: string): string[];

package/dist/split-css-rules.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitCssRules = splitCssRules;
+function splitCssRules(css) {
+    const rules = [];
+    let currentRule = '';
+    let depth = 0;
+    let inComment = false;
+    let inString = null;
+    for (let i = 0; i < css.length; i++) {
+        const char = css[i];
+        const nextChar = css[i + 1];
+        if (inComment) {
+            currentRule += char;
+            if (char === '*' && nextChar === '/') {
+                currentRule += '/';
+                i++;
+                inComment = false;
+            }
+            continue;
+        }
+        if (char === '/' && nextChar === '*') {
+            currentRule += '/*';
+            i++;
+            inComment = true;
+            continue;
+        }
+        if (inString) {
+            currentRule += char;
+            if (char === '\\') {
+                if (nextChar) {
+                    currentRule += nextChar;
+                    i++;
+                }
+            }
+            else if (char === inString) {
+                inString = null;
+            }
+            continue;
+        }
+        if (char === '"' || char === "'") {
+            currentRule += char;
+            inString = char;
+            continue;
+        }
+        currentRule += char;
+        if (char === '{') {
+            depth++;
+        }
+        else if (char === '}') {
+            depth--;
+            if (depth === 0) {
+                const trimmed = currentRule.trim();
+                if (trimmed)
+                    rules.push(trimmed);
+                currentRule = '';
+            }
+        }
+        else if (char === ';' && depth === 0) {
+            const trimmed = currentRule.trim();
+            if (trimmed)
+                rules.push(trimmed);
+            currentRule = '';
+        }
+    }
+    const trimmed = currentRule.trim();
+    if (trimmed && depth === 0) {
+        rules.push(trimmed);
+    }
+    return rules;
+}

package/package.json

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