@plumeria/turbopack-loader 6.2.1 → 6.3.0

package/dist/index.js

@@ -142,6 +142,11 @@ async function loader(source) {
     const mergedCreateThemeHashTable = {};
     for (const key of Object.keys(scannedTables.createThemeHashTable)) {
         mergedCreateThemeHashTable[key] = scannedTables.createThemeHashTable[key];
+        if (key.startsWith(`${resourcePath}-`)) {
+            const varName = key.slice(resourcePath.length + 1);
+            mergedCreateThemeHashTable[varName] =
+                scannedTables.createThemeHashTable[key];
+        }
     }
     for (const key of Object.keys(createThemeImportMap)) {
         mergedCreateThemeHashTable[key] = createThemeImportMap[key];
@@ -149,6 +154,11 @@ async function loader(source) {
     const mergedCreateStaticHashTable = {};
     for (const key of Object.keys(scannedTables.createStaticHashTable)) {
         mergedCreateStaticHashTable[key] = scannedTables.createStaticHashTable[key];
+        if (key.startsWith(`${resourcePath}-`)) {
+            const varName = key.slice(resourcePath.length + 1);
+            mergedCreateStaticHashTable[varName] =
+                scannedTables.createStaticHashTable[key];
+        }
     }
     for (const key of Object.keys(createStaticImportMap)) {
         mergedCreateStaticHashTable[key] = createStaticImportMap[key];
@@ -244,6 +254,9 @@ async function loader(source) {
             }
             else if (propName === 'variants' &&
                 utils_1.t.isObjectExpression(node.init.arguments[0].expression)) {
+                if (utils_1.t.isIdentifier(node.id)) {
+                    idSpans.add(node.id.span.start);
+                }
                 const obj = (0, utils_1.objectExpressionToObject)(node.init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable, (name) => {
                     if (localCreateStyles[name]) {
                         return localCreateStyles[name].obj;
@@ -272,6 +285,32 @@ async function loader(source) {
                     },
                 };
             }
+            else if (propName === 'createTheme' &&
+                utils_1.t.isObjectExpression(node.init.arguments[0].expression)) {
+                if (utils_1.t.isIdentifier(node.id)) {
+                    idSpans.add(node.id.span.start);
+                }
+                const obj = (0, utils_1.objectExpressionToObject)(node.init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
+                const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                const uniqueKey = `${resourcePath}-${node.id.value}`;
+                scannedTables.createThemeHashTable[uniqueKey] = hash;
+                scannedTables.createThemeObjectTable[hash] = obj;
+                localCreateStyles[node.id.value] = {
+                    name: node.id.value,
+                    type: 'constant',
+                    obj,
+                    hashMap: scannedTables.createAtomicMapTable[hash],
+                    isExported,
+                    initSpan: {
+                        start: node.init.span.start - ast.span.start,
+                        end: node.init.span.end - ast.span.start,
+                    },
+                    declSpan: {
+                        start: declSpan.start - ast.span.start,
+                        end: declSpan.end - ast.span.start,
+                    },
+                };
+            }
         }
     };
     (0, utils_1.traverse)(ast, {
@@ -345,7 +384,6 @@ async function loader(source) {
                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
                     scannedTables.viewTransitionObjectTable[hash] = obj;
                     if (!isProduction) {
-                        (0, utils_1.extractOndemandStyles)(obj, extractedSheets, scannedTables);
                         (0, utils_1.extractOndemandStyles)({ vt: `vt-${hash}` }, extractedSheets, scannedTables);
                     }
                     replacements.push({
@@ -396,7 +434,7 @@ async function loader(source) {
             if (utils_1.t.isIdentifier(node.object) && utils_1.t.isIdentifier(node.property)) {
                 const varName = node.object.value;
                 const propName = node.property.value;
-                const uniqueKey = `${this.resourcePath}-${varName}`;
+                const uniqueKey = `${resourcePath}-${varName}`;
                 let hash = scannedTables.createHashTable[uniqueKey];
                 if (!hash) {
                     hash = mergedCreateTable[varName];
@@ -419,13 +457,12 @@ async function loader(source) {
                     themeHash = mergedCreateThemeHashTable[varName];
                 }
                 if (themeHash) {
-                    const themeObj = scannedTables.createThemeObjectTable[themeHash];
-                    if (themeObj && themeObj[propName] !== undefined) {
-                        const cssVarName = (0, zss_engine_1.camelToKebabCase)(propName);
+                    const atomicMap = scannedTables.createAtomicMapTable[themeHash];
+                    if (atomicMap && atomicMap && atomicMap[propName]) {
                         replacements.push({
                             start: node.span.start - ast.span.start,
                             end: node.span.end - ast.span.start,
-                            content: JSON.stringify(`var(--${cssVarName})`),
+                            content: JSON.stringify(atomicMap[propName]),
                         });
                     }
                 }
@@ -460,7 +497,7 @@ async function loader(source) {
                 return;
             }
             const varName = node.value;
-            const uniqueKey = `${this.resourcePath}-${varName}`;
+            const uniqueKey = `${resourcePath}-${varName}`;
             let hash = scannedTables.createHashTable[uniqueKey];
             if (!hash) {
                 hash = mergedCreateTable[varName];
@@ -482,46 +519,19 @@ async function loader(source) {
                     });
                 }
             }
-            let kfHash = scannedTables.keyframesHashTable[uniqueKey];
-            if (!kfHash) {
-                kfHash = mergedKeyframesTable[varName];
-            }
-            if (kfHash) {
-                replacements.push({
-                    start: node.span.start - ast.span.start,
-                    end: node.span.end - ast.span.start,
-                    content: JSON.stringify(`kf-${kfHash}`),
-                });
-                return;
-            }
-            let vtHash = scannedTables.viewTransitionHashTable[uniqueKey];
-            if (!vtHash) {
-                vtHash = mergedViewTransitionTable[varName];
-            }
-            if (vtHash) {
-                replacements.push({
-                    start: node.span.start - ast.span.start,
-                    end: node.span.end - ast.span.start,
-                    content: JSON.stringify(`vt-${vtHash}`),
-                });
-                return;
-            }
             let themeHash = scannedTables.createThemeHashTable[uniqueKey];
             if (!themeHash) {
                 themeHash = mergedCreateThemeHashTable[varName];
             }
             if (themeHash) {
-                const themeObj = scannedTables.createThemeObjectTable[themeHash];
-                if (themeObj) {
-                    const themeVars = {};
-                    Object.keys(themeObj).forEach((key) => {
-                        themeVars[key] = `var(--${(0, zss_engine_1.camelToKebabCase)(key)})`;
-                    });
+                const atomicMap = scannedTables.createAtomicMapTable[themeHash];
+                if (atomicMap) {
                     replacements.push({
                         start: node.span.start - ast.span.start,
                         end: node.span.end - ast.span.start,
-                        content: JSON.stringify(themeVars),
+                        content: JSON.stringify(atomicMap),
                     });
+                    return;
                 }
             }
             let staticHash = scannedTables.createStaticHashTable[uniqueKey];
@@ -838,6 +848,9 @@ async function loader(source) {
         },
     });
     Object.values(localCreateStyles).forEach((info) => {
+        if (info.type === 'constant' || info.type === 'variant') {
+            return;
+        }
         if (info.isExported) {
             replacements.push({
                 start: info.declSpan.start,

package/package.json

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