@plumeria/compiler 12.0.7 → 13.0.0

package/dist/index.js

@@ -590,11 +590,19 @@ function compileCSS(options) {
                     ctx.scannedTables.viewTransitionObjectTable[hash] = obj;
                 }
                 else if (propName === 'createTheme' &&
-                    args.length > 0 &&
-                    utils_1.t.isObjectExpression(args[0].expression)) {
-                    const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable, ctx.mergedVariantsTable);
+                    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 obj = (0, utils_1.objectExpressionToObject)(args[1].expression, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable, ctx.mergedVariantsTable);
                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
                     ctx.scannedTables.createThemeObjectTable[hash] = obj;
+                    if (ctx.scannedTables.createThemeSelectorTable) {
+                        ctx.scannedTables.createThemeSelectorTable[hash] = selector;
+                    }
                 }
                 else if (propName === 'createStatic' &&
                     args.length > 0 &&
@@ -630,10 +638,18 @@ function compileCSS(options) {
                     else if (utils_1.t.isIdentifier(callee) && plumeriaAliases[callee.value]) {
                         pName = plumeriaAliases[callee.value];
                     }
+                    const isTheme = pName === 'createTheme';
                     if (pName &&
-                        node.init.arguments.length === 1 &&
-                        utils_1.t.isObjectExpression(node.init.arguments[0].expression)) {
-                        const arg = node.init.arguments[0].expression;
+                        node.init.arguments.length > 0 &&
+                        ((!isTheme &&
+                            node.init.arguments.length === 1 &&
+                            utils_1.t.isObjectExpression(node.init.arguments[0].expression)) ||
+                            (isTheme &&
+                                node.init.arguments.length >= 2 &&
+                                utils_1.t.isObjectExpression(node.init.arguments[1].expression)))) {
+                        const arg = isTheme
+                            ? node.init.arguments[1].expression
+                            : node.init.arguments[0].expression;
                         const resolveVariable = (name) => ctx.localCreateStyles[name]?.obj ||
                             (ctx.mergedCreateThemeHashTable[name]
                                 ? ctx.scannedTables.createAtomicMapTable[ctx.mergedCreateThemeHashTable[name]]
@@ -696,11 +712,26 @@ function compileCSS(options) {
                             }
                         }
                         else if (pName === 'createTheme') {
+                            let selector = '';
+                            const selectorExpr = node.init.arguments[0].expression;
+                            if (utils_1.t.isStringLiteral(selectorExpr)) {
+                                selector = selectorExpr.value;
+                            }
                             const obj = (0, utils_1.objectExpressionToObject)(arg, ctx.mergedStaticTable, ctx.mergedKeyframesTable, ctx.mergedViewTransitionTable, ctx.mergedCreateThemeHashTable, ctx.scannedTables.createThemeObjectTable, ctx.mergedCreateTable, ctx.mergedCreateStaticHashTable, ctx.scannedTables.createStaticObjectTable, ctx.mergedVariantsTable);
                             const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
                             const uKey = `${resourcePath}-${node.id.value}`;
                             ctx.scannedTables.createThemeHashTable[uKey] = hash;
                             ctx.scannedTables.createThemeObjectTable[hash] = obj;
+                            if (ctx.scannedTables.createThemeSelectorTable) {
+                                ctx.scannedTables.createThemeSelectorTable[hash] = selector;
+                            }
+                            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);
+                                themeHashMap[key] = `var(--${atomicHash}-${cssVarName})`;
+                            }
+                            ctx.scannedTables.createAtomicMapTable[hash] = themeHashMap;
                             ctx.localCreateStyles[node.id.value] = {
                                 type: 'create',
                                 obj: ctx.scannedTables.createAtomicMapTable[hash],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "12.0.7",
+  "version": "13.0.0",
   "description": "Plumeria swc based compiler for statically extracting css",
   "author": "Refirst 11",
   "license": "MIT",
@@ -21,12 +21,12 @@
     "dist/"
   ],
   "dependencies": {
-    "@plumeria/utils": "^12.0.7"
+    "@plumeria/utils": "^13.0.0"
   },
   "devDependencies": {
     "@rust-gear/glob": "1.0.0",
     "@swc/core": "1.15.40",
-    "zss-engine": "2.2.8"
+    "zss-engine": "2.3.0"
   },
   "publishConfig": {
     "access": "public",