@noldova/context.parsers.typescript 0.0.7 → 0.0.8

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 (106) hide show
  1. package/extensions/diagnostic-collector.extensions.js +2 -12
  2. package/extensions/diagnostic-collector.extensions.js.map +1 -1
  3. package/extensions/nodes/declarations/typescript-export-assignment.node.extensions.js +3 -2
  4. package/extensions/nodes/declarations/typescript-export-assignment.node.extensions.js.map +1 -1
  5. package/extensions/nodes/declarations/typescript-import-declaration.node.extensions.js +3 -2
  6. package/extensions/nodes/declarations/typescript-import-declaration.node.extensions.js.map +1 -1
  7. package/extensions/nodes/declarations/typescript-parameter-list.node.extensions.js +1 -2
  8. package/extensions/nodes/declarations/typescript-parameter-list.node.extensions.js.map +1 -1
  9. package/extensions/nodes/delimiters/typescript-at.node.extensions.js +1 -1
  10. package/extensions/nodes/delimiters/typescript-at.node.extensions.js.map +1 -1
  11. package/extensions/nodes/statements/typescript-for-in-or-of-statement.node.extensions.js +3 -2
  12. package/extensions/nodes/statements/typescript-for-in-or-of-statement.node.extensions.js.map +1 -1
  13. package/extensions/nodes/typescript-delimited-list.node.extensions.js +1 -1
  14. package/extensions/nodes/typescript-delimited-list.node.extensions.js.map +1 -1
  15. package/models/typescript-arrow-function-parts.js +30 -0
  16. package/models/typescript-arrow-function-parts.js.map +1 -0
  17. package/models/typescript-deferred-records.js +4 -4
  18. package/models/typescript-deferred-records.js.map +1 -1
  19. package/models/typescript-function-parts.js +38 -0
  20. package/models/typescript-function-parts.js.map +1 -0
  21. package/models/typescript-modifier-list.js +16 -0
  22. package/models/typescript-modifier-list.js.map +1 -0
  23. package/models/typescript-parameter-list-read.js +16 -0
  24. package/models/typescript-parameter-list-read.js.map +1 -0
  25. package/models/typescript-parser-context.js +18 -17
  26. package/models/typescript-parser-context.js.map +1 -1
  27. package/models/typescript-region-set.js +4 -1
  28. package/models/typescript-region-set.js.map +1 -1
  29. package/models/typescript-spelling-distance-row.js +21 -0
  30. package/models/typescript-spelling-distance-row.js.map +1 -0
  31. package/package.json +7 -7
  32. package/services/keyword-spelling-suggester.js +16 -18
  33. package/services/keyword-spelling-suggester.js.map +1 -1
  34. package/services/lexers/trivia.lexer.js +6 -4
  35. package/services/lexers/trivia.lexer.js.map +1 -1
  36. package/services/parsers/class.parser.js +12 -17
  37. package/services/parsers/class.parser.js.map +1 -1
  38. package/services/parsers/clauses/switch-clause.parser.js +2 -2
  39. package/services/parsers/clauses/switch-clause.parser.js.map +1 -1
  40. package/services/parsers/declarations/class-body.parser.js +2 -2
  41. package/services/parsers/declarations/class-body.parser.js.map +1 -1
  42. package/services/parsers/declarations/class-member.parser.js +7 -6
  43. package/services/parsers/declarations/class-member.parser.js.map +1 -1
  44. package/services/parsers/declarations/declaration.parser.js +3 -2
  45. package/services/parsers/declarations/declaration.parser.js.map +1 -1
  46. package/services/parsers/declarations/enum-declaration.parser.js +2 -2
  47. package/services/parsers/declarations/enum-declaration.parser.js.map +1 -1
  48. package/services/parsers/declarations/heritage-clause.parser.js +4 -4
  49. package/services/parsers/declarations/heritage-clause.parser.js.map +1 -1
  50. package/services/parsers/declarations/import-attributes.parser.js +11 -12
  51. package/services/parsers/declarations/import-attributes.parser.js.map +1 -1
  52. package/services/parsers/declarations/import-clause.parser.js +14 -8
  53. package/services/parsers/declarations/import-clause.parser.js.map +1 -1
  54. package/services/parsers/declarations/import-export-specifier.parser.js +13 -14
  55. package/services/parsers/declarations/import-export-specifier.parser.js.map +1 -1
  56. package/services/parsers/declarations/index-signature.parser.js.map +1 -1
  57. package/services/parsers/declarations/modifier.parser.js +11 -3
  58. package/services/parsers/declarations/modifier.parser.js.map +1 -1
  59. package/services/parsers/declarations/named-bindings.parser.js +7 -9
  60. package/services/parsers/declarations/named-bindings.parser.js.map +1 -1
  61. package/services/parsers/declarations/parameter-list.parser.js +51 -22
  62. package/services/parsers/declarations/parameter-list.parser.js.map +1 -1
  63. package/services/parsers/declarations/variable-declaration-list.parser.js +2 -2
  64. package/services/parsers/declarations/variable-declaration-list.parser.js.map +1 -1
  65. package/services/parsers/expressions/argument-list.parser.js +2 -2
  66. package/services/parsers/expressions/argument-list.parser.js.map +1 -1
  67. package/services/parsers/expressions/array-literal-expression.parser.js +2 -2
  68. package/services/parsers/expressions/array-literal-expression.parser.js.map +1 -1
  69. package/services/parsers/expressions/arrow-function.parser.js +69 -38
  70. package/services/parsers/expressions/arrow-function.parser.js.map +1 -1
  71. package/services/parsers/expressions/assignment-expression.parser.js +3 -2
  72. package/services/parsers/expressions/assignment-expression.parser.js.map +1 -1
  73. package/services/parsers/expressions/object-literal-expression.parser.js +2 -2
  74. package/services/parsers/expressions/object-literal-expression.parser.js.map +1 -1
  75. package/services/parsers/expressions/parenthesized-expression.parser.js +6 -7
  76. package/services/parsers/expressions/parenthesized-expression.parser.js.map +1 -1
  77. package/services/parsers/function.parser.js +6 -7
  78. package/services/parsers/function.parser.js.map +1 -1
  79. package/services/parsers/names/binding-name.parser.js +4 -4
  80. package/services/parsers/names/binding-name.parser.js.map +1 -1
  81. package/services/parsers/source.parser.js +20 -24
  82. package/services/parsers/source.parser.js.map +1 -1
  83. package/services/parsers/statements/block.parser.js +2 -2
  84. package/services/parsers/statements/block.parser.js.map +1 -1
  85. package/services/parsers/statements/for-statement.parser.js +2 -2
  86. package/services/parsers/statements/for-statement.parser.js.map +1 -1
  87. package/services/parsers/statements/switch-statement.parser.js +2 -2
  88. package/services/parsers/statements/switch-statement.parser.js.map +1 -1
  89. package/services/parsers/statements/try-statement.parser.js +4 -1
  90. package/services/parsers/statements/try-statement.parser.js.map +1 -1
  91. package/services/parsers/types/tuple-type.parser.js +2 -2
  92. package/services/parsers/types/tuple-type.parser.js.map +1 -1
  93. package/services/parsers/types/type-argument-list.parser.js +19 -11
  94. package/services/parsers/types/type-argument-list.parser.js.map +1 -1
  95. package/services/parsers/types/type-literal.parser.js +4 -2
  96. package/services/parsers/types/type-literal.parser.js.map +1 -1
  97. package/services/parsers/types/type-member.parser.js +2 -2
  98. package/services/parsers/types/type-member.parser.js.map +1 -1
  99. package/services/parsers/types/type-parameter-list.parser.js +2 -2
  100. package/services/parsers/types/type-parameter-list.parser.js.map +1 -1
  101. package/services/parsers/types/type.parser.js +1 -2
  102. package/services/parsers/types/type.parser.js.map +1 -1
  103. package/services/typescript-syntax.parser.js +5 -6
  104. package/services/typescript-syntax.parser.js.map +1 -1
  105. package/services/typescript.parser.js +7 -1
  106. package/services/typescript.parser.js.map +1 -1
@@ -6,6 +6,7 @@
6
6
  * LICENSE file in the root directory of this source tree.
7
7
  */
8
8
  import "@noldova/context.core";
9
+ import { TypeScriptSpellingDistanceRow } from "../models/typescript-spelling-distance-row.js";
9
10
  import { Resources } from "../resources.js";
10
11
  import { TypeScriptKeywordNodeFactory } from "./typescript-keyword-node-factory.js";
11
12
  export class KeywordSpellingSuggester {
@@ -38,36 +39,33 @@ export class KeywordSpellingSuggester {
38
39
  return undefined;
39
40
  }
40
41
  static distance(source, target, budget) {
41
- let previous = target.map((_, index) => index + 1);
42
- previous.unshift(0);
43
- let current = new Array(target.length + 1);
44
42
  const beyond = budget + Resources.spellingBudgetMargin;
45
- for (let row = 1; row <= source.length; row++) {
46
- const character = source[row - 1];
43
+ let previous = new TypeScriptSpellingDistanceRow(beyond);
44
+ for (let column = 0; column <= target.length; column++)
45
+ previous.write(column, column);
46
+ for (const [sourceIndex, character] of source.entries()) {
47
+ const row = sourceIndex + 1;
47
48
  const firstColumn = Math.max(Math.ceil(row - budget), 1);
48
49
  const lastColumn = Math.min(Math.floor(budget + row), target.length);
50
+ const current = new TypeScriptSpellingDistanceRow(beyond);
49
51
  let columnMinimum = row;
50
- current[0] = row;
51
- for (let column = 1; column < firstColumn; column++)
52
- current[column] = beyond;
53
- for (let column = firstColumn; column <= lastColumn; column++) {
54
- const other = target[column - 1];
55
- const substitution = previous[column - 1] + (character.toLowerCase() === other.toLowerCase()
52
+ current.write(0, row);
53
+ for (const [offset, other] of target.slice(firstColumn - 1, lastColumn).entries()) {
54
+ const column = firstColumn + offset;
55
+ const substitution = previous.read(column - 1) + (character.toLowerCase() === other.toLowerCase()
56
56
  ? Resources.spellingCaseChangeCost
57
57
  : Resources.spellingSubstitutionCost);
58
58
  const distance = character === other
59
- ? previous[column - 1]
60
- : Math.min(previous[column] + Resources.spellingEditCost, current[column - 1] + Resources.spellingEditCost, substitution);
61
- current[column] = distance;
59
+ ? previous.read(column - 1)
60
+ : Math.min(previous.read(column) + Resources.spellingEditCost, current.read(column - 1) + Resources.spellingEditCost, substitution);
61
+ current.write(column, distance);
62
62
  columnMinimum = Math.min(columnMinimum, distance);
63
63
  }
64
- for (let column = lastColumn + 1; column <= target.length; column++)
65
- current[column] = beyond;
66
64
  if (columnMinimum > budget)
67
65
  return undefined;
68
- [previous, current] = [current, previous];
66
+ previous = current;
69
67
  }
70
- const result = previous[target.length];
68
+ const result = previous.read(target.length);
71
69
  return result > budget ? undefined : result;
72
70
  }
73
71
  }
@@ -1 +1 @@
1
- {"version":3,"file":"keyword-spelling-suggester.js","sourceRoot":"","sources":["../../../../src/parsers/noldova.context.parsers.typescript/src/services/keyword-spelling-suggester.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keyword-spelling-suggester.js","sourceRoot":"","sources":["../../../../src/parsers/noldova.context.parsers.typescript/src/services/keyword-spelling-suggester.ts"],"names":[],"mappings":"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"}
@@ -20,6 +20,7 @@ import { TypeScriptCharacterClassifier } from "./typescript-character-classifier
20
20
  export class TriviaLexer {
21
21
  lex(lexer) {
22
22
  const reader = lexer.reader;
23
+ const triviaStartOffset = reader.currentOffset;
23
24
  let trivia;
24
25
  while (!reader.isAtEnd) {
25
26
  const startOffset = reader.currentOffset;
@@ -70,10 +71,11 @@ export class TriviaLexer {
70
71
  }
71
72
  if (Object.isUndefined(trivia))
72
73
  return undefined;
73
- const first = trivia[0];
74
- if (trivia.length === 1)
74
+ if (trivia.length === 1) {
75
+ const [first] = trivia;
75
76
  return first;
76
- const span = reader.createSpan(first.span.startOffset, reader.currentOffset - first.span.startOffset);
77
+ }
78
+ const span = reader.createSpan(triviaStartOffset, reader.currentOffset - triviaStartOffset);
77
79
  return new TypeScriptTriviaNode(trivia, span);
78
80
  }
79
81
  static isLineCommentDirective(text) {
@@ -99,7 +101,7 @@ export class TriviaLexer {
99
101
  }
100
102
  static lastLineStart(text) {
101
103
  for (let index = text.length - 1; index >= 0; index--)
102
- if (TypeScriptCharacterClassifier.isLineTerminator(text[index]))
104
+ if (TypeScriptCharacterClassifier.isLineTerminator(text.charAt(index)))
103
105
  return index + 1;
104
106
  return 0;
105
107
  }
@@ -1 +1 @@
1
- {"version":3,"file":"trivia.lexer.js","sourceRoot":"","sources":["../../../../../src/parsers/noldova.context.parsers.typescript/src/services/lexers/trivia.lexer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"trivia.lexer.js","sourceRoot":"","sources":["../../../../../src/parsers/noldova.context.parsers.typescript/src/services/lexers/trivia.lexer.ts"],"names":[],"mappings":"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"}
@@ -36,26 +36,26 @@ export class ClassParser {
36
36
  this.typeParameterListParser = new TypeParameterListParser(typescriptParser);
37
37
  }
38
38
  parseDeclaration(classKeywordNode, modifierNodes = []) {
39
- return this.parse(classKeywordNode, true, modifierNodes);
39
+ return this.parse(classKeywordNode, modifierNodes, TypeScriptClassDeclarationNode);
40
40
  }
41
41
  parseExpression(classKeywordNode) {
42
- return this.parse(classKeywordNode, false, []);
42
+ return this.parse(classKeywordNode, [], TypeScriptClassExpressionNode);
43
43
  }
44
- parseDecoratedExpression() {
44
+ parseDecoratedExpression(atNode) {
45
45
  const parser = this.typescriptParser;
46
- const startNode = parser.currentNode;
47
- const modifierNodes = this.modifierParser.parseDeclaration();
46
+ const modifierList = this.modifierParser.parseDecoratedDeclaration(atNode);
47
+ const modifierNodes = modifierList.nodes;
48
48
  const classKeywordNode = parser.currentNode;
49
49
  if (classKeywordNode instanceof TypeScriptClassKeywordNode) {
50
- const expressionNode = this.parse(classKeywordNode, false, modifierNodes);
50
+ const expressionNode = this.parse(classKeywordNode, modifierNodes, TypeScriptClassExpressionNode);
51
51
  this.modifierParser.validate(modifierNodes, TypeScriptModifierTarget.ModuleElement, expressionNode);
52
52
  return expressionNode;
53
53
  }
54
- const endNode = modifierNodes.at(-1);
54
+ const endNode = modifierList.lastNode;
55
55
  parser.context.diagnosticCollector.addTypeScriptParseDiagnostic(TypeScriptDiagnosticTemplates.TS1109, parser.typescriptLexer.reader.createSpan(endNode.span.endOffset, 0));
56
- return new TypeScriptMissingDeclarationNode(modifierNodes, parser.typescriptLexer.reader.createSpan(startNode.span, endNode.span), startNode.leadingTrivia, endNode.trailingTrivia);
56
+ return new TypeScriptMissingDeclarationNode(modifierNodes, parser.typescriptLexer.reader.createSpan(atNode.span, endNode.span), atNode.leadingTrivia, endNode.trailingTrivia);
57
57
  }
58
- parse(classKeywordNode, isDeclaration, modifierNodes) {
58
+ parse(classKeywordNode, modifierNodes, nodeType) {
59
59
  const parser = this.typescriptParser;
60
60
  const context = parser.context;
61
61
  const startNode = modifierNodes[0] ?? classKeywordNode;
@@ -79,14 +79,9 @@ export class ClassParser {
79
79
  if (modifierNodes.some(t => t instanceof TypeScriptDeclareKeywordNode))
80
80
  context.records.awaitNameCount = previousAwaitNameCount;
81
81
  const span = parser.typescriptLexer.reader.createSpan(startNode.span, bodyNode.span);
82
- if (isDeclaration) {
83
- const declarationNode = new TypeScriptClassDeclarationNode(classKeywordNode, heritageClauseNodes, span, bodyNode, nameNode, typeParameterListNode, modifierNodes, startNode.leadingTrivia, bodyNode.trailingTrivia);
84
- declarationNode.validateTypeScriptGrammar(context);
85
- return declarationNode;
86
- }
87
- const expressionNode = new TypeScriptClassExpressionNode(classKeywordNode, heritageClauseNodes, span, bodyNode, nameNode, typeParameterListNode, modifierNodes, startNode.leadingTrivia, bodyNode.trailingTrivia);
88
- expressionNode.validateTypeScriptGrammar(context);
89
- return expressionNode;
82
+ const classNode = new nodeType(classKeywordNode, heritageClauseNodes, span, bodyNode, nameNode, typeParameterListNode, modifierNodes, startNode.leadingTrivia, bodyNode.trailingTrivia);
83
+ classNode.validateTypeScriptGrammar(context);
84
+ return classNode;
90
85
  }
91
86
  finally {
92
87
  context.contextFlags = previousFlags;
@@ -1 +1 @@
1
- {"version":3,"file":"class.parser.js","sourceRoot":"","sources":["../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/class.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"class.parser.js","sourceRoot":"","sources":["../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/class.parser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,kCAAkC,EAAE,MAAM,sDAAsD,CAAC;AAC1G,OAAO,EAAE,6BAA6B,EAAE,MAAM,6DAA6D,CAAC;AAE5G,OAAO,EAAE,8BAA8B,EAAE,MAAM,sEAAsE,CAAC;AAEtH,OAAO,EAAE,gCAAgC,EAAE,MAAM,wEAAwE,CAAC;AAE1H,OAAO,EAAE,uBAAuB,EAAE,MAAM,6DAA6D,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,oEAAoE,CAAC;AACnH,OAAO,EAAE,6BAA6B,EAAE,MAAM,iEAAiE,CAAC;AAChH,OAAO,EAAE,0BAA0B,EAAE,MAAM,8DAA8D,CAAC;AAC1G,OAAO,EAAE,4BAA4B,EAAE,MAAM,gEAAgE,CAAC;AAC9G,OAAO,EAAE,2BAA2B,EAAE,MAAM,+DAA+D,CAAC;AAC5G,OAAO,EAAE,+BAA+B,EAAE,MAAM,mEAAmE,CAAC;AAIpH,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,MAAM,OAAO,WAAW;IACL,eAAe,CAAkB;IACjC,oBAAoB,CAAuB;IAC3C,cAAc,CAAiB;IAC/B,uBAAuB,CAA0B;IACjD,gBAAgB,CAAyB;IAE1D,YAAmB,gBAAwC;QACzD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAC7D,IAAI,CAAC,oBAAoB,GAAG,IAAI,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;QACvE,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,gBAAgB,CAAC,CAAC;QAC3D,IAAI,CAAC,uBAAuB,GAAG,IAAI,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAC/E,CAAC;IAEM,gBAAgB,CAAC,gBAA4C,EAAE,aAAa,GAAoB,EAAE;QACvG,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,aAAa,EAAE,8BAA8B,CAAC,CAAC;IACrF,CAAC;IAEM,eAAe,CAAC,gBAA4C;QACjE,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,EAAE,6BAA6B,CAAC,CAAC;IACzE,CAAC;IAEM,wBAAwB,CAAC,MAAwB;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;QAC3E,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC;QACzC,MAAM,gBAAgB,GAAG,MAAM,CAAC,WAAW,CAAC;QAC5C,IAAI,gBAAgB,YAAY,0BAA0B,EAAE,CAAC;YAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,aAAa,EAAE,6BAA6B,CAAC,CAAC;YAClG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,aAAa,EAAE,wBAAwB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;YACpG,OAAO,cAAc,CAAC;QACxB,CAAC;QACD,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC;QACtC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,6BAA6B,CAAC,MAAM,EAClG,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QACvE,OAAO,IAAI,gCAAgC,CAAC,aAAa,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAC5H,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAoC,gBAA4C,EAAE,aAA8B,EAC3H,QAE6G;QAC7G,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC;QACvD,MAAM,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;QAC3C,MAAM,yBAAyB,GAAG,OAAO,CAAC,mBAAmB,CAAC;QAC9D,MAAM,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACzD,MAAM,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;QAC9D,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;QACjC,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,qBAAqB,GAAG,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,kCAAkC,CAAC,KAAK,GAAG,kCAAkC,CAAC,QAAQ,CAAC,CAAC;YACzJ,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,2BAA2B,CAAC;gBACnE,OAAO,CAAC,YAAY,IAAI,sBAAsB,CAAC,KAAK,CAAC;YACvD,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC;YAElE,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC;YACzC,OAAO,CAAC,mBAAmB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,6BAA6B,CAAC,CAAC;YAClG,MAAM,QAAQ,GAAG,aAAa,YAAY,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC;YACrJ,QAAQ,CAAC,0CAA0C,CAAC,OAAO,CAAC,CAAC;YAC7D,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,4BAA4B,CAAC;gBACpE,OAAO,CAAC,OAAO,CAAC,cAAc,GAAG,sBAAsB,CAAC;YAE1D,MAAM,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACrF,MAAM,SAAS,GAAG,IAAI,QAAQ,CAC5B,gBAAgB,EAAE,mBAAmB,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,qBAAqB,EAAE,aAAa,EAAE,SAAS,CAAC,aAAa,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;YAE3J,SAAS,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;YAC7C,OAAO,SAAS,CAAC;QACnB,CAAC;gBACO,CAAC;YACP,OAAO,CAAC,YAAY,GAAG,aAAa,CAAC;YACrC,OAAO,CAAC,mBAAmB,GAAG,yBAAyB,CAAC;YACxD,OAAO,CAAC,iBAAiB,GAAG,sBAAsB,CAAC;YACnD,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC;IAEO,YAAY;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,6BAA6B,EAAE;YACrD,OAAO,SAAS,CAAC;QAEnB,IAAI,MAAM,CAAC,WAAW,YAAY,+BAA+B,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE;YACzF,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC,WAAW,CAAC,0BAA0B,EAAE,CAAC;QACzD,CAAC,CAAC;YACA,OAAO,SAAS,CAAC;QAEnB,OAAO,MAAM,CAAC,kBAAkB,EAAE,CAAC;IACrC,CAAC;CACF"}
@@ -43,7 +43,7 @@ export class SwitchClauseParser {
43
43
  }
44
44
  parseStatements(statements) {
45
45
  const parser = this.typescriptParser;
46
- parser.context.enterList(TypeScriptListKind.SwitchClauseStatements);
46
+ const outerListScope = parser.context.enterList(TypeScriptListKind.SwitchClauseStatements);
47
47
  try {
48
48
  let endNode;
49
49
  while (!parser.isEndOfFile && !parser.currentNode.isTypeScriptSwitchClauseStart() && !(parser.currentNode instanceof TypeScriptCloseBraceNode))
@@ -61,7 +61,7 @@ export class SwitchClauseParser {
61
61
  return endNode;
62
62
  }
63
63
  finally {
64
- parser.context.leaveList();
64
+ parser.context.leaveList(outerListScope);
65
65
  }
66
66
  }
67
67
  }
@@ -1 +1 @@
1
- {"version":3,"file":"switch-clause.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/clauses/switch-clause.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"switch-clause.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/clauses/switch-clause.parser.ts"],"names":[],"mappings":"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"}
@@ -26,7 +26,7 @@ export class ClassBodyParser {
26
26
  context.isClassBodyContext = true;
27
27
  context.isTypeMemberContext = false;
28
28
  context.isClassStaticBlock = false;
29
- context.enterList(TypeScriptListKind.ClassMembers);
29
+ const outerListScope = context.enterList(TypeScriptListKind.ClassMembers);
30
30
  try {
31
31
  const typescriptParser = this.typescriptParser;
32
32
  typescriptParser.advance();
@@ -56,7 +56,7 @@ export class ClassBodyParser {
56
56
  return new TypeScriptClassBodyNode(openBraceNode, memberNodes, span, closeBraceNode, openBraceNode.leadingTrivia, endNode.trailingTrivia);
57
57
  }
58
58
  finally {
59
- context.leaveList();
59
+ context.leaveList(outerListScope);
60
60
  context.isClassBodyContext = previousClassBodyContext;
61
61
  context.isTypeMemberContext = previousTypeMemberContext;
62
62
  context.isClassStaticBlock = previousClassStaticBlock;
@@ -1 +1 @@
1
- {"version":3,"file":"class-body.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/class-body.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"class-body.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/class-body.parser.ts"],"names":[],"mappings":"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"}
@@ -60,14 +60,15 @@ export class ClassMemberParser {
60
60
  }
61
61
  parseMember(startNode, modifierNodes) {
62
62
  const typescriptParser = this.typescriptParser;
63
+ const lastModifierNode = modifierNodes.at(-1);
63
64
  const node = typescriptParser.currentNode;
64
65
  if (node.startsTypeScriptClassStaticBlock(typescriptParser)) {
65
66
  typescriptParser.advance();
66
67
  return this.staticBlockParser.parse(modifierNodes, node, typescriptParser.requireCurrentNode(TypeScriptOpenBraceNode));
67
68
  }
68
69
  if (node instanceof TypeScriptSemicolonNode) {
69
- if (modifierNodes.length > 0)
70
- return this.parseNamelessProperty(startNode, modifierNodes);
70
+ if (!Object.isUndefined(lastModifierNode))
71
+ return this.parseNamelessProperty(startNode, modifierNodes, lastModifierNode);
71
72
  typescriptParser.advance();
72
73
  const span = typescriptParser.typescriptLexer.reader.createSpan(startNode.span, node.span);
73
74
  return new TypeScriptSemicolonClassElementNode(modifierNodes, node, span, startNode.leadingTrivia, node.trailingTrivia);
@@ -78,9 +79,9 @@ export class ClassMemberParser {
78
79
  return this.accessorParser.parse(startNode, modifierNodes, node);
79
80
  if (node instanceof TypeScriptOpenBracketNode && this.indexSignatureParser.isStart)
80
81
  return this.indexSignatureParser.parse(startNode, modifierNodes, node);
81
- if (modifierNodes.length > 0 && !(node instanceof TypeScriptAsteriskNode) && !(node instanceof TypeScriptOpenBracketNode)
82
+ if (!Object.isUndefined(lastModifierNode) && !(node instanceof TypeScriptAsteriskNode) && !(node instanceof TypeScriptOpenBracketNode)
82
83
  && !node.canStartTypeScriptPropertyName())
83
- return this.parseNamelessProperty(startNode, modifierNodes);
84
+ return this.parseNamelessProperty(startNode, modifierNodes, lastModifierNode);
84
85
  const asteriskNode = typescriptParser.tryConsume(TypeScriptAsteriskNode);
85
86
  const nameNode = this.propertyNameParser.parse();
86
87
  const questionNode = typescriptParser.tryConsume(TypeScriptQuestionNode);
@@ -92,9 +93,9 @@ export class ClassMemberParser {
92
93
  : undefined;
93
94
  return this.propertyDeclarationParser.parse(startNode, modifierNodes, nameNode, questionNode, exclamationNode);
94
95
  }
95
- parseNamelessProperty(startNode, modifierNodes) {
96
+ parseNamelessProperty(startNode, modifierNodes, lastModifierNode) {
96
97
  const typescriptParser = this.typescriptParser;
97
- typescriptParser.context.diagnosticCollector.addTypeScriptParseDiagnostic(TypeScriptDiagnosticTemplates.TS1146, typescriptParser.typescriptLexer.reader.createSpan(modifierNodes.at(-1).span.endOffset, 0));
98
+ typescriptParser.context.diagnosticCollector.addTypeScriptParseDiagnostic(TypeScriptDiagnosticTemplates.TS1146, typescriptParser.typescriptLexer.reader.createSpan(lastModifierNode.span.endOffset, 0));
98
99
  return this.propertyDeclarationParser.parse(startNode, modifierNodes, new TypeScriptMissingIdentifierNode(typescriptParser.currentNode.getTypeScriptMissingNodeSpan()));
99
100
  }
100
101
  }
@@ -1 +1 @@
1
- {"version":3,"file":"class-member.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/class-member.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"class-member.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/class-member.parser.ts"],"names":[],"mappings":"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"}
@@ -35,18 +35,19 @@ export class DeclarationParser {
35
35
  const parser = this.typescriptParser;
36
36
  const startNode = parser.currentNode;
37
37
  const modifierNodes = this.modifierParser.parseDeclaration();
38
+ const lastModifierNode = modifierNodes.at(-1);
38
39
  const previousAmbient = parser.context.hasAmbientDeclaration;
39
40
  if (modifierNodes.some(t => t instanceof TypeScriptDeclareKeywordNode))
40
41
  parser.context.hasAmbientDeclaration = true;
41
42
  try {
42
- if (parser.currentNode.isTypeScriptDeclarationKeyword(parser)) {
43
+ if (Object.isUndefined(lastModifierNode) || parser.currentNode.isTypeScriptDeclarationKeyword(parser)) {
43
44
  const declarationNode = parser.currentNode.parseTypeScriptStatement(parser, modifierNodes);
44
45
  parser.context.hasAmbientDeclaration = previousAmbient;
45
46
  const hasModifierDiagnostics = this.modifierParser.validate(modifierNodes, TypeScriptModifierTarget.ModuleElement, declarationNode);
46
47
  declarationNode.reportTypeScriptGrammarAfterModifiers(parser.context, hasModifierDiagnostics);
47
48
  return declarationNode;
48
49
  }
49
- const endNode = modifierNodes.at(-1);
50
+ const endNode = lastModifierNode;
50
51
  parser.context.diagnosticCollector.addTypeScriptParseDiagnostic(TypeScriptDiagnosticTemplates.TS1146, parser.typescriptLexer.reader.createSpan(endNode.span.endOffset, 0));
51
52
  const span = parser.typescriptLexer.reader.createSpan(startNode.span, endNode.span);
52
53
  const missingNode = new TypeScriptMissingDeclarationNode(modifierNodes, span, startNode.leadingTrivia, endNode.trailingTrivia);
@@ -1 +1 @@
1
- {"version":3,"file":"declaration.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/declaration.parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"declaration.parser.js","sourceRoot":"","sources":["../../../../../../src/parsers/noldova.context.parsers.typescript/src/services/parsers/declarations/declaration.parser.ts"],"names":[],"mappings":"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"}
@@ -53,7 +53,7 @@ export class EnumDeclarationParser {
53
53
  }
54
54
  }
55
55
  parseMembers(memberNodes, commaNodes) {
56
- this.typescriptParser.context.enterList(TypeScriptListKind.EnumMembers);
56
+ const outerListScope = this.typescriptParser.context.enterList(TypeScriptListKind.EnumMembers);
57
57
  try {
58
58
  const parser = this.typescriptParser;
59
59
  let endNode;
@@ -80,7 +80,7 @@ export class EnumDeclarationParser {
80
80
  return endNode;
81
81
  }
82
82
  finally {
83
- this.typescriptParser.context.leaveList();
83
+ this.typescriptParser.context.leaveList(outerListScope);
84
84
  }
85
85
  }
86
86
  }
@@ -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":"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"}