Use isAmbientModule

CC972 · CC972 · commit 964abaaf4d51 · 2023-04-24T16:10:33.000+01:00
Signed-off-by: Chi Leung &lt;chiguan.leung@gmail.com&gt;
diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts
@@ -146,6 +146,7 @@ import {
     InterfaceDeclaration,
     InternalEmitFlags,
     IntersectionTypeNode,
+    isAmbientModule,
     isArray,
     isArrayLiteralExpression,
     isArrowFunction,
@@ -469,7 +470,7 @@ import {
     VoidExpression,
     WhileStatement,
     WithStatement,
-    YieldExpression,
+    YieldExpression
 } from "../_namespaces/ts";
 
 let nextAutoGenerateId = 0;
@@ -4484,7 +4485,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
         name: ModuleName,
         body: ModuleBody | undefined
     ) {
-        if (node.flags & (NodeFlags.Ambient | NodeFlags.Namespace)) {
+        if (isAmbientModule(node)) {
             return updateModuleDeclaration(node, modifiers, name, body);
         }
 
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.js
@@ -14,7 +14,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
@@ -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/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js
@@ -100,19 +100,19 @@ 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<ModelType extends templa.mvc.IModel> {
     }
 }
-declare module templa.mvc {
+declare namespace templa.mvc {
     class AbstractController<ModelType extends templa.mvc.IModel> implements mvc.IController<ModelType> {
     }
 }
-declare module templa.mvc.composite {
+declare namespace templa.mvc.composite {
     interface ICompositeControllerModel extends mvc.IModel {
         getControllers(): mvc.IController<mvc.IModel>[];
     }
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -74,7 +74,7 @@ var X;
 
 
 //// [declFileWithClassNameConflictingWithClassReferredByExtendsClause.d.ts]
-declare module A.B.Base {
+declare namespace A.B.Base {
     class W {
         id: number;
     }
diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
@@ -64,7 +64,7 @@ var A;
 
 
 //// [declFileWithExtendsClauseThatHasItsContainerNameConflict.d.ts]
-declare module A.B.C {
+declare namespace A.B.C {
     class B {
     }
 }
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js
@@ -104,6 +104,6 @@ declare var v: number;
 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
@@ -12,7 +12,7 @@ declare module mAmbient {
 
 
 //// [enumDecl1.d.ts]
-declare module mAmbient {
+declare namespace mAmbient {
     enum e {
         x,
         y,
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
@@ -1227,7 +1227,7 @@ export declare namespace eM {
         function eaF(): void;
         class eaC {
         }
-        module eaM { }
+        namespace eaM { }
     }
     var eaV: any;
     function eaF(): void;
@@ -1252,21 +1252,21 @@ export declare namespace 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;
@@ -1292,7 +1292,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 {
@@ -1330,26 +1330,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;
@@ -1389,18 +1389,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/moduleOuterQualification.js b/tests/baselines/reference/moduleOuterQualification.js
@@ -12,10 +12,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/moduledecl.js b/tests/baselines/reference/moduledecl.js
@@ -434,16 +434,16 @@ declare namespace m13 {
         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" {
@@ -463,7 +463,7 @@ declare namespace exportTests {
         get c1(): C1_public;
     }
 }
-declare module mAmbient {
+declare namespace mAmbient {
     class C {
         myProp: number;
     }
@@ -478,7 +478,7 @@ declare module mAmbient {
         y,
         z
     }
-    module m3 {
+    namespace m3 {
         class C {
             myProp: number;
         }
diff --git 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;
         }
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
@@ -216,7 +216,7 @@ declare module "GlobalWidgets" {
         name: string;
     }
     function createWidget3(): Widget3;
-    module SpecializedGlobalWidget {
+    namespace SpecializedGlobalWidget {
         class Widget4 {
             name: string;
         }
diff --git 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;
         }
diff --git 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;
         }
diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js
@@ -332,15 +332,15 @@ 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 namespace m2 {
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.js b/tests/baselines/reference/privacyGloImportParseErrors.js
@@ -331,17 +331,17 @@ 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" {
         }
     }
diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js
@@ -122,7 +122,7 @@ export declare function exportedFunction(): {
     y: string;
     n: number;
 };
-export declare module m2 {
+export declare namespace m2 {
     var a: number;
 }
 export declare namespace m3 {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ declare module "test" {`
`14`	`14`
`15`	`15`	`//// [declFileAliasUseBeforeDeclaration2.d.ts]`
`16`	`16`	`declare module "test" {`
`17`		`- module A {`
	`17`	`+ namespace A {`
`18`	`18`	`class C {`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ exports.x = void 0;`
`26`	`26`
`27`	`27`	`//// [declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts]`
`28`	`28`	`declare module "SubModule" {`
`29`		`- module m {`
`30`		`- module m3 {`
	`29`	`+ namespace m {`
	`30`	`+ namespace m3 {`
`31`	`31`	`interface c {`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,19 +100,19 @@ var templa;`
`100`	`100`
`101`	`101`
`102`	`102`	`//// [declFileGenericType2.d.ts]`
`103`		`-declare module templa.mvc {`
	`103`	`+declare namespace templa.mvc {`
`104`	`104`	`interface IModel {`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`-declare module templa.mvc {`
	`107`	`+declare namespace templa.mvc {`
`108`	`108`	`interface IController<ModelType extends templa.mvc.IModel> {`
`109`	`109`	`}`
`110`	`110`	`}`
`111`		`-declare module templa.mvc {`
	`111`	`+declare namespace templa.mvc {`
`112`	`112`	`class AbstractController<ModelType extends templa.mvc.IModel> implements mvc.IController<ModelType> {`
`113`	`113`	`}`
`114`	`114`	`}`
`115`		`-declare module templa.mvc.composite {`
	`115`	`+declare namespace templa.mvc.composite {`
`116`	`116`	`interface ICompositeControllerModel extends mvc.IModel {`
`117`	`117`	`getControllers(): mvc.IController<mvc.IModel>[];`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ var X;`
`74`	`74`
`75`	`75`
`76`	`76`	`//// [declFileWithClassNameConflictingWithClassReferredByExtendsClause.d.ts]`
`77`		`-declare module A.B.Base {`
	`77`	`+declare namespace A.B.Base {`
`78`	`78`	`class W {`
`79`	`79`	`id: number;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ var A;`
`64`	`64`
`65`	`65`
`66`	`66`	`//// [declFileWithExtendsClauseThatHasItsContainerNameConflict.d.ts]`
`67`		`-declare module A.B.C {`
	`67`	`+declare namespace A.B.C {`
`68`	`68`	`class B {`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,6 @@ declare var v: number;`
`104`	`104`	`declare namespace Foo {`
`105`	`105`	`var x: number;`
`106`	`106`	`}`
`107`		`-declare module N {`
	`107`	`+declare namespace N {`
`108`	`108`	`function F(): any;`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1227,7 +1227,7 @@ export declare namespace eM {`
`1227`	`1227`	`function eaF(): void;`
`1228`	`1228`	`class eaC {`
`1229`	`1229`	`}`
`1230`		`- module eaM { }`
	`1230`	`+ namespace eaM { }`
`1231`	`1231`	`}`
`1232`	`1232`	`var eaV: any;`
`1233`	`1233`	`function eaF(): void;`
`@@ -1252,21 +1252,21 @@ export declare namespace eM {`
`1252`	`1252`	`static tgF(): void;`
`1253`	`1253`	`static get tgF(): any;`
`1254`	`1254`	`}`
`1255`		`- module eaM {`
	`1255`	`+ namespace eaM {`
`1256`	`1256`	`var V: any;`
`1257`	`1257`	`function F(): void;`
`1258`	`1258`	`class C {`
`1259`	`1259`	`}`
`1260`	`1260`	`interface I {`
`1261`	`1261`	`}`
`1262`		`- module M { }`
	`1262`	`+ namespace M { }`
`1263`	`1263`	`var eV: any;`
`1264`	`1264`	`function eF(): void;`
`1265`	`1265`	`class eC {`
`1266`	`1266`	`}`
`1267`	`1267`	`interface eI {`
`1268`	`1268`	`}`
`1269`		`- module eM { }`
	`1269`	`+ namespace eM { }`
`1270`	`1270`	`}`
`1271`	`1271`	`}`
`1272`	`1272`	`export declare var eaV: any;`
`@@ -1292,7 +1292,7 @@ export declare class eaC {`
`1292`	`1292`	`static tgF(): void;`
`1293`	`1293`	`static get tgF(): any;`
`1294`	`1294`	`}`
`1295`		`-export declare module eaM {`
	`1295`	`+export declare namespace eaM {`
`1296`	`1296`	`var V: any;`
`1297`	`1297`	`function F(): void;`
`1298`	`1298`	`class C {`
`@@ -1330,26 +1330,26 @@ export declare module eaM {`
`1330`	`1330`	`p7(pa1: any, pa2: any): void;`
`1331`	`1331`	`p7?(pa1: any, pa2: any): void;`
`1332`	`1332`	`}`
`1333`		`- module M {`
	`1333`	`+ namespace M {`
`1334`	`1334`	`var V: any;`
`1335`	`1335`	`function F(): void;`
`1336`	`1336`	`class C {`
`1337`	`1337`	`}`
`1338`	`1338`	`interface I {`
`1339`	`1339`	`}`
`1340`		`- module M { }`
	`1340`	`+ namespace M { }`
`1341`	`1341`	`var eV: any;`
`1342`	`1342`	`function eF(): void;`
`1343`	`1343`	`class eC {`
`1344`	`1344`	`}`
`1345`	`1345`	`interface eI {`
`1346`	`1346`	`}`
`1347`		`- module eM { }`
	`1347`	`+ namespace eM { }`
`1348`	`1348`	`var eaV: any;`
`1349`	`1349`	`function eaF(): void;`
`1350`	`1350`	`class eaC {`
`1351`	`1351`	`}`
`1352`		`- module eaM { }`
	`1352`	`+ namespace eaM { }`
`1353`	`1353`	`}`
`1354`	`1354`	`var eV: any;`
`1355`	`1355`	`function eF(): void;`
`@@ -1389,18 +1389,18 @@ export declare module eaM {`
`1389`	`1389`	`p7(pa1: any, pa2: any): void;`
`1390`	`1390`	`p7?(pa1: any, pa2: any): void;`
`1391`	`1391`	`}`
`1392`		`- module eM {`
	`1392`	`+ namespace eM {`
`1393`	`1393`	`var V: any;`
`1394`	`1394`	`function F(): void;`
`1395`	`1395`	`class C {`
`1396`	`1396`	`}`
`1397`		`- module M { }`
	`1397`	`+ namespace M { }`
`1398`	`1398`	`var eV: any;`
`1399`	`1399`	`function eF(): void;`
`1400`	`1400`	`class eC {`
`1401`	`1401`	`}`
`1402`	`1402`	`interface eI {`
`1403`	`1403`	`}`
`1404`		`- module eM { }`
	`1404`	`+ namespace eM { }`
`1405`	`1405`	`}`
`1406`	`1406`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ declare module outer {`
`12`	`12`
`13`	`13`
`14`	`14`	`//// [moduleOuterQualification.d.ts]`
`15`		`-declare module outer {`
	`15`	`+declare namespace outer {`
`16`	`16`	`interface Beta {`
`17`	`17`	`}`
`18`		`- module inner {`
	`18`	`+ namespace inner {`
`19`	`19`	`interface Beta extends outer.Beta {`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -434,16 +434,16 @@ declare namespace m13 {`
`434`	`434`	`function f(): number;`
`435`	`435`	`}`
`436`	`436`	`}`
`437`		`-declare module m4 {`
	`437`	`+declare namespace m4 {`
`438`	`438`	`var b: any;`
`439`	`439`	`}`
`440`		`-declare module m5 {`
	`440`	`+declare namespace m5 {`
`441`	`441`	`var c: any;`
`442`	`442`	`}`
`443`		`-declare module m43 {`
	`443`	`+declare namespace m43 {`
`444`	`444`	`var b: any;`
`445`	`445`	`}`
`446`		`-declare module m55 {`
	`446`	`+declare namespace m55 {`
`447`	`447`	`var c: any;`
`448`	`448`	`}`
`449`	`449`	`declare module "m3" {`
`@@ -463,7 +463,7 @@ declare namespace exportTests {`
`463`	`463`	`get c1(): C1_public;`
`464`	`464`	`}`
`465`	`465`	`}`
`466`		`-declare module mAmbient {`
	`466`	`+declare namespace mAmbient {`
`467`	`467`	`class C {`
`468`	`468`	`myProp: number;`
`469`	`469`	`}`
`@@ -478,7 +478,7 @@ declare module mAmbient {`
`478`	`478`	`y,`
`479`	`479`	`z`
`480`	`480`	`}`
`481`		`- module m3 {`
	`481`	`+ namespace m3 {`
`482`	`482`	`class C {`
`483`	`483`	`myProp: number;`
`484`	`484`	`}`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ declare module "GlobalWidgets" {`
`391`	`391`	`name: string;`
`392`	`392`	`}`
`393`	`393`	`function createWidget3(): Widget3;`
`394`		`- module SpecializedGlobalWidget {`
	`394`	`+ namespace SpecializedGlobalWidget {`
`395`	`395`	`class Widget4 {`
`396`	`396`	`name: string;`
`397`	`397`	`}`