Skip to content

Commit 3f5a06d

Browse files
andrewbranchandrewbranch
committed
Add nightly-only error on ImportType resolution mode assertion (microsoft#49356)
* Add nightly-only error on ImportType resolution mode assertion * Temporarily change version to demonstrate errors * Revert "Temporarily change version to demonstrate errors" This reverts commit 40c2469. * "Resolution mode" -> "resolution-mode"
1 parent c07d883 commit 3f5a06d

File tree

6 files changed

+29
-12
lines changed

6 files changed

+29
-12
lines changed

‎src/compiler/checker.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6199,6 +6199,7 @@ namespace ts {
61996199
factory.createStringLiteral("import")
62006200
)
62016201
])));
6202+
context.tracker.reportImportTypeNodeResolutionModeOverride?.();
62026203
}
62036204
}
62046205
if (!specifier) {
@@ -6222,6 +6223,7 @@ namespace ts {
62226223
factory.createStringLiteral(swappedMode === ModuleKind.ESNext ? "import" : "require")
62236224
)
62246225
])));
6226+
context.tracker.reportImportTypeNodeResolutionModeOverride?.();
62256227
}
62266228
}
62276229

@@ -35825,8 +35827,11 @@ namespace ts {
3582535827
if (node.assertions) {
3582635828
const override = getResolutionModeOverrideForClause(node.assertions.assertClause, grammarErrorOnNode);
3582735829
if (override) {
35830+
if (!isNightly()) {
35831+
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);
35832+
}
3582835833
if (getEmitModuleResolutionKind(compilerOptions) !== ModuleResolutionKind.Node16 && getEmitModuleResolutionKind(compilerOptions) !== ModuleResolutionKind.NodeNext) {
35829-
grammarErrorOnNode(node.assertions.assertClause, Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
35834+
grammarErrorOnNode(node.assertions.assertClause, Diagnostics.resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
3583035835
}
3583135836
}
3583235837
}
@@ -40720,11 +40725,11 @@ namespace ts {
4072040725
const override = getResolutionModeOverrideForClause(declaration.assertClause, validForTypeAssertions ? grammarErrorOnNode : undefined);
4072140726
if (validForTypeAssertions && override) {
4072240727
if (!isNightly()) {
40723-
grammarErrorOnNode(declaration.assertClause, Diagnostics.Resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
40728+
grammarErrorOnNode(declaration.assertClause, Diagnostics.resolution_mode_assertions_are_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next);
4072440729
}
4072540730

4072640731
if (getEmitModuleResolutionKind(compilerOptions) !== ModuleResolutionKind.Node16 && getEmitModuleResolutionKind(compilerOptions) !== ModuleResolutionKind.NodeNext) {
40727-
return grammarErrorOnNode(declaration.assertClause, Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
40732+
return grammarErrorOnNode(declaration.assertClause, Diagnostics.resolution_mode_assertions_are_only_supported_when_moduleResolution_is_node16_or_nodenext);
4072840733
}
4072940734
return; // Other grammar checks do not apply to type-only imports with resolution mode assertions
4073040735
}

‎src/compiler/diagnosticMessages.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@
14241424
"category": "Error",
14251425
"code": 1451
14261426
},
1427-
"Resolution modes are only supported when `moduleResolution` is `node16` or `nodenext`.": {
1427+
"'resolution-mode' assertions are only supported when `moduleResolution` is `node16` or `nodenext`.": {
14281428
"category": "Error",
14291429
"code": 1452
14301430
},
@@ -3451,6 +3451,10 @@
34513451
"category": "Error",
34523452
"code": 2838
34533453
},
3454+
"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'.": {
3455+
"category": "Error",
3456+
"code": 2841
3457+
},
34543458

34553459
"Import declaration '{0}' is using private name '{1}'.": {
34563460
"category": "Error",
@@ -3880,7 +3884,7 @@
38803884
"category": "Error",
38813885
"code": 4124
38823886
},
3883-
"Resolution mode assertions are unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'.": {
3887+
"'resolution-mode' assertions are unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'.": {
38843888
"category": "Error",
38853889
"code": 4125
38863890
},

‎src/compiler/program.ts‎

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

‎src/compiler/transformers/declarations.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ namespace ts {
7878
trackReferencedAmbientModule,
7979
trackExternalModuleSymbolOfImportTypeNode,
8080
reportNonlocalAugmentation,
81-
reportNonSerializableProperty
81+
reportNonSerializableProperty,
82+
reportImportTypeNodeResolutionModeOverride,
8283
};
8384
let errorNameNode: DeclarationName | undefined;
8485
let errorFallbackNode: Declaration | undefined;
@@ -235,6 +236,12 @@ namespace ts {
235236
}
236237
}
237238

239+
function reportImportTypeNodeResolutionModeOverride() {
240+
if (!isNightly() && (errorNameNode || errorFallbackNode)) {
241+
context.addDiagnostic(createDiagnosticForNode((errorNameNode || errorFallbackNode)!, Diagnostics.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));
242+
}
243+
}
244+
238245
function transformDeclarationsForJS(sourceFile: SourceFile, bundled?: boolean) {
239246
const oldDiag = getSymbolAccessibilityDiagnostic;
240247
getSymbolAccessibilityDiagnostic = (s) => (s.errorNode && canProduceDiagnostics(s.errorNode) ? createGetSymbolAccessibilityDiagnosticForNode(s.errorNode)(s) : ({
@@ -792,7 +799,7 @@ namespace ts {
792799
const mode = getResolutionModeOverrideForClause(assertClause);
793800
if (mode !== undefined) {
794801
if (!isNightly()) {
795-
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));
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));
796803
}
797804
return assertClause;
798805
}

‎src/compiler/types.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8511,6 +8511,7 @@ namespace ts {
85118511
trackExternalModuleSymbolOfImportTypeNode?(symbol: Symbol): void;
85128512
reportNonlocalAugmentation?(containingFile: SourceFile, parentSymbol: Symbol, augmentingSymbol: Symbol): void;
85138513
reportNonSerializableProperty?(propertyName: string): void;
8514+
reportImportTypeNodeResolutionModeOverride?(): void;
85148515
}
85158516

85168517
export interface TextSpan {

‎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)