@plumeria/utils 11.1.1 → 11.1.3

package/dist/createTheme.d.ts

@@ -1,3 +1,3 @@
 import type { CreateTheme } from './types';
-declare const createTheme: <const T extends CreateTheme>(rule: T) => Record<string, Record<string, string | number | Record<string, string | number>>>;
+declare const createTheme: <const T extends CreateTheme>(rule: T, hash?: string) => Record<string, Record<string, string | number | Record<string, string | number>>>;
 export { createTheme };

package/dist/createTheme.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTheme = void 0;
 const zss_engine_1 = require("zss-engine");
-const createTheme = (rule) => {
+const createTheme = (rule, hash) => {
     const styles = {};
     for (const key in rule) {
-        const varKey = `--${(0, zss_engine_1.camelToKebabCase)(key)}`;
+        const varKey = hash
+            ? `--${hash}-${(0, zss_engine_1.camelToKebabCase)(key)}`
+            : `--${(0, zss_engine_1.camelToKebabCase)(key)}`;
         const themeMap = rule[key];
         for (const themeKey in themeMap) {
             const value = themeMap[themeKey];

package/dist/parser.js

@@ -123,6 +123,20 @@ function objectExpressionToObject(node, staticTable, keyframesHashTable, viewTra
             }
             return;
         }
+        if (exports.t.isIdentifier(prop) && !exports.t.isObjectProperty(prop)) {
+            const key = prop.value;
+            if (resolveVariable) {
+                const resolved = resolveVariable(key);
+                if (resolved !== undefined) {
+                    obj[key] = resolved;
+                    return;
+                }
+            }
+            if (staticTable[key] !== undefined) {
+                obj[key] = staticTable[key];
+            }
+            return;
+        }
         if (!exports.t.isObjectProperty(prop))
             return;
         const key = getPropertyKey(prop.key, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createStaticHashTable, createStaticObjectTable);
@@ -488,7 +502,7 @@ function resolveCreateThemeTableMemberExpressionByNode(node, createThemeHashTabl
                 }
                 if (key && themeObj[key] !== undefined) {
                     const cssVarName = (0, zss_engine_1.camelToKebabCase)(key);
-                    return `var(--${cssVarName})`;
+                    return `var(--${hash}-${cssVarName})`;
                 }
             }
         }
@@ -700,6 +714,10 @@ function scanAll() {
                                         if (localTables.createThemeHashTable[uniqueKey]) {
                                             const hash = localTables.createThemeHashTable[uniqueKey];
                                             localCreateThemeHashTable[localName] = hash;
+                                            if (localTables.createThemeObjectTable[hash]) {
+                                                localCreateThemeObjectTable[hash] =
+                                                    localTables.createThemeObjectTable[hash];
+                                            }
                                         }
                                         if (localTables.keyframesHashTable[uniqueKey]) {
                                             const hash = localTables.keyframesHashTable[uniqueKey];
@@ -821,7 +839,7 @@ function scanAll() {
                                     const hashMap = {};
                                     for (const [key] of Object.entries(obj)) {
                                         const cssVarName = (0, zss_engine_1.camelToKebabCase)(key);
-                                        hashMap[key] = `var(--${cssVarName})`;
+                                        hashMap[key] = `var(--${hash}-${cssVarName})`;
                                     }
                                     localTables.createAtomicMapTable[hash] = hashMap;
                                 }
@@ -978,26 +996,28 @@ function extractOndemandStyles(obj, extractedSheets, t) {
         }
     }
     if (usedVariables.size > 0) {
-        for (const themeVarName in t.createThemeHashTable) {
+        Object.keys(t.createThemeHashTable)
+            .sort()
+            .forEach((themeVarName) => {
             const hash = t.createThemeHashTable[themeVarName];
             const definition = t.createThemeObjectTable[hash];
             if (definition && typeof definition === 'object') {
                 const filteredDefinition = {};
                 let hasUsed = false;
                 Object.keys(definition).forEach((key) => {
-                    const varName = `--${(0, zss_engine_1.camelToKebabCase)(key)}`;
+                    const varName = `--${hash}-${(0, zss_engine_1.camelToKebabCase)(key)}`;
                     if (usedVariables.has(varName)) {
                         filteredDefinition[key] = definition[key];
                         hasUsed = true;
                     }
                 });
                 if (hasUsed) {
-                    const styles = (0, createTheme_1.createTheme)(filteredDefinition);
+                    const styles = (0, createTheme_1.createTheme)(filteredDefinition, hash);
                     const { styleSheet } = (0, zss_engine_1.transpile)(styles, undefined, '--global');
                     addSheet(styleSheet);
                 }
             }
-        }
+        });
     }
 }
 function deepMerge(target, source) {

package/package.json

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