@plumeria/utils 21.2.2 → 21.2.3

package/dist/parser.js

@@ -365,12 +365,12 @@ function objectExpressionToObject(node, staticTable, keyframesHashTable, viewTra
                 obj[key] = 'cr-' + resolvedCreate;
                 return;
             }
-            const resolvedTheme = resolveCreateThemeTableMemberExpressionByNode(val, createThemeHashTable, createThemeObjectTable);
+            const resolvedTheme = resolveCreateThemeTableMemberExpressionByNode(val, staticTable, createThemeHashTable, createThemeObjectTable);
             if (resolvedTheme !== undefined) {
                 obj[key] = resolvedTheme;
                 return;
             }
-            const resolvedStatic = resolveCreateStaticTableMemberExpression(val, createStaticHashTable, createStaticObjectTable);
+            const resolvedStatic = resolveCreateStaticTableMemberExpression(val, staticTable, createStaticHashTable, createStaticObjectTable);
             if (resolvedStatic !== undefined) {
                 obj[key] = resolvedStatic;
                 return;
@@ -726,10 +726,10 @@ function getPropertyKey(node, staticTable, keyframesHashTable, viewTransitionHas
             const result = resolveStaticTableMemberExpression(expr, staticTable);
             if (typeof result === 'string')
                 return result;
-            const staticResult = resolveCreateStaticTableMemberExpression(expr, createStaticHashTable, createStaticObjectTable);
+            const staticResult = resolveCreateStaticTableMemberExpression(expr, staticTable, createStaticHashTable, createStaticObjectTable);
             if (typeof staticResult === 'string')
                 return staticResult;
-            const themeResult = resolveCreateThemeTableMemberExpressionByNode(expr, createThemeHashTable, createThemeObjectTable);
+            const themeResult = resolveCreateThemeTableMemberExpressionByNode(expr, staticTable, createThemeHashTable, createThemeObjectTable);
             if (typeof themeResult === 'string')
                 return themeResult;
         }
@@ -912,11 +912,11 @@ function evaluateExpression(node, staticTable, keyframesHashTable, viewTransitio
         if (resolved !== undefined) {
             return resolved;
         }
-        const resolvedTheme = resolveCreateThemeTableMemberExpressionByNode(node, createThemeHashTable, createThemeObjectTable);
+        const resolvedTheme = resolveCreateThemeTableMemberExpressionByNode(node, staticTable, createThemeHashTable, createThemeObjectTable);
         if (resolvedTheme !== undefined) {
             return resolvedTheme;
         }
-        const resolvedStatic = resolveCreateStaticTableMemberExpression(node, createStaticHashTable, createStaticObjectTable);
+        const resolvedStatic = resolveCreateStaticTableMemberExpression(node, staticTable, createStaticHashTable, createStaticObjectTable);
         if (resolvedStatic !== undefined) {
             return resolvedStatic;
         }
@@ -972,26 +972,30 @@ function resolveCreateTableMemberExpression(node, createHashTable) {
         return createHashTable[node.value];
     }
 }
+function memberKey(node, staticTable) {
+    const property = node.property;
+    if (exports.t.isIdentifier(property))
+        return property.value;
+    if (property.type !== 'Computed')
+        return undefined;
+    const key = unwrapExpression(property.expression);
+    const value = exports.t.isStringLiteral(key) || exports.t.isNumericLiteral(key)
+        ? key.value
+        : exports.t.isIdentifier(key)
+            ? staticTable[key.value]
+            : undefined;
+    return typeof value === 'string' || typeof value === 'number'
+        ? String(value)
+        : undefined;
+}
 function resolveStaticTableMemberExpression(node, staticTable) {
     const keys = [];
     let current = node;
     while (exports.t.isMemberExpression(current)) {
-        const property = current.property;
-        const key = exports.t.isIdentifier(property)
-            ? property.value
-            : property.type === 'Computed'
-                ? unwrapExpression(property.expression)
-                : undefined;
-        const value = typeof key === 'string'
-            ? key
-            : exports.t.isStringLiteral(key) || exports.t.isNumericLiteral(key)
-                ? String(key.value)
-                : exports.t.isIdentifier(key)
-                    ? staticTable[key.value]
-                    : undefined;
-        if (typeof value !== 'string' && typeof value !== 'number')
+        const key = memberKey(current, staticTable);
+        if (key === undefined)
             return undefined;
-        keys.unshift(String(value));
+        keys.unshift(key);
         current = unwrapExpression(current.object);
     }
     if (!exports.t.isIdentifier(current))
@@ -1004,21 +1008,14 @@ function resolveStaticTableMemberExpression(node, staticTable) {
     }
     return value;
 }
-function resolveCreateThemeTableMemberExpressionByNode(node, createThemeHashTable, createThemeObjectTable) {
+function resolveCreateThemeTableMemberExpressionByNode(node, staticTable, createThemeHashTable, createThemeObjectTable) {
     if (exports.t.isMemberExpression(node) && exports.t.isIdentifier(node.object)) {
         const varName = node.object.value;
         const hash = createThemeHashTable[varName];
         if (hash) {
             const themeObj = createThemeObjectTable[hash];
             if (themeObj) {
-                let key;
-                if (exports.t.isIdentifier(node.property)) {
-                    key = node.property.value;
-                }
-                else if (node.property.type === 'Computed' &&
-                    exports.t.isStringLiteral(node.property.expression)) {
-                    key = node.property.expression.value;
-                }
+                const key = memberKey(node, staticTable);
                 if (key && themeObj[key] !== undefined) {
                     const value = themeObj[key];
                     const atomicHash = (0, zss_engine_1.genBase36Hash)({ _theme: hash, [key]: value }, 1, 8);
@@ -1030,21 +1027,14 @@ function resolveCreateThemeTableMemberExpressionByNode(node, createThemeHashTabl
     }
     return undefined;
 }
-function resolveCreateStaticTableMemberExpression(node, createStaticHashTable, createStaticObjectTable) {
+function resolveCreateStaticTableMemberExpression(node, staticTable, createStaticHashTable, createStaticObjectTable) {
     if (exports.t.isMemberExpression(node) && exports.t.isIdentifier(node.object)) {
         const varName = node.object.value;
         const hash = createStaticHashTable[varName];
         if (hash) {
             const staticObj = createStaticObjectTable[hash];
             if (staticObj) {
-                let key;
-                if (exports.t.isIdentifier(node.property)) {
-                    key = node.property.value;
-                }
-                else if (node.property.type === 'Computed' &&
-                    exports.t.isStringLiteral(node.property.expression)) {
-                    key = node.property.expression.value;
-                }
+                const key = memberKey(node, staticTable);
                 if (key && staticObj[key] !== undefined) {
                     return staticObj[key];
                 }

package/package.json

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