@plumeria/compiler 12.0.4 → 12.0.5

package/dist/index.js

@@ -37,6 +37,7 @@ exports.compileCSS = compileCSS;
 const core_1 = require("@swc/core");
 const zss_engine_1 = require("zss-engine");
 const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 const rs = __importStar(require("@rust-gear/glob"));
 const utils_1 = require("@plumeria/utils");
 const utils_2 = require("@plumeria/utils");
@@ -120,8 +121,14 @@ function compileCSS(options) {
         const leadingBytes = Buffer.byteLength(source.slice(0, leadingLen), 'utf-8');
         const baseByteOffset = ast.span.start - leadingBytes;
         const localConsts = (0, utils_1.collectLocalConsts)(ast);
-        const resourcePath = filePath;
+        const resourcePath = path.resolve(cwd, filePath);
         const importMap = {};
+        const keyframesImportMap = {};
+        const viewTransitionImportMap = {};
+        const createImportMap = {};
+        const variantsImportMap = {};
+        const createThemeImportMap = {};
+        const createStaticImportMap = {};
         const plumeriaAliases = {};
         (0, utils_1.traverse)(ast, {
             ImportDeclaration({ node }) {
@@ -154,21 +161,22 @@ function compileCSS(options) {
                             if (scannedTables.staticTable[uniqueKey])
                                 importMap[localName] = scannedTables.staticTable[uniqueKey];
                             if (scannedTables.keyframesHashTable[uniqueKey])
-                                importMap[localName] =
+                                keyframesImportMap[localName] =
                                     scannedTables.keyframesHashTable[uniqueKey];
                             if (scannedTables.viewTransitionHashTable[uniqueKey])
-                                importMap[localName] =
+                                viewTransitionImportMap[localName] =
                                     scannedTables.viewTransitionHashTable[uniqueKey];
                             if (scannedTables.createHashTable[uniqueKey])
-                                importMap[localName] = scannedTables.createHashTable[uniqueKey];
+                                createImportMap[localName] =
+                                    scannedTables.createHashTable[uniqueKey];
                             if (scannedTables.variantsHashTable[uniqueKey])
-                                importMap[localName] =
+                                variantsImportMap[localName] =
                                     scannedTables.variantsHashTable[uniqueKey];
                             if (scannedTables.createThemeHashTable[uniqueKey])
-                                importMap[localName] =
+                                createThemeImportMap[localName] =
                                     scannedTables.createThemeHashTable[uniqueKey];
                             if (scannedTables.createStaticHashTable[uniqueKey])
-                                importMap[localName] =
+                                createStaticImportMap[localName] =
                                     scannedTables.createStaticHashTable[uniqueKey];
                         }
                     });
@@ -188,65 +196,74 @@ function compileCSS(options) {
         const mergedKeyframesTable = {};
         for (const key of Object.keys(scannedTables.keyframesHashTable)) {
             mergedKeyframesTable[key] = scannedTables.keyframesHashTable[key];
-        }
-        for (const key of Object.keys(importMap)) {
-            const val = importMap[key];
-            if (typeof val === 'string') {
-                mergedKeyframesTable[key] = val;
+            if (key.startsWith(`${resourcePath}-`)) {
+                const varName = key.slice(resourcePath.length + 1);
+                mergedKeyframesTable[varName] = scannedTables.keyframesHashTable[key];
             }
         }
+        for (const key of Object.keys(keyframesImportMap)) {
+            mergedKeyframesTable[key] = keyframesImportMap[key];
+        }
         const mergedViewTransitionTable = {};
         for (const key of Object.keys(scannedTables.viewTransitionHashTable)) {
             mergedViewTransitionTable[key] =
                 scannedTables.viewTransitionHashTable[key];
-        }
-        for (const key of Object.keys(importMap)) {
-            const val = importMap[key];
-            if (typeof val === 'string') {
-                mergedViewTransitionTable[key] = val;
+            if (key.startsWith(`${resourcePath}-`)) {
+                const varName = key.slice(resourcePath.length + 1);
+                mergedViewTransitionTable[varName] =
+                    scannedTables.viewTransitionHashTable[key];
             }
         }
+        for (const key of Object.keys(viewTransitionImportMap)) {
+            mergedViewTransitionTable[key] = viewTransitionImportMap[key];
+        }
         const mergedCreateThemeHashTable = {};
         for (const key of Object.keys(scannedTables.createThemeHashTable)) {
             mergedCreateThemeHashTable[key] = scannedTables.createThemeHashTable[key];
-        }
-        for (const key of Object.keys(importMap)) {
-            const val = importMap[key];
-            if (typeof val === 'string') {
-                mergedCreateThemeHashTable[key] = val;
+            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];
+        }
         const mergedCreateStaticHashTable = {};
         for (const key of Object.keys(scannedTables.createStaticHashTable)) {
             mergedCreateStaticHashTable[key] =
                 scannedTables.createStaticHashTable[key];
-        }
-        for (const key of Object.keys(importMap)) {
-            const val = importMap[key];
-            if (typeof val === 'string') {
-                mergedCreateStaticHashTable[key] = val;
+            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];
+        }
         const mergedCreateTable = {};
         for (const key of Object.keys(scannedTables.createHashTable)) {
             mergedCreateTable[key] = scannedTables.createHashTable[key];
-        }
-        for (const key of Object.keys(importMap)) {
-            const val = importMap[key];
-            if (typeof val === 'string') {
-                mergedCreateTable[key] = val;
+            if (key.startsWith(`${resourcePath}-`)) {
+                const varName = key.slice(resourcePath.length + 1);
+                mergedCreateTable[varName] = scannedTables.createHashTable[key];
             }
         }
+        for (const key of Object.keys(createImportMap)) {
+            mergedCreateTable[key] = createImportMap[key];
+        }
         const mergedVariantsTable = {};
         for (const key of Object.keys(scannedTables.variantsHashTable)) {
             mergedVariantsTable[key] = scannedTables.variantsHashTable[key];
-        }
-        for (const key of Object.keys(importMap)) {
-            const val = importMap[key];
-            if (typeof val === 'string') {
-                mergedVariantsTable[key] = val;
+            if (key.startsWith(`${resourcePath}-`)) {
+                const varName = key.slice(resourcePath.length + 1);
+                mergedVariantsTable[varName] = scannedTables.variantsHashTable[key];
             }
         }
+        for (const key of Object.keys(variantsImportMap)) {
+            mergedVariantsTable[key] = variantsImportMap[key];
+        }
         const ctx = {
             mergedStaticTable,
             mergedKeyframesTable,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "12.0.4",
+  "version": "12.0.5",
   "description": "Plumeria swc based compiler for statically extracting css",
   "author": "Refirst 11",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@plumeria/utils": "^12.0.4"
+    "@plumeria/utils": "^12.0.5"
   },
   "devDependencies": {
     "@rust-gear/glob": "1.0.0",