fix(ts): fix string as parameter issue

phodal · Nov 17, 2022 · 0eea7d2 · 0eea7d2
1 parent 41e62e7
commit 0eea7d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -444,11 +444,6 @@ constructorDeclaration
     : accessibilityModifier? Constructor '(' formalParameterList? ')' block?
     ;
 
-//propertyMemberDeclaration
-//    : abstractDeclaration
-//    | propertyMember
-//    ;
-
 propertyMemberDeclaration
     : propertyMemberBase propertyName  '!'? '?'? typeAnnotation? initializer?                      # PropertyDeclarationExpression
     | propertyMemberBase propertyName callSignature ( ('{' functionBody '}'))                       # MethodDeclarationExpression
@@ -457,7 +452,7 @@ propertyMemberDeclaration
     ;
 
 abstractDeclaration
-    : Abstract (Identifier '?'? callSignature | variableStatement)
+    : Abstract (identifierName '?'? callSignature | variableStatement)
     ;
 
 //propertyMember
@@ -495,7 +490,7 @@ formalParameterList
     ;
 
 formalParameterArg
-    : decoratorList? accessibilityModifier? ReadOnly? identifierOrKeyWord '?'? typeAnnotation? ('=' singleExpression)?      // ECMAScript 6: Initialization
+    : decoratorList? accessibilityModifier? ReadOnly? identifierName '?'? typeAnnotation? ('=' singleExpression)?      // ECMAScript 6: Initialization
     | lastFormalParameterArg
     // ([key, value]: [string, string[]])
 //    | arrayLiteral (':' formalParameterList)?                                                                // ECMAScript 6: Parameter Context Matching

diff --git a/chapi-ast-typescript/src/main/kotlin/chapi/ast/typescriptast/TypeScriptAstListener.kt b/chapi-ast-typescript/src/main/kotlin/chapi/ast/typescriptast/TypeScriptAstListener.kt
@@ -15,11 +15,11 @@ open class TypeScriptAstListener : TypeScriptParserBaseListener() {
         for (argCtx in formalParameterListContext!!.formalParameterArg()) {
             val typeType = this.buildTypeAnnotation(argCtx.typeAnnotation())
             var typeValue = argCtx.text
-            if (argCtx.identifierOrKeyWord() != null) {
-                typeValue = argCtx.identifierOrKeyWord().text
+            if (argCtx.identifierName() != null) {
+                typeValue = argCtx.identifierName().text
             }
 
-            val parameter = CodeProperty(TypeValue = typeValue, TypeType = typeType!!)
+            val parameter = CodeProperty(TypeValue = typeValue, TypeType = typeType)
 
             if (argCtx.accessibilityModifier() != null) {
                 parameter.Modifiers += argCtx.accessibilityModifier().text