diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts index e94128e8e30..02e6acd9dd8 100644 --- a/src/compiler/transformers/declarations.ts +++ b/src/compiler/transformers/declarations.ts @@ -91,6 +91,7 @@ import { ImportTypeNode, IndexSignatureDeclaration, InterfaceDeclaration, + isAmbientModule, isAnyImportSyntax, isArray, isArrayBindingElement, @@ -163,8 +164,10 @@ import { MethodSignature, Modifier, ModifierFlags, + ModifierLike, ModuleBody, ModuleDeclaration, + ModuleName, NamedDeclaration, NamespaceDeclaration, needsScopeMarker, @@ -1422,6 +1425,31 @@ export function transformDeclarations(context: TransformationContext) { return factory.updateModifiers(statement, modifiers); } + function updateModuleDeclarationAndKeyword( + node: ModuleDeclaration, + modifiers: readonly ModifierLike[] | undefined, + name: ModuleName, + body: ModuleBody | undefined + ) { + const updated = factory.updateModuleDeclaration(node, modifiers, name, body); + + if (isAmbientModule(updated) || updated.flags & NodeFlags.Namespace) { + return updated; + } + + const fixed = factory.createModuleDeclaration( + updated.modifiers, + updated.name, + updated.body, + updated.flags | NodeFlags.Namespace + ); + + setOriginalNode(fixed, updated); + setTextRange(fixed, updated); + + return fixed; + } + function transformTopLevelDeclaration(input: LateVisibilityPaintedStatement) { if (lateMarkedStatements) { while (orderedRemoveItem(lateMarkedStatements, input)); @@ -1598,7 +1626,8 @@ export function transformDeclarations(context: TransformationContext) { needsScopeFixMarker = oldNeedsScopeFix; resultHasScopeMarker = oldHasScopeFix; const mods = ensureModifiers(input); - return cleanup(factory.updateModuleDeclaration( + + return cleanup(updateModuleDeclarationAndKeyword( input, mods, isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name, @@ -1614,7 +1643,7 @@ export function transformDeclarations(context: TransformationContext) { const id = getOriginalNodeId(inner!); // TODO: GH#18217 const body = lateStatementReplacementMap.get(id); lateStatementReplacementMap.delete(id); - return cleanup(factory.updateModuleDeclaration( + return cleanup(updateModuleDeclarationAndKeyword( input, mods, input.name, diff --git a/tests/baselines/reference/aliasInaccessibleModule.js b/tests/baselines/reference/aliasInaccessibleModule.js index 74e3b327dd9..cc599fd874b 100644 --- a/tests/baselines/reference/aliasInaccessibleModule.js +++ b/tests/baselines/reference/aliasInaccessibleModule.js @@ -14,8 +14,8 @@ var M; //// [aliasInaccessibleModule.d.ts] -declare module M { - module N { +declare namespace M { + namespace N { } export import X = N; export {}; diff --git a/tests/baselines/reference/aliasInaccessibleModule2.js b/tests/baselines/reference/aliasInaccessibleModule2.js index 2b6b69a8241..71e897b9446 100644 --- a/tests/baselines/reference/aliasInaccessibleModule2.js +++ b/tests/baselines/reference/aliasInaccessibleModule2.js @@ -28,8 +28,8 @@ var M; //// [aliasInaccessibleModule2.d.ts] -declare module M { - module N { +declare namespace M { + namespace N { } import R = N; export import X = R; diff --git a/tests/baselines/reference/classConstructorAccessibility.js b/tests/baselines/reference/classConstructorAccessibility.js index d2aca7a65d2..4675b2e7c5a 100644 --- a/tests/baselines/reference/classConstructorAccessibility.js +++ b/tests/baselines/reference/classConstructorAccessibility.js @@ -100,5 +100,5 @@ declare class E { declare var c: C; declare var d: any; declare var e: any; -declare module Generic { +declare namespace Generic { } diff --git a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js index 6ad32744e4e..65a137349a5 100644 --- a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js +++ b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js @@ -21,7 +21,7 @@ var M; //// [classDoesNotDependOnPrivateMember.d.ts] -declare module M { +declare namespace M { class C { private x; } diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js index a5c1865953a..9eea1a33f30 100644 --- a/tests/baselines/reference/classdecl.js +++ b/tests/baselines/reference/classdecl.js @@ -235,14 +235,14 @@ declare class a { } declare class b extends a { } -declare module m1 { +declare namespace m1 { class b { } interface ib { } } -declare module m2 { - module m3 { +declare namespace m2 { + namespace m3 { class c extends b { } class ib2 implements m1.ib { diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js index 3445abea9fb..2c3a5d215a8 100644 --- a/tests/baselines/reference/commentsDottedModuleName.js +++ b/tests/baselines/reference/commentsDottedModuleName.js @@ -32,7 +32,7 @@ define(["require", "exports"], function (require, exports) { //// [commentsDottedModuleName.d.ts] /** this is multi declare module*/ -export declare module outerModule.InnerModule { +export declare namespace outerModule.InnerModule { class b { } } diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js index 3a7af6d908d..6af61d8ba78 100644 --- a/tests/baselines/reference/commentsExternalModules.js +++ b/tests/baselines/reference/commentsExternalModules.js @@ -139,11 +139,11 @@ define(["require", "exports", "commentsExternalModules_0"], function (require, e //// [commentsExternalModules_0.d.ts] /** Module comment*/ -export declare module m1 { +export declare namespace m1 { /** b's comment*/ var b: number; /** m2 comments*/ - module m2 { + namespace m2 { /** class comment;*/ class c { } @@ -154,12 +154,12 @@ export declare module m1 { function fooExport(): number; } /** Module comment */ -export declare module m4 { +export declare namespace m4 { /** b's comment */ var b: number; /** m2 comments */ - module m2 { + namespace m2 { /** class comment; */ class c { } diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js index 536a3ea9f5a..2a400b10b34 100644 --- a/tests/baselines/reference/commentsExternalModules2.js +++ b/tests/baselines/reference/commentsExternalModules2.js @@ -140,11 +140,11 @@ define(["require", "exports", "commentsExternalModules2_0"], function (require, //// [commentsExternalModules2_0.d.ts] /** Module comment*/ -export declare module m1 { +export declare namespace m1 { /** b's comment*/ var b: number; /** m2 comments*/ - module m2 { + namespace m2 { /** class comment;*/ class c { } @@ -155,12 +155,12 @@ export declare module m1 { function fooExport(): number; } /** Module comment */ -export declare module m4 { +export declare namespace m4 { /** b's comment */ var b: number; /** m2 comments */ - module m2 { + namespace m2 { /** class comment; */ class c { } diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js index 9e89238ccc6..761263f815e 100644 --- a/tests/baselines/reference/commentsExternalModules3.js +++ b/tests/baselines/reference/commentsExternalModules3.js @@ -138,11 +138,11 @@ exports.newVar2 = new extMod.m4.m2.c(); //// [commentsExternalModules2_0.d.ts] /** Module comment*/ -export declare module m1 { +export declare namespace m1 { /** b's comment*/ var b: number; /** m2 comments*/ - module m2 { + namespace m2 { /** class comment;*/ class c { } @@ -153,12 +153,12 @@ export declare module m1 { function fooExport(): number; } /** Module comment */ -export declare module m4 { +export declare namespace m4 { /** b's comment */ var b: number; /** m2 comments */ - module m2 { + namespace m2 { /** class comment; */ class c { } diff --git a/tests/baselines/reference/commentsFormatting.js b/tests/baselines/reference/commentsFormatting.js index a78ce08c0e5..8f523e14269 100644 --- a/tests/baselines/reference/commentsFormatting.js +++ b/tests/baselines/reference/commentsFormatting.js @@ -190,7 +190,7 @@ this is 4 spaces left aligned but above line is empty //// [commentsFormatting.d.ts] -declare module m { +declare namespace m { /** this is first line - aligned to class declaration * this is 4 spaces left aligned * this is 3 spaces left aligned diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js index d4e28627aa0..8e07a595c93 100644 --- a/tests/baselines/reference/commentsModules.js +++ b/tests/baselines/reference/commentsModules.js @@ -272,11 +272,11 @@ new m7.m8.m9.c(); //// [commentsModules.d.ts] /** Module comment*/ -declare module m1 { +declare namespace m1 { /** b's comment*/ var b: number; /** m2 comments*/ - module m2 { + namespace m2 { /** class comment;*/ class c { } @@ -293,44 +293,44 @@ declare module m1 { } declare var myvar: m1.m2.c; /** module comment of m2.m3*/ -declare module m2.m3 { +declare namespace m2.m3 { /** Exported class comment*/ class c { } } /** module comment of m3.m4.m5*/ -declare module m3.m4.m5 { +declare namespace m3.m4.m5 { /** Exported class comment*/ class c { } } /** module comment of m4.m5.m6*/ -declare module m4.m5.m6 { - module m7 { +declare namespace m4.m5.m6 { + namespace m7 { /** Exported class comment*/ class c { } } } /** module comment of m5.m6.m7*/ -declare module m5.m6.m7 { +declare namespace m5.m6.m7 { /** module m8 comment*/ - module m8 { + namespace m8 { /** Exported class comment*/ class c { } } } -declare module m6.m7 { - module m8 { +declare namespace m6.m7 { + namespace m8 { /** Exported class comment*/ class c { } } } -declare module m7.m8 { +declare namespace m7.m8 { /** module m9 comment*/ - module m9 { + namespace m9 { /** Exported class comment*/ class c { } diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js index fc8141d9099..2eff094fb9a 100644 --- a/tests/baselines/reference/commentsMultiModuleMultiFile.js +++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js @@ -100,12 +100,12 @@ define(["require", "exports"], function (require, exports) { //// [commentsMultiModuleMultiFile_0.d.ts] /** this is multi declare module*/ -export declare module multiM { +export declare namespace multiM { class b { } } /** thi is multi module 2*/ -export declare module multiM { +export declare namespace multiM { /** class c comment*/ class c { } @@ -114,7 +114,7 @@ export declare module multiM { } //// [commentsMultiModuleMultiFile_1.d.ts] /** this is multi module 3 comment*/ -export declare module multiM { +export declare namespace multiM { /** class d comment*/ class d { } diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.js b/tests/baselines/reference/commentsMultiModuleSingleFile.js index 0d42fcfbd31..0b9044ef8c9 100644 --- a/tests/baselines/reference/commentsMultiModuleSingleFile.js +++ b/tests/baselines/reference/commentsMultiModuleSingleFile.js @@ -67,14 +67,14 @@ new multiM.c(); //// [commentsMultiModuleSingleFile.d.ts] /** this is multi declare module*/ -declare module multiM { +declare namespace multiM { /** class b*/ class b { } class d { } } -declare module multiM { +declare namespace multiM { /** class c comment*/ class c { } diff --git a/tests/baselines/reference/commentsdoNotEmitComments.js b/tests/baselines/reference/commentsdoNotEmitComments.js index 214301bd740..6e03e388aeb 100644 --- a/tests/baselines/reference/commentsdoNotEmitComments.js +++ b/tests/baselines/reference/commentsdoNotEmitComments.js @@ -160,12 +160,12 @@ interface i1 { prop: string; } declare var i1_i: i1; -declare module m1 { +declare namespace m1 { class b { x: number; constructor(x: number); } - module m2 { + namespace m2 { } } declare var x: any; diff --git a/tests/baselines/reference/commentsemitComments.js b/tests/baselines/reference/commentsemitComments.js index 2f80ab7da81..0710d018624 100644 --- a/tests/baselines/reference/commentsemitComments.js +++ b/tests/baselines/reference/commentsemitComments.js @@ -188,13 +188,13 @@ interface i1 { /**interface instance comments*/ declare var i1_i: i1; /** this is module comment*/ -declare module m1 { +declare namespace m1 { /** class b */ class b { x: number; constructor(x: number); } - module m2 { + namespace m2 { } } declare var x: any; diff --git a/tests/baselines/reference/constDeclarations2.js b/tests/baselines/reference/constDeclarations2.js index f8a51154096..e870d7dcc99 100644 --- a/tests/baselines/reference/constDeclarations2.js +++ b/tests/baselines/reference/constDeclarations2.js @@ -20,7 +20,7 @@ var M; //// [constDeclarations2.d.ts] -declare module M { +declare namespace M { const c1 = false; const c2: number; const c3 = 0, c4: string, c5: any; diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js index e547a475975..2747dd997de 100644 --- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js +++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js @@ -16,7 +16,7 @@ declare module "test" { //// [declFileAliasUseBeforeDeclaration2.d.ts] declare module "test" { - module A { + namespace A { class C { } } diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js index 14d0c278e70..c1279fb0299 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js @@ -26,8 +26,8 @@ exports.x = void 0; //// [declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts] declare module "SubModule" { - module m { - module m3 { + namespace m { + namespace m3 { interface c { } } diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js index 2fe41949261..10633bbae1e 100644 --- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js +++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js @@ -33,8 +33,8 @@ module.exports = m; //// [declFileExportAssignmentImportInternalModule.d.ts] -declare module m3 { - module m2 { +declare namespace m3 { + namespace m2 { interface connectModule { (res: any, req: any, next: any): void; } diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index 418984a9ebb..a0daf8a31f4 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -66,8 +66,8 @@ define(["require", "exports"], function (require, exports) { //// [declFileExportImportChain_a.d.ts] -declare module m1 { - module m2 { +declare namespace m1 { + namespace m2 { class c1 { } } diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index e7e83b378b3..848e048cf5e 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -57,8 +57,8 @@ define(["require", "exports"], function (require, exports) { //// [declFileExportImportChain2_a.d.ts] -declare module m1 { - module m2 { +declare namespace m1 { + namespace m2 { class c1 { } } diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index 3a977678cdb..560c67f31b5 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -114,7 +114,7 @@ exports.j = C.F6; //// [declFileGenericType.d.ts] -export declare module C { +export declare namespace C { class A { } class B { diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js index ea150741e5d..f13b3bed145 100644 --- a/tests/baselines/reference/declFileGenericType2.js +++ b/tests/baselines/reference/declFileGenericType2.js @@ -102,33 +102,33 @@ var templa; //// [declFileGenericType2.d.ts] -declare module templa.mvc { +declare namespace templa.mvc { interface IModel { } } -declare module templa.mvc { +declare namespace templa.mvc { interface IController { } } -declare module templa.mvc { +declare namespace templa.mvc { class AbstractController implements mvc.IController { } } -declare module templa.mvc.composite { +declare namespace templa.mvc.composite { interface ICompositeControllerModel extends mvc.IModel { getControllers(): mvc.IController[]; } } -declare module templa.dom.mvc { +declare namespace templa.dom.mvc { interface IElementController extends templa.mvc.IController { } } -declare module templa.dom.mvc { +declare namespace templa.dom.mvc { class AbstractElementController extends templa.mvc.AbstractController implements IElementController { constructor(); } } -declare module templa.dom.mvc.composite { +declare namespace templa.dom.mvc.composite { class AbstractCompositeElementController extends templa.dom.mvc.AbstractElementController { _controllers: templa.mvc.IController[]; constructor(); diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js index 4a358fd09ef..a2f5e21dfeb 100644 --- a/tests/baselines/reference/declFileImportChainInExportAssignment.js +++ b/tests/baselines/reference/declFileImportChainInExportAssignment.js @@ -31,8 +31,8 @@ module.exports = b; //// [declFileImportChainInExportAssignment.d.ts] -declare module m { - module c { +declare namespace m { + namespace c { class c { } } diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js index d3bd712f69e..65bac37e0e8 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js @@ -40,7 +40,7 @@ exports.a.test1(null, null, null); //// [declFileImportModuleWithExportAssignment_0.d.ts] -declare module m2 { +declare namespace m2 { interface connectModule { (res: any, req: any, next: any): void; } diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js index e8eb3e65990..b5ae88711f9 100644 --- a/tests/baselines/reference/declFileInternalAliases.js +++ b/tests/baselines/reference/declFileInternalAliases.js @@ -37,15 +37,15 @@ var m2; //// [declFileInternalAliases.d.ts] -declare module m { +declare namespace m { class c { } } -declare module m1 { +declare namespace m1 { import x = m.c; var d: x; } -declare module m2 { +declare namespace m2 { export import x = m.c; var d: x; } diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js index 667cad2646c..908aa40322e 100644 --- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js +++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js @@ -27,7 +27,7 @@ var d = { //// [declFileModuleAssignmentInObjectLiteralProperty.d.ts] -declare module m1 { +declare namespace m1 { class c { } } diff --git a/tests/baselines/reference/declFileModuleContinuation.js b/tests/baselines/reference/declFileModuleContinuation.js index 197f07199ca..f2026a93aff 100644 --- a/tests/baselines/reference/declFileModuleContinuation.js +++ b/tests/baselines/reference/declFileModuleContinuation.js @@ -30,11 +30,11 @@ var A; //// [declFileModuleContinuation.d.ts] -declare module A.C { +declare namespace A.C { interface Z { } } -declare module A.B.C { +declare namespace A.B.C { class W implements A.C.Z { } } diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js index 211896b6410..dff1a93f272 100644 --- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js +++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js @@ -22,7 +22,7 @@ var m; //// [declFileModuleWithPropertyOfTypeModule.d.ts] -declare module m { +declare namespace m { class c { } var a: typeof m; diff --git a/tests/baselines/reference/declFileTypeAnnotationArrayType.js b/tests/baselines/reference/declFileTypeAnnotationArrayType.js index 9a42f77d650..9f3bc3fd165 100644 --- a/tests/baselines/reference/declFileTypeAnnotationArrayType.js +++ b/tests/baselines/reference/declFileTypeAnnotationArrayType.js @@ -118,7 +118,7 @@ function foo10() { //// [declFileTypeAnnotationArrayType.d.ts] declare class c { } -declare module m { +declare namespace m { class c { } class g { diff --git a/tests/baselines/reference/declFileTypeAnnotationTupleType.js b/tests/baselines/reference/declFileTypeAnnotationTupleType.js index 789d28450d2..2600fa5f4cf 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTupleType.js +++ b/tests/baselines/reference/declFileTypeAnnotationTupleType.js @@ -55,7 +55,7 @@ var y = x; //// [declFileTypeAnnotationTupleType.d.ts] declare class c { } -declare module m { +declare namespace m { class c { } class g { diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js index 579ab82a9a9..e06dd61b97f 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js @@ -65,13 +65,13 @@ var M; //// [declFileTypeAnnotationTypeAlias.d.ts] -declare module M { +declare namespace M { type Value = string | number | boolean; var x: Value; class c { } type C = c; - module m { + namespace m { class c { } } @@ -81,9 +81,9 @@ declare module M { interface Window { someMethod(): any; } -declare module M { +declare namespace M { type W = Window | string; - module N { + namespace N { class Window { } var p: W; diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js index ace17bb7016..6180f99cda9 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js @@ -73,7 +73,7 @@ declare class c { } declare class g { } -declare module m { +declare namespace m { class c { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js index eb7d1a6154d..6145369ebdf 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js @@ -103,7 +103,7 @@ function foo8() { //// [declFileTypeAnnotationTypeQuery.d.ts] declare class c { } -declare module m { +declare namespace m { class c { } class g { diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js index acf701d43ea..7ac6e760524 100644 --- a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js +++ b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js @@ -103,7 +103,7 @@ function foo8() { //// [declFileTypeAnnotationTypeReference.d.ts] declare class c { } -declare module m { +declare namespace m { class c { } class g { diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.js b/tests/baselines/reference/declFileTypeAnnotationUnionType.js index c7daca11eff..67ef1f95e71 100644 --- a/tests/baselines/reference/declFileTypeAnnotationUnionType.js +++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.js @@ -60,7 +60,7 @@ var y = new g() || new m.g() || (function () { return new c(); }); declare class c { private p; } -declare module m { +declare namespace m { class c { private q; } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js index d6d2dff6856..8cdbb889f80 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js @@ -263,12 +263,12 @@ var m; //// [declFileTypeAnnotationVisibilityErrorAccessors.d.ts] -declare module m { +declare namespace m { class private1 { } export class public1 { } - module m2 { + namespace m2 { class public2 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js index 3bad09b4285..e101c1657af 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js @@ -110,7 +110,7 @@ var m; //// [declFileTypeAnnotationVisibilityErrorParameterOfFunction.d.ts] -declare module m { +declare namespace m { class private1 { } export class public1 { @@ -119,7 +119,7 @@ declare module m { export function foo4(param?: private1): void; export function foo13(param: public1): void; export function foo14(param?: public1): void; - module m2 { + namespace m2 { class public2 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js index d4fdadace11..bf1c17b6a24 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js @@ -128,7 +128,7 @@ var m; //// [declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.d.ts] -declare module m { +declare namespace m { class private1 { } export class public1 { @@ -137,7 +137,7 @@ declare module m { export function foo4(): private1; export function foo13(): public1; export function foo14(): public1; - module m2 { + namespace m2 { class public2 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js index 42968425684..c2a5df30d34 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js @@ -95,29 +95,29 @@ var M2; interface Window { someMethod(): any; } -declare module M { +declare namespace M { type W = Window | string; - export module N { + export namespace N { class Window { } var p: W; } export {}; } -declare module M1 { +declare namespace M1 { type W = Window | string; - module N { + namespace N { class Window { } var p: W; } } -declare module M2 { +declare namespace M2 { class private1 { } class public1 { } - module m3 { + namespace m3 { class public1 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js index efde01f7612..2a89acf5c8e 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js @@ -66,10 +66,10 @@ var m; //// [declFileTypeAnnotationVisibilityErrorTypeLiteral.d.ts] -declare module m { +declare namespace m { class private1 { } - module m2 { + namespace m2 { class public1 { } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js index f22168928ae..20387523b24 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js @@ -71,7 +71,7 @@ var m; //// [declFileTypeAnnotationVisibilityErrorVariableDeclaration.d.ts] -declare module m { +declare namespace m { class private1 { } export class public1 { @@ -80,7 +80,7 @@ declare module m { export var l: private1; export var k2: public1; export var l2: public1; - module m2 { + namespace m2 { class public2 { } } diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.js b/tests/baselines/reference/declFileTypeofInAnonymousType.js index 5ece4dfde09..57292acfb6f 100644 --- a/tests/baselines/reference/declFileTypeofInAnonymousType.js +++ b/tests/baselines/reference/declFileTypeofInAnonymousType.js @@ -54,7 +54,7 @@ var d = { //// [declFileTypeofInAnonymousType.d.ts] -declare module m1 { +declare namespace m1 { class c { } enum e { diff --git a/tests/baselines/reference/declFileTypeofModule.js b/tests/baselines/reference/declFileTypeofModule.js index c6dc0359139..6afaf6d1534 100644 --- a/tests/baselines/reference/declFileTypeofModule.js +++ b/tests/baselines/reference/declFileTypeofModule.js @@ -28,12 +28,12 @@ var m2_2; //// [declFileTypeofModule.d.ts] -declare module m1 { +declare namespace m1 { var c: string; } declare var m1_1: typeof m1; declare var m1_2: typeof m1; -declare module m2 { +declare namespace m2 { var d: typeof m2; } declare var m2_1: typeof m2; diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js index 262a3602848..4704ce9bf0a 100644 --- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js +++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js @@ -76,17 +76,17 @@ var X; //// [declFileWithClassNameConflictingWithClassReferredByExtendsClause.d.ts] -declare module A.B.Base { +declare namespace A.B.Base { class W { id: number; } } -declare module X.Y.base { +declare namespace X.Y.base { class W extends A.B.Base.W { name: string; } } -declare module X.Y.base.Z { +declare namespace X.Y.base.Z { class W extends X.Y.base.W { value: boolean; } diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js index e0230fdcc63..00ae333dfad 100644 --- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js +++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js @@ -66,16 +66,16 @@ var A; //// [declFileWithExtendsClauseThatHasItsContainerNameConflict.d.ts] -declare module A.B.C { +declare namespace A.B.C { class B { } } -declare module A.B { +declare namespace A.B { class EventManager { id: number; } } -declare module A.B.C { +declare namespace A.B.C { class ContextMenu extends EventManager { name: string; } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js index 2c42a66ba71..f25083f46f9 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js @@ -34,11 +34,11 @@ var X; //// [declFileWithInternalModuleNameConflictsInExtendsClause1.d.ts] -declare module X.A.C { +declare namespace X.A.C { interface Z { } } -declare module X.A.B.C { +declare namespace X.A.B.C { class W implements X.A.C.Z { } } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js index 6c26bdf0f41..2a28f1a494c 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js @@ -37,13 +37,13 @@ var X; //// [declFileWithInternalModuleNameConflictsInExtendsClause2.d.ts] -declare module X.A.C { +declare namespace X.A.C { interface Z { } } -declare module X.A.B.C { +declare namespace X.A.B.C { class W implements A.C.Z { } } -declare module X.A.B.C { +declare namespace X.A.B.C { } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js index a059568b83b..45302b2f92c 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js @@ -37,15 +37,15 @@ var X; //// [declFileWithInternalModuleNameConflictsInExtendsClause3.d.ts] -declare module X.A.C { +declare namespace X.A.C { interface Z { } } -declare module X.A.B.C { +declare namespace X.A.B.C { class W implements X.A.C.Z { } } -declare module X.A.B.C { - module A { +declare namespace X.A.B.C { + namespace A { } } diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js index 46a03b27d89..8262ce5f369 100644 --- a/tests/baselines/reference/declInput-2.js +++ b/tests/baselines/reference/declInput-2.js @@ -53,7 +53,7 @@ var M; //// [declInput-2.d.ts] -declare module M { +declare namespace M { class C { } export class E { diff --git a/tests/baselines/reference/declInput4.js b/tests/baselines/reference/declInput4.js index 2f9b2e2f85f..1684a11db5a 100644 --- a/tests/baselines/reference/declInput4.js +++ b/tests/baselines/reference/declInput4.js @@ -44,7 +44,7 @@ var M; //// [declInput4.d.ts] -declare module M { +declare namespace M { class E { } interface I1 { diff --git a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js index 8093ecf505a..457d1c0e88c 100644 --- a/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js +++ b/tests/baselines/reference/declarationEmitDestructuringArrayPattern3.js @@ -14,6 +14,6 @@ var M; //// [declarationEmitDestructuringArrayPattern3.d.ts] -declare module M { +declare namespace M { var a: number, b: number; } diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js index e95752f5d92..5c3936c85a8 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.js @@ -60,6 +60,6 @@ declare function f15(): { c4: boolean; }; declare var a4: string, b4: number, c4: boolean; -declare module m { +declare namespace m { var a4: string, b4: number, c4: boolean; } diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js index 381e2925ba6..ad59c4a34ea 100644 --- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js +++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.js @@ -39,6 +39,6 @@ declare function f15(): { c4: boolean; }; declare var a4: string, b4: number, c4: boolean; -declare module m { +declare namespace m { var a4: string, b4: number, c4: boolean; } diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js index 65fa3e362cb..bc3917ede8e 100644 --- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js +++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js @@ -21,7 +21,7 @@ var m; //// [declarationEmitDestructuringPrivacyError.d.ts] -declare module m { +declare namespace m { class c { } export var x: number, y: c, z: number; diff --git a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js index f5f9fc28daf..7f220e5ed51 100644 --- a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js +++ b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js @@ -29,8 +29,8 @@ module.exports = m; //// [declarationEmitImportInExportAssignmentModule.d.ts] -declare module m { - module c { +declare namespace m { + namespace c { class c { } } diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js index 01f9c307e3f..c9e0cdc0e7f 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts.js +++ b/tests/baselines/reference/declarationEmitNameConflicts.js @@ -134,18 +134,18 @@ var M; //// [declarationEmit_nameConflicts_1.d.ts] -declare module f { +declare namespace f { class c { } } export = f; //// [declarationEmit_nameConflicts_0.d.ts] import im = require('./declarationEmit_nameConflicts_1'); -export declare module M { +export declare namespace M { function f(): void; class C { } - module N { + namespace N { function g(): void; interface I { } @@ -155,11 +155,11 @@ export declare module M { export import c = N; export import d = im; } -export declare module M.P { +export declare namespace M.P { function f(): void; class C { } - module N { + namespace N { function g(): void; interface I { } @@ -171,11 +171,11 @@ export declare module M.P { var g: typeof M.N.g; var d: typeof M.d; } -export declare module M.Q { +export declare namespace M.Q { function f(): void; class C { } - module N { + namespace N { function g(): void; interface I { } @@ -184,7 +184,7 @@ export declare module M.Q { } interface I extends M.c.I { } - module c { + namespace c { interface I extends M.c.I { } } diff --git a/tests/baselines/reference/declarationEmitNameConflicts2.js b/tests/baselines/reference/declarationEmitNameConflicts2.js index b8cb3863e5b..bbcf0565d06 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts2.js +++ b/tests/baselines/reference/declarationEmitNameConflicts2.js @@ -59,17 +59,17 @@ var X; //// [declarationEmitNameConflicts2.d.ts] -declare module X.Y.base { +declare namespace X.Y.base { function f(): void; class C { } - module M { + namespace M { var v: any; } enum E { } } -declare module X.Y.base.Z { +declare namespace X.Y.base.Z { var f: typeof base.f; var C: typeof base.C; var M: typeof base.M; diff --git a/tests/baselines/reference/declarationEmitNameConflicts3.js b/tests/baselines/reference/declarationEmitNameConflicts3.js index e9068662832..4720e548438 100644 --- a/tests/baselines/reference/declarationEmitNameConflicts3.js +++ b/tests/baselines/reference/declarationEmitNameConflicts3.js @@ -92,20 +92,20 @@ var M; //// [declarationEmitNameConflicts3.d.ts] -declare module M { +declare namespace M { interface D { } - module D { + namespace D { function f(): void; } - module C { + namespace C { function f(): void; } - module E { + namespace E { function f(): void; } } -declare module M.P { +declare namespace M.P { class C { static f(): void; } diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js index e874827db9d..608174fbd10 100644 --- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js @@ -18,13 +18,13 @@ var M; //// [declarationEmitNameConflictsWithAlias.d.ts] -export declare module C { +export declare namespace C { interface I { } } export import v = C; -export declare module M { - module C { +export declare namespace M { + namespace C { interface I { } } diff --git a/tests/baselines/reference/declarationMaps.js b/tests/baselines/reference/declarationMaps.js index c57fdf5b5e3..1129dcac177 100644 --- a/tests/baselines/reference/declarationMaps.js +++ b/tests/baselines/reference/declarationMaps.js @@ -27,7 +27,7 @@ module.exports = m2; //// [declarationMaps.d.ts] -declare module m2 { +declare namespace m2 { interface connectModule { (res: any, req: any, next: any): void; } diff --git a/tests/baselines/reference/declarationMaps.js.map b/tests/baselines/reference/declarationMaps.js.map index d6b83b2232b..e26401dd61d 100644 --- a/tests/baselines/reference/declarationMaps.js.map +++ b/tests/baselines/reference/declarationMaps.js.map @@ -1,3 +1,3 @@ //// [declarationMaps.d.ts.map] -{"version":3,"file":"declarationMaps.d.ts","sourceRoot":"","sources":["declarationMaps.ts"],"names":[],"mappings":"AAAA,eAAO,EAAE,CAAC;IACN,UAAiB,aAAa;QAC1B,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,IAAI,KAAA,GAAG,IAAI,CAAC;KAC1B;IACD,UAAiB,aAAa;QAC1B,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,aAAa,CAAC;QAC3C,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;KAClC;CAEJ;AAED,QAAA,IAAI,EAAE,EAAE;IACJ,IAAI,EAAE,CAAC,aAAa,CAAC;IACrB,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC;IACxB,KAAK,IAAI,EAAE,CAAC,aAAa,CAAC;CAC7B,CAAC;AAEF,SAAS,EAAE,CAAC"} -//// https://sokra.github.io/source-map-visualization#base64,ZGVjbGFyZSBtb2R1bGUgbTIgew0KICAgIGludGVyZmFjZSBjb25uZWN0TW9kdWxlIHsNCiAgICAgICAgKHJlczogYW55LCByZXE6IGFueSwgbmV4dDogYW55KTogdm9pZDsNCiAgICB9DQogICAgaW50ZXJmYWNlIGNvbm5lY3RFeHBvcnQgew0KICAgICAgICB1c2U6IChtb2Q6IGNvbm5lY3RNb2R1bGUpID0+IGNvbm5lY3RFeHBvcnQ7DQogICAgICAgIGxpc3RlbjogKHBvcnQ6IG51bWJlcikgPT4gdm9pZDsNCiAgICB9DQp9DQpkZWNsYXJlIHZhciBtMjogew0KICAgICgpOiBtMi5jb25uZWN0RXhwb3J0Ow0KICAgIHRlc3QxOiBtMi5jb25uZWN0TW9kdWxlOw0KICAgIHRlc3QyKCk6IG0yLmNvbm5lY3RNb2R1bGU7DQp9Ow0KZXhwb3J0ID0gbTI7DQovLyMgc291cmNlTWFwcGluZ1VSTD1kZWNsYXJhdGlvbk1hcHMuZC50cy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjbGFyYXRpb25NYXBzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJkZWNsYXJhdGlvbk1hcHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZUFBTyxFQUFFLENBQUM7SUFDTixVQUFpQixhQUFhO1FBQzFCLENBQUMsR0FBRyxLQUFBLEVBQUUsR0FBRyxLQUFBLEVBQUUsSUFBSSxLQUFBLEdBQUcsSUFBSSxDQUFDO0tBQzFCO0lBQ0QsVUFBaUIsYUFBYTtRQUMxQixHQUFHLEVBQUUsQ0FBQyxHQUFHLEVBQUUsYUFBYSxLQUFLLGFBQWEsQ0FBQztRQUMzQyxNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxLQUFLLElBQUksQ0FBQztLQUNsQztDQUVKO0FBRUQsUUFBQSxJQUFJLEVBQUUsRUFBRTtJQUNKLElBQUksRUFBRSxDQUFDLGFBQWEsQ0FBQztJQUNyQixLQUFLLEVBQUUsRUFBRSxDQUFDLGFBQWEsQ0FBQztJQUN4QixLQUFLLElBQUksRUFBRSxDQUFDLGFBQWEsQ0FBQztDQUM3QixDQUFDO0FBRUYsU0FBUyxFQUFFLENBQUMifQ==,bW9kdWxlIG0yIHsKICAgIGV4cG9ydCBpbnRlcmZhY2UgY29ubmVjdE1vZHVsZSB7CiAgICAgICAgKHJlcywgcmVxLCBuZXh0KTogdm9pZDsKICAgIH0KICAgIGV4cG9ydCBpbnRlcmZhY2UgY29ubmVjdEV4cG9ydCB7CiAgICAgICAgdXNlOiAobW9kOiBjb25uZWN0TW9kdWxlKSA9PiBjb25uZWN0RXhwb3J0OwogICAgICAgIGxpc3RlbjogKHBvcnQ6IG51bWJlcikgPT4gdm9pZDsKICAgIH0KCn0KCnZhciBtMjogewogICAgKCk6IG0yLmNvbm5lY3RFeHBvcnQ7CiAgICB0ZXN0MTogbTIuY29ubmVjdE1vZHVsZTsKICAgIHRlc3QyKCk6IG0yLmNvbm5lY3RNb2R1bGU7Cn07CgpleHBvcnQgPSBtMjs= +{"version":3,"file":"declarationMaps.d.ts","sourceRoot":"","sources":["declarationMaps.ts"],"names":[],"mappings":"AAAA,kBAAO,EAAE,CAAC;IACN,UAAiB,aAAa;QAC1B,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,IAAI,KAAA,GAAG,IAAI,CAAC;KAC1B;IACD,UAAiB,aAAa;QAC1B,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,aAAa,CAAC;QAC3C,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;KAClC;CAEJ;AAED,QAAA,IAAI,EAAE,EAAE;IACJ,IAAI,EAAE,CAAC,aAAa,CAAC;IACrB,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC;IACxB,KAAK,IAAI,EAAE,CAAC,aAAa,CAAC;CAC7B,CAAC;AAEF,SAAS,EAAE,CAAC"} +//// https://sokra.github.io/source-map-visualization#base64,ZGVjbGFyZSBuYW1lc3BhY2UgbTIgew0KICAgIGludGVyZmFjZSBjb25uZWN0TW9kdWxlIHsNCiAgICAgICAgKHJlczogYW55LCByZXE6IGFueSwgbmV4dDogYW55KTogdm9pZDsNCiAgICB9DQogICAgaW50ZXJmYWNlIGNvbm5lY3RFeHBvcnQgew0KICAgICAgICB1c2U6IChtb2Q6IGNvbm5lY3RNb2R1bGUpID0+IGNvbm5lY3RFeHBvcnQ7DQogICAgICAgIGxpc3RlbjogKHBvcnQ6IG51bWJlcikgPT4gdm9pZDsNCiAgICB9DQp9DQpkZWNsYXJlIHZhciBtMjogew0KICAgICgpOiBtMi5jb25uZWN0RXhwb3J0Ow0KICAgIHRlc3QxOiBtMi5jb25uZWN0TW9kdWxlOw0KICAgIHRlc3QyKCk6IG0yLmNvbm5lY3RNb2R1bGU7DQp9Ow0KZXhwb3J0ID0gbTI7DQovLyMgc291cmNlTWFwcGluZ1VSTD1kZWNsYXJhdGlvbk1hcHMuZC50cy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjbGFyYXRpb25NYXBzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJkZWNsYXJhdGlvbk1hcHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsa0JBQU8sRUFBRSxDQUFDO0lBQ04sVUFBaUIsYUFBYTtRQUMxQixDQUFDLEdBQUcsS0FBQSxFQUFFLEdBQUcsS0FBQSxFQUFFLElBQUksS0FBQSxHQUFHLElBQUksQ0FBQztLQUMxQjtJQUNELFVBQWlCLGFBQWE7UUFDMUIsR0FBRyxFQUFFLENBQUMsR0FBRyxFQUFFLGFBQWEsS0FBSyxhQUFhLENBQUM7UUFDM0MsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sS0FBSyxJQUFJLENBQUM7S0FDbEM7Q0FFSjtBQUVELFFBQUEsSUFBSSxFQUFFLEVBQUU7SUFDSixJQUFJLEVBQUUsQ0FBQyxhQUFhLENBQUM7SUFDckIsS0FBSyxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUM7SUFDeEIsS0FBSyxJQUFJLEVBQUUsQ0FBQyxhQUFhLENBQUM7Q0FDN0IsQ0FBQztBQUVGLFNBQVMsRUFBRSxDQUFDIn0=,bW9kdWxlIG0yIHsKICAgIGV4cG9ydCBpbnRlcmZhY2UgY29ubmVjdE1vZHVsZSB7CiAgICAgICAgKHJlcywgcmVxLCBuZXh0KTogdm9pZDsKICAgIH0KICAgIGV4cG9ydCBpbnRlcmZhY2UgY29ubmVjdEV4cG9ydCB7CiAgICAgICAgdXNlOiAobW9kOiBjb25uZWN0TW9kdWxlKSA9PiBjb25uZWN0RXhwb3J0OwogICAgICAgIGxpc3RlbjogKHBvcnQ6IG51bWJlcikgPT4gdm9pZDsKICAgIH0KCn0KCnZhciBtMjogewogICAgKCk6IG0yLmNvbm5lY3RFeHBvcnQ7CiAgICB0ZXN0MTogbTIuY29ubmVjdE1vZHVsZTsKICAgIHRlc3QyKCk6IG0yLmNvbm5lY3RNb2R1bGU7Cn07CgpleHBvcnQgPSBtMjs= diff --git a/tests/baselines/reference/declarationMaps.sourcemap.txt b/tests/baselines/reference/declarationMaps.sourcemap.txt index a8e6526bc4d..c1784ff9afa 100644 --- a/tests/baselines/reference/declarationMaps.sourcemap.txt +++ b/tests/baselines/reference/declarationMaps.sourcemap.txt @@ -8,20 +8,20 @@ sources: declarationMaps.ts emittedFile:declarationMaps.d.ts sourceFile:declarationMaps.ts ------------------------------------------------------------------- ->>>declare module m2 { +>>>declare namespace m2 { 1 > -2 >^^^^^^^^^^^^^^^ -3 > ^^ -4 > ^ -5 > ^^^^^^^^^^^^-> +2 >^^^^^^^^^^^^^^^^^^ +3 > ^^ +4 > ^ +5 > ^^^^^^^^^-> 1 > 2 >module -3 > m2 -4 > +3 > m2 +4 > 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 16) Source(1, 8) + SourceIndex(0) -3 >Emitted(1, 18) Source(1, 10) + SourceIndex(0) -4 >Emitted(1, 19) Source(1, 11) + SourceIndex(0) +2 >Emitted(1, 19) Source(1, 8) + SourceIndex(0) +3 >Emitted(1, 21) Source(1, 10) + SourceIndex(0) +4 >Emitted(1, 22) Source(1, 11) + SourceIndex(0) --- >>> interface connectModule { 1->^^^^ diff --git a/tests/baselines/reference/declareDottedModuleName.js b/tests/baselines/reference/declareDottedModuleName.js index 5001a6df7d5..a7ea2f35919 100644 --- a/tests/baselines/reference/declareDottedModuleName.js +++ b/tests/baselines/reference/declareDottedModuleName.js @@ -16,10 +16,10 @@ module T.U { // This needs to be emitted //// [declareDottedModuleName.d.ts] -declare module M { +declare namespace M { } -declare module M { - module R.S { } +declare namespace M { + namespace R.S { } } -declare module T.U { +declare namespace T.U { } diff --git a/tests/baselines/reference/declareFileExportAssignment.js b/tests/baselines/reference/declareFileExportAssignment.js index 41eaf2fd41e..ed4b9e960e9 100644 --- a/tests/baselines/reference/declareFileExportAssignment.js +++ b/tests/baselines/reference/declareFileExportAssignment.js @@ -27,7 +27,7 @@ module.exports = m2; //// [declareFileExportAssignment.d.ts] -declare module m2 { +declare namespace m2 { interface connectModule { (res: any, req: any, next: any): void; } diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js index 7b6c81d2c40..a442fcc99fe 100644 --- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js +++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js @@ -27,7 +27,7 @@ module.exports = m2; //// [declareFileExportAssignmentWithVarFromVariableStatement.d.ts] -declare module m2 { +declare namespace m2 { interface connectModule { (res: any, req: any, next: any): void; } diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js index 465b2f7b8e9..bc718c83f04 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js @@ -88,8 +88,8 @@ declare var v: number; declare class Foo { static x: number; } -declare module N { - module F { +declare namespace N { + namespace F { } } //// [file2.d.ts] @@ -101,9 +101,9 @@ declare function C2(): void; declare class f { } declare var v: number; -declare module Foo { +declare namespace Foo { var x: number; } -declare module N { +declare namespace N { function F(): any; } diff --git a/tests/baselines/reference/enumDecl1.js b/tests/baselines/reference/enumDecl1.js index fdfe3bb66ea..65680b23e52 100644 --- a/tests/baselines/reference/enumDecl1.js +++ b/tests/baselines/reference/enumDecl1.js @@ -14,7 +14,7 @@ declare module mAmbient { //// [enumDecl1.d.ts] -declare module mAmbient { +declare namespace mAmbient { enum e { x, y, diff --git a/tests/baselines/reference/es5ExportEqualsDts.js b/tests/baselines/reference/es5ExportEqualsDts.js index fb210e0dc1c..06ab915bddc 100644 --- a/tests/baselines/reference/es5ExportEqualsDts.js +++ b/tests/baselines/reference/es5ExportEqualsDts.js @@ -32,7 +32,7 @@ module.exports = A; declare class A { foo(): A.B; } -declare module A { +declare namespace A { interface B { } } diff --git a/tests/baselines/reference/es6ExportAll.js b/tests/baselines/reference/es6ExportAll.js index 9149bcfa2e7..a47ea92be51 100644 --- a/tests/baselines/reference/es6ExportAll.js +++ b/tests/baselines/reference/es6ExportAll.js @@ -32,11 +32,11 @@ export declare class c { } export interface i { } -export declare module m { +export declare namespace m { var x: number; } export declare var x: number; -export declare module uninstantiated { +export declare namespace uninstantiated { } //// [client.d.ts] export * from "server"; diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js index 32ed260be24..bca51095554 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.js +++ b/tests/baselines/reference/es6ExportAllInEs5.js @@ -55,11 +55,11 @@ export declare class c { } export interface i { } -export declare module m { +export declare namespace m { var x: number; } export declare var x: number; -export declare module uninstantiated { +export declare namespace uninstantiated { } //// [client.d.ts] export * from "./server"; diff --git a/tests/baselines/reference/es6ExportClause.js b/tests/baselines/reference/es6ExportClause.js index 80d59ffa31c..eaf6536aafe 100644 --- a/tests/baselines/reference/es6ExportClause.js +++ b/tests/baselines/reference/es6ExportClause.js @@ -36,11 +36,11 @@ declare class c { } interface i { } -declare module m { +declare namespace m { var x: number; } declare var x: number; -declare module uninstantiated { +declare namespace uninstantiated { } export { c }; export { c as c2 }; diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js index af3f25cda6d..b2d30fa7567 100644 --- a/tests/baselines/reference/es6ExportClauseInEs5.js +++ b/tests/baselines/reference/es6ExportClauseInEs5.js @@ -41,11 +41,11 @@ declare class c { } interface i { } -declare module m { +declare namespace m { var x: number; } declare var x: number; -declare module uninstantiated { +declare namespace uninstantiated { } export { c }; export { c as c2 }; diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js index 9fda5910fcc..f9bd8f84484 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js @@ -39,11 +39,11 @@ export declare class c { } export interface i { } -export declare module m { +export declare namespace m { var x: number; } export declare var x: number; -export declare module uninstantiated { +export declare namespace uninstantiated { } //// [client.d.ts] export { c } from "server"; diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js index 294d2923b34..50bd55e9a5d 100644 --- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js +++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js @@ -53,11 +53,11 @@ export declare class c { } export interface i { } -export declare module m { +export declare namespace m { var x: number; } export declare var x: number; -export declare module uninstantiated { +export declare namespace uninstantiated { } //// [client.d.ts] export { c } from "./server"; diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js index 65a8db776dd..ba5bc412412 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js @@ -32,7 +32,7 @@ module.exports = x; //// [es6ImportNamedImportInIndirectExportAssignment_0.d.ts] -export declare module a { +export declare namespace a { class c { } } diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js index 2c655dfc8fe..700ed5d1655 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.js +++ b/tests/baselines/reference/exportDeclarationInInternalModule.js @@ -71,11 +71,11 @@ declare class Bbb { } declare class Aaa extends Bbb { } -declare module Aaa { +declare namespace Aaa { class SomeType { } } -declare module Bbb { +declare namespace Bbb { export class SomeType { } export * from Aaa; diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.js b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.js index f8bc8580d03..d73054a7df8 100644 --- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.js +++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.js @@ -92,7 +92,7 @@ var MsPortalFx; //// [exportImportCanSubstituteConstEnumForValue.d.ts] -declare module MsPortalFx.ViewModels.Dialogs { +declare namespace MsPortalFx.ViewModels.Dialogs { const enum DialogResult { Abort = 0, Cancel = 1, @@ -115,7 +115,7 @@ declare module MsPortalFx.ViewModels.Dialogs { YesNoCancel = 5 } } -declare module MsPortalFx.ViewModels { +declare namespace MsPortalFx.ViewModels { /** * For some reason javascript code is emitted for this re-exported const enum. */ diff --git a/tests/baselines/reference/funcdecl.js b/tests/baselines/reference/funcdecl.js index a7d15cb0da4..185f3b7d66e 100644 --- a/tests/baselines/reference/funcdecl.js +++ b/tests/baselines/reference/funcdecl.js @@ -156,7 +156,7 @@ declare function overload1(n: number): string; declare function overload1(s: string): string; declare var withOverloadSignature: typeof overload1; declare function f(n: () => void): void; -declare module m2 { +declare namespace m2 { function foo(n: () => void): void; } declare function fooAmbient(n: number): string; diff --git a/tests/baselines/reference/generatorInAmbientContext6.js b/tests/baselines/reference/generatorInAmbientContext6.js index 00b27f2bfae..f5530160882 100644 --- a/tests/baselines/reference/generatorInAmbientContext6.js +++ b/tests/baselines/reference/generatorInAmbientContext6.js @@ -14,6 +14,6 @@ var M; //// [generatorInAmbientContext6.d.ts] -declare module M { +declare namespace M { function generator(): any; } diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js index 61431fde500..7f7a3796a4b 100644 --- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js +++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js @@ -22,11 +22,11 @@ var bar; //// [genericClassImplementingGenericInterfaceFromAnotherModule.d.ts] -declare module foo { +declare namespace foo { interface IFoo { } } -declare module bar { +declare namespace bar { class Foo implements foo.IFoo { } } diff --git a/tests/baselines/reference/genericClassesInModule.js b/tests/baselines/reference/genericClassesInModule.js index 055510d4da5..b83314b5e74 100644 --- a/tests/baselines/reference/genericClassesInModule.js +++ b/tests/baselines/reference/genericClassesInModule.js @@ -30,7 +30,7 @@ var a = new Foo.B(); //// [genericClassesInModule.d.ts] -declare module Foo { +declare namespace Foo { class B { } class A { diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline index 580bd65b66a..f992ec803b7 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline @@ -12,7 +12,7 @@ var M; })(M || (M = {})); FileName : /tests/cases/fourslash/inputFile.d.ts -declare module M { +declare namespace M { class C { } export var foo: C; diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline index 7a47485e662..a0ee0e676ea 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline @@ -19,7 +19,7 @@ define(["require", "exports"], function (require, exports) { FileName : /tests/cases/fourslash/inputFile.d.ts declare class C { } -export declare module M { +export declare namespace M { var foo: C; } export {}; diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 6330ac6e100..bc9a1876734 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -1165,7 +1165,7 @@ export interface eI { p7(pa1: any, pa2: any): void; p7?(pa1: any, pa2: any): void; } -export declare module eM { +export declare namespace eM { var eV: any; function eF(): void; class eC { @@ -1217,19 +1217,19 @@ export declare module eM { p7(pa1: any, pa2: any): void; p7?(pa1: any, pa2: any): void; } - module eM { + namespace eM { var eV: any; function eF(): void; class eC { } interface eI { } - module eM { } + namespace eM { } var eaV: any; function eaF(): void; class eaC { } - module eaM { } + namespace eaM { } } var eaV: any; function eaF(): void; @@ -1254,21 +1254,21 @@ export declare module eM { static tgF(): void; static get tgF(): any; } - module eaM { + namespace eaM { var V: any; function F(): void; class C { } interface I { } - module M { } + namespace M { } var eV: any; function eF(): void; class eC { } interface eI { } - module eM { } + namespace eM { } } } export declare var eaV: any; @@ -1294,7 +1294,7 @@ export declare class eaC { static tgF(): void; static get tgF(): any; } -export declare module eaM { +export declare namespace eaM { var V: any; function F(): void; class C { @@ -1332,26 +1332,26 @@ export declare module eaM { p7(pa1: any, pa2: any): void; p7?(pa1: any, pa2: any): void; } - module M { + namespace M { var V: any; function F(): void; class C { } interface I { } - module M { } + namespace M { } var eV: any; function eF(): void; class eC { } interface eI { } - module eM { } + namespace eM { } var eaV: any; function eaF(): void; class eaC { } - module eaM { } + namespace eaM { } } var eV: any; function eF(): void; @@ -1391,18 +1391,18 @@ export declare module eaM { p7(pa1: any, pa2: any): void; p7?(pa1: any, pa2: any): void; } - module eM { + namespace eM { var V: any; function F(): void; class C { } - module M { } + namespace M { } var eV: any; function eF(): void; class eC { } interface eI { } - module eM { } + namespace eM { } } } diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index 115b4426031..c4062b62b1a 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -219,7 +219,7 @@ import m4 = require("./importDecl_require"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; -export declare module m1 { +export declare namespace m1 { var x2: m4.d; var d2: typeof m4.d; var f2: m4.d; @@ -229,7 +229,7 @@ export declare var useGlo_m4_d4: typeof glo_m4.d; export declare var useGlo_m4_f4: glo_m4.d; import fncOnly_m4 = require("./importDecl_require2"); export declare var useFncOnly_m4_f4: fncOnly_m4.d; -export declare module usePrivate_m4_m1 { +export declare namespace usePrivate_m4_m1 { } export declare var d: m4.d; export declare var useMultiImport_m4_x4: m4.d; diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js index 78f5f15bc1c..2708737bba6 100644 --- a/tests/baselines/reference/internalAliasClass.js +++ b/tests/baselines/reference/internalAliasClass.js @@ -29,11 +29,11 @@ var c; //// [internalAliasClass.d.ts] -declare module a { +declare namespace a { class c { } } -declare module c { +declare namespace c { import b = a.c; var x: b; } diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js index 7fe6f9af34d..17b82cdfe6b 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js @@ -48,13 +48,13 @@ exports.d = new m2.m3.c(); //// [internalAliasClassInsideLocalModuleWithExport.d.ts] -export declare module x { +export declare namespace x { class c { foo(a: number): number; } } -export declare module m2 { - module m3 { +export declare namespace m2 { + namespace m3 { export import c = x.c; var cProp: c; } diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js index 1ad82eaf022..fd0287a31a3 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js @@ -45,13 +45,13 @@ var m2; //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts] -export declare module x { +export declare namespace x { class c { foo(a: number): number; } } -export declare module m2 { - module m3 { +export declare namespace m2 { + namespace m3 { import c = x.c; var cProp: c; } diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js index c2831572aba..b79bc7f0ec9 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js @@ -35,7 +35,7 @@ var cReturnVal = exports.cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithExport.d.ts] -export declare module x { +export declare namespace x { class c { foo(a: number): number; } diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index 2a9c8a6f449..54f659a3e6f 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -35,7 +35,7 @@ var cReturnVal = exports.cProp.foo(10); //// [internalAliasClassInsideTopLevelModuleWithoutExport.d.ts] -export declare module x { +export declare namespace x { class c { foo(a: number): number; } diff --git a/tests/baselines/reference/internalAliasEnum.js b/tests/baselines/reference/internalAliasEnum.js index 6f0b9b89a88..f6d641181f2 100644 --- a/tests/baselines/reference/internalAliasEnum.js +++ b/tests/baselines/reference/internalAliasEnum.js @@ -33,14 +33,14 @@ var c; //// [internalAliasEnum.d.ts] -declare module a { +declare namespace a { enum weekend { Friday = 0, Saturday = 1, Sunday = 2 } } -declare module c { +declare namespace c { import b = a.weekend; var bVal: b; } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js index 7ecc3909403..4c644fa52f6 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js @@ -36,14 +36,14 @@ var c; //// [internalAliasEnumInsideLocalModuleWithExport.d.ts] -export declare module a { +export declare namespace a { enum weekend { Friday = 0, Saturday = 1, Sunday = 2 } } -export declare module c { +export declare namespace c { export import b = a.weekend; var bVal: b; } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js index 4d346ab4945..f7c6897c5b7 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js @@ -36,14 +36,14 @@ var c; //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts] -export declare module a { +export declare namespace a { enum weekend { Friday = 0, Saturday = 1, Sunday = 2 } } -export declare module c { +export declare namespace c { import b = a.weekend; var bVal: b; } diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js index 16fbafe561c..1b98d32bd32 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js @@ -33,7 +33,7 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasEnumInsideTopLevelModuleWithExport.d.ts] -export declare module a { +export declare namespace a { enum weekend { Friday = 0, Saturday = 1, diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js index 529be9e8dda..173bc832fb8 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js @@ -33,7 +33,7 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasEnumInsideTopLevelModuleWithoutExport.d.ts] -export declare module a { +export declare namespace a { enum weekend { Friday = 0, Saturday = 1, diff --git a/tests/baselines/reference/internalAliasFunction.js b/tests/baselines/reference/internalAliasFunction.js index f43ab0b4f57..987df6fe46f 100644 --- a/tests/baselines/reference/internalAliasFunction.js +++ b/tests/baselines/reference/internalAliasFunction.js @@ -31,10 +31,10 @@ var c; //// [internalAliasFunction.d.ts] -declare module a { +declare namespace a { function foo(x: number): number; } -declare module c { +declare namespace c { import b = a.foo; var bVal: number; var bVal2: typeof b; diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js index 030fcad3d6d..b0f4d96f6fb 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js @@ -34,10 +34,10 @@ var c; //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts] -export declare module a { +export declare namespace a { function foo(x: number): number; } -export declare module c { +export declare namespace c { export import b = a.foo; var bVal: number; var bVal2: typeof b; diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js index cb45c066a5f..a825869db9c 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js @@ -34,10 +34,10 @@ var c; //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts] -export declare module a { +export declare namespace a { function foo(x: number): number; } -export declare module c { +export declare namespace c { import b = a.foo; var bVal2: typeof b; } diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js index de601d1b744..45e89fddb89 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js @@ -31,7 +31,7 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasFunctionInsideTopLevelModuleWithExport.d.ts] -export declare module a { +export declare namespace a { function foo(x: number): number; } export import b = a.foo; diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js index b4b57532ee3..d5168fd8a89 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js @@ -29,7 +29,7 @@ exports.bVal2 = b; //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.d.ts] -export declare module a { +export declare namespace a { function foo(x: number): number; } import b = a.foo; diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js index 3d68cc5a4e6..eeeb1da2a0e 100644 --- a/tests/baselines/reference/internalAliasInitializedModule.js +++ b/tests/baselines/reference/internalAliasInitializedModule.js @@ -34,13 +34,13 @@ var c; //// [internalAliasInitializedModule.d.ts] -declare module a { - module b { +declare namespace a { + namespace b { class c { } } } -declare module c { +declare namespace c { import b = a.b; var x: b.c; } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js index 9dde378436b..ba3d0eb5e25 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js @@ -39,13 +39,13 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasInitializedModuleInsideLocalModuleWithExport.d.ts] -export declare module a { - module b { +export declare namespace a { + namespace b { class c { } } } -export declare module c { +export declare namespace c { export import b = a.b; var x: b.c; } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index 6f783d00c22..2ac850a62c1 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -37,13 +37,13 @@ var c; //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts] -export declare module a { - module b { +export declare namespace a { + namespace b { class c { } } } -export declare module c { +export declare namespace c { import b = a.b; var x: b.c; } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js index eb8c5d585b8..88c659aac6a 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js @@ -32,8 +32,8 @@ exports.x = new exports.b.c(); //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.d.ts] -export declare module a { - module b { +export declare namespace a { + namespace b { class c { } } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index 876fe7a1773..36626c05a6e 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -34,8 +34,8 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.d.ts] -export declare module a { - module b { +export declare namespace a { + namespace b { class c { } } diff --git a/tests/baselines/reference/internalAliasInterface.js b/tests/baselines/reference/internalAliasInterface.js index 1cf4d9f1dda..f588ef54f28 100644 --- a/tests/baselines/reference/internalAliasInterface.js +++ b/tests/baselines/reference/internalAliasInterface.js @@ -19,11 +19,11 @@ var c; //// [internalAliasInterface.d.ts] -declare module a { +declare namespace a { interface I { } } -declare module c { +declare namespace c { import b = a.I; var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js index 6b72824a1ec..61170ea9f96 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js @@ -24,11 +24,11 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasInterfaceInsideLocalModuleWithExport.d.ts] -export declare module a { +export declare namespace a { interface I { } } -export declare module c { +export declare namespace c { export import b = a.I; var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js index 97bd2cd746a..b15d9f561ee 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js @@ -24,11 +24,11 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasInterfaceInsideLocalModuleWithoutExport.d.ts] -export declare module a { +export declare namespace a { interface I { } } -export declare module c { +export declare namespace c { import b = a.I; var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js index fe8bbad59fc..3fdafa56c88 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js @@ -17,7 +17,7 @@ exports.x = void 0; //// [internalAliasInterfaceInsideTopLevelModuleWithExport.d.ts] -export declare module a { +export declare namespace a { interface I { } } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js index 9d33276a231..8fcab4bd9c3 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js @@ -19,7 +19,7 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasInterfaceInsideTopLevelModuleWithoutExport.d.ts] -export declare module a { +export declare namespace a { interface I { } } diff --git a/tests/baselines/reference/internalAliasUninitializedModule.js b/tests/baselines/reference/internalAliasUninitializedModule.js index d35d85339e2..90530093a91 100644 --- a/tests/baselines/reference/internalAliasUninitializedModule.js +++ b/tests/baselines/reference/internalAliasUninitializedModule.js @@ -23,14 +23,14 @@ var c; //// [internalAliasUninitializedModule.d.ts] -declare module a { - module b { +declare namespace a { + namespace b { interface I { foo(): any; } } } -declare module c { +declare namespace c { import b = a.b; var x: b.I; } diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js index 4c18ac19587..230ef741256 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js @@ -26,14 +26,14 @@ var c; //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.d.ts] -export declare module a { - module b { +export declare namespace a { + namespace b { interface I { foo(): any; } } } -export declare module c { +export declare namespace c { export import b = a.b; var x: b.I; } diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js index 21c6547e938..87e8b3e9c1c 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js @@ -26,14 +26,14 @@ var c; //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts] -export declare module a { - module b { +export declare namespace a { + namespace b { interface I { foo(): any; } } } -export declare module c { +export declare namespace c { import b = a.b; var x: b.I; } diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js index ca648edb1ee..108365ce3f4 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js @@ -24,8 +24,8 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasUninitializedModuleInsideTopLevelModuleWithExport.d.ts] -export declare module a { - module b { +export declare namespace a { + namespace b { interface I { foo(): any; } diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js index 4170286136f..49f01fe526a 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js @@ -22,8 +22,8 @@ exports.x.foo(); //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts] -export declare module a { - module b { +export declare namespace a { + namespace b { interface I { foo(): any; } diff --git a/tests/baselines/reference/internalAliasVar.js b/tests/baselines/reference/internalAliasVar.js index 0a5b94259f9..6cc8293a4a0 100644 --- a/tests/baselines/reference/internalAliasVar.js +++ b/tests/baselines/reference/internalAliasVar.js @@ -24,9 +24,9 @@ var c; //// [internalAliasVar.d.ts] -declare module a { +declare namespace a { var x: number; } -declare module c { +declare namespace c { var bVal: number; } diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js index c9e6faeed0d..e650d13ee01 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js @@ -29,10 +29,10 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasVarInsideLocalModuleWithExport.d.ts] -export declare module a { +export declare namespace a { var x: number; } -export declare module c { +export declare namespace c { export import b = a.x; var bVal: number; } diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js index c6ab0ffb0b2..d6b1b108a15 100644 --- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js @@ -29,9 +29,9 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasVarInsideLocalModuleWithoutExport.d.ts] -export declare module a { +export declare namespace a { var x: number; } -export declare module c { +export declare namespace c { var bVal: number; } diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js index 4b58993edde..7641cfd1bc6 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js @@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) { //// [internalAliasVarInsideTopLevelModuleWithExport.d.ts] -export declare module a { +export declare namespace a { var x: number; } export import b = a.x; diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js index 1b462cee02d..3076eff77a7 100644 --- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js @@ -23,7 +23,7 @@ exports.bVal = b; //// [internalAliasVarInsideTopLevelModuleWithoutExport.d.ts] -export declare module a { +export declare namespace a { var x: number; } export declare var bVal: number; diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.js b/tests/baselines/reference/internalAliasWithDottedNameEmit.js index a56cb445233..186b0267edb 100644 --- a/tests/baselines/reference/internalAliasWithDottedNameEmit.js +++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.js @@ -22,8 +22,8 @@ var a; //// [internalAliasWithDottedNameEmit.d.ts] -declare module a.b.c { +declare namespace a.b.c { var d: any; } -declare module a.e.f { +declare namespace a.e.f { } diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js index 84debc45033..3c32766dd36 100644 --- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js +++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js @@ -152,39 +152,39 @@ var schema; //// [isDeclarationVisibleNodeKinds.d.ts] -declare module schema { +declare namespace schema { function createValidator1(schema: any): (data: T) => T; } -declare module schema { +declare namespace schema { function createValidator2(schema: any): new (data: T) => T; } -declare module schema { +declare namespace schema { function createValidator3(schema: any): number | { new (data: T): T; }; } -declare module schema { +declare namespace schema { function createValidator4(schema: any): { new (data: T): T; }[]; } -declare module schema { +declare namespace schema { function createValidator5(schema: any): { new (data: T): T; }; } -declare module schema { +declare namespace schema { function createValidator6(schema: any): [new (data: T) => T, number]; } -declare module schema { +declare namespace schema { function createValidator7(schema: any): (new (data: T) => T)[]; } -declare module schema { +declare namespace schema { function createValidator8(schema: any): Array<{ (data: T): T; }>; } -declare module schema { +declare namespace schema { class T { get createValidator9(): (data: T) => T; set createValidator10(v: (data: T) => T); diff --git a/tests/baselines/reference/letDeclarations2.js b/tests/baselines/reference/letDeclarations2.js index efb64f7234f..fd3653c92ee 100644 --- a/tests/baselines/reference/letDeclarations2.js +++ b/tests/baselines/reference/letDeclarations2.js @@ -15,6 +15,6 @@ var M; //// [letDeclarations2.d.ts] -declare module M { +declare namespace M { let l2: number; } diff --git a/tests/baselines/reference/moduleOuterQualification.js b/tests/baselines/reference/moduleOuterQualification.js index f681e4fe1f1..5d8afb8461e 100644 --- a/tests/baselines/reference/moduleOuterQualification.js +++ b/tests/baselines/reference/moduleOuterQualification.js @@ -14,10 +14,10 @@ declare module outer { //// [moduleOuterQualification.d.ts] -declare module outer { +declare namespace outer { interface Beta { } - module inner { + namespace inner { interface Beta extends outer.Beta { } } diff --git a/tests/baselines/reference/moduleSymbolMerging.js b/tests/baselines/reference/moduleSymbolMerging.js index 02421199ce6..db701f20929 100644 --- a/tests/baselines/reference/moduleSymbolMerging.js +++ b/tests/baselines/reference/moduleSymbolMerging.js @@ -27,13 +27,13 @@ var B; //// [A.d.ts] -declare module A { +declare namespace A { interface I { } } //// [B.d.ts] /// -declare module A { } -declare module B { +declare namespace A { } +declare namespace B { function f(): A.I; } diff --git a/tests/baselines/reference/moduledecl.js b/tests/baselines/reference/moduledecl.js index 9b23b0fd01d..2d66db9d01f 100644 --- a/tests/baselines/reference/moduledecl.js +++ b/tests/baselines/reference/moduledecl.js @@ -376,17 +376,17 @@ var m3eVar; //// [moduledecl.d.ts] -declare module a { +declare namespace a { } -declare module b.a { +declare namespace b.a { } -declare module c.a.b { +declare namespace c.a.b { } -declare module mImport { +declare namespace mImport { } -declare module m0 { +declare namespace m0 { } -declare module m1 { +declare namespace m1 { function f1(): void; function f2(s: string): any; function f2(n: number): any; @@ -411,47 +411,47 @@ declare module m1 { [n: number]: c1; } } -declare module m { - module m2 { +declare namespace m { + namespace m2 { var b: number; } - module m3 { + namespace m3 { var c: number; } } -declare module m { - module m25 { - module m5 { +declare namespace m { + namespace m25 { + namespace m5 { var c: number; } } } -declare module m13 { - module m4 { - module m2 { - module m3 { +declare namespace m13 { + namespace m4 { + namespace m2 { + namespace m3 { var c: number; } } function f(): number; } } -declare module m4 { +declare namespace m4 { var b: any; } -declare module m5 { +declare namespace m5 { var c: any; } -declare module m43 { +declare namespace m43 { var b: any; } -declare module m55 { +declare namespace m55 { var c: any; } declare module "m3" { var b: number; } -declare module exportTests { +declare namespace exportTests { class C1_public { private f2; f3(): string; @@ -465,7 +465,7 @@ declare module exportTests { get c1(): C1_public; } } -declare module mAmbient { +declare namespace mAmbient { class C { myProp: number; } @@ -480,7 +480,7 @@ declare module mAmbient { y, z } - module m3 { + namespace m3 { class C { myProp: number; } diff --git a/tests/baselines/reference/namespacesDeclaration1.js b/tests/baselines/reference/namespacesDeclaration1.js index 4d1058e1ce4..da07863d89e 100644 --- a/tests/baselines/reference/namespacesDeclaration1.js +++ b/tests/baselines/reference/namespacesDeclaration1.js @@ -13,9 +13,9 @@ module M { //// [namespacesDeclaration1.d.ts] -declare module M { +declare namespace M { namespace N { - module M2 { + namespace M2 { interface I { } } diff --git a/tests/baselines/reference/namespacesDeclaration2.js b/tests/baselines/reference/namespacesDeclaration2.js index 6ec513b87b5..936260eabf1 100644 --- a/tests/baselines/reference/namespacesDeclaration2.js +++ b/tests/baselines/reference/namespacesDeclaration2.js @@ -33,7 +33,7 @@ var x; //// [namespacesDeclaration2.d.ts] declare namespace N { } -declare module M { +declare namespace M { } declare namespace ns { let f: number; diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js index 95e83ac33be..69c0208e5d8 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.js +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -3604,7 +3604,7 @@ export declare class publicClassWithPrivateModuleSetAccessorTypes { static set myPublicStaticMethod(param: privateModule.publicClass); set myPublicMethod(param: privateModule.publicClass); } -export declare module publicModule { +export declare namespace publicModule { class privateClass { } export class publicClass { @@ -3653,7 +3653,7 @@ export declare module publicModule { } export {}; } -declare module privateModule { +declare namespace privateModule { class privateClass { } export class publicClass { @@ -3722,12 +3722,12 @@ declare class publicClassInGlobalWithWithPublicSetAccessorTypes { set myPublicMethod(param: publicClassInGlobal); private set myPrivateMethod(value); } -declare module publicModuleInGlobal { +declare namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } export class publicClass { diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js index 166fc1b9744..310d337fa47 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js @@ -391,7 +391,7 @@ declare module "GlobalWidgets" { name: string; } function createWidget3(): Widget3; - module SpecializedGlobalWidget { + namespace SpecializedGlobalWidget { class Widget4 { name: string; } @@ -403,7 +403,7 @@ export declare class Widget1 { name: string; } export declare function createWidget1(): Widget1; -export declare module SpecializedWidget { +export declare namespace SpecializedWidget { class Widget2 { name: string; } diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js index cc61a1f860a..a7f9b6a94d7 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js @@ -218,7 +218,7 @@ declare module "GlobalWidgets" { name: string; } function createWidget3(): Widget3; - module SpecializedGlobalWidget { + namespace SpecializedGlobalWidget { class Widget4 { name: string; } @@ -230,7 +230,7 @@ export declare class Widget1 { name: string; } export declare function createWidget1(): Widget1; -export declare module SpecializedWidget { +export declare namespace SpecializedWidget { class Widget2 { name: string; } diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js index 054e214c220..d1f649d790d 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js @@ -17,7 +17,7 @@ module.exports = Foo; //// [privacyCheckExportAssignmentOnExportedGenericInterface1.d.ts] -declare module Foo { +declare namespace Foo { interface A { } } diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js index 45dd315cab2..ecb18d7c2b6 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js @@ -33,6 +33,6 @@ export = Foo; interface Foo { } declare function Foo(array: T[]): Foo; -declare module Foo { +declare namespace Foo { var x: string; } diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js index 07aafd26e9d..ba5a1fad814 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js @@ -20,8 +20,8 @@ var Outer; //// [privacyCheckTypeOfInvisibleModuleError.d.ts] -declare module Outer { - module Inner { +declare namespace Outer { + namespace Inner { var m: typeof Inner; } export var f: typeof Inner; diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js index 642cf6033e2..8d48438936d 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js @@ -20,8 +20,8 @@ var Outer; //// [privacyCheckTypeOfInvisibleModuleNoError.d.ts] -declare module Outer { - module Inner { +declare namespace Outer { + namespace Inner { var m: number; } export var f: typeof Inner; diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js index 1052a71edd7..752adc42fdc 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js @@ -372,7 +372,7 @@ var publicClassExtendingPublicClassInGlobal = /** @class */ (function (_super) { //// [privacyClassExtendsClauseDeclFile_externalModule.d.ts] -export declare module publicModule { +export declare namespace publicModule { export class publicClassInPublicModule { private f1; } @@ -386,7 +386,7 @@ export declare module publicModule { } export {}; } -declare module privateModule { +declare namespace privateModule { export class publicClassInPrivateModule { private f1; } @@ -413,7 +413,7 @@ export declare class publicClassExtendingFromPrivateModuleClass extends privateM } export {}; //// [privacyClassExtendsClauseDeclFile_GlobalFile.d.ts] -declare module publicModuleInGlobal { +declare namespace publicModuleInGlobal { export class publicClassInPublicModule { private f1; } diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js index 76c94d82220..cc9ea29488e 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js @@ -242,7 +242,7 @@ var publicClassImplementingPublicInterfaceInGlobal = /** @class */ (function () //// [privacyClassImplementsClauseDeclFile_externalModule.d.ts] -export declare module publicModule { +export declare namespace publicModule { export interface publicInterfaceInPublicModule { } interface privateInterfaceInPublicModule { @@ -257,7 +257,7 @@ export declare module publicModule { } export {}; } -declare module privateModule { +declare namespace privateModule { export interface publicInterfaceInPrivateModule { } interface privateInterfaceInPrivateModule { @@ -282,7 +282,7 @@ export declare class publicClassImplementingFromPrivateModuleInterface implement } export {}; //// [privacyClassImplementsClauseDeclFile_GlobalFile.d.ts] -declare module publicModuleInGlobal { +declare namespace publicModuleInGlobal { export interface publicInterfaceInPublicModule { } interface privateInterfaceInPublicModule { diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js index 94330a8421c..d4c321577be 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js @@ -404,7 +404,7 @@ declare module "GlobalWidgets" { name: string; } function createWidget3(): Widget3; - module SpecializedGlobalWidget { + namespace SpecializedGlobalWidget { class Widget4 { name: string; } @@ -416,7 +416,7 @@ export declare class Widget1 { name: string; } export declare function createWidget1(): Widget1; -export declare module SpecializedWidget { +export declare namespace SpecializedWidget { class Widget2 { name: string; } diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js index 83df98c1196..87a0b6b32b8 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js @@ -361,7 +361,7 @@ declare module "GlobalWidgets" { name: string; } function createWidget3(): Widget3; - module SpecializedGlobalWidget { + namespace SpecializedGlobalWidget { class Widget4 { name: string; } @@ -373,7 +373,7 @@ export declare class Widget1 { name: string; } export declare function createWidget1(): Widget1; -export declare module SpecializedWidget { +export declare namespace SpecializedWidget { class Widget2 { name: string; } diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js index 3f50482bc77..f74a60b8e45 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js @@ -1332,7 +1332,7 @@ export declare class publicClassWithPrivateModuleParameterTypes { } export declare function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; -export declare module publicModule { +export declare namespace publicModule { class privateClass { } export class publicClass { @@ -1385,7 +1385,7 @@ export declare module publicModule { export function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; export {}; } -declare module privateModule { +declare namespace privateModule { class privateClass { } export class publicClass { @@ -1458,12 +1458,12 @@ declare class publicClassWithWithPublicParmeterTypesInGlobal { } declare function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void; declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void; -declare module publicModuleInGlobal { +declare namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } export class publicClass { diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js index 0572a5c04db..b9907650a57 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js @@ -2339,7 +2339,7 @@ export declare class publicClassWithPrivateModuleParameterTypes { export declare function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; export declare function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass; export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; -export declare module publicModule { +export declare namespace publicModule { class privateClass { } export class publicClass { @@ -2399,7 +2399,7 @@ export declare module publicModule { export function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; export {}; } -declare module privateModule { +declare namespace privateModule { class privateClass { } export class publicClass { @@ -2482,12 +2482,12 @@ declare class publicClassWithWithPublicParmeterTypesInGlobal { declare function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal; declare function publicFunctionWithPublicParmeterTypesInGlobal1(): publicClassInGlobal; declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal; -declare module publicModuleInGlobal { +declare namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } export class publicClass { diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js index 069aa0a0e5e..d99ccda06e2 100644 --- a/tests/baselines/reference/privacyGloImport.js +++ b/tests/baselines/reference/privacyGloImport.js @@ -266,15 +266,15 @@ var m2; //// [privacyGloImport.d.ts] -declare module m1 { - export module m1_M1_public { +declare namespace m1 { + export namespace m1_M1_public { class c1 { } function f1(): c1; var v1: typeof c1; var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { class c1 { } function f1(): c1; @@ -295,7 +295,7 @@ declare module m1 { export import m1_im2_public = m1_M2_private; export {}; } -declare module glo_M1_public { +declare namespace glo_M1_public { class c1 { } function f1(): c1; @@ -334,16 +334,16 @@ declare module "use_glo_M1_public" { }; var use_glo_M2_public_v2_private: typeof use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { - module m5 { + namespace m2 { + namespace m5 { } } } declare module "anotherParseError" { - module m2 { + namespace m2 { } - module m2 { + namespace m2 { } } -declare module m2 { +declare namespace m2 { } diff --git a/tests/baselines/reference/privacyGloImportParseErrors.js b/tests/baselines/reference/privacyGloImportParseErrors.js index 9ba2ba6cf25..1a1252819e3 100644 --- a/tests/baselines/reference/privacyGloImportParseErrors.js +++ b/tests/baselines/reference/privacyGloImportParseErrors.js @@ -246,15 +246,15 @@ var m2; //// [privacyGloImportParseErrors.d.ts] -declare module m1 { - export module m1_M1_public { +declare namespace m1 { + export namespace m1_M1_public { class c1 { } function f1(): c1; var v1: typeof c1; var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { class c1 { } function f1(): c1; @@ -294,7 +294,7 @@ declare module m1 { export import m1_im4_public = require("m1_M4_private"); export {}; } -declare module glo_M1_public { +declare namespace glo_M1_public { class c1 { } function f1(): c1; @@ -333,22 +333,22 @@ declare module "use_glo_M1_public" { }; var use_glo_M2_public_v2_private: typeof use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { - module m5 { + namespace m2 { + namespace m5 { } } } declare module "anotherParseError" { - module m2 { + namespace m2 { module "abc" { } } - module m2 { + namespace m2 { module "abc2" { } } module "abc3" { } } -declare module m2 { +declare namespace m2 { } diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js index 6527a9e0875..0681c429ff0 100644 --- a/tests/baselines/reference/privacyImport.js +++ b/tests/baselines/reference/privacyImport.js @@ -708,15 +708,15 @@ var m3; //// [privacyImport.d.ts] -export declare module m1 { - export module m1_M1_public { +export declare namespace m1 { + export namespace m1_M1_public { class c1 { } function f1(): c1; var v1: typeof c1; var v2: c1; } - module m1_M2_private { + namespace m1_M2_private { class c1 { } function f1(): c1; @@ -737,14 +737,14 @@ export declare module m1 { export import m1_im2_public = m1_M2_private; export {}; } -export declare module glo_M1_public { +export declare namespace glo_M1_public { class c1 { } function f1(): c1; var v1: typeof c1; var v2: c1; } -export declare module glo_M3_private { +export declare namespace glo_M3_private { class c1 { } function f1(): c1; @@ -763,5 +763,5 @@ export declare var glo_im3_private_v3_public: typeof glo_im3_private.f1; export declare var glo_im3_private_v4_public: glo_im3_private.c1; export import glo_im1_public = glo_M1_public; export import glo_im2_public = glo_M3_private; -export declare module m3 { +export declare namespace m3 { } diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js index 6237db0cdd9..84a2b3ad52b 100644 --- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js @@ -100,7 +100,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); //// [privacyInterfaceExtendsClauseDeclFile_externalModule.d.ts] -export declare module publicModule { +export declare namespace publicModule { export interface publicInterfaceInPublicModule { } interface privateInterfaceInPublicModule { @@ -115,7 +115,7 @@ export declare module publicModule { } export {}; } -declare module privateModule { +declare namespace privateModule { export interface publicInterfaceInPrivateModule { } interface privateInterfaceInPrivateModule { @@ -140,7 +140,7 @@ export interface publicInterfaceImplementingFromPrivateModuleInterface extends p } export {}; //// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.d.ts] -declare module publicModuleInGlobal { +declare namespace publicModuleInGlobal { export interface publicInterfaceInPublicModule { } interface privateInterfaceInPublicModule { diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js index 58cd7dcabb9..5ce9646b771 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js @@ -301,7 +301,7 @@ var import_private; //// [privacyLocalInternalReferenceImportWithExport.d.ts] -declare module m_private { +declare namespace m_private { class c_private { } enum e_private { @@ -312,16 +312,16 @@ declare module m_private { var v_private: c_private; interface i_private { } - module mi_private { + namespace mi_private { class c { } } - module mu_private { + namespace mu_private { interface i { } } } -export declare module m_public { +export declare namespace m_public { class c_public { } enum e_public { @@ -332,16 +332,16 @@ export declare module m_public { var v_public: number; interface i_public { } - module mi_public { + namespace mi_public { class c { } } - module mu_public { + namespace mu_public { interface i { } } } -export declare module import_public { +export declare namespace import_public { export import im_public_c_private = m_private.c_private; export import im_public_e_private = m_private.e_private; export import im_public_f_private = m_private.f_private; diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js index 370c12394f3..9b88c75388c 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js @@ -303,7 +303,7 @@ define(["require", "exports"], function (require, exports) { //// [privacyLocalInternalReferenceImportWithoutExport.d.ts] -declare module m_private { +declare namespace m_private { class c_private { } enum e_private { @@ -314,16 +314,16 @@ declare module m_private { var v_private: c_private; interface i_private { } - module mi_private { + namespace mi_private { class c { } } - module mu_private { + namespace mu_private { interface i { } } } -export declare module m_public { +export declare namespace m_public { class c_public { } enum e_public { @@ -334,16 +334,16 @@ export declare module m_public { var v_public: number; interface i_public { } - module mi_public { + namespace mi_public { class c { } } - module mu_public { + namespace mu_public { interface i { } } } -export declare module import_public { +export declare namespace import_public { import im_private_c_private = m_private.c_private; import im_private_e_private = m_private.e_private; import im_private_i_private = m_private.i_private; diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js index 7d889902fda..99397be4c40 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js @@ -206,7 +206,7 @@ define(["require", "exports"], function (require, exports) { //// [privacyTopLevelInternalReferenceImportWithExport.d.ts] -declare module m_private { +declare namespace m_private { class c_private { } enum e_private { @@ -217,16 +217,16 @@ declare module m_private { var v_private: c_private; interface i_private { } - module mi_private { + namespace mi_private { class c { } } - module mu_private { + namespace mu_private { interface i { } } } -export declare module m_public { +export declare namespace m_public { class c_public { } enum e_public { @@ -237,11 +237,11 @@ export declare module m_public { var v_public: number; interface i_public { } - module mi_public { + namespace mi_public { class c { } } - module mu_public { + namespace mu_public { interface i { } } diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js index cf25f696222..a7158320d67 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js @@ -206,7 +206,7 @@ define(["require", "exports"], function (require, exports) { //// [privacyTopLevelInternalReferenceImportWithoutExport.d.ts] -declare module m_private { +declare namespace m_private { class c_private { } enum e_private { @@ -217,16 +217,16 @@ declare module m_private { var v_private: c_private; interface i_private { } - module mi_private { + namespace mi_private { class c { } } - module mu_private { + namespace mu_private { interface i { } } } -export declare module m_public { +export declare namespace m_public { class c_public { } enum e_public { @@ -237,11 +237,11 @@ export declare module m_public { var v_public: number; interface i_public { } - module mi_public { + namespace mi_public { class c { } } - module mu_public { + namespace mu_public { interface i { } } diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js index efc90dbf95c..e542f0cea20 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js @@ -872,7 +872,7 @@ export declare class publicClassWithWithPrivateModuleTypeParameters { myPublicMethod(): void; } export declare function publicFunctionWithPrivateMopduleTypeParameters(): void; -export declare module publicModule { +export declare namespace publicModule { class privateClass { } export class publicClass { @@ -925,7 +925,7 @@ export declare module publicModule { export function publicFunctionWithPrivateMopduleTypeParameters(): void; export {}; } -declare module privateModule { +declare namespace privateModule { class privateClass { } export class publicClass { diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js index 47942837721..a0c721acc99 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js @@ -405,7 +405,7 @@ export declare class publicClassWithPublicTypeParametersWithoutExtends { export declare class publicClassWithTypeParametersFromPrivateModule { myMethod(val: T): T; } -export declare module publicModule { +export declare namespace publicModule { class privateClassInPublicModule { } export class publicClassInPublicModule { @@ -424,7 +424,7 @@ export declare module publicModule { } export {}; } -declare module privateModule { +declare namespace privateModule { class privateClassInPrivateModule { } export class publicClassInPrivateModule { diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js index db00e1a628c..66f07c0dcc6 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js @@ -301,7 +301,7 @@ export interface publicInterfaceWithPublicTypeParametersWithoutExtends { } export interface publicInterfaceWithPrivateModuleTypeParameterConstraints { } -export declare module publicModule { +export declare namespace publicModule { class privateClassInPublicModule { } export class publicClassInPublicModule { @@ -334,7 +334,7 @@ export declare module publicModule { } export {}; } -declare module privateModule { +declare namespace privateModule { class privateClassInPrivateModule { } export class publicClassInPrivateModule { diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js index 3497a7372fb..83f6ef53f1a 100644 --- a/tests/baselines/reference/privacyVarDeclFile.js +++ b/tests/baselines/reference/privacyVarDeclFile.js @@ -725,7 +725,7 @@ export declare class publicClassWithPrivateModulePropertyTypes { } export declare var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; -export declare module publicModule { +export declare namespace publicModule { class privateClass { } export class publicClass { @@ -763,7 +763,7 @@ export declare module publicModule { export var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; export {}; } -declare module privateModule { +declare namespace privateModule { class privateClass { } export class publicClass { @@ -816,12 +816,12 @@ declare class publicClassWithWithPublicPropertyTypesInGlobal { } declare var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; -declare module publicModuleInGlobal { +declare namespace publicModuleInGlobal { class privateClass { } export class publicClass { } - module privateModule { + namespace privateModule { class privateClass { } export class publicClass { diff --git a/tests/baselines/reference/project/declarationsExportNamespace/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsExportNamespace/amd/useModule.d.ts index 40fb7f35522..ed142ecc00e 100644 --- a/tests/baselines/reference/project/declarationsExportNamespace/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsExportNamespace/amd/useModule.d.ts @@ -1,4 +1,4 @@ -declare module moduleB { +declare namespace moduleB { interface IUseModuleA { a: moduleA.A; } diff --git a/tests/baselines/reference/project/declarationsExportNamespace/node/useModule.d.ts b/tests/baselines/reference/project/declarationsExportNamespace/node/useModule.d.ts index 40fb7f35522..ed142ecc00e 100644 --- a/tests/baselines/reference/project/declarationsExportNamespace/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsExportNamespace/node/useModule.d.ts @@ -1,4 +1,4 @@ -declare module moduleB { +declare namespace moduleB { interface IUseModuleA { a: moduleA.A; } diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts index 40f147141de..4d73e681dd9 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.d.ts @@ -1,3 +1,3 @@ -export declare module usePrivate_m4_m1 { +export declare namespace usePrivate_m4_m1 { var numberVar: number; } diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts index 40f147141de..4d73e681dd9 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.d.ts @@ -1,3 +1,3 @@ -export declare module usePrivate_m4_m1 { +export declare namespace usePrivate_m4_m1 { var numberVar: number; } diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts index 508c764d153..7c1925b99f8 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts @@ -2,7 +2,7 @@ import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; -export declare module m1 { +export declare namespace m1 { var x2: m4.d; var d2: typeof m4.d; var f2: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts index 508c764d153..7c1925b99f8 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts @@ -2,7 +2,7 @@ import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; -export declare module m1 { +export declare namespace m1 { var x2: m4.d; var d2: typeof m4.d; var f2: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts index f2ba92bca9e..2c6f15796d0 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts @@ -2,7 +2,7 @@ import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; -export declare module m1 { +export declare namespace m1 { var x2: m4.d; var d2: typeof m4.d; var f2: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts index f2ba92bca9e..2c6f15796d0 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts @@ -2,7 +2,7 @@ import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; -export declare module m1 { +export declare namespace m1 { var x2: m4.d; var d2: typeof m4.d; var f2: m4.d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts index c5355f22ef5..2a157b2307c 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts @@ -2,7 +2,7 @@ import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; -export declare module m1 { +export declare namespace m1 { var x2: m4.d; var d2: typeof m4.d; var f2: m4.d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts index c5355f22ef5..2a157b2307c 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts @@ -2,7 +2,7 @@ import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; -export declare module m1 { +export declare namespace m1 { var x2: m4.d; var d2: typeof m4.d; var f2: m4.d; diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.d.ts index bf5f4edd706..acdc8d31b31 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.d.ts +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.d.ts @@ -1,4 +1,4 @@ -declare module test { +declare namespace test { class ClassA { method(): void; } diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.d.ts index bf5f4edd706..acdc8d31b31 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.d.ts +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.d.ts @@ -1,4 +1,4 @@ -declare module test { +declare namespace test { class ClassA { method(): void; } diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js index 35df5e19491..931c4aed0cb 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js @@ -6008,7 +6008,7 @@ var imperfecta; //// [resolvingClassDeclarationWhenInBaseTypeResolution.d.ts] -declare module rionegrensis { +declare namespace rionegrensis { class caniventer extends Lanthanum.nitidus { salomonseni(): caniventer; uchidai(): lavali.xanthognathus; @@ -6024,7 +6024,7 @@ declare module rionegrensis { nivicola(): samarensis.pallidus; } } -declare module julianae { +declare namespace julianae { class steerii { } class nudicaudus { @@ -6109,13 +6109,13 @@ declare module julianae { phrudus(): sagitta.stolzmanni; } } -declare module ruatanica { +declare namespace ruatanica { class hector { humulis(): julianae.steerii; eurycerus(): panamensis.linulus, lavali.wilsoni>; } } -declare module Lanthanum { +declare namespace Lanthanum { class suillus { spilosoma(): quasiater.carolinensis; tumbalensis(): caurinus.megaphyllus; @@ -6160,7 +6160,7 @@ declare module Lanthanum { ileile(): quasiater.carolinensis; } } -declare module rendalli { +declare namespace rendalli { class zuluensis extends julianae.steerii { telfairi(): argurus.wetmorei; keyensis(): quasiater.wattsi; @@ -6195,7 +6195,7 @@ declare module rendalli { edax(): lutreolus.cor>, rionegrensis.caniventer>; } } -declare module trivirgatus { +declare namespace trivirgatus { class tumidifrons { nivalis(): dogramacii.kaiseri; vestitus(): lavali.xanthognathus; @@ -6245,7 +6245,7 @@ declare module trivirgatus { ralli(): lavali.xanthognathus; } } -declare module quasiater { +declare namespace quasiater { class bobrinskoi { crassicaudatus(): samarensis.cahirinus; mulatta(): argurus.oreas; @@ -6253,7 +6253,7 @@ declare module quasiater { Copper(): argurus.netscheri; } } -declare module ruatanica { +declare namespace ruatanica { class americanus extends imperfecta.ciliolabrum { nasoloi(): macrorhinos.konganensis; mystacalis(): howi.angulatus; @@ -6261,7 +6261,7 @@ declare module ruatanica { tumidus(): gabriellae.amicus; } } -declare module lavali { +declare namespace lavali { class wilsoni extends Lanthanum.nitidus { setiger(): nigra.thalia; lorentzii(): imperfecta.subspinosus; @@ -6323,7 +6323,7 @@ declare module lavali { aequalis(): sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis>; } } -declare module dogramacii { +declare namespace dogramacii { class robustulus extends lavali.wilsoni { fossor(): minutus.inez; humboldti(): sagitta.cinereus; @@ -6364,7 +6364,7 @@ declare module dogramacii { erythromos(): caurinus.johorensis, nigra.dolichurus>; } } -declare module lutreolus { +declare namespace lutreolus { class schlegeli extends lavali.beisa { mittendorfi(): rionegrensis.caniventer; blicki(): dogramacii.robustulus; @@ -6382,7 +6382,7 @@ declare module lutreolus { dispar(): panamensis.linulus; } } -declare module argurus { +declare namespace argurus { class dauricus { chinensis(): Lanthanum.jugularis; duodecimcostatus(): lavali.xanthognathus; @@ -6397,7 +6397,7 @@ declare module argurus { misionensis(): macrorhinos.marmosurus, gabriellae.echinatus>; } } -declare module nigra { +declare namespace nigra { class dolichurus { solomonis(): panglima.abidi, argurus.netscheri, julianae.oralis>>>; alfredi(): caurinus.psilurus; @@ -6409,7 +6409,7 @@ declare module nigra { sagei(): howi.marcanoi; } } -declare module panglima { +declare namespace panglima { class amphibius extends caurinus.johorensis, Lanthanum.jugularis> { bottegi(): macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>; jerdoni(): macrorhinos.daphaenodon; @@ -6431,7 +6431,7 @@ declare module panglima { ega(): imperfecta.lasiurus>; } } -declare module quasiater { +declare namespace quasiater { class carolinensis { concinna(): rendalli.zuluensis; aeneus(): howi.marcanoi; @@ -6442,7 +6442,7 @@ declare module quasiater { patrizii(): Lanthanum.megalonyx; } } -declare module minutus { +declare namespace minutus { class himalayana extends lutreolus.punicus { simoni(): argurus.netscheri>; lobata(): samarensis.pallidus; @@ -6458,7 +6458,7 @@ declare module minutus { olympus(): Lanthanum.megalonyx; } } -declare module caurinus { +declare namespace caurinus { class mahaganus extends panglima.fundatus { martiniquensis(): ruatanica.hector>>; devius(): samarensis.pelurus, trivirgatus.falconeri>>; @@ -6470,21 +6470,21 @@ declare module caurinus { acticola(): argurus.luctuosa; } } -declare module macrorhinos { +declare namespace macrorhinos { class marmosurus { tansaniana(): lutreolus.punicus; } } -declare module howi { +declare namespace howi { class angulatus extends sagitta.stolzmanni { pennatus(): howi.marcanoi; } } -declare module daubentonii { +declare namespace daubentonii { class nesiotes { } } -declare module nigra { +declare namespace nigra { class thalia { dichotomus(): quasiater.carolinensis; arnuxii(): panamensis.linulus, lavali.beisa>; @@ -6496,21 +6496,21 @@ declare module nigra { brucei(): chrysaeolus.sarasinorum; } } -declare module sagitta { +declare namespace sagitta { class walkeri extends minutus.portoricensis { maracajuensis(): samarensis.cahirinus; } } -declare module minutus { +declare namespace minutus { class inez extends samarensis.pelurus { vexillaris(): samarensis.cahirinus; } } -declare module macrorhinos { +declare namespace macrorhinos { class konganensis extends imperfecta.lasiurus { } } -declare module panamensis { +declare namespace panamensis { class linulus extends ruatanica.hector> { goslingi(): daubentonii.arboreus; taki(): patas.uralensis; @@ -6523,7 +6523,7 @@ declare module panamensis { gomantongensis(): rionegrensis.veraecrucis>; } } -declare module nigra { +declare namespace nigra { class gracilis { weddellii(): nigra.dolichurus; echinothrix(): Lanthanum.nitidus, argurus.oreas>; @@ -6540,7 +6540,7 @@ declare module nigra { ramirohitra(): panglima.amphibius; } } -declare module samarensis { +declare namespace samarensis { class pelurus extends sagitta.stolzmanni { Palladium(): panamensis.linulus; castanea(): argurus.netscheri, julianae.oralis>; @@ -6586,7 +6586,7 @@ declare module samarensis { saussurei(): rendalli.crenulata, argurus.netscheri, julianae.oralis>>; } } -declare module sagitta { +declare namespace sagitta { class leptoceros extends caurinus.johorensis> { victus(): rionegrensis.caniventer; hoplomyoides(): panglima.fundatus, nigra.gracilis>; @@ -6595,23 +6595,23 @@ declare module sagitta { bolami(): trivirgatus.tumidifrons; } } -declare module daubentonii { +declare namespace daubentonii { class nigricans extends sagitta.stolzmanni { woosnami(): dogramacii.robustulus; } } -declare module dammermani { +declare namespace dammermani { class siberu { } } -declare module argurus { +declare namespace argurus { class pygmaea extends rendalli.moojeni { pajeros(): gabriellae.echinatus; capucinus(): rendalli.zuluensis; cuvieri(): rionegrensis.caniventer; } } -declare module chrysaeolus { +declare namespace chrysaeolus { class sarasinorum extends caurinus.psilurus { belzebul(): samarensis.pallidus; hinpoon(): nigra.caucasica; @@ -6622,7 +6622,7 @@ declare module chrysaeolus { princeps(): minutus.portoricensis; } } -declare module argurus { +declare namespace argurus { class wetmorei { leucoptera(): petrophilus.rosalia; ochraventer(): sagitta.walkeri; @@ -6633,7 +6633,7 @@ declare module argurus { mayori(): sagitta.stolzmanni; } } -declare module argurus { +declare namespace argurus { class oreas extends lavali.wilsoni { salamonis(): lavali.xanthognathus; paniscus(): ruatanica.Praseodymium; @@ -6645,7 +6645,7 @@ declare module argurus { univittatus(): argurus.peninsulae; } } -declare module daubentonii { +declare namespace daubentonii { class arboreus { capreolus(): rendalli.crenulata, lavali.wilsoni>; moreni(): panglima.abidi; @@ -6661,7 +6661,7 @@ declare module daubentonii { tianshanica(): howi.marcanoi; } } -declare module patas { +declare namespace patas { class uralensis { cartilagonodus(): Lanthanum.nitidus; pyrrhinus(): lavali.beisa; @@ -6678,19 +6678,19 @@ declare module patas { albiventer(): rendalli.crenulata; } } -declare module provocax { +declare namespace provocax { class melanoleuca extends lavali.wilsoni { Neodymium(): macrorhinos.marmosurus, lutreolus.foina>; baeri(): imperfecta.lasiurus; } } -declare module sagitta { +declare namespace sagitta { class sicarius { Chlorine(): samarensis.cahirinus, dogramacii.robustulus>; simulator(): macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>>; } } -declare module howi { +declare namespace howi { class marcanoi extends Lanthanum.megalonyx { formosae(): Lanthanum.megalonyx; dudui(): lutreolus.punicus; @@ -6708,7 +6708,7 @@ declare module howi { hyaena(): julianae.oralis; } } -declare module argurus { +declare namespace argurus { class gilbertii { nasutus(): lavali.lepturus; poecilops(): julianae.steerii; @@ -6724,11 +6724,11 @@ declare module argurus { amurensis(): daubentonii.arboreus; } } -declare module petrophilus { +declare namespace petrophilus { class minutilla { } } -declare module lutreolus { +declare namespace lutreolus { class punicus { strandi(): gabriellae.klossii; lar(): caurinus.mahaganus; @@ -6745,7 +6745,7 @@ declare module lutreolus { Helium(): julianae.acariensis; } } -declare module macrorhinos { +declare namespace macrorhinos { class daphaenodon { bredanensis(): julianae.sumatrana; othus(): howi.coludo; @@ -6755,7 +6755,7 @@ declare module macrorhinos { callosus(): trivirgatus.lotor; } } -declare module sagitta { +declare namespace sagitta { class cinereus { zunigae(): rendalli.crenulata>; microps(): daubentonii.nigricans>; @@ -6771,11 +6771,11 @@ declare module sagitta { pittieri(): samarensis.fuscus; } } -declare module nigra { +declare namespace nigra { class caucasica { } } -declare module gabriellae { +declare namespace gabriellae { class klossii extends imperfecta.lasiurus { } class amicus { @@ -6794,7 +6794,7 @@ declare module gabriellae { tenuipes(): howi.coludo>; } } -declare module imperfecta { +declare namespace imperfecta { class lasiurus { marisae(): lavali.thaeleri; fulvus(): argurus.germaini; @@ -6822,7 +6822,7 @@ declare module imperfecta { sinicus(): macrorhinos.marmosurus; } } -declare module quasiater { +declare namespace quasiater { class wattsi { lagotis(): lavali.xanthognathus; hussoni(): lavali.wilsoni; @@ -6830,9 +6830,9 @@ declare module quasiater { cabrerae(): lavali.lepturus; } } -declare module butleri { +declare namespace butleri { } -declare module petrophilus { +declare namespace petrophilus { class sodyi extends quasiater.bobrinskoi { saundersiae(): samarensis.pallidus; imberbis(): quasiater.carolinensis; @@ -6845,7 +6845,7 @@ declare module petrophilus { bairdii(): lavali.beisa; } } -declare module caurinus { +declare namespace caurinus { class megaphyllus extends imperfecta.lasiurus> { montana(): argurus.oreas; amatus(): lutreolus.schlegeli; @@ -6857,14 +6857,14 @@ declare module caurinus { cirrhosus(): quasiater.carolinensis; } } -declare module minutus { +declare namespace minutus { class portoricensis { relictus(): quasiater.carolinensis; aequatorianus(): gabriellae.klossii; rhinogradoides(): samarensis.cahirinus; } } -declare module lutreolus { +declare namespace lutreolus { class foina { tarfayensis(): lutreolus.punicus; Promethium(): samarensis.pelurus; @@ -6881,7 +6881,7 @@ declare module lutreolus { argentiventer(): trivirgatus.mixtus; } } -declare module lutreolus { +declare namespace lutreolus { class cor extends panglima.fundatus, lavali.beisa>, dammermani.melanops> { antinorii(): petrophilus.sodyi; voi(): caurinus.johorensis; @@ -6895,19 +6895,19 @@ declare module lutreolus { castroviejoi(): Lanthanum.jugularis; } } -declare module howi { +declare namespace howi { class coludo { bernhardi(): lutreolus.punicus; isseli(): argurus.germaini; } } -declare module argurus { +declare namespace argurus { class germaini extends gabriellae.amicus { sharpei(): lavali.wilsoni; palmarum(): macrorhinos.marmosurus; } } -declare module sagitta { +declare namespace sagitta { class stolzmanni { riparius(): nigra.dolichurus; dhofarensis(): lutreolus.foina; @@ -6922,7 +6922,7 @@ declare module sagitta { florium(): rendalli.zuluensis; } } -declare module dammermani { +declare namespace dammermani { class melanops extends minutus.inez { blarina(): dammermani.melanops; harwoodi(): rionegrensis.veraecrucis, lavali.wilsoni>; @@ -6939,7 +6939,7 @@ declare module dammermani { bocagei(): julianae.albidens; } } -declare module argurus { +declare namespace argurus { class peninsulae extends patas.uralensis { aitkeni(): trivirgatus.mixtus, panglima.amphibius>; novaeangliae(): lavali.xanthognathus; @@ -6951,7 +6951,7 @@ declare module argurus { cavernarum(): minutus.inez; } } -declare module argurus { +declare namespace argurus { class netscheri { gravis(): nigra.caucasica, dogramacii.kaiseri>; ruschii(): imperfecta.lasiurus>; @@ -6968,7 +6968,7 @@ declare module argurus { ruemmleri(): panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum>; } } -declare module ruatanica { +declare namespace ruatanica { class Praseodymium extends ruatanica.hector { clara(): panglima.amphibius, argurus.dauricus>; spectabilis(): petrophilus.sodyi; @@ -6985,17 +6985,17 @@ declare module ruatanica { soricinus(): quasiater.carolinensis; } } -declare module caurinus { +declare namespace caurinus { class johorensis extends lutreolus.punicus { maini(): ruatanica.Praseodymium; } } -declare module argurus { +declare namespace argurus { class luctuosa { loriae(): rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>; } } -declare module panamensis { +declare namespace panamensis { class setulosus { duthieae(): caurinus.mahaganus, dogramacii.aurata>; guereza(): howi.coludo; @@ -7007,7 +7007,7 @@ declare module panamensis { vampyrus(): julianae.oralis; } } -declare module petrophilus { +declare namespace petrophilus { class rosalia { palmeri(): panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>>; baeops(): Lanthanum.nitidus; @@ -7016,7 +7016,7 @@ declare module petrophilus { montivaga(): panamensis.setulosus>; } } -declare module caurinus { +declare namespace caurinus { class psilurus extends lutreolus.punicus { socialis(): panglima.amphibius; lundi(): petrophilus.sodyi; diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js index 490ce8776cc..bdbf5554d0a 100644 --- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js +++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.js @@ -14,7 +14,7 @@ var m1; //// [stringLiteralObjectLiteralDeclaration1.d.ts] -declare module m1 { +declare namespace m1 { var n: { 'foo bar': number; }; diff --git a/tests/baselines/reference/structuralTypeInDeclareFileForModule.js b/tests/baselines/reference/structuralTypeInDeclareFileForModule.js index e353afd102c..006d4554438 100644 --- a/tests/baselines/reference/structuralTypeInDeclareFileForModule.js +++ b/tests/baselines/reference/structuralTypeInDeclareFileForModule.js @@ -12,7 +12,7 @@ var m = M; //// [structuralTypeInDeclareFileForModule.d.ts] -declare module M { +declare namespace M { var x: any; } declare var m: typeof M; diff --git a/tests/baselines/reference/symbolDeclarationEmit12.js b/tests/baselines/reference/symbolDeclarationEmit12.js index 2b4713ff518..97cc921d53e 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.js +++ b/tests/baselines/reference/symbolDeclarationEmit12.js @@ -30,7 +30,7 @@ var M; //// [symbolDeclarationEmit12.d.ts] -declare module M { +declare namespace M { interface I { } export class C { diff --git a/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js b/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js index 1723c8a7198..b6ef95475cd 100644 --- a/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js +++ b/tests/baselines/reference/tsserver/projectReferenceCompileOnSave/compile-on-save-emits-same-output-as-project-build-with-external-project.js @@ -54,7 +54,7 @@ var Hmi; //// [/user/username/projects/myproject/buttonClass/Source.d.ts] -declare module Hmi { +declare namespace Hmi { class Button { static myStaticFunction(): void; } @@ -62,7 +62,7 @@ declare module Hmi { //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./Source.ts"],"js":{"sections":[{"pos":0,"end":251,"kind":"text"}],"hash":"10774636636-var Hmi;\n(function (Hmi) {\n var Button = /** @class */ (function () {\n function Button() {\n }\n Button.myStaticFunction = function () {\n };\n return Button;\n }());\n Hmi.Button = Button;\n})(Hmi || (Hmi = {}));\n"},"dts":{"sections":[{"pos":0,"end":89,"kind":"text"}],"hash":"-9317793727-declare module Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n"}},"program":{"fileNames":["../../../../../a/lib/lib.d.ts","./Source.ts"],"fileInfos":["-7698705165-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }","-1678937917-module Hmi {\n export class Button {\n public static myStaticFunction() {\n }\n }\n}"],"root":[2],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"outSignature":"-9317793727-declare module Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n","latestChangedDtsFile":"./Source.d.ts"},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./Source.ts"],"js":{"sections":[{"pos":0,"end":251,"kind":"text"}],"hash":"10774636636-var Hmi;\n(function (Hmi) {\n var Button = /** @class */ (function () {\n function Button() {\n }\n Button.myStaticFunction = function () {\n };\n return Button;\n }());\n Hmi.Button = Button;\n})(Hmi || (Hmi = {}));\n"},"dts":{"sections":[{"pos":0,"end":92,"kind":"text"}],"hash":"6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n"}},"program":{"fileNames":["../../../../../a/lib/lib.d.ts","./Source.ts"],"fileInfos":["-7698705165-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }","-1678937917-module Hmi {\n export class Button {\n public static myStaticFunction() {\n }\n }\n}"],"root":[2],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"outSignature":"6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n","latestChangedDtsFile":"./Source.d.ts"},"version":"FakeTSVersion"} //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo.readable.baseline.txt] { @@ -85,11 +85,11 @@ declare module Hmi { "sections": [ { "pos": 0, - "end": 89, + "end": 92, "kind": "text" } ], - "hash": "-9317793727-declare module Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n" + "hash": "6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n" } }, "program": { @@ -112,11 +112,11 @@ declare module Hmi { "module": 0, "outFile": "./Source.js" }, - "outSignature": "-9317793727-declare module Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n", + "outSignature": "6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n", "latestChangedDtsFile": "./Source.d.ts" }, "version": "FakeTSVersion", - "size": 1409 + "size": 1413 } //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo.baseline.txt] @@ -140,8 +140,8 @@ var Hmi; ====================================================================== File:: /user/username/projects/myproject/buttonClass/Source.d.ts ---------------------------------------------------------------------- -text: (0-89) -declare module Hmi { +text: (0-92) +declare namespace Hmi { class Button { static myStaticFunction(): void; } @@ -164,7 +164,7 @@ var Hmi; //// [/user/username/projects/myproject/SiblingClass/Source.d.ts] -declare module Hmi { +declare namespace Hmi { class Sibling { mySiblingFunction(): void; } @@ -172,7 +172,7 @@ declare module Hmi { //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo] -{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./Source.ts"],"js":{"sections":[{"pos":0,"end":268,"kind":"text"}],"hash":"7833001416-var Hmi;\n(function (Hmi) {\n var Sibling = /** @class */ (function () {\n function Sibling() {\n }\n Sibling.prototype.mySiblingFunction = function () {\n };\n return Sibling;\n }());\n Hmi.Sibling = Sibling;\n})(Hmi || (Hmi = {}));\n"},"dts":{"sections":[{"pos":0,"end":84,"kind":"text"}],"hash":"7777218469-declare module Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n"}},"program":{"fileNames":["../../../../../a/lib/lib.d.ts","../buttonClass/Source.d.ts","./Source.ts"],"fileInfos":["-7698705165-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }","-9317793727-declare module Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n","-3370344921-module Hmi {\n export class Sibling {\n public mySiblingFunction() {\n }\n }\n}"],"root":[3],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"outSignature":"7777218469-declare module Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n","latestChangedDtsFile":"./Source.d.ts"},"version":"FakeTSVersion"} +{"bundle":{"commonSourceDirectory":"./","sourceFiles":["./Source.ts"],"js":{"sections":[{"pos":0,"end":268,"kind":"text"}],"hash":"7833001416-var Hmi;\n(function (Hmi) {\n var Sibling = /** @class */ (function () {\n function Sibling() {\n }\n Sibling.prototype.mySiblingFunction = function () {\n };\n return Sibling;\n }());\n Hmi.Sibling = Sibling;\n})(Hmi || (Hmi = {}));\n"},"dts":{"sections":[{"pos":0,"end":87,"kind":"text"}],"hash":"-2810380820-declare namespace Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n"}},"program":{"fileNames":["../../../../../a/lib/lib.d.ts","../buttonClass/Source.d.ts","./Source.ts"],"fileInfos":["-7698705165-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }","6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n","-3370344921-module Hmi {\n export class Sibling {\n public mySiblingFunction() {\n }\n }\n}"],"root":[3],"options":{"composite":true,"module":0,"outFile":"./Source.js"},"outSignature":"-2810380820-declare namespace Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n","latestChangedDtsFile":"./Source.d.ts"},"version":"FakeTSVersion"} //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo.readable.baseline.txt] { @@ -195,11 +195,11 @@ declare module Hmi { "sections": [ { "pos": 0, - "end": 84, + "end": 87, "kind": "text" } ], - "hash": "7777218469-declare module Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n" + "hash": "-2810380820-declare namespace Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n" } }, "program": { @@ -210,7 +210,7 @@ declare module Hmi { ], "fileInfos": { "../../../../../a/lib/lib.d.ts": "-7698705165-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }", - "../buttonClass/Source.d.ts": "-9317793727-declare module Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n", + "../buttonClass/Source.d.ts": "6176297704-declare namespace Hmi {\n class Button {\n static myStaticFunction(): void;\n }\n}\n", "./Source.ts": "-3370344921-module Hmi {\n export class Sibling {\n public mySiblingFunction() {\n }\n }\n}" }, "root": [ @@ -224,11 +224,11 @@ declare module Hmi { "module": 0, "outFile": "./Source.js" }, - "outSignature": "7777218469-declare module Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n", + "outSignature": "-2810380820-declare namespace Hmi {\n class Sibling {\n mySiblingFunction(): void;\n }\n}\n", "latestChangedDtsFile": "./Source.d.ts" }, "version": "FakeTSVersion", - "size": 1546 + "size": 1556 } //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo.baseline.txt] @@ -252,8 +252,8 @@ var Hmi; ====================================================================== File:: /user/username/projects/myproject/SiblingClass/Source.d.ts ---------------------------------------------------------------------- -text: (0-84) -declare module Hmi { +text: (0-87) +declare namespace Hmi { class Sibling { mySiblingFunction(): void; } diff --git a/tests/baselines/reference/vardecl.js b/tests/baselines/reference/vardecl.js index 0fe94b0abbb..1356ade167d 100644 --- a/tests/baselines/reference/vardecl.js +++ b/tests/baselines/reference/vardecl.js @@ -227,7 +227,7 @@ declare var d4: { y: number; }; }; -declare module m2 { +declare namespace m2 { var a: any, b2: number, b: any; class C2 { b: any; diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js index abb30dc6db0..b286ebbcb67 100644 --- a/tests/baselines/reference/withExportDecl.js +++ b/tests/baselines/reference/withExportDecl.js @@ -124,10 +124,10 @@ export declare function exportedFunction(): { y: string; n: number; }; -export declare module m2 { +export declare namespace m2 { var a: number; } -export declare module m3 { +export declare namespace m3 { function foo(): string; } export declare var eVar1: any, eVar2: number;