Skip to content

Commit da6f2a6

Browse files
andrewbranchandrewbranch
committed
"Resolution mode" -> "resolution-mode"
1 parent e158d6c commit da6f2a6

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎src/compiler/checker.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36032,10 +36032,10 @@ namespace ts {
3603236032
const override = getResolutionModeOverrideForClause(node.assertions.assertClause, grammarErrorOnNode);
3603336033
if (override) {
3603436034
if (!isNightly()) {
36035-
grammarErrorOnNode(node.assertions.assertClause, Diagnostics.Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
36035+
grammarErrorOnNode(node.assertions.assertClause, Diagnostics.resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
3603636036
}
3603736037
if (getEmitModuleResolutionKind(compilerOptions) !== ModuleResolutionKind.Node16 && getEmitModuleResolutionKind(compilerOptions) !== ModuleResolutionKind.NodeNext) {
36038-
grammarErrorOnNode(node.assertions.assertClause, Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
36038+
grammarErrorOnNode(node.assertions.assertClause, Diagnostics.resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
3603936039
}
3604036040
}
3604136041
}
@@ -40966,11 +40966,11 @@ namespace ts {
4096640966
const override = getResolutionModeOverrideForClause(declaration.assertClause, validForTypeAssertions ? grammarErrorOnNode : undefined);
4096740967
if (validForTypeAssertions && override) {
4096840968
if (!isNightly()) {
40969-
grammarErrorOnNode(declaration.assertClause, Diagnostics.Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
40969+
grammarErrorOnNode(declaration.assertClause, Diagnostics.resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
4097040970
}
4097140971

4097240972
if (getEmitModuleResolutionKind(compilerOptions) !== ModuleResolutionKind.Node16 && getEmitModuleResolutionKind(compilerOptions) !== ModuleResolutionKind.NodeNext) {
40973-
return grammarErrorOnNode(declaration.assertClause, Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
40973+
return grammarErrorOnNode(declaration.assertClause, Diagnostics.resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
4097440974
}
4097540975
return; // Other grammar checks do not apply to type-only imports with resolution mode assertions
4097640976
}

‎src/compiler/diagnosticMessages.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@
14361436
"category": "Error",
14371437
"code": 1451
14381438
},
1439-
"Resolution modes are only supported when `moduleResolution` is `node16` or `nodenext`.": {
1439+
"'resolution-mode' assertions are only supported when `moduleResolution` is `node16` or `nodenext`.": {
14401440
"category": "Error",
14411441
"code": 1452
14421442
},
@@ -3479,7 +3479,7 @@
34793479
"category": "Error",
34803480
"code": 2840
34813481
},
3482-
"The type of this expression cannot be named without a resolution mode assertion, which is an unstable feature. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'.": {
3482+
"The type of this expression cannot be named without a 'resolution-mode' assertion, which is an unstable feature. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'.": {
34833483
"category": "Error",
34843484
"code": 2841
34853485
},
@@ -3912,7 +3912,7 @@
39123912
"category": "Error",
39133913
"code": 4124
39143914
},
3915-
"Resolution mode assertions are unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'.": {
3915+
"'resolution-mode' assertions are unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'.": {
39163916
"category": "Error",
39173917
"code": 4125
39183918
},

‎src/compiler/program.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3121,7 +3121,7 @@ namespace ts {
31213121
setResolvedTypeReferenceDirective(file, fileName, resolvedTypeReferenceDirective);
31223122
const mode = ref.resolutionMode || file.impliedNodeFormat;
31233123
if (mode && getEmitModuleResolutionKind(options) !== ModuleResolutionKind.Node16 && getEmitModuleResolutionKind(options) !== ModuleResolutionKind.NodeNext) {
3124-
programDiagnostics.add(createDiagnosticForRange(file, ref, Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext));
3124+
programDiagnostics.add(createDiagnosticForRange(file, ref, Diagnostics.resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext));
31253125
}
31263126
processTypeReferenceDirective(fileName, mode, resolvedTypeReferenceDirective, { kind: FileIncludeKind.TypeReferenceDirective, file: file.path, index, });
31273127
}

‎src/compiler/transformers/declarations.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -795,13 +795,13 @@ namespace ts {
795795
// Nothing visible
796796
}
797797

798-
function getResolutionModeOverrideForClauseInNightly<T extends AssertClause | ImportTypeAssertionContainer>(container: T | undefined): T | undefined {
799-
const mode = getResolutionModeOverrideForClause(container?.kind === SyntaxKind.AssertClause ? container : container?.assertClause);
798+
function getResolutionModeOverrideForClauseInNightly(assertClause: AssertClause | undefined) {
799+
const mode = getResolutionModeOverrideForClause(assertClause);
800800
if (mode !== undefined) {
801801
if (!isNightly()) {
802-
context.addDiagnostic(createDiagnosticForNode(container!, Diagnostics.Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next));
802+
context.addDiagnostic(createDiagnosticForNode(assertClause!, Diagnostics.resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next));
803803
}
804-
return container;
804+
return assertClause;
805805
}
806806
return undefined;
807807
}
@@ -1074,7 +1074,7 @@ namespace ts {
10741074
return cleanup(factory.updateImportTypeNode(
10751075
input,
10761076
factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)),
1077-
getResolutionModeOverrideForClauseInNightly(input.assertions),
1077+
input.assertions,
10781078
input.qualifier,
10791079
visitNodes(input.typeArguments, visitDeclarationSubtree, isTypeNode),
10801080
input.isTypeOf

‎tests/baselines/reference/nodeModulesTripleSlashReferenceModeOverrideOldResolutionError.errors.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/index.ts(1,23): error TS1452: Resolution modes are only supported when `moduleResolution` is `node16` or `nodenext`.
1+
/index.ts(1,23): error TS1452: 'resolution-mode' assertions are only supported when `moduleResolution` is `node16` or `nodenext`.
22
/index.ts(1,23): error TS2688: Cannot find type definition file for 'pkg'.
3-
/index.ts(2,23): error TS1452: Resolution modes are only supported when `moduleResolution` is `node16` or `nodenext`.
3+
/index.ts(2,23): error TS1452: 'resolution-mode' assertions are only supported when `moduleResolution` is `node16` or `nodenext`.
44
/index.ts(2,23): error TS2688: Cannot find type definition file for 'pkg'.
55
/index.ts(3,1): error TS2304: Cannot find name 'foo'.
66
/index.ts(4,1): error TS2304: Cannot find name 'bar'.
@@ -9,12 +9,12 @@
99
==== /index.ts (6 errors) ====
1010
/// <reference types="pkg" resolution-mode="require" />
1111
~~~
12-
!!! error TS1452: Resolution modes are only supported when `moduleResolution` is `node16` or `nodenext`.
12+
!!! error TS1452: 'resolution-mode' assertions are only supported when `moduleResolution` is `node16` or `nodenext`.
1313
~~~
1414
!!! error TS2688: Cannot find type definition file for 'pkg'.
1515
/// <reference types="pkg" resolution-mode="import" />
1616
~~~
17-
!!! error TS1452: Resolution modes are only supported when `moduleResolution` is `node16` or `nodenext`.
17+
!!! error TS1452: 'resolution-mode' assertions are only supported when `moduleResolution` is `node16` or `nodenext`.
1818
~~~
1919
!!! error TS2688: Cannot find type definition file for 'pkg'.
2020
foo; // `resolution-mode` is an error in old resolution settings, which resolves is arbitrary

0 commit comments

Comments
 (0)