@plumeria/utils 19.6.2 → 19.8.0

package/dist/parser.js

@@ -298,9 +298,20 @@ function objectExpressionToObject(node, staticTable, keyframesHashTable, viewTra
         }
         if (!exports.t.isObjectProperty(prop))
             return;
-        const key = getPropertyKey(prop.key, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createStaticHashTable, createStaticObjectTable);
-        if (!key)
+        const rawKey = getPropertyKey(prop.key, staticTable, keyframesHashTable, viewTransitionHashTable, createThemeHashTable, createThemeObjectTable, createStaticHashTable, createStaticObjectTable);
+        if (!rawKey)
             return;
+        const key = typeof rawKey === 'string' ? (0, zss_engine_1.stripSelectorComments)(rawKey) : rawKey;
+        if (typeof key === 'string' &&
+            (key.startsWith(':') || key.startsWith('['))) {
+            const nesting = (0, zss_engine_1.findInvalidSelector)(key);
+            if (nesting?.kind === 'same-name')
+                throw new Error(`[plumeria] "${nesting.name}()" cannot be nested inside another "${nesting.name}()": "${key}". Rewrite the selector without nesting.`);
+            if (nesting?.kind === 'stray-quote')
+                throw new Error(`[plumeria] Unexpected quote in selector: "${key}". Close the string inside brackets or parentheses, or remove the quote.`);
+            if (nesting?.kind === 'too-deep')
+                throw new Error(`[plumeria] Selector nests deeper than ${zss_engine_1.MAX_SELECTOR_NESTING} levels: "${key}". Rewrite the selector with fewer levels.`);
+        }
         const val = unwrapExpression(prop.value);
         if (exports.t.isIdentifier(val) || exports.t.isMemberExpression(val)) {
             if (resolveVariable && exports.t.isMemberExpression(val)) {

package/dist/stylePropFilter.js

@@ -5,7 +5,7 @@ const CORE = '@plumeria/core';
 const isIdentifierStart = (c) => (c >= 65 && c <= 90) || (c >= 97 && c <= 122) || c === 95 || c === 36;
 const isNameChar = (c) => isIdentifierStart(c) || (c >= 48 && c <= 57) || c === 46 || c === 45;
 const isSpace = (c) => c === 32 || (c >= 9 && c <= 13);
-const EXPRESSION_BEFORE = new Set(Array.from('(,=:[!&|?{};+-*%<>~^', (c) => c.charCodeAt(0)));
+const EXPRESSION_BEFORE = new Set(Array.from('(,=:[!&|?{};+-*%<>~^/', (c) => c.charCodeAt(0)));
 const EXPRESSION_WORDS = new Set([
     'return',
     'yield',
@@ -202,7 +202,7 @@ const writesAttribute = (source, name) => {
             if (end === -1)
                 return true;
             i = end;
-            previous = 96;
+            previous = source.charCodeAt(i) === 123 ? 123 : 96;
             continue;
         }
         if (c === 123) {
@@ -217,7 +217,7 @@ const writesAttribute = (source, name) => {
                 if (end === -1)
                     return true;
                 i = end;
-                previous = 96;
+                previous = source.charCodeAt(i) === 123 ? 123 : 96;
                 continue;
             }
             if (kind === 'attribute') {
@@ -237,6 +237,7 @@ const writesAttribute = (source, name) => {
             source.charCodeAt(previousEnd - 2) === previous;
         const expressionStart = previous === 0 ||
             (EXPRESSION_BEFORE.has(previous) && !afterUpdate) ||
+            (previous === 46 && source.startsWith('...', previousEnd - 3)) ||
             (isNameChar(previous) &&
                 EXPRESSION_WORDS.has(wordBefore(source, previousEnd)));
         if (c === 47 && expressionStart) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "19.6.2",
+  "version": "19.8.0",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "@swc/core": "1.15.47",
     "lightningcss": "^1.32.0",
     "postcss": "8.5.26",
-    "zss-engine": "2.8.0"
+    "zss-engine": "2.9.0"
   },
   "publishConfig": {
     "access": "public",