@plumeria/utils 21.1.4 → 21.1.6

package/dist/dynamicKey.js

@@ -163,9 +163,53 @@ const writtenUnitAfter = (rest) => {
         return token;
     return unitSet.has(token.toLowerCase()) ? token : '';
 };
-const unitAt = (prop, rest) => {
+const UNITLESS_FUNCTIONS = new Set([
+    'rgb',
+    'rgba',
+    'hsl',
+    'hsla',
+    'hwb',
+    'lab',
+    'lch',
+    'oklab',
+    'oklch',
+    'color',
+    'scale',
+    'scalex',
+    'scaley',
+    'scalez',
+    'scale3d',
+    'matrix',
+    'matrix3d',
+    'brightness',
+    'contrast',
+    'grayscale',
+    'invert',
+    'opacity',
+    'saturate',
+    'sepia',
+]);
+const FUNCTION_NAME_BEFORE = /[a-z0-9-]*$/i;
+const inUnitlessFunction = (before) => {
+    let depth = 0;
+    for (let i = before.length - 1; i >= 0; i--) {
+        if (before[i] === ')')
+            depth++;
+        else if (before[i] === '(') {
+            if (depth > 0)
+                depth--;
+            else {
+                const name = FUNCTION_NAME_BEFORE.exec(before.slice(0, i))[0];
+                if (UNITLESS_FUNCTIONS.has(name.toLowerCase()))
+                    return true;
+            }
+        }
+    }
+    return false;
+};
+const unitAt = (prop, before, rest) => {
     const written = writtenUnitAfter(rest);
-    if (written)
+    if (written || inUnitlessFunction(before))
         return { unit: written, written: true };
     return { unit: (0, exports.isUnitlessProp)(prop) ? '' : 'px', written: false };
 };
@@ -180,8 +224,9 @@ const rewriteVarOccurrences = (style, cssVar, assign) => {
             let at = rest.indexOf(reference);
             while (at !== -1) {
                 const after = rest.slice(at + reference.length);
-                const unit = unitAt(prop, after);
-                rewritten += `${rest.slice(0, at)}var(${assign(prop, unit)})`;
+                rewritten += rest.slice(0, at);
+                const unit = unitAt(prop, rewritten, after);
+                rewritten += `var(${assign(prop, unit)})`;
                 rest = unit.written ? after.slice(unit.unit.length) : after;
                 at = rest.indexOf(reference);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "21.1.4",
+  "version": "21.1.6",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",