@plumeria/utils 18.3.4 → 18.3.6

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 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';

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.themeHashOf = 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");

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;
@@ -725,10 +726,10 @@ function evaluateExpression(node, staticTable, keyframesHashTable, viewTransitio
             return staticTable[node.value];
         }
         if (keyframesHashTable[node.value] !== undefined) {
-            return keyframesHashTable[node.value];
+            return 'kf-' + keyframesHashTable[node.value];
         }
         if (viewTransitionHashTable[node.value] !== undefined) {
-            return viewTransitionHashTable[node.value];
+            return 'vt-' + viewTransitionHashTable[node.value];
         }
         if (createStaticHashTable[node.value] !== undefined) {
             const hash = createStaticHashTable[node.value];
@@ -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,11 +1352,7 @@ 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 selector = resolveThemeSelector(init.arguments[0].expression, scopedStaticTable, localCreateStaticHashTable, localCreateStaticObjectTable);
                                     const hash = (0, createTheme_1.themeHashOf)(selector, obj);
                                     localTables.createThemeObjectTable[hash] = obj;
                                     localCreateThemeObjectTable[hash] = obj;
@@ -1830,6 +1836,7 @@ function resolveExport(filePath, exportName, visited = new Set()) {
     }
     return null;
 }
+const REFERENCE_MARKER = /(kf|vt|cr)-([0-9a-z]+)/g;
 function extractOndemandStyles(obj, extractedSheets, t) {
     if (!obj || typeof obj !== 'object')
         return;
@@ -1844,28 +1851,26 @@ function extractOndemandStyles(obj, extractedSheets, t) {
         visited.add(n);
         Object.values(n).forEach((val) => {
             if (typeof val === 'string') {
-                if (val.startsWith('kf-')) {
-                    const hash = val.slice(3);
-                    if (!keyframesHashes.has(hash)) {
-                        keyframesHashes.add(hash);
-                        walk(t.keyframesObjectTable[hash]);
+                for (const [, kind, hash] of val.matchAll(REFERENCE_MARKER)) {
+                    if (kind === 'kf') {
+                        if (!keyframesHashes.has(hash) && t.keyframesObjectTable[hash]) {
+                            keyframesHashes.add(hash);
+                            walk(t.keyframesObjectTable[hash]);
+                        }
                     }
-                }
-                else if (val.startsWith('vt-')) {
-                    const hash = val.slice(3);
-                    if (!viewTransitionHashes.has(hash)) {
-                        viewTransitionHashes.add(hash);
-                        walk(t.viewTransitionObjectTable[hash]);
+                    else if (kind === 'vt') {
+                        if (!viewTransitionHashes.has(hash) &&
+                            t.viewTransitionObjectTable[hash]) {
+                            viewTransitionHashes.add(hash);
+                            walk(t.viewTransitionObjectTable[hash]);
+                        }
                     }
-                }
-                else if (val.startsWith('cr-')) {
-                    const hash = val.slice(3);
-                    if (!createHashes.has(hash)) {
+                    else if (!createHashes.has(hash) && t.createObjectTable[hash]) {
                         createHashes.add(hash);
                         walk(t.createObjectTable[hash]);
                     }
                 }
-                else if (val.includes('var(--')) {
+                if (val.includes('var(--')) {
                     let startIdx = 0;
                     while ((startIdx = val.indexOf('var(--', startIdx)) !== -1) {
                         startIdx += 4;

package/package.json

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