microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-20 13:45:34 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix import assertion occurrences crash and make import assertion parsing more generous (#47535)

Browse Source
This commit is contained in:
Wesley Wigham
2022-01-20 14:08:47 -08:00
committed by GitHub
parent 04d77fe900
commit bae0f50818
15 changed files with 154 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/checker.ts
View File

@@ -39786,6 +39786,16 @@ namespace ts {
return false;
}
}
if (!isImportEqualsDeclaration(node) && node.assertClause) {
let hasError = false;
for (const clause of node.assertClause.elements) {
if (!isStringLiteral(clause.value)) {
hasError = true;
error(clause.value, Diagnostics.Import_assertion_values_must_be_string_literal_expressions);
}
}
return !hasError;
}
return true;
}

4
src/compiler/diagnosticMessages.json
View File

@@ -3369,6 +3369,10 @@
"category": "Error",
"code": 2836
},
"Import assertion values must be string literal expressions.": {
"category": "Error",
"code": 2837
},
"Import declaration '{0}' is using private name '{1}'.": {
"category": "Error",

4
src/compiler/factory/nodeFactory.ts
View File

@@ -4024,7 +4024,7 @@ namespace ts {
}
// @api
function createAssertEntry(name: AssertionKey, value: StringLiteral): AssertEntry {
function createAssertEntry(name: AssertionKey, value: Expression): AssertEntry {
const node = createBaseNode<AssertEntry>(SyntaxKind.AssertEntry);
node.name = name;
node.value = value;
@@ -4033,7 +4033,7 @@ namespace ts {
}
// @api
function updateAssertEntry(node: AssertEntry, name: AssertionKey, value: StringLiteral): AssertEntry {
function updateAssertEntry(node: AssertEntry, name: AssertionKey, value: Expression): AssertEntry {
return node.name !== name
|| node.value !== value
? update(createAssertEntry(name, value), node)

2
src/compiler/parser.ts
View File

@@ -7281,7 +7281,7 @@ namespace ts {
const pos = getNodePos();
const name = tokenIsIdentifierOrKeyword(token()) ? parseIdentifierName() : parseLiteralLikeNode(SyntaxKind.StringLiteral) as StringLiteral;
parseExpected(SyntaxKind.ColonToken);
const value = parseLiteralLikeNode(SyntaxKind.StringLiteral) as StringLiteral;
const value = parseAssignmentExpressionOrHigher();
return finishNode(factory.createAssertEntry(name, value), pos);
}

6
src/compiler/types.ts
View File

@@ -3055,7 +3055,7 @@ namespace ts {
readonly kind: SyntaxKind.AssertEntry;
readonly parent: AssertClause;
readonly name: AssertionKey;
readonly value: StringLiteral;
readonly value: Expression;
}
export interface AssertClause extends Node {
@@ -7446,8 +7446,8 @@ namespace ts {
updateImportClause(node: ImportClause, isTypeOnly: boolean, name: Identifier | undefined, namedBindings: NamedImportBindings | undefined): ImportClause;
createAssertClause(elements: NodeArray<AssertEntry>, multiLine?: boolean): AssertClause;
updateAssertClause(node: AssertClause, elements: NodeArray<AssertEntry>, multiLine?: boolean): AssertClause;
createAssertEntry(name: AssertionKey, value: StringLiteral): AssertEntry;
updateAssertEntry (node: AssertEntry, name: AssertionKey, value: StringLiteral): AssertEntry;
createAssertEntry(name: AssertionKey, value: Expression): AssertEntry;
updateAssertEntry(node: AssertEntry, name: AssertionKey, value: Expression): AssertEntry;
createNamespaceImport(name: Identifier): NamespaceImport;
updateNamespaceImport(node: NamespaceImport, name: Identifier): NamespaceImport;
createNamespaceExport(name: Identifier): NamespaceExport;

2
src/compiler/visitorPublic.ts
View File

@@ -1090,7 +1090,7 @@ namespace ts {
Debug.type<AssertEntry>(node);
return factory.updateAssertEntry(node,
nodeVisitor(node.name, visitor, isAssertionKey),
nodeVisitor(node.value, visitor, isStringLiteral));
nodeVisitor(node.value, visitor, isExpressionNode));
case SyntaxKind.ImportClause:
Debug.type<ImportClause>(node);