fix: replace the top-level context only

LeoYuan · LeoYuan · commit 37e07bb23839 · 2023-02-10T22:10:17.000+08:00
diff --git a/modules/code-generator/src/utils/expressionParser.ts b/modules/code-generator/src/utils/expressionParser.ts
@@ -271,7 +271,7 @@ export function parseExpressionConvertThis2Context(
 
     const localVariablesSet = new Set(localVariables);
 
-    let thisScopeLevel = CROSS_THIS_SCOPE_TYPE_NODE[exprAst.type] ? -1 : 0;
+    let thisScopeLevel = -1;
     traverse(fileAst, {
       enter(path) {
         if (CROSS_THIS_SCOPE_TYPE_NODE[path.node.type]) {
@@ -303,7 +303,7 @@ export function parseExpressionConvertThis2Context(
         }
 
         // 替换 this (只在顶层替换)
-        if (thisScopeLevel <= 0) {
+        if (thisScopeLevel === 0) {
           obj.replaceWith(t.identifier(contextName));
         }
       },
@@ -317,7 +317,7 @@ export function parseExpressionConvertThis2Context(
           return;
         }
 
-        if (thisScopeLevel <= 0) {
+        if (thisScopeLevel === 0) {
           path.replaceWith(t.identifier(contextName));
         }
       },

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ export function parseExpressionConvertThis2Context(`
`271`	`271`
`272`	`272`	`const localVariablesSet = new Set(localVariables);`
`273`	`273`
`274`		`- let thisScopeLevel = CROSS_THIS_SCOPE_TYPE_NODE[exprAst.type] ? -1 : 0;`
	`274`	`+ let thisScopeLevel = -1;`
`275`	`275`	`traverse(fileAst, {`
`276`	`276`	`enter(path) {`
`277`	`277`	`if (CROSS_THIS_SCOPE_TYPE_NODE[path.node.type]) {`
`@@ -303,7 +303,7 @@ export function parseExpressionConvertThis2Context(`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`// 替换 this (只在顶层替换)`
`306`		`- if (thisScopeLevel <= 0) {`
	`306`	`+ if (thisScopeLevel === 0) {`
`307`	`307`	`obj.replaceWith(t.identifier(contextName));`
`308`	`308`	`}`
`309`	`309`	`},`
`@@ -317,7 +317,7 @@ export function parseExpressionConvertThis2Context(`
`317`	`317`	`return;`
`318`	`318`	`}`
`319`	`319`
`320`		`- if (thisScopeLevel <= 0) {`
	`320`	`+ if (thisScopeLevel === 0) {`
`321`	`321`	`path.replaceWith(t.identifier(contextName));`
`322`	`322`	`}`
`323`	`323`	`},`