From cda5ebcf2d6963cd2c3b1e2850cc86d08c5f3bee Mon Sep 17 00:00:00 2001
From: laibo102 <laibo2@huawei.com>
Date: Sat, 7 May 2022 17:17:46 +0800
Subject: [PATCH] bugFix: fixed component params validate

Signed-off-by: laibo102 <laibo2@huawei.com>
Change-Id: I585eb246554766b567eecc39e9f0afeadf952403
---
 compiler/src/process_component_class.ts  | 36 ++++++++++--------------
 compiler/src/process_custom_component.ts |  6 +++-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/compiler/src/process_component_class.ts b/compiler/src/process_component_class.ts
index 7ccefb1..12c8089 100644
--- a/compiler/src/process_component_class.ts
+++ b/compiler/src/process_component_class.ts
@@ -230,8 +230,7 @@ function addPropertyMember(item: ts.ClassElement, newMembers: ts.ClassElement[],
 }
 
 function createPropertyDeclaration(propertyItem: ts.PropertyDeclaration, newType: ts.TypeNode | undefined,
-  normalVar: boolean, isLocalStorage: boolean = false, parentComponentName: string = null
-  ): ts.PropertyDeclaration {
+  normalVar: boolean, isLocalStorage: boolean = false, parentComponentName: string = null): ts.PropertyDeclaration {
   if (typeof newType === undefined) {
     return undefined;
   }
@@ -418,27 +417,22 @@ export function createReference(node: ts.PropertyAssignment): ts.PropertyAssignm
   const linkParentComponent: string[] = getParentNode(node, linkCollection).slice(1);
   const propertyName: ts.Identifier = node.name as ts.Identifier;
   let initText: string;
-  if (linkParentComponent && ts.isPropertyAssignment(node) && ts.isIdentifier(propertyName) &&
-    linkParentComponent.includes(propertyName.escapedText.toString())) {
-    const LINK_REG: RegExp = /^\$/g;
-    const initExpression: ts.Expression = node.initializer;
-    if (ts.isIdentifier(initExpression) &&
-      initExpression.escapedText.toString().match(LINK_REG)) {
-      if (linkParentComponent.includes(propertyName.escapedText.toString())) {
-        initText = initExpression.escapedText.toString().replace(LINK_REG, '');
-      }
-    } else if (ts.isPropertyAccessExpression(initExpression) && initExpression.expression &&
-      initExpression.expression.kind === ts.SyntaxKind.ThisKeyword &&
-      ts.isIdentifier(initExpression.name) &&
-      initExpression.name.escapedText.toString().match(LINK_REG)) {
-      if (linkParentComponent.includes(propertyName.escapedText.toString())) {
-        initText = initExpression.name.escapedText.toString().replace(LINK_REG, '');
-      }
-    }
-    if (initText) {
-      node = addDoubleUnderline(node, propertyName, initText);
+  const LINK_REG: RegExp = /^\$/g;
+  const initExpression: ts.Expression = node.initializer;
+  if (ts.isIdentifier(initExpression) &&
+    initExpression.escapedText.toString().match(LINK_REG)) {
+    initText = initExpression.escapedText.toString().replace(LINK_REG, '');
+  } else if (ts.isPropertyAccessExpression(initExpression) && initExpression.expression &&
+    initExpression.expression.kind === ts.SyntaxKind.ThisKeyword &&
+    ts.isIdentifier(initExpression.name) &&
+    initExpression.name.escapedText.toString().match(LINK_REG)) {
+    if (linkParentComponent.includes(propertyName.escapedText.toString())) {
+      initText = initExpression.name.escapedText.toString().replace(LINK_REG, '');
     }
   }
+  if (initText) {
+    node = addDoubleUnderline(node, propertyName, initText);
+  }
   return node;
 }
 
diff --git a/compiler/src/process_custom_component.ts b/compiler/src/process_custom_component.ts
index e18502b..0c78a2f 100644
--- a/compiler/src/process_custom_component.ts
+++ b/compiler/src/process_custom_component.ts
@@ -108,7 +108,7 @@ function isHasChild(node: ts.CallExpression): boolean {
 function isToChange(item: ts.PropertyAssignment, node: ts.CallExpression): boolean {
   const builderParamName: Set<string> = builderParamObjectCollection.get(node.expression.getText());
   if (item.initializer && ts.isCallExpression(item.initializer) && builderParamName &&
-    builderParamName.has(item.name.getText()) && 
+    builderParamName.has(item.name.getText()) &&
     !/\.(bind|call|apply)/.test(item.initializer.getText())) {
     return true;
   }
@@ -191,6 +191,10 @@ function isThisProperty(node: ts.ObjectLiteralElementLike, propertySet: Set<stri
 }
 
 function isNonThisProperty(node: ts.ObjectLiteralElementLike, propertySet: Set<string>): boolean {
+  if (ts.isPropertyAssignment(node) && ts.isIdentifier(node.name) &&
+    node.initializer.escapedText && node.initializer.escapedText.includes('$')) {
+    return false;
+  }
   if (ts.isPropertyAssignment(node) && ts.isIdentifier(node.name) &&
     !propertySet.has(node.name.escapedText.toString())) {
     return true;