fix: Fix Style transform stencil variable lookup (#3038)

Fix variable lookups in Stencils during static style transformation. [category:Infrastructure]
Workday · Nov 6, 2024 · 6cf5850 · 6cf5850
1 parent 6ed8303
commit 6cf5850
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/modules/styling-transform/lib/utils/handleCreateStencil.ts b/modules/styling-transform/lib/utils/handleCreateStencil.ts
@@ -341,7 +341,7 @@ function parseStyleBlock(
     if (ts.isObjectLiteralExpression(property.initializer)) {
       styleObj = parseObjectToStaticValue(property.initializer, {
         ...context,
-        nameScope: `${stencilName}.`,
+        nameScope: `${stencilName}.vars.`,
       });
     }
 
@@ -350,7 +350,7 @@ function parseStyleBlock(
       if (returnNode) {
         styleObj = parseObjectToStaticValue(returnNode, {
           ...context,
-          nameScope: `${stencilName}.`,
+          nameScope: `${stencilName}.vars.`,
         });
       }
     }
@@ -361,7 +361,7 @@ function parseStyleBlock(
     if (returnNode) {
       styleObj = parseObjectToStaticValue(returnNode, {
         ...context,
-        nameScope: `${stencilName}.`,
+        nameScope: `${stencilName}.vars.`,
       });
     }
   }

diff --git a/modules/styling-transform/lib/utils/parseNodeToStaticValue.ts b/modules/styling-transform/lib/utils/parseNodeToStaticValue.ts
@@ -274,13 +274,13 @@ export function getValueFromAliasedSymbol(
 function getValueFromProcessedNodes(varName: string, context: TransformerContext): string | void {
   const {names} = context;
 
-  if (names[varName]) {
-    return names[varName];
-  }
-
   if (context.nameScope && names[`${context.nameScope}${varName}`]) {
     return names[`${context.nameScope}${varName}`];
   }
+
+  if (names[varName]) {
+    return names[varName];
+  }
 }
 
 function hasExpression(node: ts.Node): node is ts.Node & {initializer: ts.Expression} {