@noldova/context.parsers.typescript 0.0.7 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (119) hide show
  1. package/api/index.d.ts +2 -1
  2. package/extensions/diagnostic-collector.extensions.js +2 -12
  3. package/extensions/diagnostic-collector.extensions.js.map +1 -1
  4. package/extensions/nodes/declarations/typescript-binding-element.node.extensions.js +1 -1
  5. package/extensions/nodes/declarations/typescript-binding-element.node.extensions.js.map +1 -1
  6. package/extensions/nodes/declarations/typescript-export-assignment.node.extensions.js +3 -2
  7. package/extensions/nodes/declarations/typescript-export-assignment.node.extensions.js.map +1 -1
  8. package/extensions/nodes/declarations/typescript-import-declaration.node.extensions.js +3 -2
  9. package/extensions/nodes/declarations/typescript-import-declaration.node.extensions.js.map +1 -1
  10. package/extensions/nodes/declarations/typescript-parameter-list.node.extensions.js +1 -2
  11. package/extensions/nodes/declarations/typescript-parameter-list.node.extensions.js.map +1 -1
  12. package/extensions/nodes/delimiters/typescript-at.node.extensions.js +1 -1
  13. package/extensions/nodes/delimiters/typescript-at.node.extensions.js.map +1 -1
  14. package/extensions/nodes/statements/typescript-block.node.extensions.js +1 -1
  15. package/extensions/nodes/statements/typescript-block.node.extensions.js.map +1 -1
  16. package/extensions/nodes/statements/typescript-for-in-or-of-statement.node.extensions.js +4 -4
  17. package/extensions/nodes/statements/typescript-for-in-or-of-statement.node.extensions.js.map +1 -1
  18. package/extensions/nodes/types/typescript-expression-with-type-arguments.node.extensions.js +4 -0
  19. package/extensions/nodes/types/typescript-expression-with-type-arguments.node.extensions.js.map +1 -1
  20. package/extensions/nodes/typescript-delimited-list.node.extensions.js +1 -1
  21. package/extensions/nodes/typescript-delimited-list.node.extensions.js.map +1 -1
  22. package/models/typescript-arrow-function-parts.js +30 -0
  23. package/models/typescript-arrow-function-parts.js.map +1 -0
  24. package/models/typescript-deferred-records.js +4 -4
  25. package/models/typescript-deferred-records.js.map +1 -1
  26. package/models/typescript-function-parts.js +38 -0
  27. package/models/typescript-function-parts.js.map +1 -0
  28. package/models/typescript-modifier-list.js +16 -0
  29. package/models/typescript-modifier-list.js.map +1 -0
  30. package/models/typescript-parameter-list-read.js +16 -0
  31. package/models/typescript-parameter-list-read.js.map +1 -0
  32. package/models/typescript-parser-context.js +18 -17
  33. package/models/typescript-parser-context.js.map +1 -1
  34. package/models/typescript-region-set.js +9 -11
  35. package/models/typescript-region-set.js.map +1 -1
  36. package/models/typescript-spelling-distance-row.js +21 -0
  37. package/models/typescript-spelling-distance-row.js.map +1 -0
  38. package/package.json +9 -8
  39. package/resources.js +2 -0
  40. package/resources.js.map +1 -1
  41. package/services/keyword-spelling-suggester.js +16 -18
  42. package/services/keyword-spelling-suggester.js.map +1 -1
  43. package/services/lexers/trivia.lexer.js +6 -4
  44. package/services/lexers/trivia.lexer.js.map +1 -1
  45. package/services/parsers/class.parser.js +12 -17
  46. package/services/parsers/class.parser.js.map +1 -1
  47. package/services/parsers/clauses/switch-clause.parser.js +2 -2
  48. package/services/parsers/clauses/switch-clause.parser.js.map +1 -1
  49. package/services/parsers/declarations/class-body.parser.js +2 -2
  50. package/services/parsers/declarations/class-body.parser.js.map +1 -1
  51. package/services/parsers/declarations/class-member.parser.js +7 -6
  52. package/services/parsers/declarations/class-member.parser.js.map +1 -1
  53. package/services/parsers/declarations/declaration.parser.js +3 -2
  54. package/services/parsers/declarations/declaration.parser.js.map +1 -1
  55. package/services/parsers/declarations/enum-declaration.parser.js +2 -2
  56. package/services/parsers/declarations/enum-declaration.parser.js.map +1 -1
  57. package/services/parsers/declarations/heritage-clause.parser.js +4 -4
  58. package/services/parsers/declarations/heritage-clause.parser.js.map +1 -1
  59. package/services/parsers/declarations/import-attributes.parser.js +11 -12
  60. package/services/parsers/declarations/import-attributes.parser.js.map +1 -1
  61. package/services/parsers/declarations/import-clause.parser.js +14 -8
  62. package/services/parsers/declarations/import-clause.parser.js.map +1 -1
  63. package/services/parsers/declarations/import-export-specifier.parser.js +13 -14
  64. package/services/parsers/declarations/import-export-specifier.parser.js.map +1 -1
  65. package/services/parsers/declarations/index-signature.parser.js.map +1 -1
  66. package/services/parsers/declarations/modifier.parser.js +11 -3
  67. package/services/parsers/declarations/modifier.parser.js.map +1 -1
  68. package/services/parsers/declarations/named-bindings.parser.js +7 -9
  69. package/services/parsers/declarations/named-bindings.parser.js.map +1 -1
  70. package/services/parsers/declarations/parameter-list.parser.js +51 -22
  71. package/services/parsers/declarations/parameter-list.parser.js.map +1 -1
  72. package/services/parsers/declarations/variable-declaration-list.parser.js +2 -2
  73. package/services/parsers/declarations/variable-declaration-list.parser.js.map +1 -1
  74. package/services/parsers/expressions/argument-list.parser.js +2 -2
  75. package/services/parsers/expressions/argument-list.parser.js.map +1 -1
  76. package/services/parsers/expressions/array-literal-expression.parser.js +2 -2
  77. package/services/parsers/expressions/array-literal-expression.parser.js.map +1 -1
  78. package/services/parsers/expressions/arrow-function.parser.js +69 -38
  79. package/services/parsers/expressions/arrow-function.parser.js.map +1 -1
  80. package/services/parsers/expressions/assignment-expression.parser.js +3 -2
  81. package/services/parsers/expressions/assignment-expression.parser.js.map +1 -1
  82. package/services/parsers/expressions/object-literal-expression.parser.js +2 -2
  83. package/services/parsers/expressions/object-literal-expression.parser.js.map +1 -1
  84. package/services/parsers/expressions/parenthesized-expression.parser.js +6 -7
  85. package/services/parsers/expressions/parenthesized-expression.parser.js.map +1 -1
  86. package/services/parsers/function.parser.js +6 -7
  87. package/services/parsers/function.parser.js.map +1 -1
  88. package/services/parsers/names/binding-name.parser.js +4 -4
  89. package/services/parsers/names/binding-name.parser.js.map +1 -1
  90. package/services/parsers/source.parser.js +18 -29
  91. package/services/parsers/source.parser.js.map +1 -1
  92. package/services/parsers/statements/block.parser.js +2 -2
  93. package/services/parsers/statements/block.parser.js.map +1 -1
  94. package/services/parsers/statements/for-statement.parser.js +2 -2
  95. package/services/parsers/statements/for-statement.parser.js.map +1 -1
  96. package/services/parsers/statements/switch-statement.parser.js +2 -2
  97. package/services/parsers/statements/switch-statement.parser.js.map +1 -1
  98. package/services/parsers/statements/try-statement.parser.js +4 -1
  99. package/services/parsers/statements/try-statement.parser.js.map +1 -1
  100. package/services/parsers/types/tuple-type.parser.js +2 -2
  101. package/services/parsers/types/tuple-type.parser.js.map +1 -1
  102. package/services/parsers/types/type-argument-list.parser.js +19 -11
  103. package/services/parsers/types/type-argument-list.parser.js.map +1 -1
  104. package/services/parsers/types/type-literal.parser.js +4 -2
  105. package/services/parsers/types/type-literal.parser.js.map +1 -1
  106. package/services/parsers/types/type-member.parser.js +2 -2
  107. package/services/parsers/types/type-member.parser.js.map +1 -1
  108. package/services/parsers/types/type-parameter-list.parser.js +2 -2
  109. package/services/parsers/types/type-parameter-list.parser.js.map +1 -1
  110. package/services/parsers/types/type.parser.js +1 -2
  111. package/services/parsers/types/type.parser.js.map +1 -1
  112. package/services/typescript-diagnostic-locator.js +18 -0
  113. package/services/typescript-diagnostic-locator.js.map +1 -0
  114. package/services/typescript-region-splicer.js +54 -0
  115. package/services/typescript-region-splicer.js.map +1 -0
  116. package/services/typescript-syntax.parser.js +5 -6
  117. package/services/typescript-syntax.parser.js.map +1 -1
  118. package/services/typescript.parser.js +13 -4
  119. package/services/typescript.parser.js.map +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"enum-declaration.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/enum-declaration.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"enum-declaration.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/enum-declaration.parser.ts"],"names":[],"mappings":"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"}
@@ -21,13 +21,13 @@ export class HeritageClauseParser {
21
21
  parseList() {
22
22
  const typescriptParser = this.typescriptParser;
23
23
  const clauseNodes = [];
24
- typescriptParser.context.enterList(TypeScriptListKind.HeritageClauses);
24
+ const outerListScope = typescriptParser.context.enterList(TypeScriptListKind.HeritageClauses);
25
25
  try {
26
26
  while (typescriptParser.currentNode instanceof TypeScriptExtendsKeywordNode || typescriptParser.currentNode instanceof TypeScriptImplementsKeywordNode)
27
27
  clauseNodes.push(this.parse(typescriptParser.currentNode));
28
28
  }
29
29
  finally {
30
- typescriptParser.context.leaveList();
30
+ typescriptParser.context.leaveList(outerListScope);
31
31
  }
32
32
  return clauseNodes;
33
33
  }
@@ -37,7 +37,7 @@ export class HeritageClauseParser {
37
37
  const typeNodes = [];
38
38
  const commaNodes = [];
39
39
  let endNode = keywordNode;
40
- typescriptParser.context.enterList(TypeScriptListKind.HeritageClauseElement);
40
+ const outerListScope = typescriptParser.context.enterList(TypeScriptListKind.HeritageClauseElement);
41
41
  try {
42
42
  while (!typescriptParser.isEndOfFile) {
43
43
  const node = typescriptParser.currentNode;
@@ -74,7 +74,7 @@ export class HeritageClauseParser {
74
74
  }
75
75
  }
76
76
  finally {
77
- typescriptParser.context.leaveList();
77
+ typescriptParser.context.leaveList(outerListScope);
78
78
  }
79
79
  const span = typescriptParser.typescriptLexer.reader.createSpan(keywordNode.span, endNode.span);
80
80
  const resultNode = new TypeScriptHeritageClauseNode(keywordNode, typeNodes, commaNodes, span, keywordNode.leadingTrivia, endNode.trailingTrivia);
@@ -1 +1 @@
1
- {"version":3,"file":"heritage-clause.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/heritage-clause.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"heritage-clause.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/heritage-clause.parser.ts"],"names":[],"mappings":"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"}
@@ -17,13 +17,10 @@ import { TypeScriptSemicolonNode } from "../../../models/nodes/delimiters/typesc
17
17
  import { TypeScriptAssertKeywordNode } from "../../../models/nodes/keywords/typescript-assert-keyword.node.js";
18
18
  import { TypeScriptWithKeywordNode } from "../../../models/nodes/keywords/typescript-with-keyword.node.js";
19
19
  import { Resources } from "../../../resources.js";
20
- import { IdentifierNameParser } from "../names/identifier-name.parser.js";
21
20
  export class ImportAttributesParser {
22
21
  typescriptParser;
23
- nameParser;
24
22
  constructor(typescriptParser) {
25
23
  this.typescriptParser = typescriptParser;
26
- this.nameParser = new IdentifierNameParser(typescriptParser);
27
24
  }
28
25
  parse() {
29
26
  const parser = this.typescriptParser;
@@ -56,12 +53,17 @@ export class ImportAttributesParser {
56
53
  }
57
54
  parseList(keywordNode, startNode, colonNode) {
58
55
  const parser = this.typescriptParser;
59
- parser.context.enterList(TypeScriptListKind.ImportAttributes);
56
+ const outerListScope = parser.context.enterList(TypeScriptListKind.ImportAttributes);
60
57
  try {
61
58
  const openBraceNode = parser.tryConsume(TypeScriptOpenBraceNode);
62
59
  const attributeNodes = [];
63
60
  const commaNodes = [];
64
- let endNode = openBraceNode ?? startNode;
61
+ const firstNode = startNode ?? openBraceNode;
62
+ if (Object.isUndefined(firstNode)) {
63
+ parser.reportExpected(Resources.openBrace);
64
+ return new TypeScriptImportAttributesNode(keywordNode, attributeNodes, commaNodes, parser.currentNode.getTypeScriptMissingNodeSpan(), undefined, undefined, colonNode, undefined, undefined);
65
+ }
66
+ let endNode = openBraceNode ?? firstNode;
65
67
  if (Object.isUndefined(openBraceNode))
66
68
  parser.reportExpected(Resources.openBrace);
67
69
  else
@@ -96,20 +98,17 @@ export class ImportAttributesParser {
96
98
  parser.context.diagnosticCollector.relateTypeScriptOpeningDelimiter(parser.context.source, openBraceNode.span, Resources.openBrace, Resources.closeBrace);
97
99
  }
98
100
  endNode = closeBraceNode ?? endNode;
99
- const firstNode = startNode ?? openBraceNode;
100
- const span = Object.isUndefined(endNode)
101
- ? parser.currentNode.getTypeScriptMissingNodeSpan()
102
- : parser.typescriptLexer.reader.createSpan(firstNode.span, endNode.span);
103
- return new TypeScriptImportAttributesNode(keywordNode, attributeNodes, commaNodes, span, openBraceNode, closeBraceNode, colonNode, firstNode?.leadingTrivia, endNode?.trailingTrivia);
101
+ const span = parser.typescriptLexer.reader.createSpan(firstNode.span, endNode.span);
102
+ return new TypeScriptImportAttributesNode(keywordNode, attributeNodes, commaNodes, span, openBraceNode, closeBraceNode, colonNode, firstNode.leadingTrivia, endNode.trailingTrivia);
104
103
  }
105
104
  finally {
106
- this.typescriptParser.context.leaveList();
105
+ this.typescriptParser.context.leaveList(outerListScope);
107
106
  }
108
107
  }
109
108
  parseAttribute() {
110
109
  const parser = this.typescriptParser;
111
110
  const startNode = parser.currentNode;
112
- const nameNode = this.nameParser.parseIdentifierOrStringName();
111
+ const nameNode = parser.consumeIdentifierName();
113
112
  const colonNode = parser.tryConsume(TypeScriptColonNode);
114
113
  if (Object.isUndefined(colonNode))
115
114
  parser.reportExpected(Resources.colon);
@@ -1 +1 @@
1
- {"version":3,"file":"import-attributes.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/import-attributes.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"import-attributes.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/import-attributes.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,6BAA6B,EAAE,MAAM,gEAAgE,CAAC;AAC/G,OAAO,EAAE,6BAA6B,EAAE,MAAM,wEAAwE,CAAC;AACvH,OAAO,EAAE,8BAA8B,EAAE,MAAM,yEAAyE,CAAC;AACzH,OAAO,EAAE,wBAAwB,EAAE,MAAM,iEAAiE,CAAC;AAC3G,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,2DAA2D,CAAC;AAChG,OAAO,EAAE,uBAAuB,EAAE,MAAM,gEAAgE,CAAC;AACzG,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,2BAA2B,EAAE,MAAM,kEAAkE,CAAC;AAC/G,OAAO,EAAE,yBAAyB,EAAE,MAAM,gEAAgE,CAAC;AAC3G,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,OAAO,sBAAsB;IAChB,gBAAgB,CAAyB;IAE1D,YAAmB,gBAAwC;QACzD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAEM,KAAK;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,CAAC,WAAW,YAAY,yBAAyB,CAAC,IAAI,CAAC,CAAC,WAAW,YAAY,2BAA2B,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;YACjJ,OAAO,SAAS,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAClD,CAAC;IAEM,mBAAmB;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACvC,MAAM,UAAU,GAAG,WAAW,YAAY,yBAAyB,IAAI,WAAW,YAAY,2BAA2B,CAAC;QAC1H,IAAI,UAAU;YACZ,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;;YAEjC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,6BAA6B,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5I,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC;YAC/B,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC7H,KAAK,MAAM,aAAa,IAAI,cAAc,CAAC,QAAQ;YACjD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3E,OAAO,cAAc,CAAC;IACxB,CAAC;IAEO,cAAc,CAAC,WAAoE;QACzF,IAAI,WAAW,YAAY,2BAA2B;YACpD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,6BAA6B,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QACzI,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC;IAEO,SAAS,CAAC,WAAgF,EAAE,SAA2B,EAC7H,SAA+B;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QACrF,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;YACjE,MAAM,cAAc,GAAoC,EAAE,CAAC;YAC3D,MAAM,UAAU,GAA0B,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,SAAS,IAAI,aAAa,CAAC;YAC7C,IAAI,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;gBAClC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC3C,OAAO,IAAI,8BAA8B,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,4BAA4B,EAAE,EAClI,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAC3D,CAAC;YACD,IAAI,OAAO,GAAS,aAAa,IAAI,SAAS,CAAC;YAC/C,IAAI,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC;gBACnC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;;gBAE3C,OAAO,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,YAAY,wBAAwB,CAAC,EAAE,CAAC;oBACxF,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,MAAM,CAAC,EAAE,CAAC;wBAC7F,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,6BAA6B,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;wBAC/H,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC;4BACvC,MAAM;wBACR,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;wBAC7B,MAAM,CAAC,OAAO,EAAE,CAAC;wBACjB,SAAS;oBACX,CAAC;oBACD,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;oBAC5C,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBACnC,OAAO,GAAG,aAAa,CAAC;oBACxB,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;oBACzD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;wBACnC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBAC3B,OAAO,GAAG,SAAS,CAAC;oBACtB,CAAC;yBACI,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,YAAY,wBAAwB,CAAC,EAAE,CAAC;wBAC1F,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;wBACvC,IAAI,MAAM,CAAC,WAAW,YAAY,uBAAuB,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,EAAE,CAAC;4BAC7F,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;4BAC7B,MAAM,CAAC,OAAO,EAAE,CAAC;wBACnB,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;YACnH,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC7E,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;gBAC5C,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,gCAAgC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,EAChI,SAAS,CAAC,UAAU,CAAC,CAAC;YAC1B,CAAC;YACD,OAAO,GAAG,cAAc,IAAI,OAAO,CAAC;YACpC,MAAM,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACpF,OAAO,IAAI,8BAA8B,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAC/H,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QACrD,CAAC;gBACO,CAAC;YACP,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAEO,cAAc;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;QACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,qBAAqB,EAAE,CAAC;QAChD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC;YAC/B,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QACpC,OAAO,IAAI,6BAA6B,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,EAC/G,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IACvF,CAAC;IAEO,UAAU;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;QAChC,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,4BAA4B,EAAE,IAAI,IAAI,YAAY,mBAAmB,IAAI,IAAI,YAAY,uBAAuB;YAC7I,OAAO,IAAI,CAAC,iCAAiC,CAAC,MAAM,CAAC,CAAC;QACxD,OAAO,MAAM,CAAC,yBAAyB,EAAE,CAAC;IAC5C,CAAC;CACF"}
@@ -24,14 +24,20 @@ export class ImportClauseParser {
24
24
  this.namedBindingsParser = new NamedBindingsParser(typescriptParser);
25
25
  }
26
26
  parse(defaultNameNode) {
27
- const parser = this.typescriptParser;
28
- const startNode = defaultNameNode ?? parser.currentNode;
29
- const commaNode = Object.isUndefined(defaultNameNode) ? undefined : parser.tryConsume(TypeScriptCommaNode);
30
- const namedBindingsNode = Object.isUndefined(defaultNameNode) || !Object.isUndefined(commaNode)
31
- ? parser.currentNode instanceof TypeScriptAsteriskNode ? this.parseNamespace() : this.namedBindingsParser.parseImports()
32
- : undefined;
33
- const endNode = namedBindingsNode ?? defaultNameNode;
34
- const span = parser.typescriptLexer.reader.createSpan(startNode.span, endNode.span);
27
+ if (Object.isUndefined(defaultNameNode)) {
28
+ const startNode = this.typescriptParser.currentNode;
29
+ const namedBindingsNode = this.parseNamedBindings();
30
+ return this.create(startNode, undefined, undefined, namedBindingsNode, namedBindingsNode);
31
+ }
32
+ const commaNode = this.typescriptParser.tryConsume(TypeScriptCommaNode);
33
+ const namedBindingsNode = Object.isUndefined(commaNode) ? undefined : this.parseNamedBindings();
34
+ return this.create(defaultNameNode, defaultNameNode, commaNode, namedBindingsNode, namedBindingsNode ?? defaultNameNode);
35
+ }
36
+ parseNamedBindings() {
37
+ return this.typescriptParser.currentNode instanceof TypeScriptAsteriskNode ? this.parseNamespace() : this.namedBindingsParser.parseImports();
38
+ }
39
+ create(startNode, defaultNameNode, commaNode, namedBindingsNode, endNode) {
40
+ const span = this.typescriptParser.typescriptLexer.reader.createSpan(startNode.span, endNode.span);
35
41
  return new TypeScriptImportClauseNode(span, defaultNameNode, commaNode, namedBindingsNode, startNode.leadingTrivia, endNode.trailingTrivia);
36
42
  }
37
43
  parseNamespace() {
@@ -1 +1 @@
1
- {"version":3,"file":"import-clause.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/import-clause.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"import-clause.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/import-clause.parser.ts"],"names":[],"mappings":"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"}
@@ -22,30 +22,29 @@ export class ImportExportSpecifierParser {
22
22
  this.nameParser = new IdentifierNameParser(typescriptParser);
23
23
  }
24
24
  parseImport() {
25
- return this.parse(true);
25
+ const parser = this.typescriptParser;
26
+ const specifierNode = this.parse(TypeScriptImportSpecifierNode);
27
+ const localNameNode = specifierNode.aliasNode ?? specifierNode.nameNode;
28
+ if ((localNameNode instanceof TypeScriptKeywordNode && !localNameNode.isTypeScriptBindingIdentifier())
29
+ || localNameNode instanceof TypeScriptStringLiteralNode)
30
+ parser.context.diagnosticCollector.addTypeScriptParseDiagnostic(TypeScriptDiagnosticTemplates.TS1003, localNameNode.span);
31
+ parser.readName(localNameNode);
32
+ return specifierNode;
26
33
  }
27
34
  parseExport() {
28
- return this.parse(false);
35
+ return this.parse(TypeScriptExportSpecifierNode);
29
36
  }
30
- parse(isImport) {
37
+ parse(nodeType) {
31
38
  const parser = this.typescriptParser;
32
39
  const startNode = parser.currentNode;
33
40
  const typeKeywordNode = this.isTypeOnly() ? parser.tryConsume(TypeScriptTypeKeywordNode) : undefined;
34
- const nameNode = this.nameParser.parseIdentifierOrStringName();
41
+ const nameNode = parser.consumeIdentifierName();
35
42
  const asKeywordNode = parser.tryConsume(TypeScriptAsKeywordNode);
36
43
  const aliasNode = Object.isUndefined(asKeywordNode) ? undefined
37
44
  : this.nameParser.parseIdentifierOrStringName() ?? new TypeScriptMissingIdentifierNode(parser.currentNode.getTypeScriptMissingNodeSpan());
38
- const localNameNode = aliasNode ?? nameNode;
39
- if (isImport && ((localNameNode instanceof TypeScriptKeywordNode && !localNameNode.isTypeScriptBindingIdentifier())
40
- || localNameNode instanceof TypeScriptStringLiteralNode))
41
- parser.context.diagnosticCollector.addTypeScriptParseDiagnostic(TypeScriptDiagnosticTemplates.TS1003, localNameNode.span);
42
- if (isImport)
43
- parser.readName(localNameNode);
44
- const endNode = localNameNode;
45
+ const endNode = aliasNode ?? nameNode;
45
46
  const span = parser.typescriptLexer.reader.createSpan(startNode.span, endNode.span);
46
- return isImport
47
- ? new TypeScriptImportSpecifierNode(span, nameNode, asKeywordNode, aliasNode, typeKeywordNode, startNode.leadingTrivia, endNode.trailingTrivia)
48
- : new TypeScriptExportSpecifierNode(span, nameNode, asKeywordNode, aliasNode, typeKeywordNode, startNode.leadingTrivia, endNode.trailingTrivia);
47
+ return new nodeType(span, nameNode, asKeywordNode, aliasNode, typeKeywordNode, startNode.leadingTrivia, endNode.trailingTrivia);
49
48
  }
50
49
  isTypeOnly() {
51
50
  const parser = this.typescriptParser;
@@ -1 +1 @@
1
- {"version":3,"file":"import-export-specifier.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/import-export-specifier.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"import-export-specifier.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/import-export-specifier.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,6BAA6B,EAAE,MAAM,gEAAgE,CAAC;AAC/G,OAAO,EAAE,6BAA6B,EAAE,MAAM,wEAAwE,CAAC;AAEvH,OAAO,EAAE,6BAA6B,EAAE,MAAM,wEAAwE,CAAC;AACvH,OAAO,EAAE,+BAA+B,EAAE,MAAM,yEAAyE,CAAC;AAC1H,OAAO,EAAE,uBAAuB,EAAE,MAAM,8DAA8D,CAAC;AACvG,OAAO,EAAE,qBAAqB,EAAE,MAAM,2DAA2D,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,MAAM,gEAAgE,CAAC;AAC3G,OAAO,EAAE,2BAA2B,EAAE,MAAM,kEAAkE,CAAC;AAE/G,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,OAAO,2BAA2B;IACrB,gBAAgB,CAAyB;IACzC,UAAU,CAAuB;IAElD,YAAmB,gBAAwC;QACzD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,IAAI,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;IAC/D,CAAC;IAEM,WAAW;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAChE,MAAM,aAAa,GAAG,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,QAAQ,CAAC;QACxE,IAAI,CAAC,aAAa,YAAY,qBAAqB,IAAI,CAAC,aAAa,CAAC,6BAA6B,EAAE,CAAC;eACjG,aAAa,YAAY,2BAA2B;YACvD,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,6BAA6B,CAAC,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5H,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC/B,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;IAEO,KAAK,CACX,QACqI;QACrI,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;QACrC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrG,MAAM,QAAQ,GAAG,MAAM,CAAC,qBAAqB,EAAE,CAAC;QAChD,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS;YAC7D,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,2BAA2B,EAAE,IAAI,IAAI,+BAA+B,CAAC,MAAM,CAAC,WAAW,CAAC,4BAA4B,EAAE,CAAC,CAAC;QAC5I,MAAM,OAAO,GAAG,SAAS,IAAI,QAAQ,CAAC;QACtC,MAAM,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACpF,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAClI,CAAC;IAEO,UAAU;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,YAAY,yBAAyB,CAAC;YAC5D,OAAO,KAAK,CAAC;QACf,OAAO,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE;YAC3B,MAAM,CAAC,qBAAqB,EAAE,CAAC;YAC/B,IAAI,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;YAC9B,IAAI,CAAC,CAAC,IAAI,YAAY,uBAAuB,CAAC;gBAC5C,OAAO,IAAI,CAAC,4BAA4B,EAAE,CAAC;YAC7C,MAAM,CAAC,qBAAqB,EAAE,CAAC;YAC/B,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;YAC1B,IAAI,CAAC,CAAC,IAAI,YAAY,uBAAuB,CAAC;gBAC5C,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC;YAC9C,MAAM,CAAC,qBAAqB,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,WAAW,CAAC,4BAA4B,EAAE,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"index-signature.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/index-signature.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index-signature.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/index-signature.parser.ts"],"names":[],"mappings":"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"}
@@ -15,6 +15,7 @@ import { TypeScriptAtNode } from "../../../models/nodes/delimiters/typescript-at
15
15
  import { TypeScriptDefaultKeywordNode } from "../../../models/nodes/keywords/typescript-default-keyword.node.js";
16
16
  import { TypeScriptExportKeywordNode } from "../../../models/nodes/keywords/typescript-export-keyword.node.js";
17
17
  import { TypeScriptStaticKeywordNode } from "../../../models/nodes/keywords/typescript-static-keyword.node.js";
18
+ import { TypeScriptModifierList } from "../../../models/typescript-modifier-list.js";
18
19
  import { DecoratorParser } from "./decorator.parser.js";
19
20
  export class ModifierParser {
20
21
  decoratorParser;
@@ -98,7 +99,12 @@ export class ModifierParser {
98
99
  }
99
100
  }
100
101
  parseDeclaration() {
101
- return this.parseModifiers((node, writtenNodes) => node.canParseTypeScriptDeclarationModifier(this.typescriptParser, writtenNodes));
102
+ return this.parseModifiers((node, writtenNodes) => this.canParseDeclarationModifier(node, writtenNodes));
103
+ }
104
+ parseDecoratedDeclaration(atNode) {
105
+ const firstNode = this.decoratorParser.parse(atNode);
106
+ const modifierNodes = this.parseModifiers((node, writtenNodes) => this.canParseDeclarationModifier(node, writtenNodes), [firstNode]);
107
+ return new TypeScriptModifierList(firstNode, modifierNodes.slice(1));
102
108
  }
103
109
  parseParameter() {
104
110
  return this.parseModifiers(t => t.canParseTypeScriptParameterModifier(this.typescriptParser));
@@ -118,8 +124,10 @@ export class ModifierParser {
118
124
  this.parseKeywords(modifierNodes, t => t.canParseTypeScriptParameterModifier(this.typescriptParser));
119
125
  return modifierNodes;
120
126
  }
121
- parseModifiers(canParseModifier) {
122
- const modifierNodes = [];
127
+ canParseDeclarationModifier(node, writtenNodes) {
128
+ return node.canParseTypeScriptDeclarationModifier(this.typescriptParser, writtenNodes);
129
+ }
130
+ parseModifiers(canParseModifier, modifierNodes = []) {
123
131
  this.parseDecorators(modifierNodes);
124
132
  const hasReadKeyword = this.parseKeywords(modifierNodes, canParseModifier);
125
133
  if (hasReadKeyword && this.typescriptParser.currentNode instanceof TypeScriptAtNode) {
@@ -1 +1 @@
1
- {"version":3,"file":"modifier.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/modifier.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"modifier.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/modifier.parser.ts"],"names":[],"mappings":"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"}
@@ -22,12 +22,12 @@ export class NamedBindingsParser {
22
22
  this.specifierParser = new ImportExportSpecifierParser(typescriptParser);
23
23
  }
24
24
  parseImports() {
25
- return this.parse(true);
25
+ return this.parse(() => this.specifierParser.parseImport(), TypeScriptNamedImportsNode);
26
26
  }
27
27
  parseExports() {
28
- return this.parse(false);
28
+ return this.parse(() => this.specifierParser.parseExport(), TypeScriptNamedExportsNode);
29
29
  }
30
- parse(isImport) {
30
+ parse(parseMember, nodeType) {
31
31
  const parser = this.typescriptParser;
32
32
  const startNode = parser.currentNode;
33
33
  const openBraceNode = parser.tryConsume(TypeScriptOpenBraceNode);
@@ -37,7 +37,7 @@ export class NamedBindingsParser {
37
37
  if (Object.isUndefined(openBraceNode))
38
38
  parser.reportExpected(Resources.openBrace);
39
39
  else {
40
- parser.context.enterList(TypeScriptListKind.ImportOrExportSpecifiers);
40
+ const outerListScope = parser.context.enterList(TypeScriptListKind.ImportOrExportSpecifiers);
41
41
  try {
42
42
  while (!parser.isEndOfFile && !(parser.currentNode instanceof TypeScriptCloseBraceNode) && !parser.currentNode.startsTypeScriptFromClause(parser)) {
43
43
  if (!parser.currentNode.isTypeScriptListElement(TypeScriptListKind.ImportOrExportSpecifiers, parser)) {
@@ -48,7 +48,7 @@ export class NamedBindingsParser {
48
48
  parser.advance();
49
49
  continue;
50
50
  }
51
- const memberNode = isImport ? this.specifierParser.parseImport() : this.specifierParser.parseExport();
51
+ const memberNode = parseMember();
52
52
  memberNodes.push(memberNode);
53
53
  endNode = memberNode;
54
54
  const commaNode = parser.tryConsume(TypeScriptCommaNode);
@@ -61,7 +61,7 @@ export class NamedBindingsParser {
61
61
  }
62
62
  }
63
63
  finally {
64
- parser.context.leaveList();
64
+ parser.context.leaveList(outerListScope);
65
65
  }
66
66
  }
67
67
  const closeBraceNode = Object.isUndefined(openBraceNode) ? undefined : parser.tryConsume(TypeScriptCloseBraceNode);
@@ -71,9 +71,7 @@ export class NamedBindingsParser {
71
71
  const span = Object.isUndefined(endNode)
72
72
  ? startNode.getTypeScriptMissingNodeSpan()
73
73
  : parser.typescriptLexer.reader.createSpan(startNode.span, endNode.span);
74
- return isImport
75
- ? new TypeScriptNamedImportsNode(memberNodes, commaNodes, span, openBraceNode, closeBraceNode, openBraceNode?.leadingTrivia, endNode?.trailingTrivia)
76
- : new TypeScriptNamedExportsNode(memberNodes, commaNodes, span, openBraceNode, closeBraceNode, openBraceNode?.leadingTrivia, endNode?.trailingTrivia);
74
+ return new nodeType(memberNodes, commaNodes, span, openBraceNode, closeBraceNode, openBraceNode?.leadingTrivia, endNode?.trailingTrivia);
77
75
  }
78
76
  }
79
77
  //# sourceMappingURL=named-bindings.parser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"named-bindings.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/named-bindings.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"named-bindings.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/named-bindings.parser.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,7 @@ import { TypeScriptPrivateIdentifierNode } from "../../../models/nodes/identifie
21
21
  import { TypeScriptThisKeywordNode } from "../../../models/nodes/keywords/typescript-this-keyword.node.js";
22
22
  import { TypeScriptEqualsNode } from "../../../models/nodes/operators/typescript-equals.node.js";
23
23
  import { TypeScriptQuestionNode } from "../../../models/nodes/operators/typescript-question.node.js";
24
+ import { TypeScriptParameterListRead } from "../../../models/typescript-parameter-list-read.js";
24
25
  import { Resources } from "../../../resources.js";
25
26
  import { BindingNameParser } from "../names/binding-name.parser.js";
26
27
  import { ModifierParser } from "./modifier.parser.js";
@@ -34,33 +35,59 @@ export class ParameterListParser {
34
35
  this.modifierParser = new ModifierParser(typescriptParser);
35
36
  }
36
37
  parseConstructorParameters() {
37
- return this.parseList(false, this.typescriptParser.context.awaitFlags, true);
38
+ return this.parseList(this.typescriptParser.context.awaitFlags, true);
38
39
  }
39
- parseList(isParameterNameRequired, enclosingAwaitFlags, holdsParameterProperties = false) {
40
+ parseList(enclosingAwaitFlags, holdsParameterProperties = false) {
40
41
  const typescriptParser = this.typescriptParser;
41
- const parsedOpenParenthesisNode = typescriptParser.tryConsume(TypeScriptOpenParenthesisNode);
42
- if (Object.isUndefined(parsedOpenParenthesisNode)) {
42
+ const openParenthesisNode = typescriptParser.tryConsume(TypeScriptOpenParenthesisNode);
43
+ if (Object.isUndefined(openParenthesisNode)) {
43
44
  typescriptParser.reportExpected(Resources.openParenthesis);
44
45
  return new TypeScriptParameterListNode(undefined, [], [], typescriptParser.currentNode.getTypeScriptMissingNodeSpan());
45
46
  }
46
47
  const parameterNodes = [];
47
48
  const commaNodes = [];
48
- let endNode = this.parseParameters(parsedOpenParenthesisNode, parameterNodes, commaNodes, isParameterNameRequired, enclosingAwaitFlags, holdsParameterProperties);
49
- if (Object.isUndefined(endNode))
50
- return undefined;
49
+ const endNode = this.readParameters(openParenthesisNode, parameterNodes, commaNodes, () => true, enclosingAwaitFlags, holdsParameterProperties)
50
+ .endNode;
51
+ return this.closeList(openParenthesisNode, parameterNodes, commaNodes, endNode);
52
+ }
53
+ tryParseList(openParenthesisNode, isParameterNameRequired, enclosingAwaitFlags) {
54
+ this.typescriptParser.advance();
55
+ const parameterNodes = [];
56
+ const commaNodes = [];
57
+ const endNode = this.tryParseParameters(openParenthesisNode, parameterNodes, commaNodes, isParameterNameRequired, enclosingAwaitFlags);
58
+ return Object.isUndefined(endNode) ? undefined : this.closeList(openParenthesisNode, parameterNodes, commaNodes, endNode);
59
+ }
60
+ closeList(openParenthesisNode, parameterNodes, commaNodes, parametersEndNode) {
61
+ const typescriptParser = this.typescriptParser;
62
+ let endNode = parametersEndNode;
51
63
  const closeParenthesisNode = typescriptParser.tryConsume(TypeScriptCloseParenthesisNode);
52
64
  if (Object.isUndefined(closeParenthesisNode))
53
65
  typescriptParser.reportExpected(Resources.closeParenthesis);
54
66
  else
55
67
  endNode = closeParenthesisNode;
56
- const span = typescriptParser.typescriptLexer.reader.createSpan(parsedOpenParenthesisNode.span, endNode.span);
57
- const resultNode = new TypeScriptParameterListNode(parsedOpenParenthesisNode, parameterNodes, commaNodes, span, closeParenthesisNode, parsedOpenParenthesisNode.leadingTrivia, endNode.trailingTrivia);
68
+ const span = typescriptParser.typescriptLexer.reader.createSpan(openParenthesisNode.span, endNode.span);
69
+ const resultNode = new TypeScriptParameterListNode(openParenthesisNode, parameterNodes, commaNodes, span, closeParenthesisNode, openParenthesisNode.leadingTrivia, endNode.trailingTrivia);
58
70
  return resultNode;
59
71
  }
60
- parseParameters(openNode, parameterNodes, commaNodes, isParameterNameRequired = false, enclosingAwaitFlags = this.typescriptParser.context.awaitFlags, holdsParameterProperties = false) {
72
+ parseParameters(openNode, parameterNodes, commaNodes) {
73
+ return this.readParameters(openNode, parameterNodes, commaNodes, () => true, this.typescriptParser.context.awaitFlags, false).endNode;
74
+ }
75
+ tryParseParameters(openNode, parameterNodes, commaNodes, isParameterNameRequired, enclosingAwaitFlags = this.typescriptParser.context.awaitFlags) {
76
+ const read = this.readParameters(openNode, parameterNodes, commaNodes, () => !isParameterNameRequired || this.startsNamedParameter(enclosingAwaitFlags), enclosingAwaitFlags, false);
77
+ return read.isComplete ? read.endNode : undefined;
78
+ }
79
+ startsNamedParameter(enclosingAwaitFlags) {
80
+ const typescriptParser = this.typescriptParser;
81
+ return typescriptParser.lookAhead(() => {
82
+ this.parseModifiers(enclosingAwaitFlags);
83
+ typescriptParser.tryConsume(TypeScriptDotDotDotNode);
84
+ return typescriptParser.currentNode.canStartTypeScriptBindingName() || typescriptParser.currentNode instanceof TypeScriptThisKeywordNode;
85
+ });
86
+ }
87
+ readParameters(openNode, parameterNodes, commaNodes, canParse, enclosingAwaitFlags, holdsParameterProperties) {
61
88
  const typescriptParser = this.typescriptParser;
62
89
  let endNode = openNode;
63
- typescriptParser.context.enterList(TypeScriptListKind.Parameters);
90
+ const outerListScope = typescriptParser.context.enterList(TypeScriptListKind.Parameters);
64
91
  try {
65
92
  while (!typescriptParser.isEndOfFile && !typescriptParser.currentNode.isTypeScriptListTerminator(TypeScriptListKind.Parameters, typescriptParser)) {
66
93
  const startNode = typescriptParser.currentNode;
@@ -72,12 +99,8 @@ export class ParameterListParser {
72
99
  typescriptParser.advance();
73
100
  continue;
74
101
  }
75
- if (isParameterNameRequired && !typescriptParser.lookAhead(() => {
76
- this.parseModifiers(enclosingAwaitFlags);
77
- typescriptParser.tryConsume(TypeScriptDotDotDotNode);
78
- return typescriptParser.currentNode.canStartTypeScriptBindingName() || typescriptParser.currentNode instanceof TypeScriptThisKeywordNode;
79
- }))
80
- return undefined;
102
+ if (!canParse())
103
+ return new TypeScriptParameterListRead(endNode, false);
81
104
  const parameterNode = this.parseParameter(undefined, enclosingAwaitFlags, holdsParameterProperties);
82
105
  parameterNodes.push(parameterNode);
83
106
  endNode = parameterNode;
@@ -95,10 +118,10 @@ export class ParameterListParser {
95
118
  typescriptParser.advance();
96
119
  }
97
120
  }
98
- return endNode;
121
+ return new TypeScriptParameterListRead(endNode, true);
99
122
  }
100
123
  finally {
101
- typescriptParser.context.leaveList();
124
+ typescriptParser.context.leaveList(outerListScope);
102
125
  }
103
126
  }
104
127
  validate(parameterListNode, typeParameterListNode) {
@@ -154,13 +177,19 @@ export class ParameterListParser {
154
177
  const enclosingAwaitFlags = context.awaitFlags;
155
178
  context.contextFlags = previousFlags & ~(TypeScriptContextFlags.Yield | enclosingAwaitFlags);
156
179
  try {
157
- return this.parseList(false, enclosingAwaitFlags);
180
+ return this.parseList(enclosingAwaitFlags);
158
181
  }
159
182
  finally {
160
183
  context.contextFlags = previousFlags;
161
184
  }
162
185
  }
163
- parseFunctionParameters(flags = TypeScriptContextFlags.None, isParameterNameRequired = false, isNewTargetScope = false) {
186
+ parseFunctionParameters(flags = TypeScriptContextFlags.None, isNewTargetScope = false) {
187
+ return this.inFunctionScope(flags, isNewTargetScope, enclosingAwaitFlags => this.parseList(enclosingAwaitFlags));
188
+ }
189
+ tryParseFunctionParameters(openParenthesisNode, flags, isParameterNameRequired, isNewTargetScope) {
190
+ return this.inFunctionScope(flags, isNewTargetScope, enclosingAwaitFlags => this.tryParseList(openParenthesisNode, isParameterNameRequired, enclosingAwaitFlags));
191
+ }
192
+ inFunctionScope(flags, isNewTargetScope, parse) {
164
193
  const context = this.typescriptParser.context;
165
194
  const previousFlags = context.contextFlags;
166
195
  const previousFunctionScope = context.isFunctionScope;
@@ -172,7 +201,7 @@ export class ParameterListParser {
172
201
  context.isNewTargetScope = isNewTargetScope;
173
202
  context.isClassStaticBlock = false;
174
203
  try {
175
- return this.parseList(isParameterNameRequired, enclosingAwaitFlags);
204
+ return parse(enclosingAwaitFlags);
176
205
  }
177
206
  finally {
178
207
  context.contextFlags = previousFlags;