@plumeria/utils 6.2.1 → 6.3.0

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export type { CSSObject, FileStyles, StaticTable, KeyframesHashTable, KeyframesObjectTable, ViewTransitionHashTable, ViewTransitionObjectTable, CreateThemeObjectTable, CreateHashTable, CreateObjectTable, VariantsHashTable, VariantsObjectTable, CreateThemeHashTable, CreateStaticHashTable, CreateStaticObjectTable, } from './types';
 export { objectExpressionToObject, collectLocalConsts, traverse, t, extractOndemandStyles, deepMerge, scanAll, } from './parser';
 export { getStyleRecords } from './create';
+export { createTheme } from './createTheme';
 export type { StyleRecord } from './create';
 export { resolveImportPath } from './resolver';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveImportPath = exports.getStyleRecords = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.t = exports.traverse = exports.collectLocalConsts = exports.objectExpressionToObject = void 0;
+exports.resolveImportPath = exports.createTheme = exports.getStyleRecords = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.t = exports.traverse = exports.collectLocalConsts = exports.objectExpressionToObject = void 0;
 var parser_1 = require("./parser");
 Object.defineProperty(exports, "objectExpressionToObject", { enumerable: true, get: function () { return parser_1.objectExpressionToObject; } });
 Object.defineProperty(exports, "collectLocalConsts", { enumerable: true, get: function () { return parser_1.collectLocalConsts; } });
@@ -11,5 +11,7 @@ Object.defineProperty(exports, "deepMerge", { enumerable: true, get: function ()
 Object.defineProperty(exports, "scanAll", { enumerable: true, get: function () { return parser_1.scanAll; } });
 var create_1 = require("./create");
 Object.defineProperty(exports, "getStyleRecords", { enumerable: true, get: function () { return create_1.getStyleRecords; } });
+var createTheme_1 = require("./createTheme");
+Object.defineProperty(exports, "createTheme", { enumerable: true, get: function () { return createTheme_1.createTheme; } });
 var resolver_1 = require("./resolver");
 Object.defineProperty(exports, "resolveImportPath", { enumerable: true, get: function () { return resolver_1.resolveImportPath; } });

package/dist/parser.js

@@ -227,6 +227,9 @@ function getPropertyKey(node, staticTable, keyframesHashTable, viewTransitionHas
             const staticResult = resolveCreateStaticTableMemberExpression(expr, createStaticHashTable, createStaticObjectTable);
             if (typeof staticResult === 'string')
                 return staticResult;
+            const themeResult = resolveCreateThemeTableMemberExpressionByNode(expr, createThemeHashTable, createThemeObjectTable);
+            if (typeof themeResult === 'string')
+                return themeResult;
         }
         if (exports.t.isTemplateLiteral(expr)) {
             return evaluateTemplateLiteral(expr, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createStaticHashTable, createStaticObjectTable);
@@ -453,18 +456,8 @@ function scanAll() {
         extractedSheet: '',
     };
     const files = fs_1.default.globSync(PATTERN_PATH, GLOB_OPTIONS);
-    files.sort((a, b) => {
-        const aPriority = a.includes('/lib/') || a.includes('/utils/') || a.includes('/common/')
-            ? 0
-            : 1;
-        const bPriority = b.includes('/lib/') || b.includes('/utils/') || b.includes('/common/')
-            ? 0
-            : 1;
-        if (aPriority !== bPriority)
-            return aPriority - bPriority;
-        return a.localeCompare(b);
-    });
     const totalExtractedSheets = [];
+    const currentScanThemeObjectTable = {};
     for (let passNumber = 1; passNumber <= 2; passNumber++) {
         const isFirstPass = passNumber === 1;
         for (const filePath of files) {
@@ -500,6 +493,8 @@ function scanAll() {
                         for (const key of Object.keys(cached.createThemeObjectTable)) {
                             localTables.createThemeObjectTable[key] =
                                 cached.createThemeObjectTable[key];
+                            currentScanThemeObjectTable[key] =
+                                cached.createThemeObjectTable[key];
                         }
                         for (const key of Object.keys(cached.createStaticHashTable)) {
                             localTables.createStaticHashTable[`${filePath}-${key}`] =
@@ -625,10 +620,6 @@ function scanAll() {
                                         if (localTables.createThemeHashTable[uniqueKey]) {
                                             const hash = localTables.createThemeHashTable[uniqueKey];
                                             localCreateThemeHashTable[localName] = hash;
-                                            if (localTables.createThemeObjectTable[hash]) {
-                                                localCreateThemeObjectTable[hash] =
-                                                    localTables.createThemeObjectTable[hash];
-                                            }
                                         }
                                     }
                                 });
@@ -724,7 +715,6 @@ function scanAll() {
                                     localTables.viewTransitionObjectTable[hash] = obj;
                                     localViewTransitionObjectTable[hash] = obj;
                                     if (!isProduction) {
-                                        extractOndemandStyles(obj, fileExtractedSheets, localTables);
                                         extractOndemandStyles({ vt: `vt-${hash}` }, fileExtractedSheets, localTables);
                                     }
                                 }
@@ -734,6 +724,13 @@ function scanAll() {
                                     localCreateThemeObjectTable[hash] = obj;
                                     localCreateThemeHashTable[name] = hash;
                                     localTables.createThemeHashTable[uniqueKey] = hash;
+                                    currentScanThemeObjectTable[hash] = obj;
+                                    const hashMap = {};
+                                    for (const [key] of Object.entries(obj)) {
+                                        const cssVarName = (0, zss_engine_1.camelToKebabCase)(key);
+                                        hashMap[key] = `var(--${cssVarName})`;
+                                    }
+                                    localTables.createAtomicMapTable[hash] = hashMap;
                                 }
                                 else if (method === 'create') {
                                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
@@ -747,14 +744,12 @@ function scanAll() {
                                         const atomMap = {};
                                         records.forEach((r) => (atomMap[r.key] = r.hash));
                                         hashMap[key] = atomMap;
-                                        if (!isProduction) {
-                                            extractOndemandStyles(style, fileExtractedSheets, localTables);
-                                            records.forEach((r) => {
-                                                if (!fileExtractedSheets.includes(r.sheet)) {
-                                                    fileExtractedSheets.push(r.sheet);
-                                                }
-                                            });
-                                        }
+                                        extractOndemandStyles(style, fileExtractedSheets, localTables);
+                                        records.forEach((r) => {
+                                            if (!fileExtractedSheets.includes(r.sheet)) {
+                                                fileExtractedSheets.push(r.sheet);
+                                            }
+                                        });
                                     });
                                     localCreateAtomicMapTable[hash] = hashMap;
                                     localTables.createAtomicMapTable[hash] = hashMap;
@@ -828,7 +823,7 @@ function extractOndemandStyles(obj, extractedSheets, t) {
                 else if (val.startsWith('cr-')) {
                     createHashes.add(val.slice(3));
                 }
-                else if (!needsTheme && val.includes('var(--')) {
+                else if (val.includes('var(--')) {
                     needsTheme = true;
                 }
             }

package/dist/resolver.js

@@ -20,7 +20,7 @@ function getTsConfig(startDir) {
         };
     }
     while (currentDir !== path_1.default.parse(currentDir).root) {
-        const tsConfigPath = path_1.default.join(currentDir, 'tsconfig.json');
+        const tsConfigPath = path_1.default.join(process.cwd(), 'tsconfig.json');
         if (fs_1.default.existsSync(tsConfigPath)) {
             if (!tsConfigCache.has(tsConfigPath)) {
                 try {
@@ -34,7 +34,7 @@ function getTsConfig(startDir) {
             tsConfigPathCache.set(startDir, tsConfigPath);
             return {
                 config: tsConfigCache.get(tsConfigPath) ?? null,
-                basePath: currentDir,
+                basePath: path_1.default.dirname(tsConfigPath),
             };
         }
         currentDir = path_1.default.dirname(currentDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "6.2.1",
+  "version": "6.3.0",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",