@plumeria/vite-plugin 4.1.3 → 4.2.1

package/dist/index.js

@@ -1,8 +1,9 @@
 import { createFilter } from 'vite';
 import { parseSync } from '@swc/core';
 import path from 'path';
+import fs from 'fs';
 import { genBase36Hash } from 'zss-engine';
-import { tables, traverse, getStyleRecords, collectLocalConsts, objectExpressionToObject, scanForCreateStatic, scanForCreateTheme, scanForKeyframes, scanForViewTransition, t, extractOndemandStyles, deepMerge, } from '@plumeria/utils';
+import { tables, traverse, getStyleRecords, collectLocalConsts, objectExpressionToObject, t, extractOndemandStyles, deepMerge, scanAll, resolveImportPath, } from '@plumeria/utils';
 const TARGET_EXTENSIONS = ['ts', 'tsx', 'js', 'jsx'];
 const EXTENSION_PATTERN = /\.(ts|tsx|js|jsx)$/;
 export function plumeria(options = {}) {
@@ -69,23 +70,51 @@ export function plumeria(options = {}) {
                 dependencies.push(depPath);
                 this.addWatchFile(depPath);
             };
-            tables.staticTable = scanForCreateStatic(addDependency);
-            const { keyframesHashTableLocal, keyframesObjectTableLocal } = scanForKeyframes(addDependency);
-            tables.keyframesHashTable = keyframesHashTableLocal;
-            tables.keyframesObjectTable = keyframesObjectTableLocal;
-            const { viewTransitionHashTableLocal, viewTransitionObjectTableLocal } = scanForViewTransition(addDependency);
-            tables.viewTransitionHashTable = viewTransitionHashTableLocal;
-            tables.viewTransitionObjectTable = viewTransitionObjectTableLocal;
-            const { themeTableLocal, createThemeObjectTableLocal } = scanForCreateTheme(addDependency);
-            tables.themeTable = themeTableLocal;
-            tables.createThemeObjectTable = createThemeObjectTableLocal;
+            scanAll(addDependency);
             const ast = parseSync(source, {
                 syntax: 'typescript',
                 tsx: true,
                 target: 'es2022',
             });
             const localConsts = collectLocalConsts(ast);
-            Object.assign(tables.staticTable, localConsts);
+            const resourcePath = id;
+            const importMap = {};
+            traverse(ast, {
+                ImportDeclaration({ node }) {
+                    const sourcePath = node.source.value;
+                    const actualPath = resolveImportPath(sourcePath, resourcePath);
+                    if (actualPath && fs.existsSync(actualPath)) {
+                        if (fs.existsSync(actualPath)) {
+                            node.specifiers.forEach((specifier) => {
+                                if (specifier.type === 'ImportSpecifier') {
+                                    const importedName = specifier.imported
+                                        ? specifier.imported.value
+                                        : specifier.local.value;
+                                    const localName = specifier.local.value;
+                                    const uniqueKey = `${actualPath}-${importedName}`;
+                                    if (tables.staticTable[uniqueKey]) {
+                                        importMap[localName] = tables.staticTable[uniqueKey];
+                                    }
+                                    if (tables.keyframesHashTable[uniqueKey]) {
+                                        importMap[localName] = tables.keyframesHashTable[uniqueKey];
+                                    }
+                                    if (tables.viewTransitionHashTable[uniqueKey]) {
+                                        importMap[localName] =
+                                            tables.viewTransitionHashTable[uniqueKey];
+                                    }
+                                    if (tables.themeTable[uniqueKey]) {
+                                        importMap[localName] = tables.themeTable[uniqueKey];
+                                    }
+                                }
+                            });
+                        }
+                    }
+                },
+            });
+            const mergedStaticTable = Object.assign(Object.create(tables.staticTable), localConsts, importMap);
+            const mergedKeyframesTable = Object.assign(Object.create(tables.keyframesHashTable), importMap);
+            const mergedViewTransitionTable = Object.assign(Object.create(tables.viewTransitionHashTable), importMap);
+            const mergedThemeTable = Object.assign(Object.create(tables.themeTable), importMap);
             const localCreateStyles = {};
             const replacements = [];
             const extractedSheets = [];
@@ -103,7 +132,7 @@ export function plumeria(options = {}) {
                     const propName = node.init.callee.property.value;
                     if (propName === 'create' &&
                         t.isObjectExpression(node.init.arguments[0].expression)) {
-                        const obj = objectExpressionToObject(node.init.arguments[0].expression, tables.staticTable, tables.keyframesHashTable, tables.viewTransitionHashTable, tables.themeTable);
+                        const obj = objectExpressionToObject(node.init.arguments[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable);
                         if (obj) {
                             const hashMap = {};
                             Object.entries(obj).forEach(([key, style]) => {
@@ -201,7 +230,7 @@ export function plumeria(options = {}) {
                         if (propName === 'keyframes' &&
                             args.length > 0 &&
                             t.isObjectExpression(args[0].expression)) {
-                            const obj = objectExpressionToObject(args[0].expression, tables.staticTable, tables.keyframesHashTable, tables.viewTransitionHashTable, tables.themeTable);
+                            const obj = objectExpressionToObject(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable);
                             const hash = genBase36Hash(obj, 1, 8);
                             tables.keyframesObjectTable[hash] = obj;
                             replacements.push({
@@ -213,7 +242,7 @@ export function plumeria(options = {}) {
                         else if (propName === 'viewTransition' &&
                             args.length > 0 &&
                             t.isObjectExpression(args[0].expression)) {
-                            const obj = objectExpressionToObject(args[0].expression, tables.staticTable, tables.keyframesHashTable, tables.viewTransitionHashTable, tables.themeTable);
+                            const obj = objectExpressionToObject(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable);
                             const hash = genBase36Hash(obj, 1, 8);
                             tables.viewTransitionObjectTable[hash] = obj;
                             extractOndemandStyles(obj, extractedSheets);
@@ -227,7 +256,7 @@ export function plumeria(options = {}) {
                         else if (propName === 'createTheme' &&
                             args.length > 0 &&
                             t.isObjectExpression(args[0].expression)) {
-                            const obj = objectExpressionToObject(args[0].expression, tables.staticTable, tables.keyframesHashTable, tables.viewTransitionHashTable, tables.themeTable);
+                            const obj = objectExpressionToObject(args[0].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable);
                             const hash = genBase36Hash(obj, 1, 8);
                             tables.createThemeObjectTable[hash] = obj;
                         }
@@ -259,14 +288,10 @@ export function plumeria(options = {}) {
                         return;
                     const styleInfo = localCreateStyles[node.value];
                     if (styleInfo && !styleInfo.hasDynamicAccess) {
-                        const fullHashMap = {};
-                        Object.entries(styleInfo.hashMap).forEach(([key, atomMap]) => {
-                            fullHashMap[key] = Object.values(atomMap).join(' ');
-                        });
                         replacements.push({
                             start: node.span.start - ast.span.start,
                             end: node.span.end - ast.span.start,
-                            content: JSON.stringify(fullHashMap),
+                            content: JSON.stringify(styleInfo.hashMap),
                         });
                     }
                 },
@@ -326,7 +351,7 @@ export function plumeria(options = {}) {
                             const merged = args.reduce((acc, arg) => {
                                 const expr = arg.expression;
                                 if (t.isObjectExpression(expr)) {
-                                    const obj = objectExpressionToObject(expr, tables.staticTable, tables.keyframesHashTable, tables.viewTransitionHashTable, tables.themeTable);
+                                    const obj = objectExpressionToObject(expr, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedThemeTable);
                                     return obj ? deepMerge(acc, obj) : acc;
                                 }
                                 else if (t.isMemberExpression(expr) &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/vite-plugin",
-  "version": "4.1.3",
+  "version": "4.2.1",
   "type": "module",
   "description": "Plumeria Vite plugin",
   "author": "Refirst 11",
@@ -22,7 +22,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@plumeria/utils": "^4.1.3"
+    "@plumeria/utils": "^4.2.1"
   },
   "devDependencies": {
     "@swc/core": "1.15.8",