fix(ts): resolve all imports

phodal · phodal · commit fa9e70a6c306 · 2022-11-15T19:30:52.000+08:00
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -782,10 +782,12 @@ singleExpression
     | jsxArrowFunction                                                       # JsxArrowFunctionExpression
     | Class Identifier? classTail                                            # ClassExpression
     // this.form.value?.id?.[0]
-    | singleExpression '?'? '!'? '.''[' expressionSequence ']'               # MemberIndexExpression
+    | singleExpression '?'? '!'? '.'? '[' expressionSequence ']'               # MemberIndexExpression
     // for: `onHotUpdateSuccess?.();`
     // onChange?.(userName || password || null)
-    | singleExpression '?'? '!'? '.' '#'? identifierName? nestedTypeGeneric? # MemberDotExpression
+    | singleExpression '?'? '!'? '.' '#'? identifierName? nestedTypeGeneric?  # MemberDotExpression
+    // for: `onHotUpdateSuccess?.();`
+    | singleExpression '?'? '!'? '.' '#'? '(' identifierName? ')'            # MemberDotExpression
 
     // samples: `error?.response?.data?.message ?? error.message;`
     | singleExpression '??' singleExpression                                 # NullCoalesceExpression
@@ -835,6 +837,7 @@ singleExpression
     | arrayLiteral                                                           # ArrayLiteralExpression
     | objectLiteral                                                          # ObjectLiteralExpression
     | '(' expressionSequence ')'                                             # ParenthesizedExpression
+    | Of '(' expressionSequence ')'                                          # OfParenthesizedExpression
     | typeArguments expressionSequence?                                      # GenericTypes
     | singleExpression As asExpression                                       # CastAsExpression
     | htmlElements                                                           # HtmlElementExpression
diff --git a/chapi-ast-typescript/src/main/kotlin/chapi/ast/typescriptast/TypeScriptFullIdentListener.kt b/chapi-ast-typescript/src/main/kotlin/chapi/ast/typescriptast/TypeScriptFullIdentListener.kt
@@ -74,7 +74,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
 
                     }
                     else -> {
-                        println("enterVariableStatement: ${it::class.java.simpleName} === ${it.text}")
+//                        println("enterVariableStatement: ${it::class.java.simpleName} === ${it.text}")
                     }
                 }
             }
@@ -116,7 +116,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                         }
                     }
                     else -> {
-                        println("variableToFields -> ${lastExpr.text} === ${lastExpr.javaClass.simpleName}")
+//                        println("variableToFields -> ${lastExpr.text} === ${lastExpr.javaClass.simpleName}")
                     }
                 }
 
@@ -144,7 +144,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                     field.Calls += CodeCall("", CallType.FIELD, "", identExpr.identifierName().text)
                 }
                 else -> {
-                    println("todo -> var -> decl call: $name")
+//                    println("todo -> var -> decl call: $name")
                 }
             }
         }
@@ -236,7 +236,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                     currentNode.Functions += codeFunction
                 }
                 else -> {
-                    println("handleClassBodyElements -> childElementType : $childElementType")
+//                    println("handleClassBodyElements -> childElementType : $childElementType")
                 }
             }
         }
@@ -319,7 +319,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                     currentNode.Functions += func
                 }
                 else -> {
-                    println("enterInterfaceDeclaration -> buildInterfaceBody")
+//                    println("enterInterfaceDeclaration -> buildInterfaceBody")
                 }
             }
         }
@@ -494,7 +494,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
             }
             else -> {
                 val text = statementParent.text
-                println("enterArrowFunctionDeclaration -> $parentName, $text")
+//                println("enterArrowFunctionDeclaration -> $parentName, $text")
             }
         }
 
@@ -589,7 +589,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                 defaultNode.Functions += currentFunc
             }
             else -> {
-                println("enterFunctionExpressionDeclaration -> $parentName, ${statementParent.text} ")
+//                println("enterFunctionExpressionDeclaration -> $parentName, ${statementParent.text} ")
             }
         }
     }
@@ -655,7 +655,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                 currentFunc.FunctionCalls += CodeCall("", CallType.FUNCTION, "", currentExprIdent, parameters)
             }
             else -> {
-                println("todo -> need support type: ${ctx::class.java.simpleName} ==== ${ctx.text}")
+//                println("todo -> need support type: ${ctx::class.java.simpleName} ==== ${ctx.text}")
             }
         }
     }
@@ -708,7 +708,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                             currentExprIdent = ident.identifierName().text
                         }
                         else -> {
-                            println("MemberDotExpressionContext: -> $subName")
+//                            println("MemberDotExpressionContext: -> $subName")
                         }
                     }
 
@@ -722,7 +722,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
 
                 }
                 else -> {
-                    println("singleExpression -> ArgumentsExpressionContext -> $childName")
+//                    println("singleExpression -> ArgumentsExpressionContext -> $childName")
                 }
             }
         }
@@ -762,7 +762,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                     parameter = CodeProperty(TypeValue = singleExpToText(subSingle), TypeType = "string")
                 }
                 else -> {
-                    println("todo -> ParenthesizedExpressionContext: $simpleName, text: ${subSingle.text}")
+//                    println("todo -> ParenthesizedExpressionContext: $simpleName, text: ${subSingle.text}")
                 }
             }
 
@@ -791,7 +791,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                     root += prop
                 }
                 else -> {
-                    println(propName)
+//                    println(propName)
                 }
             }
         }
@@ -847,10 +847,10 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                     currentFunc.FunctionCalls += codeCall
                 }
                 "IdentifierExpressionContext" -> {
-                    println("enterExpressionStatement -> IdentifierExpressionContext: ${singleExprCtx.text}")
+//                    println("enterExpressionStatement -> IdentifierExpressionContext: ${singleExprCtx.text}")
                 }
                 else -> {
-                    println("enterExpressionStatement : $singleCtxType")
+//                    println("enterExpressionStatement : $singleCtxType")
                 }
             }
 
@@ -918,7 +918,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                             parseSingleExpression(identExpr.singleExpression())
                         }
                         else -> {
-                            println("IdentifierExpressionContext -> others variable decl: $identExprText ==== ${singleExprCtx.text}")
+//                            println("IdentifierExpressionContext -> others variable decl: $identExprText ==== ${singleExprCtx.text}")
                         }
                     }
                 }
@@ -936,7 +936,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                     parseParenthesizedExpression(singleExprCtx as ParenthesizedExpressionContext)
                 }
                 else -> {
-                    println("enterVariableDeclaration : $singleCtxType === ${ctx.text}")
+//                    println("enterVariableDeclaration : $singleCtxType === ${ctx.text}")
                 }
             }
         }
diff --git a/chapi-ast-typescript/src/test/kotlin/chapi/ast/typescriptast/TypeScriptRegressionTest.kt b/chapi-ast-typescript/src/test/kotlin/chapi/ast/typescriptast/TypeScriptRegressionTest.kt
@@ -29,6 +29,8 @@ if (node in graph) {
 
   }
 }
+
+of(data)
 """
 
         TypeScriptAnalyser().analysis(code, "index.tsx")
@@ -63,6 +65,15 @@ if (node in graph) {
         TypeScriptAnalyser().analysis(code, "index.tsx")
     }
 
+    @Test
+    fun array_in_for_loop() {
+        val code = """this.names.forEach((it, index) => {
+  multiSelect('', this.accessor[index])
+})
+"""
+        TypeScriptAnalyser().analysis(code, "index.tsx")
+    }
+
     @Test
     fun query_array_literal() {
         val code = """

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`74`	`74`
`75`	`75`	`}`
`76`	`76`	`else -> {`
`77`		`- println("enterVariableStatement: ${it::class.java.simpleName} === ${it.text}")`
	`77`	`+// println("enterVariableStatement: ${it::class.java.simpleName} === ${it.text}")`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`}`
`@@ -116,7 +116,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`else -> {`
`119`		`- println("variableToFields -> ${lastExpr.text} === ${lastExpr.javaClass.simpleName}")`
	`119`	`+// println("variableToFields -> ${lastExpr.text} === ${lastExpr.javaClass.simpleName}")`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`@@ -144,7 +144,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`144`	`144`	`field.Calls += CodeCall("", CallType.FIELD, "", identExpr.identifierName().text)`
`145`	`145`	`}`
`146`	`146`	`else -> {`
`147`		`- println("todo -> var -> decl call: $name")`
	`147`	`+// println("todo -> var -> decl call: $name")`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`}`
`@@ -236,7 +236,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`236`	`236`	`currentNode.Functions += codeFunction`
`237`	`237`	`}`
`238`	`238`	`else -> {`
`239`		`- println("handleClassBodyElements -> childElementType : $childElementType")`
	`239`	`+// println("handleClassBodyElements -> childElementType : $childElementType")`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`}`
`@@ -319,7 +319,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`319`	`319`	`currentNode.Functions += func`
`320`	`320`	`}`
`321`	`321`	`else -> {`
`322`		`- println("enterInterfaceDeclaration -> buildInterfaceBody")`
	`322`	`+// println("enterInterfaceDeclaration -> buildInterfaceBody")`
`323`	`323`	`}`
`324`	`324`	`}`
`325`	`325`	`}`
`@@ -494,7 +494,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`494`	`494`	`}`
`495`	`495`	`else -> {`
`496`	`496`	`val text = statementParent.text`
`497`		`- println("enterArrowFunctionDeclaration -> $parentName, $text")`
	`497`	`+// println("enterArrowFunctionDeclaration -> $parentName, $text")`
`498`	`498`	`}`
`499`	`499`	`}`
`500`	`500`
`@@ -589,7 +589,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`589`	`589`	`defaultNode.Functions += currentFunc`
`590`	`590`	`}`
`591`	`591`	`else -> {`
`592`		`- println("enterFunctionExpressionDeclaration -> $parentName, ${statementParent.text} ")`
	`592`	`+// println("enterFunctionExpressionDeclaration -> $parentName, ${statementParent.text} ")`
`593`	`593`	`}`
`594`	`594`	`}`
`595`	`595`	`}`
`@@ -655,7 +655,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`655`	`655`	`currentFunc.FunctionCalls += CodeCall("", CallType.FUNCTION, "", currentExprIdent, parameters)`
`656`	`656`	`}`
`657`	`657`	`else -> {`
`658`		`- println("todo -> need support type: ${ctx::class.java.simpleName} ==== ${ctx.text}")`
	`658`	`+// println("todo -> need support type: ${ctx::class.java.simpleName} ==== ${ctx.text}")`
`659`	`659`	`}`
`660`	`660`	`}`
`661`	`661`	`}`
`@@ -708,7 +708,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`708`	`708`	`currentExprIdent = ident.identifierName().text`
`709`	`709`	`}`
`710`	`710`	`else -> {`
`711`		`- println("MemberDotExpressionContext: -> $subName")`
	`711`	`+// println("MemberDotExpressionContext: -> $subName")`
`712`	`712`	`}`
`713`	`713`	`}`
`714`	`714`
`@@ -722,7 +722,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`722`	`722`
`723`	`723`	`}`
`724`	`724`	`else -> {`
`725`		`- println("singleExpression -> ArgumentsExpressionContext -> $childName")`
	`725`	`+// println("singleExpression -> ArgumentsExpressionContext -> $childName")`
`726`	`726`	`}`
`727`	`727`	`}`
`728`	`728`	`}`
`@@ -762,7 +762,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`762`	`762`	`parameter = CodeProperty(TypeValue = singleExpToText(subSingle), TypeType = "string")`
`763`	`763`	`}`
`764`	`764`	`else -> {`
`765`		`- println("todo -> ParenthesizedExpressionContext: $simpleName, text: ${subSingle.text}")`
	`765`	`+// println("todo -> ParenthesizedExpressionContext: $simpleName, text: ${subSingle.text}")`
`766`	`766`	`}`
`767`	`767`	`}`
`768`	`768`
`@@ -791,7 +791,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`791`	`791`	`root += prop`
`792`	`792`	`}`
`793`	`793`	`else -> {`
`794`		`- println(propName)`
	`794`	`+// println(propName)`
`795`	`795`	`}`
`796`	`796`	`}`
`797`	`797`	`}`
`@@ -847,10 +847,10 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`847`	`847`	`currentFunc.FunctionCalls += codeCall`
`848`	`848`	`}`
`849`	`849`	`"IdentifierExpressionContext" -> {`
`850`		`- println("enterExpressionStatement -> IdentifierExpressionContext: ${singleExprCtx.text}")`
	`850`	`+// println("enterExpressionStatement -> IdentifierExpressionContext: ${singleExprCtx.text}")`
`851`	`851`	`}`
`852`	`852`	`else -> {`
`853`		`- println("enterExpressionStatement : $singleCtxType")`
	`853`	`+// println("enterExpressionStatement : $singleCtxType")`
`854`	`854`	`}`
`855`	`855`	`}`
`856`	`856`
`@@ -918,7 +918,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`918`	`918`	`parseSingleExpression(identExpr.singleExpression())`
`919`	`919`	`}`
`920`	`920`	`else -> {`
`921`		`- println("IdentifierExpressionContext -> others variable decl: $identExprText ==== ${singleExprCtx.text}")`
	`921`	`+// println("IdentifierExpressionContext -> others variable decl: $identExprText ==== ${singleExprCtx.text}")`
`922`	`922`	`}`
`923`	`923`	`}`
`924`	`924`	`}`
`@@ -936,7 +936,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {`
`936`	`936`	`parseParenthesizedExpression(singleExprCtx as ParenthesizedExpressionContext)`
`937`	`937`	`}`
`938`	`938`	`else -> {`
`939`		`- println("enterVariableDeclaration : $singleCtxType === ${ctx.text}")`
	`939`	`+// println("enterVariableDeclaration : $singleCtxType === ${ctx.text}")`
`940`	`940`	`}`
`941`	`941`	`}`
`942`	`942`	`}`