@plumeria/unplugin 18.3.3 → 18.3.5

package/dist/core.js

@@ -618,16 +618,17 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                         if (utils_1.t.isIdentifier(node.id)) {
                             idSpans.add(node.id.span.start);
                         }
-                        let selector = '';
                         const selectorExpr = init.arguments[0].expression;
-                        if (utils_1.t.isStringLiteral(selectorExpr)) {
-                            selector = selectorExpr.value;
+                        const selector = (0, utils_1.resolveThemeSelector)(selectorExpr, mergedStaticTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
+                        if (!selector) {
+                            throwCompilationError(`Plumeria: createTheme needs a selector it can read at build time. ` +
+                                `Pass a string literal such as ".dark", or a name this file declares as one.`, selectorExpr);
                         }
                         if (selector.startsWith('@') && !(0, zss_engine_1.isAtRule)(selector)) {
                             throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
                         }
                         const obj = (0, utils_1.objectExpressionToObject)(init.arguments[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
-                        const hash = (0, zss_engine_1.genBase36Hash)({ _themeSelector: selector, ...obj }, 1, 8);
+                        const hash = (0, utils_1.themeHashOf)(selector, obj);
                         if (utils_1.t.isIdentifier(node.id)) {
                             const uniqueKey = `${resourcePath}-${node.id.value}`;
                             scannedTables.createThemeHashTable[uniqueKey] = hash;
@@ -639,7 +640,7 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                             const themeHashMap = {};
                             for (const [key, value] of Object.entries(obj)) {
                                 const cssVarName = (0, zss_engine_1.camelToKebabCase)(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);
                                 themeHashMap[key] = `var(--${atomicHash}-${cssVarName})`;
                             }
                             localCreateStyles[node.id.value] = {
@@ -800,16 +801,17 @@ const unpluginFactory = (options = {}, unpluginMeta) => {
                         else if (propName === 'createTheme' &&
                             args.length >= 2 &&
                             utils_1.t.isObjectExpression(args[1].expression)) {
-                            let selector = '';
                             const selectorExpr = args[0].expression;
-                            if (utils_1.t.isStringLiteral(selectorExpr)) {
-                                selector = selectorExpr.value;
+                            const selector = (0, utils_1.resolveThemeSelector)(selectorExpr, mergedStaticTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
+                            if (!selector) {
+                                throwCompilationError(`Plumeria: createTheme needs a selector it can read at build time. ` +
+                                    `Pass a string literal such as ".dark", or a name this file declares as one.`, selectorExpr);
                             }
                             if (selector.startsWith('@') && !(0, zss_engine_1.isAtRule)(selector)) {
                                 throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
                             }
                             const obj = (0, utils_1.objectExpressionToObject)(args[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
-                            const hash = (0, zss_engine_1.genBase36Hash)({ _themeSelector: selector, ...obj }, 1, 8);
+                            const hash = (0, utils_1.themeHashOf)(selector, obj);
                             scannedTables.createThemeObjectTable[hash] = obj;
                             if (scannedTables.createThemeSelectorTable) {
                                 scannedTables.createThemeSelectorTable[hash] = selector;

package/dist/core.mjs

@@ -2,7 +2,7 @@ import { createFilter } from '@rollup/pluginutils';
 import { parseSync } from '@swc/core';
 import * as path from 'path';
 import { applyCssValue, genBase36Hash, exceptionCamelCase, camelToKebabCase, isAtRule, } from 'zss-engine';
-import { traverse, collectReferenceIdentifiers, getStyleRecords, getStateWeights, collectLocalConsts, objectExpressionToObject, t, getRootIdentifier, extractOndemandStyles, deepMerge, scanAll, resolveImportPath, getLeadingCommentLength, optimizer, getFileDependencies, resolveExport, resolveComponentKey, DEFAULT_STYLE_PROP, } from '@plumeria/utils';
+import { traverse, collectReferenceIdentifiers, getStyleRecords, getStateWeights, collectLocalConsts, objectExpressionToObject, t, getRootIdentifier, extractOndemandStyles, deepMerge, scanAll, resolveImportPath, getLeadingCommentLength, optimizer, themeHashOf, getFileDependencies, resolveExport, resolveComponentKey, resolveThemeSelector, DEFAULT_STYLE_PROP, } from '@plumeria/utils';
 export const TARGET_EXTENSIONS = ['ts', 'tsx', 'js', 'jsx'];
 export const EXTENSION_PATTERN = /\.(ts|tsx|js|jsx)$/;
 const isStaticArgValue = (node) => node.type === 'StringLiteral' ||
@@ -582,16 +582,17 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                         if (t.isIdentifier(node.id)) {
                             idSpans.add(node.id.span.start);
                         }
-                        let selector = '';
                         const selectorExpr = init.arguments[0].expression;
-                        if (t.isStringLiteral(selectorExpr)) {
-                            selector = selectorExpr.value;
+                        const selector = resolveThemeSelector(selectorExpr, mergedStaticTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
+                        if (!selector) {
+                            throwCompilationError(`Plumeria: createTheme needs a selector it can read at build time. ` +
+                                `Pass a string literal such as ".dark", or a name this file declares as one.`, selectorExpr);
                         }
                         if (selector.startsWith('@') && !isAtRule(selector)) {
                             throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
                         }
                         const obj = objectExpressionToObject(init.arguments[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
-                        const hash = genBase36Hash({ _themeSelector: selector, ...obj }, 1, 8);
+                        const hash = themeHashOf(selector, obj);
                         if (t.isIdentifier(node.id)) {
                             const uniqueKey = `${resourcePath}-${node.id.value}`;
                             scannedTables.createThemeHashTable[uniqueKey] = hash;
@@ -603,7 +604,7 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                             const themeHashMap = {};
                             for (const [key, value] of Object.entries(obj)) {
                                 const cssVarName = camelToKebabCase(key);
-                                const atomicHash = genBase36Hash({ [key]: value }, 1, 8);
+                                const atomicHash = genBase36Hash({ _theme: hash, [key]: value }, 1, 8);
                                 themeHashMap[key] = `var(--${atomicHash}-${cssVarName})`;
                             }
                             localCreateStyles[node.id.value] = {
@@ -764,16 +765,17 @@ export const unpluginFactory = (options = {}, unpluginMeta) => {
                         else if (propName === 'createTheme' &&
                             args.length >= 2 &&
                             t.isObjectExpression(args[1].expression)) {
-                            let selector = '';
                             const selectorExpr = args[0].expression;
-                            if (t.isStringLiteral(selectorExpr)) {
-                                selector = selectorExpr.value;
+                            const selector = resolveThemeSelector(selectorExpr, mergedStaticTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
+                            if (!selector) {
+                                throwCompilationError(`Plumeria: createTheme needs a selector it can read at build time. ` +
+                                    `Pass a string literal such as ".dark", or a name this file declares as one.`, selectorExpr);
                             }
                             if (selector.startsWith('@') && !isAtRule(selector)) {
                                 throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
                             }
                             const obj = objectExpressionToObject(args[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
-                            const hash = genBase36Hash({ _themeSelector: selector, ...obj }, 1, 8);
+                            const hash = themeHashOf(selector, obj);
                             scannedTables.createThemeObjectTable[hash] = obj;
                             if (scannedTables.createThemeSelectorTable) {
                                 scannedTables.createThemeSelectorTable[hash] = selector;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/unplugin",
-  "version": "18.3.3",
+  "version": "18.3.5",
   "description": "Universal Plumeria plugin for various build tools",
   "author": "Refirst 11",
   "license": "MIT",
@@ -94,7 +94,7 @@
   "dependencies": {
     "@rollup/pluginutils": "^5.4.0",
     "unplugin": "^3.0.0",
-    "@plumeria/utils": "^18.3.3"
+    "@plumeria/utils": "^18.3.5"
   },
   "devDependencies": {
     "@swc/core": "1.15.47",