Skip to content

Commit 11d556a

Browse files
committed
remove token param from public API
1 parent ba1f979 commit 11d556a

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

src/compiler/checker.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7919,7 +7919,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
79197919
if (targetFile?.impliedNodeFormat === ModuleKind.ESNext && targetFile.impliedNodeFormat !== contextFile?.impliedNodeFormat) {
79207920
specifier = getSpecifierForModuleSymbol(chain[0], context, ModuleKind.ESNext);
79217921
attributes = factory.createImportTypeAttributes(factory.createImportAttributes(
7922-
SyntaxKind.WithKeyword,
79237922
factory.createNodeArray([
79247923
factory.createImportAttribute(
79257924
factory.createStringLiteral("resolution-mode"),
@@ -7945,7 +7944,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
79457944
}
79467945
else {
79477946
attributes = factory.createImportTypeAttributes(factory.createImportAttributes(
7948-
SyntaxKind.WithKeyword,
79497947
factory.createNodeArray([
79507948
factory.createImportAttribute(
79517949
factory.createStringLiteral("resolution-mode"),

src/compiler/factory/nodeFactory.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4829,9 +4829,11 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
48294829
}
48304830

48314831
// @api
4832-
function createImportAttributes(token: ImportAttributes["token"], elements: readonly ImportAttribute[], multiLine?: boolean): ImportAttributes {
4832+
function createImportAttributes(elements: readonly ImportAttribute[], multiLine?: boolean): ImportAttributes;
4833+
function createImportAttributes(elements: readonly ImportAttribute[], multiLine?: boolean, token?: ImportAttributes["token"]): ImportAttributes;
4834+
function createImportAttributes(elements: readonly ImportAttribute[], multiLine?: boolean, token?: ImportAttributes["token"]): ImportAttributes {
48334835
const node = createBaseNode<ImportAttributes>(SyntaxKind.ImportAttributes);
4834-
node.token = token;
4836+
node.token = token ?? SyntaxKind.WithKeyword;
48354837
node.elements = createNodeArray(elements);
48364838
node.multiLine = multiLine;
48374839
node.transformFlags |= TransformFlags.ContainsESNext;
@@ -4842,7 +4844,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
48424844
function updateImportAttributes(node: ImportAttributes, elements: readonly ImportAttribute[], multiLine?: boolean): ImportAttributes {
48434845
return node.elements !== elements
48444846
|| node.multiLine !== multiLine
4845-
? update(createImportAttributes(node.token, elements, multiLine), node)
4847+
? update(createImportAttributes(elements, multiLine, node.token), node)
48464848
: node;
48474849
}
48484850

src/compiler/parser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8398,11 +8398,11 @@ namespace Parser {
83988398
);
83998399
}
84008400
}
8401-
return finishNode(factory.createImportAttributes(token, elements, multiLine), pos);
8401+
return finishNode(factory.createImportAttributes(elements, multiLine, token), pos);
84028402
}
84038403
else {
84048404
const elements = createNodeArray([], getNodePos(), /*end*/ undefined, /*hasTrailingComma*/ false);
8405-
return finishNode(factory.createImportAttributes(token, elements, /*multiLine*/ false), pos);
8405+
return finishNode(factory.createImportAttributes(elements, /*multiLine*/ false, token), pos);
84068406
}
84078407
}
84088408

src/compiler/types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8616,7 +8616,8 @@ export interface NodeFactory {
86168616
/** @deprecated */ updateAssertEntry(node: AssertEntry, name: AssertionKey, value: Expression): AssertEntry;
86178617
/** @deprecated */ createImportTypeAssertionContainer(clause: AssertClause, multiLine?: boolean): ImportTypeAssertionContainer;
86188618
/** @deprecated */ updateImportTypeAssertionContainer(node: ImportTypeAssertionContainer, clause: AssertClause, multiLine?: boolean): ImportTypeAssertionContainer;
8619-
createImportAttributes(token: ImportAttributes["token"], elements: NodeArray<ImportAttribute>, multiLine?: boolean): ImportAttributes;
8619+
createImportAttributes(elements: NodeArray<ImportAttribute>, multiLine?: boolean): ImportAttributes;
8620+
/** @internal */ createImportAttributes(elements: NodeArray<ImportAttribute>, multiLine?: boolean, token?: ImportAttributes["token"]): ImportAttributes;
86208621
updateImportAttributes(node: ImportAttributes, elements: NodeArray<ImportAttribute>, multiLine?: boolean): ImportAttributes;
86218622
createImportAttribute(name: ImportAttributeName, value: Expression): ImportAttribute;
86228623
updateImportAttribute(node: ImportAttribute, name: ImportAttributeName, value: Expression): ImportAttribute;

tests/baselines/reference/api/typescript.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8134,7 +8134,7 @@ declare namespace ts {
81348134
/** @deprecated */ updateAssertEntry(node: AssertEntry, name: AssertionKey, value: Expression): AssertEntry;
81358135
/** @deprecated */ createImportTypeAssertionContainer(clause: AssertClause, multiLine?: boolean): ImportTypeAssertionContainer;
81368136
/** @deprecated */ updateImportTypeAssertionContainer(node: ImportTypeAssertionContainer, clause: AssertClause, multiLine?: boolean): ImportTypeAssertionContainer;
8137-
createImportAttributes(token: ImportAttributes["token"], elements: NodeArray<ImportAttribute>, multiLine?: boolean): ImportAttributes;
8137+
createImportAttributes(elements: NodeArray<ImportAttribute>, multiLine?: boolean): ImportAttributes;
81388138
updateImportAttributes(node: ImportAttributes, elements: NodeArray<ImportAttribute>, multiLine?: boolean): ImportAttributes;
81398139
createImportAttribute(name: ImportAttributeName, value: Expression): ImportAttribute;
81408140
updateImportAttribute(node: ImportAttribute, name: ImportAttributeName, value: Expression): ImportAttribute;

0 commit comments

Comments
 (0)