Skip to content

Commit e93fa38

Browse files
Update remaining test files to use namespace instead of module keyword
Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com>
1 parent 492692e commit e93fa38

20 files changed

+840
-929
lines changed

tests/baselines/reference/augmentExportEquals5.errors.txt

Lines changed: 0 additions & 84 deletions
This file was deleted.

tests/baselines/reference/augmentExportEquals5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//// [tests/cases/compiler/augmentExportEquals5.ts] ////
22

33
//// [express.d.ts]
4-
declare module Express {
4+
declare namespace Express {
55
export interface Request { }
66
export interface Response { }
77
export interface Application { }

tests/baselines/reference/augmentExportEquals5.symbols

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//// [tests/cases/compiler/augmentExportEquals5.ts] ////
22

33
=== express.d.ts ===
4-
declare module Express {
4+
declare namespace Express {
55
>Express : Symbol(Express, Decl(express.d.ts, 0, 0))
66

77
export interface Request { }
8-
>Request : Symbol(Request, Decl(express.d.ts, 0, 24))
8+
>Request : Symbol(Request, Decl(express.d.ts, 0, 27))
99

1010
export interface Response { }
1111
>Response : Symbol(Response, Decl(express.d.ts, 1, 32))
@@ -75,9 +75,9 @@ declare module "express" {
7575

7676
interface Request extends Express.Request {
7777
>Request : Symbol(Request, Decl(express.d.ts, 25, 49), Decl(augmentation.ts, 2, 26))
78-
>Express.Request : Symbol(Express.Request, Decl(express.d.ts, 0, 24))
78+
>Express.Request : Symbol(Express.Request, Decl(express.d.ts, 0, 27))
7979
>Express : Symbol(Express, Decl(express.d.ts, 0, 0))
80-
>Request : Symbol(Express.Request, Decl(express.d.ts, 0, 24))
80+
>Request : Symbol(Express.Request, Decl(express.d.ts, 0, 27))
8181

8282
get (name: string): string;
8383
>get : Symbol(Request.get, Decl(express.d.ts, 27, 51))

tests/baselines/reference/augmentExportEquals5.types

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//// [tests/cases/compiler/augmentExportEquals5.ts] ////
22

33
=== express.d.ts ===
4-
declare module Express {
4+
declare namespace Express {
55
export interface Request { }
66
export interface Response { }
77
export interface Application { }
@@ -49,7 +49,6 @@ declare module "express" {
4949
>Router : (options?: any) => Router
5050
> : ^ ^^^ ^^^^^
5151
>options : any
52-
> : ^^^
5352

5453
export interface Router extends IRouter<Router> {}
5554

@@ -80,7 +79,6 @@ declare module "express" {
8079
interface ErrorRequestHandler {
8180
(err: any, req: Request, res: Response, next: Function): any;
8281
>err : any
83-
> : ^^^
8482
>req : Request
8583
> : ^^^^^^^
8684
>res : Response
@@ -110,7 +108,6 @@ declare module "express" {
110108
>next : Function
111109
> : ^^^^^^^^
112110
>param : any
113-
> : ^^^
114111
}
115112

116113
interface Application extends IRouter<Application>, Express.Application {
@@ -119,7 +116,6 @@ declare module "express" {
119116

120117
routes: any;
121118
>routes : any
122-
> : ^^^
123119
}
124120

125121
interface Express extends Application {
@@ -130,7 +126,6 @@ declare module "express" {
130126

131127
var static: any;
132128
>static : any
133-
> : ^^^
134129
}
135130

136131
export = e;

tests/cases/compiler/aliasBug.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
// @module: commonjs
2-
3-
namespace foo {
4-
export class Provide {
5-
}
6-
7-
export namespace bar { export module baz {export class boo {}}}
8-
}
9-
10-
import provide = foo;
11-
import booz = foo.bar.baz;
12-
13-
var p = new provide.Provide();
14-
15-
function use() {
16-
var p1: provide.Provide; // error here, but should be okay
17-
var p2: foo.Provide;
18-
var p3:booz.bar;
19-
var p22 = new provide.Provide();
20-
}
1+
// @module: commonjs
2+
3+
namespace foo {
4+
export class Provide {
5+
}
6+
7+
export namespace bar { export namespace baz {export class boo {}}}
8+
}
9+
10+
import provide = foo;
11+
import booz = foo.bar.baz;
12+
13+
var p = new provide.Provide();
14+
15+
function use() {
16+
var p1: provide.Provide; // error here, but should be okay
17+
var p2: foo.Provide;
18+
var p3:booz.bar;
19+
var p22 = new provide.Provide();
20+
}
Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
namespace foo {
2-
export class Provide {
3-
}
4-
export namespace bar { export module baz {export class boo {}}}
5-
}
6-
7-
import provide = foo;
8-
import booz = foo.bar.baz;
9-
import beez = foo.bar;
10-
11-
import m = no;
12-
import m2 = no.mod;
13-
import n = 5;
14-
import o = "s";
15-
import q = null;
16-
import r = undefined;
17-
18-
19-
var p = new provide.Provide();
20-
21-
function use() {
22-
23-
beez.baz.boo;
24-
var p1: provide.Provide;
25-
var p2: foo.Provide;
26-
var p3:booz.bar;
27-
var p22 = new provide.Provide();
28-
}
29-
1+
namespace foo {
2+
export class Provide {
3+
}
4+
export namespace bar { export namespace baz {export class boo {}}}
5+
}
6+
7+
import provide = foo;
8+
import booz = foo.bar.baz;
9+
import beez = foo.bar;
10+
11+
import m = no;
12+
import m2 = no.mod;
13+
import n = 5;
14+
import o = "s";
15+
import q = null;
16+
import r = undefined;
17+
18+
19+
var p = new provide.Provide();
20+
21+
function use() {
22+
23+
beez.baz.boo;
24+
var p1: provide.Provide;
25+
var p2: foo.Provide;
26+
var p3:booz.bar;
27+
var p22 = new provide.Provide();
28+
}
29+

0 commit comments

Comments
 (0)