fix(ts): fix array type error issues

phodal · phodal · commit c1337074cc69 · 2022-11-17T08:58:32.000+08:00
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -598,6 +598,7 @@ arrayElement
 bindingElement
     : bindingPattern
     | Identifier
+    | singleExpression
     ;
 
 
@@ -729,7 +730,7 @@ multipleExportElements
 // Variable Statement
 
 variableStatement
-    : accessibilityModifier? ReadOnly? varModifier (bindingPatternBlock | variableDeclarationList) SemiColon?
+    : accessibilityModifier? ReadOnly? varModifier (bindingPatternBlock | variableDeclarationList) eos?
     ;
 
 varModifier
@@ -747,8 +748,9 @@ variableDeclarationList
     ;
 
 variableDeclaration
-//    : ( identifierName | arrayLiteral | objectLiteral) typeAnnotation? ('=' typeParameters? singleExpression)? // ECMAScript 6: Array & Object Matching
-    : identifierName typeAnnotation? ('=' typeParameters? singleExpression)? // ECMAScript 6: Array & Object Matching
+    :  identifierName typeAnnotation? ('=' typeParameters? singleExpression)? // ECMAScript 6: Array & Object Matching
+    | arrayLiteral
+    | objectLiteral
     ;
 
 
@@ -1016,6 +1018,8 @@ identifierOrKeyWord
 
 identifierName
     : reservedWord
+    | Lodash
+    | Dollar
     | Identifier
     ;
 

Original file line number	Diff line number	Diff line change
`@@ -598,6 +598,7 @@ arrayElement`
`598`	`598`	`bindingElement`
`599`	`599`	`: bindingPattern`
`600`	`600`	`\| Identifier`
	`601`	`+ \| singleExpression`
`601`	`602`	`;`
`602`	`603`
`603`	`604`
`@@ -729,7 +730,7 @@ multipleExportElements`
`729`	`730`	`// Variable Statement`
`730`	`731`
`731`	`732`	`variableStatement`
`732`		`- : accessibilityModifier? ReadOnly? varModifier (bindingPatternBlock \| variableDeclarationList) SemiColon?`
	`733`	`+ : accessibilityModifier? ReadOnly? varModifier (bindingPatternBlock \| variableDeclarationList) eos?`
`733`	`734`	`;`
`734`	`735`
`735`	`736`	`varModifier`
`@@ -747,8 +748,9 @@ variableDeclarationList`
`747`	`748`	`;`
`748`	`749`
`749`	`750`	`variableDeclaration`
`750`		`-// : ( identifierName \| arrayLiteral \| objectLiteral) typeAnnotation? ('=' typeParameters? singleExpression)? // ECMAScript 6: Array & Object Matching`
`751`		`- : identifierName typeAnnotation? ('=' typeParameters? singleExpression)? // ECMAScript 6: Array & Object Matching`
	`751`	`+ : identifierName typeAnnotation? ('=' typeParameters? singleExpression)? // ECMAScript 6: Array & Object Matching`
	`752`	`+ \| arrayLiteral`
	`753`	`+ \| objectLiteral`
`752`	`754`	`;`
`753`	`755`
`754`	`756`
`@@ -1016,6 +1018,8 @@ identifierOrKeyWord`
`1016`	`1018`
`1017`	`1019`	`identifierName`
`1018`	`1020`	`: reservedWord`
	`1021`	`+ \| Lodash`
	`1022`	`+ \| Dollar`
`1019`	`1023`	`\| Identifier`
`1020`	`1024`	`;`
`1021`	`1025`