@plumeria/compiler 19.2.11 → 19.2.12

package/dist/index.js

@@ -244,7 +244,7 @@ function compileCSS(options) {
         exclude: exclude,
         sort: true,
     });
-    const scannedTables = (0, utils_1.scanAll)(cwd);
+    const scannedTables = (0, utils_1.scanOverlay)(cwd);
     const processFile = (filePath) => {
         const resourcePath = path.resolve(cwd, filePath);
         const source = fs.readFileSync(resourcePath, 'utf-8');
@@ -339,72 +339,52 @@ function compileCSS(options) {
                 }
             },
         });
-        const mergedStaticTable = {};
-        for (const key of Object.keys(scannedTables.staticTable)) {
-            mergedStaticTable[key] = scannedTables.staticTable[key];
-        }
+        const mergedStaticTable = Object.create(scannedTables.staticTable);
         for (const key of Object.keys(localConsts)) {
             mergedStaticTable[key] = localConsts[key];
         }
         for (const key of Object.keys(importMap)) {
             mergedStaticTable[key] = importMap[key];
         }
-        const mergedKeyframesTable = {};
-        for (const key of Object.keys(scannedTables.keyframesHashTable)) {
-            mergedKeyframesTable[key] = scannedTables.keyframesHashTable[key];
-            if (key.startsWith(`${resourcePath}-`)) {
-                const varName = key.slice(resourcePath.length + 1);
-                mergedKeyframesTable[varName] = scannedTables.keyframesHashTable[key];
-            }
+        const mergedKeyframesTable = Object.create(scannedTables.keyframesHashTable);
+        for (const key of (0, utils_1.fileTableKeys)(resourcePath, 'keyframesHashTable') ?? []) {
+            mergedKeyframesTable[key.slice(resourcePath.length + 1)] =
+                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] =
+        const mergedViewTransitionTable = Object.create(scannedTables.viewTransitionHashTable);
+        for (const key of (0, utils_1.fileTableKeys)(resourcePath, 'viewTransitionHashTable') ??
+            []) {
+            mergedViewTransitionTable[key.slice(resourcePath.length + 1)] =
                 scannedTables.viewTransitionHashTable[key];
-            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];
-            if (key.startsWith(`${resourcePath}-`)) {
-                const varName = key.slice(resourcePath.length + 1);
-                mergedCreateThemeHashTable[varName] =
-                    scannedTables.createThemeHashTable[key];
-            }
+        const mergedCreateThemeHashTable = Object.create(scannedTables.createThemeHashTable);
+        for (const key of (0, utils_1.fileTableKeys)(resourcePath, 'createThemeHashTable') ??
+            []) {
+            mergedCreateThemeHashTable[key.slice(resourcePath.length + 1)] =
+                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] =
+        const mergedCreateStaticHashTable = Object.create(scannedTables.createStaticHashTable);
+        for (const key of (0, utils_1.fileTableKeys)(resourcePath, 'createStaticHashTable') ??
+            []) {
+            mergedCreateStaticHashTable[key.slice(resourcePath.length + 1)] =
                 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];
         }
-        const mergedCreateTable = {};
-        for (const key of Object.keys(scannedTables.createHashTable)) {
-            mergedCreateTable[key] = scannedTables.createHashTable[key];
-            if (key.startsWith(`${resourcePath}-`)) {
-                const varName = key.slice(resourcePath.length + 1);
-                mergedCreateTable[varName] = scannedTables.createHashTable[key];
-            }
+        const mergedCreateTable = Object.create(scannedTables.createHashTable);
+        for (const key of (0, utils_1.fileTableKeys)(resourcePath, 'createHashTable') ?? []) {
+            mergedCreateTable[key.slice(resourcePath.length + 1)] =
+                scannedTables.createHashTable[key];
         }
         for (const key of Object.keys(createImportMap)) {
             mergedCreateTable[key] = createImportMap[key];

package/package.json

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