@plumeria/turbopack-loader 6.1.2 → 6.2.0

package/dist/index.js

@@ -395,20 +395,6 @@ async function loader(source) {
                 if (!hash) {
                     hash = mergedCreateTable[varName];
                 }
-                if (!hash) {
-                    const styleInfo = localCreateStyles[varName];
-                    if (styleInfo) {
-                        const atomMap = styleInfo.hashMap[propName];
-                        if (atomMap) {
-                            replacements.push({
-                                start: node.span.start - ast.span.start,
-                                end: node.span.end - ast.span.start,
-                                content: JSON.stringify(atomMap),
-                            });
-                            return;
-                        }
-                    }
-                }
                 if (hash) {
                     let atomMap;
                     if (scannedTables.createAtomicMapTable[hash]) {
@@ -420,11 +406,48 @@ async function loader(source) {
                             end: node.span.end - ast.span.start,
                             content: JSON.stringify(atomMap),
                         });
-                        return;
                     }
                 }
             }
         },
+        Identifier({ node }) {
+            if (excludedSpans.has(node.span.start))
+                return;
+            if (idSpans.has(node.span.start))
+                return;
+            const styleInfo = localCreateStyles[node.value];
+            if (styleInfo) {
+                replacements.push({
+                    start: node.span.start - ast.span.start,
+                    end: node.span.end - ast.span.start,
+                    content: JSON.stringify(styleInfo.hashMap),
+                });
+                return;
+            }
+            const varName = node.value;
+            const uniqueKey = `${this.resourcePath}-${varName}`;
+            let hash = scannedTables.createHashTable[uniqueKey];
+            if (!hash) {
+                hash = mergedCreateTable[varName];
+            }
+            if (hash) {
+                const obj = scannedTables.createObjectTable[hash];
+                const atomicMap = scannedTables.createAtomicMapTable[hash];
+                if (obj && atomicMap) {
+                    const hashMap = {};
+                    Object.keys(obj).forEach((key) => {
+                        if (atomicMap[key]) {
+                            hashMap[key] = atomicMap[key];
+                        }
+                    });
+                    replacements.push({
+                        start: node.span.start - ast.span.start,
+                        end: node.span.end - ast.span.start,
+                        content: JSON.stringify(hashMap),
+                    });
+                }
+            }
+        },
         CallExpression({ node }) {
             const callee = node.callee;
             let isPropsCall = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/turbopack-loader",
-  "version": "6.1.2",
+  "version": "6.2.0",
   "description": "Plumeria Turbopack-loader",
   "author": "Refirst 11",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/utils": "^6.1.2"
+    "@plumeria/utils": "^6.2.0"
   },
   "devDependencies": {
     "@swc/core": "1.15.8",
-    "zss-engine": "2.1.2"
+    "zss-engine": "2.2.0"
   },
   "publishConfig": {
     "access": "public",