microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Add missing ambient check to verbatimModuleSyntax export = error (#53385)

Browse Source
This commit is contained in:
Andrew Branch 2023-03-20 12:05:20 -07:00 committed by GitHub
parent 7a8238d88d
commit af00915d71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/checker.ts
View File

@ -44326,7 +44326,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (getAllSymbolFlags(sym) & SymbolFlags.Value) {
// However if it is a value, we need to check it's being used correctly
checkExpressionCached(id);
if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, SymbolFlags.Value)) {
if (!isIllegalExportDefaultInCJS && !(node.flags & NodeFlags.Ambient) && compilerOptions.verbatimModuleSyntax && getTypeOnlyAliasDeclaration(sym, SymbolFlags.Value)) {
error(id,
node.isExportEquals
? Diagnostics.An_export_declaration_must_reference_a_real_value_when_verbatimModuleSyntax_is_enabled_but_0_resolves_to_a_type_only_declaration
@ -44334,7 +44334,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
idText(id));
}
}
else if (!isIllegalExportDefaultInCJS && compilerOptions.verbatimModuleSyntax) {
else if (!isIllegalExportDefaultInCJS && !(node.flags & NodeFlags.Ambient) && compilerOptions.verbatimModuleSyntax) {
error(id,
node.isExportEquals
? Diagnostics.An_export_declaration_must_reference_a_value_when_verbatimModuleSyntax_is_enabled_but_0_only_refers_to_a_type

24
tests/baselines/reference/verbatimModuleSyntaxDeclarationFile.symbols Normal file
View File

@ -0,0 +1,24 @@
=== tests/cases/conformance/externalModules/type1.d.ts ===
declare namespace NS {
>NS : Symbol(NS, Decl(type1.d.ts, 0, 0))
type A = object;
>A : Symbol(A, Decl(type1.d.ts, 0, 22))
}
export = NS;
>NS : Symbol(NS, Decl(type1.d.ts, 0, 0))
export as namespace MyTypes;
>MyTypes : Symbol(MyTypes, Decl(type1.d.ts, 4, 12))
=== tests/cases/conformance/externalModules/type2.d.ts ===
import type * as NS from './type1';
>NS : Symbol(NS, Decl(type2.d.ts, 0, 11))
export = NS;
>NS : Symbol(NS, Decl(type2.d.ts, 0, 11))
export as namespace ModuleATypes;
>ModuleATypes : Symbol(ModuleATypes, Decl(type2.d.ts, 2, 12))

22
tests/baselines/reference/verbatimModuleSyntaxDeclarationFile.types Normal file
View File

@ -0,0 +1,22 @@
=== tests/cases/conformance/externalModules/type1.d.ts ===
declare namespace NS {
type A = object;
>A : object
}
export = NS;
>NS : any
export as namespace MyTypes;
>MyTypes : error
=== tests/cases/conformance/externalModules/type2.d.ts ===
import type * as NS from './type1';
>NS : error
export = NS;
>NS : any
export as namespace ModuleATypes;
>ModuleATypes : error

5
tests/baselines/reference/verbatimModuleSyntaxNoElisionCJS.errors.txt
View File

@ -1,7 +1,6 @@
/a.ts(2,10): error TS1282: An 'export =' declaration must reference a value when 'verbatimModuleSyntax' is enabled, but 'I' only refers to a type.
/b.ts(1,1): error TS1484: 'I' is a type and must be imported using a type-only import when 'verbatimModuleSyntax' is enabled.
/d.ts(3,10): error TS1283: An 'export =' declaration must reference a real value when 'verbatimModuleSyntax' is enabled, but 'J' resolves to a type-only declaration.
/e.d.ts(2,10): error TS1282: An 'export =' declaration must reference a value when 'verbatimModuleSyntax' is enabled, but 'I' only refers to a type.
==== /a.ts (1 errors) ====
@ -29,11 +28,9 @@
~
!!! error TS1283: An 'export =' declaration must reference a real value when 'verbatimModuleSyntax' is enabled, but 'J' resolves to a type-only declaration.
==== /e.d.ts (1 errors) ====
==== /e.d.ts (0 errors) ====
interface I {}
export = I;
~
!!! error TS1282: An 'export =' declaration must reference a value when 'verbatimModuleSyntax' is enabled, but 'I' only refers to a type.
==== /f.ts (0 errors) ====
import type I = require("./e");

15
tests/cases/conformance/externalModules/verbatimModuleSyntaxDeclarationFile.ts Normal file
View File

@ -0,0 +1,15 @@
// @verbatimModuleSyntax: true
// @Filename: type1.d.ts
declare namespace NS {
type A = object;
}
export = NS;
export as namespace MyTypes;
// @Filename: type2.d.ts
import type * as NS from './type1';
export = NS;
export as namespace ModuleATypes;