@plumeria/turbopack-loader 11.1.2 → 11.2.0

package/dist/index.js

@@ -385,11 +385,17 @@ async function loader(source) {
                     const uniqueKey = `${resourcePath}-${node.id.value}`;
                     scannedTables.createThemeHashTable[uniqueKey] = hash;
                     scannedTables.createThemeObjectTable[hash] = obj;
+                    mergedCreateThemeHashTable[node.id.value] = hash;
+                    const themeHashMap = {};
+                    for (const [key] of Object.entries(obj)) {
+                        const cssVarName = (0, zss_engine_1.camelToKebabCase)(key);
+                        themeHashMap[key] = `var(--${hash}-${cssVarName})`;
+                    }
                     localCreateStyles[node.id.value] = {
                         name: node.id.value,
                         type: 'constant',
                         obj,
-                        hashMap: scannedTables.createAtomicMapTable[hash],
+                        hashMap: themeHashMap,
                         isExported,
                         initSpan: {
                             start: init.span.start - baseByteOffset,
@@ -406,16 +412,42 @@ async function loader(source) {
     };
     (0, utils_1.traverse)(ast, {
         ImportDeclaration({ node }) {
-            if (node.specifiers) {
-                node.specifiers.forEach((specifier) => {
-                    if (specifier.local) {
-                        excludedSpans.add(specifier.local.span.start);
-                    }
-                    if (specifier.type === 'ImportSpecifier' && specifier.imported) {
-                        excludedSpans.add(specifier.imported.span.start);
-                    }
-                });
+            if (node.source.value === '@plumeria/core') {
+                if (node.typeOnly)
+                    return;
+                const typeOnlySpecs = node.specifiers.filter((s) => s.type === 'ImportSpecifier' && s.isTypeOnly);
+                if (typeOnlySpecs.length > 0) {
+                    const names = typeOnlySpecs
+                        .map((s) => {
+                        if (s.type !== 'ImportSpecifier')
+                            return;
+                        const imported = s.imported ? s.imported.value : s.local.value;
+                        const local = s.local.value;
+                        return imported === local ? imported : `${imported} as ${local}`;
+                    })
+                        .join(', ');
+                    replacements.push({
+                        start: node.span.start - baseByteOffset,
+                        end: node.span.end - baseByteOffset,
+                        content: `import type { ${names} } from '@plumeria/core'`,
+                    });
+                }
+                else {
+                    replacements.push({
+                        start: node.span.start - baseByteOffset,
+                        end: node.span.end - baseByteOffset,
+                        content: '',
+                    });
+                }
             }
+            node.specifiers.forEach((specifier) => {
+                if (specifier.local) {
+                    excludedSpans.add(specifier.local.span.start);
+                }
+                if (specifier.type === 'ImportSpecifier' && specifier.imported) {
+                    excludedSpans.add(specifier.imported.span.start);
+                }
+            });
         },
         ExportDeclaration({ node }) {
             if (utils_1.t.isVariableDeclaration(node.declaration)) {
@@ -1311,6 +1343,7 @@ async function loader(source) {
     });
     parts.push(buffer.subarray(offset));
     const transformedSource = Buffer.concat(parts).toString();
+    const optInCSS = await (0, utils_1.optimizer)(extractedSheets.join(''));
     let relativeImportPath = path.relative(path.dirname(resourcePath), VIRTUAL_FILE_PATH);
     relativeImportPath = relativeImportPath.replace(/\\/g, '/');
     if (!relativeImportPath.startsWith('.')) {
@@ -1320,39 +1353,21 @@ async function loader(source) {
     if (process.env.NODE_ENV === 'production') {
         return callback(null, transformedSource);
     }
-    if (process.env.NODE_ENV === 'development') {
-        const optInCSS = await (0, utils_1.optimizer)(extractedSheets.join(''));
-        const projectName = path.basename(this.rootContext);
-        const relativeFromRoot = path
-            .relative(this.rootContext, resourcePath)
-            .replace(/\\/g, '/');
-        const filePathKey = `${projectName}/${relativeFromRoot}`;
-        const startMarker = `/* ---start:${filePathKey} */`;
-        const endMarker = `/* ---end:${filePathKey} */`;
+    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) {
         }
-        let nextCss = currentCss;
-        const cleanOptInCSS = optInCSS.trim();
-        const newBlock = cleanOptInCSS
-            ? `${startMarker}\n${cleanOptInCSS}\n${endMarker}`
-            : '';
-        const startIndex = currentCss.indexOf(startMarker);
-        const endIndex = currentCss.indexOf(endMarker);
-        if (startIndex !== -1 && endIndex !== -1 && endIndex > startIndex) {
-            const before = currentCss.substring(0, startIndex);
-            const after = currentCss.substring(endIndex + endMarker.length);
-            nextCss = before + newBlock + after;
-        }
-        else if (newBlock) {
-            nextCss = currentCss + (currentCss.trim() ? '\n\n' : '') + newBlock;
-        }
-        nextCss = nextCss.replace(/\n{3,}/g, '\n\n').trim() + '\n';
-        if (currentCss !== nextCss) {
-            fs.writeFileSync(VIRTUAL_FILE_PATH, nextCss, 'utf-8');
+        if (!currentCss.includes(optInCSS)) {
+            if (currentCss) {
+                fs.writeFileSync(VIRTUAL_FILE_PATH, currentCss + newCss, 'utf-8');
+            }
+            else {
+                fs.writeFileSync(VIRTUAL_FILE_PATH, newCss, 'utf-8');
+            }
         }
     }
     return callback(null, transformedSource + postfix);

package/package.json

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