From 9668bfc2c201a9b57b7dd9cb68c8463df75b7c03 Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Sun, 13 Mar 2022 18:52:04 +0800
Subject: [PATCH] houhaoyu@huawei.com

fix constructor with ts type

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: I7f31c0a5102b40fbae74b39ac0afb5dc90760e7e
---
 compiler/src/process_component_constructor.ts | 46 +++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/compiler/src/process_component_constructor.ts b/compiler/src/process_component_constructor.ts
index d75c50cf8..9555249a2 100644
--- a/compiler/src/process_component_constructor.ts
+++ b/compiler/src/process_component_constructor.ts
@@ -20,7 +20,9 @@ import {
   COMPONENT_CONSTRUCTOR_PARENT,
   COMPONENT_CONSTRUCTOR_PARAMS,
   COMPONENT_CONSTRUCTOR_UPDATE_PARAMS,
-  COMPONENT_WATCH_FUNCTION
+  COMPONENT_WATCH_FUNCTION,
+  BASE_COMPONENT_NAME,
+  INTERFACE_NAME_SUFFIX
 } from './pre_define';
 
 export function getInitConstructor(members: ts.NodeArray<ts.Node>): ts.ConstructorDeclaration {
@@ -34,7 +36,7 @@ export function getInitConstructor(members: ts.NodeArray<ts.Node>): ts.Construct
 }
 
 export function updateConstructor(ctorNode: ts.ConstructorDeclaration,
-  para: ts.ParameterDeclaration[], addStatements: ts.Statement[], isSuper: boolean = false):
+  para: ts.ParameterDeclaration[], addStatements: ts.Statement[], isSuper: boolean = false, isAdd: boolean = false, parentComponentName?: ts.Identifier):
   ts.ConstructorDeclaration {
   let modifyPara: ts.ParameterDeclaration[];
   if (para && para.length) {
@@ -55,8 +57,13 @@ export function updateConstructor(ctorNode: ts.ConstructorDeclaration,
     }
   }
   if (ctorNode) {
+    let ctorPara: ts.ParameterDeclaration[] | ts.NodeArray<ts.ParameterDeclaration> =
+      modifyPara || ctorNode.parameters;
+    if (isAdd) {
+      ctorPara = addParamsType(ctorNode, modifyPara, parentComponentName);
+    }
     ctorNode = ts.factory.updateConstructorDeclaration(ctorNode, ctorNode.decorators,
-      ctorNode.modifiers, modifyPara || ctorNode.parameters,
+      ctorNode.modifiers, ctorPara,
       ts.factory.createBlock(modifyBody || ctorNode.body.statements, true));
   }
   return ctorNode;
@@ -80,6 +87,37 @@ function initConstructorParams(node: ts.ConstructorDeclaration): ts.ConstructorD
     node.body);
 }
 
+function addParamsType(ctorNode: ts.ConstructorDeclaration, modifyPara: ts.ParameterDeclaration[],
+  parentComponentName: ts.Identifier): ts.ParameterDeclaration[] {
+  const tsPara: ts.ParameterDeclaration[] | ts.NodeArray<ts.ParameterDeclaration> =
+    modifyPara || ctorNode.parameters;
+  const newTSPara: ts.ParameterDeclaration[] = [];
+  tsPara.forEach((item) => {
+    let parameter: ts.ParameterDeclaration = item;
+    switch (item.name.escapedText) {
+      case COMPONENT_CONSTRUCTOR_ID:
+        parameter = ts.factory.updateParameterDeclaration(item, item.decorators, item.modifiers,
+          item.dotDotDotToken, item.name, item.questionToken,
+          ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword), item.initializer);
+        break;
+      case COMPONENT_CONSTRUCTOR_PARENT:
+        parameter = ts.factory.createParameterDeclaration(item.decorators, item.modifiers,
+          item.dotDotDotToken, item.name, item.questionToken,
+          ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(BASE_COMPONENT_NAME), undefined),
+          item.initializer);
+        break;
+      case COMPONENT_CONSTRUCTOR_PARAMS:
+        parameter = ts.factory.updateParameterDeclaration(item, item.decorators, item.modifiers,
+          item.dotDotDotToken, item.name, item.questionToken,
+          ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(
+            parentComponentName.getText() + INTERFACE_NAME_SUFFIX), undefined), item.initializer);
+        break;
+    }
+    newTSPara.push(parameter);
+  })
+  return newTSPara;
+}
+
 export function addConstructor(ctorNode: any, watchMap: Map<string, ts.Node>,
   parentComponentName: ts.Identifier): ts.ConstructorDeclaration {
   const watchStatements: ts.ExpressionStatement[] = [];
@@ -109,5 +147,5 @@ export function addConstructor(ctorNode: any, watchMap: Map<string, ts.Node>,
       ts.factory.createThis(), ts.factory.createIdentifier(COMPONENT_CONSTRUCTOR_UPDATE_PARAMS)),
     undefined, [ts.factory.createIdentifier(COMPONENT_CONSTRUCTOR_PARAMS)]));
   return updateConstructor(updateConstructor(ctorNode, [], [callSuperStatement], true), [],
-    [updateWithValueParamsStatement, ...watchStatements], false);
+    [updateWithValueParamsStatement, ...watchStatements], false, true, parentComponentName);
 }
-- 
Gitee