Merge pull request #77 from bloomberg/deprecate-namespaces-declared-with-module-keyword

Transform namespaces declared with module keyword to namespace keyword in d.ts files

Author: dragomirtitian

src/compiler/factory/nodeFactory.ts

@@ -146,6 +146,7 @@ import {
     InterfaceDeclaration,
     InternalEmitFlags,
     IntersectionTypeNode,
+    isAmbientModule,
     isArray,
     isArrayLiteralExpression,
     isArrowFunction,
@@ -765,6 +766,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
         updateEnumDeclaration,
         createModuleDeclaration,
         updateModuleDeclaration,
+        updateModuleDeclarationAndKeyword,
         createModuleBlock,
         updateModuleBlock,
         createCaseBlock,
@@ -4476,6 +4478,20 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
             : node;
     }
 
+    // @api
+    function updateModuleDeclarationAndKeyword(
+        node: ModuleDeclaration,
+        modifiers: readonly ModifierLike[] | undefined,
+        name: ModuleName,
+        body: ModuleBody | undefined
+    ) {
+        if (isAmbientModule(node)) {
+            return updateModuleDeclaration(node, modifiers, name, body);
+        }
+
+        return update(createModuleDeclaration(modifiers, name, body, node.flags | NodeFlags.Namespace), node);
+    }
+
     // @api
     function createModuleBlock(statements: readonly Statement[]) {
         const node = createBaseNode<ModuleBlock>(SyntaxKind.ModuleBlock);

src/compiler/transformers/declarations.ts

@@ -1595,7 +1595,7 @@ export function transformDeclarations(context: TransformationContext) {
                     needsScopeFixMarker = oldNeedsScopeFix;
                     resultHasScopeMarker = oldHasScopeFix;
                     const mods = ensureModifiers(input);
-                    return cleanup(factory.updateModuleDeclaration(
+                    return cleanup(factory.updateModuleDeclarationAndKeyword(
                         input,
                         mods,
                         isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name,
@@ -1611,7 +1611,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(factory.updateModuleDeclarationAndKeyword(
                         input,
                         mods,
                         input.name,

src/compiler/types.ts

@@ -8587,6 +8587,7 @@ export interface NodeFactory {
     updateEnumDeclaration(node: EnumDeclaration, modifiers: readonly ModifierLike[] | undefined, name: Identifier, members: readonly EnumMember[]): EnumDeclaration;
     createModuleDeclaration(modifiers: readonly ModifierLike[] | undefined, name: ModuleName, body: ModuleBody | undefined, flags?: NodeFlags): ModuleDeclaration;
     updateModuleDeclaration(node: ModuleDeclaration, modifiers: readonly ModifierLike[] | undefined, name: ModuleName, body: ModuleBody | undefined): ModuleDeclaration;
+    /** @internal */ updateModuleDeclarationAndKeyword(node: ModuleDeclaration, modifiers: readonly ModifierLike[] | undefined, name: ModuleName, body: ModuleBody | undefined): ModuleDeclaration;
     createModuleBlock(statements: readonly Statement[]): ModuleBlock;
     updateModuleBlock(node: ModuleBlock, statements: readonly Statement[]): ModuleBlock;
     createCaseBlock(clauses: readonly CaseOrDefaultClause[]): CaseBlock;

tests/baselines/reference/aliasInaccessibleModule.js

@@ -12,8 +12,8 @@ var M;
 
 
 //// [aliasInaccessibleModule.d.ts]
-declare module M {
-    module N {
+declare namespace M {
+    namespace N {
     }
     export import X = N;
     export {};

tests/baselines/reference/aliasInaccessibleModule2.js

@@ -26,8 +26,8 @@ var M;
 
 
 //// [aliasInaccessibleModule2.d.ts]
-declare module M {
-    module N {
+declare namespace M {
+    namespace N {
     }
     import R = N;
     export import X = R;

tests/baselines/reference/classConstructorAccessibility.js

@@ -98,5 +98,5 @@ declare class E {
 declare var c: C;
 declare var d: any;
 declare var e: any;
-declare module Generic {
+declare namespace Generic {
 }

tests/baselines/reference/classDoesNotDependOnPrivateMember.js

@@ -19,7 +19,7 @@ var M;
 
 
 //// [classDoesNotDependOnPrivateMember.d.ts]
-declare module M {
+declare namespace M {
     class C {
         private x;
     }

tests/baselines/reference/classdecl.js

@@ -233,14 +233,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 {

tests/baselines/reference/commentsDottedModuleName.js

@@ -30,7 +30,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 {
     }
 }

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 {
         }