@plumeria/utils 18.3.3 → 18.3.5

package/dist/createTheme.d.ts

@@ -1,7 +1,8 @@
 import type { CreateTheme } from './types';
-declare const createTheme: <const T extends CreateTheme>(themeSelector: string, rule: T) => {
+declare const themeHashOf: (themeSelector: string, rule: Record<string, unknown>) => string;
+declare const createTheme: <const T extends CreateTheme>(themeSelector: string, rule: T, themeHash: string) => {
     ':where(:root)': {
         [x: string]: string | Record<string, string>;
     };
 };
-export { createTheme };
+export { createTheme, themeHashOf };

package/dist/createTheme.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTheme = void 0;
+exports.themeHashOf = exports.createTheme = void 0;
 const zss_engine_1 = require("zss-engine");
-const createTheme = (themeSelector, rule) => {
+const themeHashOf = (themeSelector, rule) => (0, zss_engine_1.genBase36Hash)({ _themeSelector: themeSelector, ...rule }, 1, 8);
+exports.themeHashOf = themeHashOf;
+const createTheme = (themeSelector, rule, themeHash) => {
     const rootTarget = {};
     const themeTarget = {};
     for (const key in rule) {
         const valueObj = rule[key];
-        const hash = (0, zss_engine_1.genBase36Hash)({ [key]: valueObj }, 1, 8);
+        const hash = (0, zss_engine_1.genBase36Hash)({ _theme: themeHash, [key]: valueObj }, 1, 8);
         const cssVarName = `--${hash}-${(0, zss_engine_1.camelToKebabCase)(key)}`;
         rootTarget[cssVarName] = valueObj.default;
         themeTarget[cssVarName] = valueObj.theme;

package/dist/index.d.ts

@@ -1,12 +1,12 @@
 export type { CSSObject, StaticTable, KeyframesHashTable, ViewTransitionHashTable, CreateHashTable, CreateFunctionTable, VariantsHashTable, CreateThemeHashTable, CreateStaticHashTable, } from './types';
-export { objectExpressionToObject, collectLocalConsts, traverse, t, getRootIdentifier, extractOndemandStyles, deepMerge, scanAll, getFileDependencies, resolveExport, resolveComponentKey, } from './parser';
+export { objectExpressionToObject, collectLocalConsts, traverse, t, getRootIdentifier, extractOndemandStyles, deepMerge, scanAll, getFileDependencies, resolveExport, resolveComponentKey, resolveThemeSelector, } from './parser';
 export type { StyleRecord } from './create';
 export { getStyleRecords } from './create';
 export type { Specificity } from 'zss-engine';
 export { getSpecificity, getPseudoElement } from 'zss-engine';
 export type { StyleSource } from './escalation';
 export { getStateWeights } from './escalation';
-export { createTheme } from './createTheme';
+export { themeHashOf } from './createTheme';
 export { resolveImportPath } from './resolver';
 export { optimizer } from './optimizer';
 export { processVariants } from './variants';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_STYLE_PROP = exports.timedAsync = exports.timed = exports.tally = exports.measure = exports.mark = exports.profiling = exports.collectReferenceIdentifiers = exports.getLeadingCommentLength = exports.processVariants = exports.optimizer = exports.resolveImportPath = exports.createTheme = exports.getStateWeights = exports.getPseudoElement = exports.getSpecificity = exports.getStyleRecords = exports.resolveComponentKey = exports.resolveExport = exports.getFileDependencies = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.getRootIdentifier = exports.t = exports.traverse = exports.collectLocalConsts = exports.objectExpressionToObject = void 0;
+exports.DEFAULT_STYLE_PROP = exports.timedAsync = exports.timed = exports.tally = exports.measure = exports.mark = exports.profiling = exports.collectReferenceIdentifiers = exports.getLeadingCommentLength = exports.processVariants = exports.optimizer = exports.resolveImportPath = exports.themeHashOf = exports.getStateWeights = exports.getPseudoElement = exports.getSpecificity = exports.getStyleRecords = exports.resolveThemeSelector = exports.resolveComponentKey = exports.resolveExport = exports.getFileDependencies = exports.scanAll = exports.deepMerge = exports.extractOndemandStyles = exports.getRootIdentifier = 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; } });
@@ -13,6 +13,7 @@ Object.defineProperty(exports, "scanAll", { enumerable: true, get: function () {
 Object.defineProperty(exports, "getFileDependencies", { enumerable: true, get: function () { return parser_1.getFileDependencies; } });
 Object.defineProperty(exports, "resolveExport", { enumerable: true, get: function () { return parser_1.resolveExport; } });
 Object.defineProperty(exports, "resolveComponentKey", { enumerable: true, get: function () { return parser_1.resolveComponentKey; } });
+Object.defineProperty(exports, "resolveThemeSelector", { enumerable: true, get: function () { return parser_1.resolveThemeSelector; } });
 var create_1 = require("./create");
 Object.defineProperty(exports, "getStyleRecords", { enumerable: true, get: function () { return create_1.getStyleRecords; } });
 var zss_engine_1 = require("zss-engine");
@@ -21,7 +22,7 @@ Object.defineProperty(exports, "getPseudoElement", { enumerable: true, get: func
 var escalation_1 = require("./escalation");
 Object.defineProperty(exports, "getStateWeights", { enumerable: true, get: function () { return escalation_1.getStateWeights; } });
 var createTheme_1 = require("./createTheme");
-Object.defineProperty(exports, "createTheme", { enumerable: true, get: function () { return createTheme_1.createTheme; } });
+Object.defineProperty(exports, "themeHashOf", { enumerable: true, get: function () { return createTheme_1.themeHashOf; } });
 var resolver_1 = require("./resolver");
 Object.defineProperty(exports, "resolveImportPath", { enumerable: true, get: function () { return resolver_1.resolveImportPath; } });
 var optimizer_1 = require("./optimizer");

package/dist/parser.d.ts

@@ -36,6 +36,7 @@ export declare function traverse(node: Module | JSXExpression, visitor: {
 }): void;
 export declare function objectExpressionToObject(node: ObjectExpression, staticTable: StaticTable, keyframesHashTable: KeyframesHashTable, viewTransitionHashTable: ViewTransitionHashTable, createThemeHashTable: CreateThemeHashTable, createThemeObjectTable: CreateThemeObjectTable, createHashTable: CreateHashTable, createStaticHashTable: CreateStaticHashTable, createStaticObjectTable: CreateStaticObjectTable, variantsHashTable: VariantsHashTable, resolveVariable?: (name: string) => any): CSSObject;
 export declare function collectLocalConsts(ast: Module): Record<string, any>;
+export declare function resolveThemeSelector(node: Expression, staticTable: StaticTable, createStaticHashTable: CreateStaticHashTable, createStaticObjectTable: CreateStaticObjectTable): string;
 export declare function scanAll(): Tables;
 export declare function getFileDependencies(filePath: string): string[];
 export declare function resolveExport(filePath: string, exportName: string, visited?: Set<string>): {

package/dist/parser.js

@@ -38,6 +38,7 @@ exports.resolveComponentKey = resolveComponentKey;
 exports.traverse = traverse;
 exports.objectExpressionToObject = objectExpressionToObject;
 exports.collectLocalConsts = collectLocalConsts;
+exports.resolveThemeSelector = resolveThemeSelector;
 exports.scanAll = scanAll;
 exports.getFileDependencies = getFileDependencies;
 exports.resolveExport = resolveExport;
@@ -851,7 +852,7 @@ function resolveCreateThemeTableMemberExpressionByNode(node, createThemeHashTabl
                 }
                 if (key && themeObj[key] !== undefined) {
                     const value = themeObj[key];
-                    const atomicHash = (0, zss_engine_1.genBase36Hash)({ [key]: value }, 1, 8);
+                    const atomicHash = (0, zss_engine_1.genBase36Hash)({ _theme: hash, [key]: value }, 1, 8);
                     const cssVarName = (0, zss_engine_1.camelToKebabCase)(key);
                     return `var(--${atomicHash}-${cssVarName})`;
                 }
@@ -883,6 +884,15 @@ function resolveCreateStaticTableMemberExpression(node, createStaticHashTable, c
     }
     return undefined;
 }
+function resolveThemeSelector(node, staticTable, createStaticHashTable, createStaticObjectTable) {
+    try {
+        const value = evaluateExpression(node, staticTable, {}, {}, {}, {}, createStaticHashTable, createStaticObjectTable);
+        return typeof value === 'string' ? value : '';
+    }
+    catch {
+        return '';
+    }
+}
 const fileCache = {};
 const dependentsMap = new Map();
 let knownFiles = new Set();
@@ -1342,12 +1352,8 @@ function scanAll() {
                                     registerObjectOwner('viewTransitionObjectTable', hash, filePath);
                                 }
                                 else if (method === 'createTheme') {
-                                    let selector = '';
-                                    const selectorExpr = init.arguments[0].expression;
-                                    if (exports.t.isStringLiteral(selectorExpr)) {
-                                        selector = selectorExpr.value;
-                                    }
-                                    const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                                    const selector = resolveThemeSelector(init.arguments[0].expression, scopedStaticTable, localCreateStaticHashTable, localCreateStaticObjectTable);
+                                    const hash = (0, createTheme_1.themeHashOf)(selector, obj);
                                     localTables.createThemeObjectTable[hash] = obj;
                                     localCreateThemeObjectTable[hash] = obj;
                                     registerObjectOwner('createThemeObjectTable', hash, filePath);
@@ -1358,7 +1364,7 @@ function scanAll() {
                                     registerObjectOwner('createThemeSelectorTable', hash, filePath);
                                     const hashMap = {};
                                     for (const [key, value] of Object.entries(obj)) {
-                                        const atomicHash = (0, zss_engine_1.genBase36Hash)({ [key]: value }, 1, 8);
+                                        const atomicHash = (0, zss_engine_1.genBase36Hash)({ _theme: hash, [key]: value }, 1, 8);
                                         const cssVarName = (0, zss_engine_1.camelToKebabCase)(key);
                                         hashMap[key] = `var(--${atomicHash}-${cssVarName})`;
                                     }
@@ -1936,12 +1942,10 @@ function extractOndemandStyles(obj, extractedSheets, t) {
             if (definition && typeof definition === 'object' && selector) {
                 Object.keys(definition).forEach((key) => {
                     const value = definition[key];
-                    const atomicHash = (0, zss_engine_1.genBase36Hash)({ [key]: value }, 1, 8);
+                    const atomicHash = (0, zss_engine_1.genBase36Hash)({ _theme: hash, [key]: value }, 1, 8);
                     const varName = `--${atomicHash}-${(0, zss_engine_1.camelToKebabCase)(key)}`;
                     if (usedVariables.has(varName)) {
-                        const styles = (0, createTheme_1.createTheme)(selector, {
-                            [key]: value,
-                        });
+                        const styles = (0, createTheme_1.createTheme)(selector, { [key]: value }, hash);
                         const { styleSheet } = (0, zss_engine_1.transpile)(styles, undefined, '--global');
                         addSheet(styleSheet);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "18.3.3",
+  "version": "18.3.5",
   "description": "Internal helpers shared by the Plumeria compiler and bundler plugins.",
   "author": "Refirst 11",
   "license": "MIT",