fix(ts): fix lodash issue in obj method param

phodal · Mar 12, 2022 · 34c40da · 34c40da
1 parent dabffa7
commit 34c40da
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -495,6 +495,7 @@ breakStatement
 returnStatement
     : Return ({this.notLineTerminator()}? expressionSequence)? eos
     | Return '(' htmlElements ')' eos
+//    | Return '{' statement '}' eos
     ;
 
 htmlElements
@@ -776,7 +777,7 @@ singleExpression
     | singleExpression '[' expressionSequence ']'                            # MemberIndexExpression
     | singleExpression '?'? '!'? '.' '#'? identifierName nestedTypeGeneric?  # MemberDotExpression
     // for: `onHotUpdateSuccess?.();`
-    | singleExpression '?'? '!'? '.' '#'? '(' identifierName? ')'          # MemberDotExpression
+    | singleExpression '?'? '!'? '.' '#'? '(' identifierName? ')'            # MemberDotExpression
     // samples: `error?.response?.data?.message ?? error.message;`
     | singleExpression '??' singleExpression                                 # NullCoalesceExpression
     | singleExpression '!'                                                   # PropCheckExpression
@@ -796,7 +797,7 @@ singleExpression
     | '~' singleExpression                                                   # BitNotExpression
     | '!' singleExpression                                                   # NotExpression
     | Await singleExpression                                                 # AwaitExpression
-    | <assoc=right> singleExpression '**' singleExpression                  # PowerExpression
+    | <assoc=right> singleExpression '**' singleExpression                   # PowerExpression
     | singleExpression ('*' | '/' | '%') singleExpression                    # MultiplicativeExpression
     | singleExpression ('+' | '-') singleExpression                          # AdditiveExpression
     | singleExpression ('<<' | '>>' | '>>>') singleExpression                # BitShiftExpression
@@ -894,8 +895,8 @@ numericLiteral
 identifierName
     : Identifier
     | reservedWord
-    | Lodash Lodash*
-    | Dollar Dollar*
+    | Lodash Lodash?
+    | Dollar Dollar?
     ;
 
 identifierOrKeyWord
@@ -904,6 +905,8 @@ identifierOrKeyWord
     | Require
     | Module
     | Default
+    | Lodash Lodash?
+    | Dollar Dollar?
     ;
 
 reservedWord

diff --git a/...ast-typescript/src/test/kotlin/chapi/ast/typescriptast/TypeScriptFullIdentListenerTest.kt b/...ast-typescript/src/test/kotlin/chapi/ast/typescriptast/TypeScriptFullIdentListenerTest.kt
@@ -1215,24 +1215,16 @@ const createTreeNode = <U = TreeNode, T extends JavaItem<T>>(): U => {};
 
 
     @Test
-    internal fun typeIssue() {
+    internal fun lodashIssueInObjectMethod() {
         val code = """
-export interface CouplingRecord {
-  key: string;
-  label: string;
-  fullName: string;
-  name: string;
-  moduleId: string;
-  shortName: string;
-  props: {
-    desc: string;
-    name: string;
-    value: any;
-    key: string;
-    qualified: boolean;
-  }[];
-  packages?: CouplingRecord[];
-  classess?: CouplingRecord[];
+export default function CouplingList(props: CouplingListProps) {
+  const props = firstItem.props.map((prop, index) => {
+    return {
+      render(_: any, item: CouplingRecord) {
+        return <Text type={qualified ? undefined : "danger"}>{value}</Text>;
+      },
+    };
+  })
 }
 """
         val codeFile = TypeScriptAnalyser().analysis(code, "index.tsx")