@plumeria/utils 18.3.5 → 18.3.7

package/dist/parser.js

@@ -726,10 +726,10 @@ function evaluateExpression(node, staticTable, keyframesHashTable, viewTransitio
             return staticTable[node.value];
         }
         if (keyframesHashTable[node.value] !== undefined) {
-            return keyframesHashTable[node.value];
+            return 'kf-' + keyframesHashTable[node.value];
         }
         if (viewTransitionHashTable[node.value] !== undefined) {
-            return viewTransitionHashTable[node.value];
+            return 'vt-' + viewTransitionHashTable[node.value];
         }
         if (createStaticHashTable[node.value] !== undefined) {
             const hash = createStaticHashTable[node.value];
@@ -1836,6 +1836,8 @@ function resolveExport(filePath, exportName, visited = new Set()) {
     }
     return null;
 }
+const REFERENCE_MARKER = /(kf|vt|cr)-([0-9a-z]+)/g;
+const CUSTOM_PROPERTY = /var\(\s*(--[^\s,)]+)/g;
 function extractOndemandStyles(obj, extractedSheets, t) {
     if (!obj || typeof obj !== 'object')
         return;
@@ -1850,44 +1852,27 @@ function extractOndemandStyles(obj, extractedSheets, t) {
         visited.add(n);
         Object.values(n).forEach((val) => {
             if (typeof val === 'string') {
-                if (val.startsWith('kf-')) {
-                    const hash = val.slice(3);
-                    if (!keyframesHashes.has(hash)) {
-                        keyframesHashes.add(hash);
-                        walk(t.keyframesObjectTable[hash]);
+                for (const [, kind, hash] of val.matchAll(REFERENCE_MARKER)) {
+                    if (kind === 'kf') {
+                        if (!keyframesHashes.has(hash) && t.keyframesObjectTable[hash]) {
+                            keyframesHashes.add(hash);
+                            walk(t.keyframesObjectTable[hash]);
+                        }
                     }
-                }
-                else if (val.startsWith('vt-')) {
-                    const hash = val.slice(3);
-                    if (!viewTransitionHashes.has(hash)) {
-                        viewTransitionHashes.add(hash);
-                        walk(t.viewTransitionObjectTable[hash]);
+                    else if (kind === 'vt') {
+                        if (!viewTransitionHashes.has(hash) &&
+                            t.viewTransitionObjectTable[hash]) {
+                            viewTransitionHashes.add(hash);
+                            walk(t.viewTransitionObjectTable[hash]);
+                        }
                     }
-                }
-                else if (val.startsWith('cr-')) {
-                    const hash = val.slice(3);
-                    if (!createHashes.has(hash)) {
+                    else if (!createHashes.has(hash) && t.createObjectTable[hash]) {
                         createHashes.add(hash);
                         walk(t.createObjectTable[hash]);
                     }
                 }
-                else if (val.includes('var(--')) {
-                    let startIdx = 0;
-                    while ((startIdx = val.indexOf('var(--', startIdx)) !== -1) {
-                        startIdx += 4;
-                        const endIdx = val.indexOf(')', startIdx);
-                        if (endIdx !== -1) {
-                            const content = val.slice(startIdx, endIdx);
-                            const varName = content.trim();
-                            if (varName.startsWith('--')) {
-                                usedVariables.add(varName);
-                            }
-                            startIdx = endIdx + 1;
-                        }
-                        else {
-                            break;
-                        }
-                    }
+                for (const [, varName] of val.matchAll(CUSTOM_PROPERTY)) {
+                    usedVariables.add(varName);
                 }
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "18.3.5",
+  "version": "18.3.7",
   "description": "Internal helpers shared by the Plumeria compiler and bundler plugins.",
   "author": "Refirst 11",
   "license": "MIT",