@plumeria/utils 6.3.2 → 7.0.0

package/dist/create.d.ts

@@ -4,4 +4,4 @@ export interface StyleRecord {
     hash: string;
     sheet: string;
 }
-export declare function getStyleRecords(key: string, styleRule: CSSProperties): StyleRecord[];
+export declare function getStyleRecords(styleRule: CSSProperties): StyleRecord[];

package/dist/create.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStyleRecords = getStyleRecords;
 const zss_engine_1 = require("zss-engine");
-function getStyleRecords(key, styleRule) {
+function getStyleRecords(styleRule) {
     const flat = {};
     const nonFlat = {};
     const notNormalize = ':not(#\\#)';
@@ -13,11 +13,12 @@ function getStyleRecords(key, styleRule) {
         if (prop.startsWith('@media') || prop.startsWith('@container')) {
             Object.entries(value).forEach(([innerProp, innerValue]) => {
                 const atomicMap = new Map();
+                const notSuffix = innerProp.startsWith('--') ? '' : notNormalize;
                 (0, zss_engine_1.processAtomicProps)({ [innerProp]: innerValue }, atomicMap, prop);
                 const querySheets = [];
                 const queryHashes = [];
                 for (const [hash, sheet] of atomicMap) {
-                    querySheets.push(sheet.replace(`.${hash}`, `.${hash}${notNormalize}`));
+                    querySheets.push(sheet.replace(`.${hash}`, `.${hash}${notSuffix}`));
                     queryHashes.push(hash);
                 }
                 const queryKey = prop + ':' + innerProp;
@@ -59,12 +60,9 @@ function getStyleRecords(key, styleRule) {
                 nonFlatBase[atRule] = nestedObj;
             }
         });
-        const processSelectorStyle = (selector, style, atRule, index) => {
-            const isAtomic = selector.startsWith(':') ||
-                (selector.startsWith('&') &&
-                    (selector.startsWith('&:') || selector.startsWith('&[')));
+        const processSelectorStyle = (selector, style, atRule) => {
+            const isAtomic = selector.startsWith(':') || selector.startsWith('[');
             if (isAtomic) {
-                const normalizedSelector = selector.replace('&', '');
                 Object.entries(style).forEach(([prop, value]) => {
                     let hashSource = { [prop]: value };
                     if (atRule) {
@@ -74,8 +72,9 @@ function getStyleRecords(key, styleRule) {
                         hashSource = { [selector]: hashSource };
                     }
                     const hash = (0, zss_engine_1.genBase36Hash)(hashSource, 1, 8);
-                    let sheet = (0, zss_engine_1.transpileAtomic)(prop, value, hash, normalizedSelector);
-                    sheet = sheet.replace(`.${hash}`, `.${hash}${notNormalize}`);
+                    const notSuffix = prop.startsWith('--') ? '' : notNormalize;
+                    let sheet = (0, zss_engine_1.transpileAtomic)(prop, value, hash, selector);
+                    sheet = sheet.replace(`.${hash}`, `.${hash}${notSuffix}`);
                     if (atRule) {
                         sheet = `${atRule} { ${sheet} }`;
                     }
@@ -88,34 +87,13 @@ function getStyleRecords(key, styleRule) {
                     });
                 });
             }
-            else {
-                const hashObj = {
-                    [key]: { [atRule || 'base']: { [selector]: style, index } },
-                };
-                const hash = (0, zss_engine_1.genBase36Hash)(hashObj, 1, 7);
-                const transpileObj = atRule
-                    ? { [key]: { [atRule]: { [selector]: style } } }
-                    : { [key]: { [selector]: style } };
-                const { styleSheet } = (0, zss_engine_1.transpile)(transpileObj, hash);
-                const sheet = atRule
-                    ? styleSheet.replace(`.${hash}`, `.${hash}${notNormalize}`)
-                    : styleSheet;
-                const recordKey = atRule
-                    ? `${atRule}:${selector}:${index}`
-                    : `${selector}:${index}`;
-                records.push({
-                    key: recordKey,
-                    hash: hash,
-                    sheet: sheet,
-                });
-            }
         };
-        Object.entries(nonFlatBase).forEach(([selector, style], index) => {
-            processSelectorStyle(selector, style, undefined, index);
+        Object.entries(nonFlatBase).forEach(([selector, style]) => {
+            processSelectorStyle(selector, style, undefined);
         });
         Object.entries(nonFlatQuery).forEach(([atRule, nestedStyles]) => {
-            Object.entries(nestedStyles).forEach(([selector, style], index) => {
-                processSelectorStyle(selector, style, atRule, index);
+            Object.entries(nestedStyles).forEach(([selector, style]) => {
+                processSelectorStyle(selector, style, atRule);
             });
         });
     }

package/dist/parser.js

@@ -18,6 +18,10 @@ const zss_engine_1 = require("zss-engine");
 const viewTransition_1 = require("./viewTransition");
 const create_1 = require("./create");
 const resolver_1 = require("./resolver");
+const getMarkerVar = (id, pseudo) => {
+    const state = pseudo.replace(/:/g, '');
+    return `--${id}-${state}`;
+};
 exports.t = {
     isObjectExpression: (node) => node?.type === 'ObjectExpression',
     isObjectProperty: (node) => node?.type === 'KeyValueProperty',
@@ -80,6 +84,14 @@ const GLOB_OPTIONS = {
 function objectExpressionToObject(node, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createHashTable, createStaticHashTable, createStaticObjectTable, variantsHashTable, resolveVariable) {
     const obj = {};
     node.properties.forEach((prop) => {
+        if (prop.type === 'SpreadElement') {
+            const arg = prop.arguments;
+            const spreadVal = evaluateExpression(arg, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createStaticHashTable, createStaticObjectTable);
+            if (typeof spreadVal === 'object' && spreadVal !== null) {
+                Object.assign(obj, spreadVal);
+            }
+            return;
+        }
         if (!exports.t.isObjectProperty(prop))
             return;
         const key = getPropertyKey(prop.key, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createStaticHashTable, createStaticObjectTable);
@@ -220,6 +232,11 @@ function getPropertyKey(node, staticTable, keyframesHashTable, viewTransitionHas
                 return staticTable[expr.value];
             }
         }
+        if (exports.t.isCallExpression(expr)) {
+            const result = evaluateExpression(expr, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createStaticHashTable, createStaticObjectTable);
+            if (typeof result === 'string')
+                return result;
+        }
         if (exports.t.isMemberExpression(expr)) {
             const result = resolveStaticTableMemberExpression(expr, staticTable);
             if (typeof result === 'string')
@@ -267,7 +284,49 @@ function evaluateBinaryExpression(node, staticTable, keyframesHashTable, viewTra
     }
     throw new Error(`Unsupported binary operator: ${node.operator}`);
 }
+function evaluateCallExpression(node, staticTable) {
+    const callee = node.callee;
+    let method;
+    if (exports.t.isIdentifier(callee)) {
+        method = callee.value;
+    }
+    else if (exports.t.isMemberExpression(callee) && exports.t.isIdentifier(callee.property)) {
+        method = callee.property.value;
+    }
+    if (!method)
+        return null;
+    if (method === 'marker') {
+        const args = node.arguments;
+        if (args.length >= 2) {
+            const id = evaluateExpression(args[0].expression, staticTable, {}, {}, {}, {}, {}, {});
+            const pseudo = evaluateExpression(args[1].expression, staticTable, {}, {}, {}, {}, {}, {});
+            if (typeof id === 'string' && typeof pseudo === 'string') {
+                const varName = getMarkerVar(id, pseudo);
+                return {
+                    [pseudo]: {
+                        [varName]: 1,
+                    },
+                };
+            }
+        }
+    }
+    if (method === 'extended') {
+        const args = node.arguments;
+        if (args.length >= 2) {
+            const id = evaluateExpression(args[0].expression, staticTable, {}, {}, {}, {}, {}, {});
+            const pseudo = evaluateExpression(args[1].expression, staticTable, {}, {}, {}, {}, {}, {});
+            if (typeof id === 'string' && typeof pseudo === 'string') {
+                const varName = getMarkerVar(id, pseudo);
+                return `@container style(${varName}: 1)`;
+            }
+        }
+    }
+    return null;
+}
 function evaluateExpression(node, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createStaticHashTable, createStaticObjectTable) {
+    if (exports.t.isCallExpression(node)) {
+        return evaluateCallExpression(node, staticTable);
+    }
     if (exports.t.isStringLiteral(node)) {
         return node.value;
     }
@@ -759,7 +818,7 @@ function scanAll() {
                                     localCreateObjectTable[hash] = obj;
                                     const hashMap = {};
                                     Object.entries(obj).forEach(([key, style]) => {
-                                        const records = (0, create_1.getStyleRecords)(key, style);
+                                        const records = (0, create_1.getStyleRecords)(style);
                                         const atomMap = {};
                                         records.forEach((r) => (atomMap[r.key] = r.hash));
                                         hashMap[key] = atomMap;
@@ -883,8 +942,8 @@ function extractOndemandStyles(obj, extractedSheets, t) {
         for (const hash of createHashes) {
             const obj = t.createObjectTable[hash];
             if (obj) {
-                Object.entries(obj).forEach(([key, style]) => {
-                    const records = (0, create_1.getStyleRecords)(key, style);
+                Object.entries(obj).forEach(([_key, style]) => {
+                    const records = (0, create_1.getStyleRecords)(style);
                     records.forEach((r) => addSheet(r.sheet));
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "6.3.2",
+  "version": "7.0.0",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",
@@ -22,7 +22,7 @@
   ],
   "dependencies": {
     "@swc/core": "1.15.8",
-    "zss-engine": "2.2.0",
+    "zss-engine": "2.2.3",
     "postcss": "8.5.6",
     "postcss-combine-media-query": "^2.1.0",
     "lightningcss": "^1.30.2"