fix(grammar-ts): fix any in objectLiteral type issue

phodal · Mar 12, 2022 · ad68a8a · ad68a8a
1 parent 0369682
commit ad68a8a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -82,6 +82,7 @@ typeArgument
 
 type_
     : (Keyof | Typeof)* unionOrIntersectionOrPrimaryType
+    | unionOrIntersectionOrPrimaryType
     | functionType
     | constructorType
     | typeGeneric
@@ -168,7 +169,6 @@ typeMember
     | methodSignature ('=>' type_)?
     | enumSignature
     | '[' typeReference In typeReference ']' typeAnnotation
-//    | objectSignature
     ;
 
 arrayType
@@ -909,7 +909,7 @@ identifierOrKeyWord
     | Module
     | Default
     | Lodash Lodash?
-    | Dollar Dollar?
+    | Any
     ;
 
 reservedWord
@@ -972,6 +972,7 @@ keyword
     | TypeAlias
     | String
     | Undefined
+    | Any
     ;
 
 getter

diff --git a/...ast-typescript/src/test/kotlin/chapi/ast/typescriptast/TypeScriptFullIdentListenerTest.kt b/...ast-typescript/src/test/kotlin/chapi/ast/typescriptast/TypeScriptFullIdentListenerTest.kt
@@ -1265,8 +1265,26 @@ const docs = {
     @Test
     internal fun keyofTypeOf() {
         val code = """
-const getClazzColumnsBy = (type: keyof typeof columnCount) => {
+const getClazzColumnsBy = (type: keyof typeof columnCount) => {}
+"""
+        val codeFile = TypeScriptAnalyser().analysis(code, "index.tsx")
+        assertEquals(1, codeFile.DataStructures.size)
+    }
 
+    @Test
+    internal fun someIssue() {
+        val code = """
+export function getChartsOption(data?: number[]): EChartOption {
+  return {
+      series: !data ? defaultSeriesMarkLineOpt :
+      [...defaultSeriesMarkLineOpt, {
+        data: [data],
+        tooltip: {
+          formatter: ({ value }: any) => {}
+        }
+      },
+    ]
+  }
 }
 """
         val codeFile = TypeScriptAnalyser().analysis(code, "index.tsx")