Merge pull request #74 from RightCapitalHQ/feature/support-parse-quot…

…ed-array-shape-key fix(parser): not able to correctly parse quoted array shape and object shape key
RightCapitalHQ · Jan 9, 2024 · 0c9453c · 0c9453c
2 parents d07d1f8 + dc7ee9c
commit 0c9453c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/change/@rightcapital-phpdoc-parser-c7976742-fba3-495d-8c41-1bda8d80516f.json b/change/@rightcapital-phpdoc-parser-c7976742-fba3-495d-8c41-1bda8d80516f.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix(parser): not able to correctly parse key in array shape and object shape node",
+  "packageName": "@rightcapital/phpdoc-parser",
+  "email": "yilunsun11@yeah.net",
+  "dependentChangeType": "patch"
+}
diff --git a/src/phpdoc-parser/parser/type-parser.ts b/src/phpdoc-parser/parser/type-parser.ts
@@ -751,16 +751,14 @@ export class TypeParser {
   ): ConstExprIntegerNode | ConstExprStringNode | IdentifierTypeNode {
     const startLine = tokens.currentTokenLine();
     const startIndex = tokens.currentTokenIndex();
+    let key: ConstExprIntegerNode | IdentifierTypeNode | ConstExprStringNode;
 
     if (tokens.isCurrentTokenType(Lexer.TOKEN_INTEGER)) {
-      const key = new ConstExprIntegerNode(
+      key = new ConstExprIntegerNode(
         tokens.currentTokenValue().replaceAll('_', ''),
       );
       tokens.next();
-      return this.enrichWithAttributes(tokens, key, startLine, startIndex);
-    }
-    let key: ConstExprIntegerNode | IdentifierTypeNode | ConstExprStringNode;
-    if (tokens.isCurrentTokenType(Lexer.TOKEN_SINGLE_QUOTED_STRING)) {
+    } else if (tokens.isCurrentTokenType(Lexer.TOKEN_SINGLE_QUOTED_STRING)) {
       if (this.quoteAwareConstExprString) {
         key = new QuoteAwareConstExprStringNode(
           StringUnescaper.unescapeString(tokens.currentTokenValue()),
@@ -772,8 +770,7 @@ export class TypeParser {
         );
       }
       tokens.next();
-    }
-    if (tokens.isCurrentTokenType(Lexer.TOKEN_DOUBLE_QUOTED_STRING)) {
+    } else if (tokens.isCurrentTokenType(Lexer.TOKEN_DOUBLE_QUOTED_STRING)) {
       if (this.quoteAwareConstExprString) {
         key = new QuoteAwareConstExprStringNode(
           StringUnescaper.unescapeString(tokens.currentTokenValue()),
@@ -784,10 +781,12 @@ export class TypeParser {
           tokens.currentTokenValue().replace(/(^"|"$)/g, ''),
         );
       }
+      tokens.next();
     } else {
       key = new IdentifierTypeNode(tokens.currentTokenValue());
       tokens.consumeTokenType(Lexer.TOKEN_IDENTIFIER);
     }
+
     return this.enrichWithAttributes<
       ConstExprIntegerNode | IdentifierTypeNode | ConstExprStringNode
     >(tokens, key, startLine, startIndex);
@@ -839,8 +838,8 @@ export class TypeParser {
   ): ConstExprStringNode | IdentifierTypeNode {
     const startLine = tokens.currentTokenLine();
     const startIndex = tokens.currentTokenIndex();
-
     let key: ConstExprStringNode | IdentifierTypeNode;
+
     if (tokens.isCurrentTokenType(Lexer.TOKEN_SINGLE_QUOTED_STRING)) {
       if (this.quoteAwareConstExprString) {
         key = new QuoteAwareConstExprStringNode(
@@ -849,12 +848,11 @@ export class TypeParser {
         );
       } else {
         key = new ConstExprStringNode(
-          tokens.currentTokenValue().replace(/(^"|"$)/g, ''),
+          tokens.currentTokenValue().replace(/(^'|'$)/g, ''),
         );
       }
       tokens.next();
-    }
-    if (tokens.isCurrentTokenType(Lexer.TOKEN_DOUBLE_QUOTED_STRING)) {
+    } else if (tokens.isCurrentTokenType(Lexer.TOKEN_DOUBLE_QUOTED_STRING)) {
       if (this.quoteAwareConstExprString) {
         key = new QuoteAwareConstExprStringNode(
           StringUnescaper.unescapeString(tokens.currentTokenValue()),
@@ -865,12 +863,12 @@ export class TypeParser {
           tokens.currentTokenValue().replace(/(^"|"$)/g, ''),
         );
       }
-
       tokens.next();
     } else {
       key = new IdentifierTypeNode(tokens.currentTokenValue());
       tokens.consumeTokenType(Lexer.TOKEN_IDENTIFIER);
     }
+
     return this.enrichWithAttributes(tokens, key, startLine, startIndex);
   }
 }