diff --git a/tests/baselines/reference/augmentExportEquals5.errors.txt b/tests/baselines/reference/augmentExportEquals5.errors.txt deleted file mode 100644 index b2167f9312d..00000000000 --- a/tests/baselines/reference/augmentExportEquals5.errors.txt +++ /dev/null @@ -1,84 +0,0 @@ -express.d.ts(1,9): error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. - - -==== express.d.ts (1 errors) ==== - declare module Express { - ~~~~~~ -!!! error TS1547: The 'module' keyword is not allowed for namespace declarations. Use the 'namespace' keyword instead. - export interface Request { } - export interface Response { } - export interface Application { } - } - - declare module "express" { - function e(): e.Express; - namespace e { - interface IRoute { - all(...handler: RequestHandler[]): IRoute; - } - - interface IRouterMatcher { - (name: string|RegExp, ...handlers: RequestHandler[]): T; - } - - interface IRouter extends RequestHandler { - route(path: string): IRoute; - } - - export function Router(options?: any): Router; - - export interface Router extends IRouter {} - - interface Errback { (err: Error): void; } - - interface Request extends Express.Request { - - get (name: string): string; - } - - interface Response extends Express.Response { - charset: string; - } - - interface ErrorRequestHandler { - (err: any, req: Request, res: Response, next: Function): any; - } - - interface RequestHandler { - (req: Request, res: Response, next: Function): any; - } - - interface Handler extends RequestHandler {} - - interface RequestParamHandler { - (req: Request, res: Response, next: Function, param: any): any; - } - - interface Application extends IRouter, Express.Application { - routes: any; - } - - interface Express extends Application { - createApplication(): Application; - } - - var static: any; - } - - export = e; - } - -==== augmentation.ts (0 errors) ==== - /// - import * as e from "express"; - declare module "express" { - interface Request { - id: number; - } - } - -==== consumer.ts (0 errors) ==== - import { Request } from "express"; - import "./augmentation"; - let x: Request; - const y = x.id; \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js index 7dcea50441d..03ef32a0719 100644 --- a/tests/baselines/reference/augmentExportEquals5.js +++ b/tests/baselines/reference/augmentExportEquals5.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/augmentExportEquals5.ts] //// //// [express.d.ts] -declare module Express { +declare namespace Express { export interface Request { } export interface Response { } export interface Application { } diff --git a/tests/baselines/reference/augmentExportEquals5.symbols b/tests/baselines/reference/augmentExportEquals5.symbols index b2bcb83b6f9..357f23c5096 100644 --- a/tests/baselines/reference/augmentExportEquals5.symbols +++ b/tests/baselines/reference/augmentExportEquals5.symbols @@ -1,11 +1,11 @@ //// [tests/cases/compiler/augmentExportEquals5.ts] //// === express.d.ts === -declare module Express { +declare namespace Express { >Express : Symbol(Express, Decl(express.d.ts, 0, 0)) export interface Request { } ->Request : Symbol(Request, Decl(express.d.ts, 0, 24)) +>Request : Symbol(Request, Decl(express.d.ts, 0, 27)) export interface Response { } >Response : Symbol(Response, Decl(express.d.ts, 1, 32)) @@ -75,9 +75,9 @@ declare module "express" { interface Request extends Express.Request { >Request : Symbol(Request, Decl(express.d.ts, 25, 49), Decl(augmentation.ts, 2, 26)) ->Express.Request : Symbol(Express.Request, Decl(express.d.ts, 0, 24)) +>Express.Request : Symbol(Express.Request, Decl(express.d.ts, 0, 27)) >Express : Symbol(Express, Decl(express.d.ts, 0, 0)) ->Request : Symbol(Express.Request, Decl(express.d.ts, 0, 24)) +>Request : Symbol(Express.Request, Decl(express.d.ts, 0, 27)) get (name: string): string; >get : Symbol(Request.get, Decl(express.d.ts, 27, 51)) diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types index 4575e304240..c03444303be 100644 --- a/tests/baselines/reference/augmentExportEquals5.types +++ b/tests/baselines/reference/augmentExportEquals5.types @@ -1,7 +1,7 @@ //// [tests/cases/compiler/augmentExportEquals5.ts] //// === express.d.ts === -declare module Express { +declare namespace Express { export interface Request { } export interface Response { } export interface Application { } @@ -49,7 +49,6 @@ declare module "express" { >Router : (options?: any) => Router > : ^ ^^^ ^^^^^ >options : any -> : ^^^ export interface Router extends IRouter {} @@ -80,7 +79,6 @@ declare module "express" { interface ErrorRequestHandler { (err: any, req: Request, res: Response, next: Function): any; >err : any -> : ^^^ >req : Request > : ^^^^^^^ >res : Response @@ -110,7 +108,6 @@ declare module "express" { >next : Function > : ^^^^^^^^ >param : any -> : ^^^ } interface Application extends IRouter, Express.Application { @@ -119,7 +116,6 @@ declare module "express" { routes: any; >routes : any -> : ^^^ } interface Express extends Application { @@ -130,7 +126,6 @@ declare module "express" { var static: any; >static : any -> : ^^^ } export = e; diff --git a/tests/cases/compiler/aliasBug.ts b/tests/cases/compiler/aliasBug.ts index 8ccec7283c1..a5fcb700417 100644 --- a/tests/cases/compiler/aliasBug.ts +++ b/tests/cases/compiler/aliasBug.ts @@ -1,20 +1,20 @@ -// @module: commonjs - -namespace foo { - export class Provide { - } - - export namespace bar { export module baz {export class boo {}}} -} - -import provide = foo; -import booz = foo.bar.baz; - -var p = new provide.Provide(); - -function use() { - var p1: provide.Provide; // error here, but should be okay - var p2: foo.Provide; - var p3:booz.bar; - var p22 = new provide.Provide(); -} +// @module: commonjs + +namespace foo { + export class Provide { + } + + export namespace bar { export namespace baz {export class boo {}}} +} + +import provide = foo; +import booz = foo.bar.baz; + +var p = new provide.Provide(); + +function use() { + var p1: provide.Provide; // error here, but should be okay + var p2: foo.Provide; + var p3:booz.bar; + var p22 = new provide.Provide(); +} diff --git a/tests/cases/compiler/aliasErrors.ts b/tests/cases/compiler/aliasErrors.ts index a1324781664..bfc91010b6b 100644 --- a/tests/cases/compiler/aliasErrors.ts +++ b/tests/cases/compiler/aliasErrors.ts @@ -1,29 +1,29 @@ -namespace foo { - export class Provide { - } - export namespace bar { export module baz {export class boo {}}} -} - -import provide = foo; -import booz = foo.bar.baz; -import beez = foo.bar; - -import m = no; -import m2 = no.mod; -import n = 5; -import o = "s"; -import q = null; -import r = undefined; - - -var p = new provide.Provide(); - -function use() { - - beez.baz.boo; - var p1: provide.Provide; - var p2: foo.Provide; - var p3:booz.bar; - var p22 = new provide.Provide(); -} - +namespace foo { + export class Provide { + } + export namespace bar { export namespace baz {export class boo {}}} +} + +import provide = foo; +import booz = foo.bar.baz; +import beez = foo.bar; + +import m = no; +import m2 = no.mod; +import n = 5; +import o = "s"; +import q = null; +import r = undefined; + + +var p = new provide.Provide(); + +function use() { + + beez.baz.boo; + var p1: provide.Provide; + var p2: foo.Provide; + var p3:booz.bar; + var p22 = new provide.Provide(); +} + diff --git a/tests/cases/compiler/augmentExportEquals5.ts b/tests/cases/compiler/augmentExportEquals5.ts index 3250a40f131..4cf23d60275 100644 --- a/tests/cases/compiler/augmentExportEquals5.ts +++ b/tests/cases/compiler/augmentExportEquals5.ts @@ -1,82 +1,82 @@ -// @module: amd - -// @filename: express.d.ts - -declare module Express { - export interface Request { } - export interface Response { } - export interface Application { } -} - -declare module "express" { - function e(): e.Express; - namespace e { - interface IRoute { - all(...handler: RequestHandler[]): IRoute; - } - - interface IRouterMatcher { - (name: string|RegExp, ...handlers: RequestHandler[]): T; - } - - interface IRouter extends RequestHandler { - route(path: string): IRoute; - } - - export function Router(options?: any): Router; - - export interface Router extends IRouter {} - - interface Errback { (err: Error): void; } - - interface Request extends Express.Request { - - get (name: string): string; - } - - interface Response extends Express.Response { - charset: string; - } - - interface ErrorRequestHandler { - (err: any, req: Request, res: Response, next: Function): any; - } - - interface RequestHandler { - (req: Request, res: Response, next: Function): any; - } - - interface Handler extends RequestHandler {} - - interface RequestParamHandler { - (req: Request, res: Response, next: Function, param: any): any; - } - - interface Application extends IRouter, Express.Application { - routes: any; - } - - interface Express extends Application { - createApplication(): Application; - } - - var static: any; - } - - export = e; -} - -// @filename: augmentation.ts -/// -import * as e from "express"; -declare module "express" { - interface Request { - id: number; - } -} - -// @filename: consumer.ts -import { Request } from "express"; -import "./augmentation"; -let x: Request; +// @module: amd + +// @filename: express.d.ts + +declare namespace Express { + export interface Request { } + export interface Response { } + export interface Application { } +} + +declare module "express" { + function e(): e.Express; + namespace e { + interface IRoute { + all(...handler: RequestHandler[]): IRoute; + } + + interface IRouterMatcher { + (name: string|RegExp, ...handlers: RequestHandler[]): T; + } + + interface IRouter extends RequestHandler { + route(path: string): IRoute; + } + + export function Router(options?: any): Router; + + export interface Router extends IRouter {} + + interface Errback { (err: Error): void; } + + interface Request extends Express.Request { + + get (name: string): string; + } + + interface Response extends Express.Response { + charset: string; + } + + interface ErrorRequestHandler { + (err: any, req: Request, res: Response, next: Function): any; + } + + interface RequestHandler { + (req: Request, res: Response, next: Function): any; + } + + interface Handler extends RequestHandler {} + + interface RequestParamHandler { + (req: Request, res: Response, next: Function, param: any): any; + } + + interface Application extends IRouter, Express.Application { + routes: any; + } + + interface Express extends Application { + createApplication(): Application; + } + + var static: any; + } + + export = e; +} + +// @filename: augmentation.ts +/// +import * as e from "express"; +declare module "express" { + interface Request { + id: number; + } +} + +// @filename: consumer.ts +import { Request } from "express"; +import "./augmentation"; +let x: Request; const y = x.id; \ No newline at end of file diff --git a/tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule.ts b/tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule.ts index ba71f1248eb..e339aa38ed3 100644 --- a/tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule.ts +++ b/tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule.ts @@ -1,18 +1,18 @@ -//@module: commonjs -// @declaration: true - -// @Filename: declFileAmbientExternalModuleWithSingleExportedModule_0.ts -declare module "SubModule" { - export module m { - export module m3 { - interface c { - } - } - } -} - -// @Filename: declFileAmbientExternalModuleWithSingleExportedModule_1.ts -/// -import SubModule = require('SubModule'); -export var x: SubModule.m.m3.c; - +//@module: commonjs +// @declaration: true + +// @Filename: declFileAmbientExternalModuleWithSingleExportedModule_0.ts +declare module "SubModule" { + export namespace m { + export namespace m3 { + interface c { + } + } + } +} + +// @Filename: declFileAmbientExternalModuleWithSingleExportedModule_1.ts +/// +import SubModule = require('SubModule'); +export var x: SubModule.m.m3.c; + diff --git a/tests/cases/compiler/declareAlreadySeen.ts b/tests/cases/compiler/declareAlreadySeen.ts index 963e4778ff3..a640061dec1 100644 --- a/tests/cases/compiler/declareAlreadySeen.ts +++ b/tests/cases/compiler/declareAlreadySeen.ts @@ -1,8 +1,8 @@ -namespace M { - declare declare var x; - declare declare function f(); - - declare declare module N { } - - declare declare class C { } +namespace M { + declare declare var x; + declare declare function f(); + + declare declare namespace N { } + + declare declare class C { } } \ No newline at end of file diff --git a/tests/cases/compiler/dottedModuleName2.ts b/tests/cases/compiler/dottedModuleName2.ts index f61ddbad09e..376d17e55a5 100644 --- a/tests/cases/compiler/dottedModuleName2.ts +++ b/tests/cases/compiler/dottedModuleName2.ts @@ -1,42 +1,42 @@ -module A.B { - - export var x = 1; - -} - - - -namespace AA { export module B { - - export var x = 1; - -} } - - - -var tmpOK = AA.B.x; - -var tmpError = A.B.x; - - -module A.B.C - -{ - - export var x = 1; - -} - - - -namespace M - -{ - - import X1 = A; - - import X2 = A.B; - - import X3 = A.B.C; - -} +module A.B { + + export var x = 1; + +} + + + +namespace AA { export namespace B { + + export var x = 1; + +} } + + + +var tmpOK = AA.B.x; + +var tmpError = A.B.x; + + +module A.B.C + +{ + + export var x = 1; + +} + + + +namespace M + +{ + + import X1 = A; + + import X2 = A.B; + + import X3 = A.B.C; + +} diff --git a/tests/cases/compiler/exportAlreadySeen.ts b/tests/cases/compiler/exportAlreadySeen.ts index 9ece5d0507a..4a62972657d 100644 --- a/tests/cases/compiler/exportAlreadySeen.ts +++ b/tests/cases/compiler/exportAlreadySeen.ts @@ -1,19 +1,19 @@ -namespace M { - export export var x = 1; - export export function f() { } - - export export module N { - export export class C { } - export export interface I { } - } -} - -declare namespace A { - export export var x; - export export function f() - - export export module N { - export export class C { } - export export interface I { } - } +namespace M { + export export var x = 1; + export export function f() { } + + export export namespace N { + export export class C { } + export export interface I { } + } +} + +declare namespace A { + export export var x; + export export function f() + + export export namespace N { + export export class C { } + export export interface I { } + } } \ No newline at end of file diff --git a/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts b/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts index 1c20ffb0437..88026693bd4 100644 --- a/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts +++ b/tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts @@ -1,12 +1,12 @@ -declare module "m2" { - export module X { - interface I { } - } - function Y(); - export { Y as X }; - function Z(): X.I; -} - -declare module "m2" { - function Z2(): X.I; +declare module "m2" { + export namespace X { + interface I { } + } + function Y(); + export { Y as X }; + function Z(): X.I; +} + +declare module "m2" { + function Z2(): X.I; } \ No newline at end of file diff --git a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts index e3d0a9000ab..fb95ba85e02 100644 --- a/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts +++ b/tests/cases/compiler/exportSpecifierReferencingOuterDeclaration1.ts @@ -1,5 +1,5 @@ -declare module X { export interface bar { } } -declare module "m" { - export { X }; - export function foo(): X.bar; +declare namespace X { export interface bar { } } +declare module "m" { + export { X }; + export function foo(): X.bar; } \ No newline at end of file diff --git a/tests/cases/compiler/module_augmentUninstantiatedModule2.ts b/tests/cases/compiler/module_augmentUninstantiatedModule2.ts index a3888377586..2117140ad37 100644 --- a/tests/cases/compiler/module_augmentUninstantiatedModule2.ts +++ b/tests/cases/compiler/module_augmentUninstantiatedModule2.ts @@ -1,33 +1,33 @@ -// @module: commonjs -// @moduleResolution: bundler - - -// @fileName: app.ts -import ng = require("angular"); -import "./moduleAugmentation"; - -var x: number = ng.getNumber(); - -// @filename: moduleAugmentation.ts -import * as ng from "angular" -declare module "angular" { - export interface IAngularStatic { - getNumber: () => number; - } -} - -// @filename: node_modules/angular/index.d.ts -declare var ng: ng.IAngularStatic; - -declare module ng { - export interface IModule { - name: string; - } - - export interface IAngularStatic { - module: (s: string) => IModule; - } -} - -export = ng; - +// @module: commonjs +// @moduleResolution: bundler + + +// @fileName: app.ts +import ng = require("angular"); +import "./moduleAugmentation"; + +var x: number = ng.getNumber(); + +// @filename: moduleAugmentation.ts +import * as ng from "angular" +declare module "angular" { + export interface IAngularStatic { + getNumber: () => number; + } +} + +// @filename: node_modules/angular/index.d.ts +declare var ng: ng.IAngularStatic; + +declare namespace ng { + export interface IModule { + name: string; + } + + export interface IAngularStatic { + module: (s: string) => IModule; + } +} + +export = ng; + diff --git a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts index 70369c47895..97c723988b3 100644 --- a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts +++ b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts @@ -1,138 +1,138 @@ -// @target: ES5 -// @module: commonjs -// @declaration: true - -// @Filename: privacyCannotNameAccessorDeclFile_GlobalWidgets.ts -declare module "GlobalWidgets" { - export class Widget3 { - name: string; - } - export function createWidget3(): Widget3; - - export module SpecializedGlobalWidget { - export class Widget4 { - name: string; - } - function createWidget4(): Widget4; - } -} - -// @Filename: privacyCannotNameAccessorDeclFile_Widgets.ts -export class Widget1 { - name = 'one'; -} -export function createWidget1() { - return new Widget1(); -} - -export module SpecializedWidget { - export class Widget2 { - name = 'one'; - } - export function createWidget2() { - return new Widget2(); - } -} - -// @Filename:privacyCannotNameAccessorDeclFile_exporter.ts -/// -import Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets"); -import Widgets1 = require("GlobalWidgets"); -export function createExportedWidget1() { - return Widgets.createWidget1(); -} -export function createExportedWidget2() { - return Widgets.SpecializedWidget.createWidget2(); -} -export function createExportedWidget3() { - return Widgets1.createWidget3(); -} -export function createExportedWidget4() { - return Widgets1.SpecializedGlobalWidget.createWidget4(); -} - -// @Filename:privacyCannotNameAccessorDeclFile_consumer.ts -import exporter = require("./privacyCannotNameAccessorDeclFile_exporter"); -export class publicClassWithWithPrivateGetAccessorTypes { - static get myPublicStaticMethod() { // Error - return exporter.createExportedWidget1(); - } - private static get myPrivateStaticMethod() { - return exporter.createExportedWidget1(); - } - get myPublicMethod() { // Error - return exporter.createExportedWidget1(); - } - private get myPrivateMethod() { - return exporter.createExportedWidget1(); - } - static get myPublicStaticMethod1() { // Error - return exporter.createExportedWidget3(); - } - private static get myPrivateStaticMethod1() { - return exporter.createExportedWidget3(); - } - get myPublicMethod1() { // Error - return exporter.createExportedWidget3(); - } - private get myPrivateMethod1() { - return exporter.createExportedWidget3(); - } -} - -class privateClassWithWithPrivateGetAccessorTypes { - static get myPublicStaticMethod() { - return exporter.createExportedWidget1(); - } - private static get myPrivateStaticMethod() { - return exporter.createExportedWidget1(); - } - get myPublicMethod() { - return exporter.createExportedWidget1(); - } - private get myPrivateMethod() { - return exporter.createExportedWidget1(); - } - static get myPublicStaticMethod1() { - return exporter.createExportedWidget3(); - } - private static get myPrivateStaticMethod1() { - return exporter.createExportedWidget3(); - } - get myPublicMethod1() { - return exporter.createExportedWidget3(); - } - private get myPrivateMethod1() { - return exporter.createExportedWidget3(); - } -} - -export class publicClassWithPrivateModuleGetAccessorTypes { - static get myPublicStaticMethod() { // Error - return exporter.createExportedWidget2(); - } - get myPublicMethod() { // Error - return exporter.createExportedWidget2(); - } - static get myPublicStaticMethod1() { // Error - return exporter.createExportedWidget4(); - } - get myPublicMethod1() { // Error - return exporter.createExportedWidget4(); - } -} - -class privateClassWithPrivateModuleGetAccessorTypes { - static get myPublicStaticMethod() { - return exporter.createExportedWidget2(); - } - get myPublicMethod() { - return exporter.createExportedWidget2(); - } - static get myPublicStaticMethod1() { - return exporter.createExportedWidget4(); - } - get myPublicMethod1() { - return exporter.createExportedWidget4(); - } +// @target: ES5 +// @module: commonjs +// @declaration: true + +// @Filename: privacyCannotNameAccessorDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export namespace SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyCannotNameAccessorDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export namespace SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyCannotNameAccessorDeclFile_exporter.ts +/// +import Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyCannotNameAccessorDeclFile_consumer.ts +import exporter = require("./privacyCannotNameAccessorDeclFile_exporter"); +export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { // Error + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { // Error + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { // Error + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { // Error + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } +} + +class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } +} + +export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { // Error + return exporter.createExportedWidget2(); + } + get myPublicMethod() { // Error + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} + +class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + get myPublicMethod() { + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { + return exporter.createExportedWidget4(); + } } \ No newline at end of file diff --git a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts index 1135e3c86f4..5c142955317 100644 --- a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts +++ b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts @@ -1,101 +1,101 @@ -// @module: commonjs -// @declaration: true - - -// @Filename: privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts -declare module "GlobalWidgets" { - export class Widget3 { - name: string; - } - export function createWidget3(): Widget3; - - export module SpecializedGlobalWidget { - export class Widget4 { - name: string; - } - function createWidget4(): Widget4; - } -} - -// @Filename: privacyCannotNameVarTypeDeclFile_Widgets.ts -export class Widget1 { - name = 'one'; -} -export function createWidget1() { - return new Widget1(); -} - -export module SpecializedWidget { - export class Widget2 { - name = 'one'; - } - export function createWidget2() { - return new Widget2(); - } -} - -// @Filename:privacyCannotNameVarTypeDeclFile_exporter.ts -/// -import Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets"); -import Widgets1 = require("GlobalWidgets"); -export function createExportedWidget1() { - return Widgets.createWidget1(); -} -export function createExportedWidget2() { - return Widgets.SpecializedWidget.createWidget2(); -} -export function createExportedWidget3() { - return Widgets1.createWidget3(); -} -export function createExportedWidget4() { - return Widgets1.SpecializedGlobalWidget.createWidget4(); -} - -// @Filename:privacyCannotNameVarTypeDeclFile_consumer.ts -import exporter = require("./privacyCannotNameVarTypeDeclFile_exporter"); -export class publicClassWithWithPrivatePropertyTypes { - static myPublicStaticProperty = exporter.createExportedWidget1(); // Error - private static myPrivateStaticProperty = exporter.createExportedWidget1(); - myPublicProperty = exporter.createExportedWidget1(); // Error - private myPrivateProperty = exporter.createExportedWidget1(); - - static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error - private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); - myPublicProperty1 = exporter.createExportedWidget3(); // Error - private myPrivateProperty1 = exporter.createExportedWidget3(); -} - -class privateClassWithWithPrivatePropertyTypes { - static myPublicStaticProperty = exporter.createExportedWidget1(); - private static myPrivateStaticProperty = exporter.createExportedWidget1(); - myPublicProperty = exporter.createExportedWidget1(); - private myPrivateProperty = exporter.createExportedWidget1(); - - static myPublicStaticProperty1 = exporter.createExportedWidget3(); - private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); - myPublicProperty1 = exporter.createExportedWidget3(); - private myPrivateProperty1 = exporter.createExportedWidget3(); -} - -export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error -var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); -export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error -var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); - -export class publicClassWithPrivateModulePropertyTypes { - static myPublicStaticProperty= exporter.createExportedWidget2(); // Error - myPublicProperty = exporter.createExportedWidget2(); // Error - static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error - myPublicProperty1 = exporter.createExportedWidget4(); // Error -} -export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error -export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error - -class privateClassWithPrivateModulePropertyTypes { - static myPublicStaticProperty= exporter.createExportedWidget2(); - myPublicProperty= exporter.createExportedWidget2(); - static myPublicStaticProperty1 = exporter.createExportedWidget4(); - myPublicProperty1 = exporter.createExportedWidget4(); -} -var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); +// @module: commonjs +// @declaration: true + + +// @Filename: privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export namespace SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyCannotNameVarTypeDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export namespace SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyCannotNameVarTypeDeclFile_exporter.ts +/// +import Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyCannotNameVarTypeDeclFile_consumer.ts +import exporter = require("./privacyCannotNameVarTypeDeclFile_exporter"); +export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); // Error + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); // Error + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); // Error + private myPrivateProperty1 = exporter.createExportedWidget3(); +} + +class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); + private myPrivateProperty1 = exporter.createExportedWidget3(); +} + +export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error +var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); +export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error +var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); + +export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); // Error + myPublicProperty = exporter.createExportedWidget2(); // Error + static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error + myPublicProperty1 = exporter.createExportedWidget4(); // Error +} +export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error +export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error + +class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); + myPublicProperty= exporter.createExportedWidget2(); + static myPublicStaticProperty1 = exporter.createExportedWidget4(); + myPublicProperty1 = exporter.createExportedWidget4(); +} +var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); \ No newline at end of file diff --git a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts index dd5eaf82bdf..450e1f0575f 100644 --- a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts +++ b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts @@ -1,157 +1,157 @@ -// @module: commonjs -// @declaration: true - - -// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts -declare module "GlobalWidgets" { - export class Widget3 { - name: string; - } - export function createWidget3(): Widget3; - - export module SpecializedGlobalWidget { - export class Widget4 { - name: string; - } - function createWidget4(): Widget4; - } -} - -// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts -export class Widget1 { - name = 'one'; -} -export function createWidget1() { - return new Widget1(); -} - -export module SpecializedWidget { - export class Widget2 { - name = 'one'; - } - export function createWidget2() { - return new Widget2(); - } -} - -// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts -/// -import Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); -import Widgets1 = require("GlobalWidgets"); -export function createExportedWidget1() { - return Widgets.createWidget1(); -} -export function createExportedWidget2() { - return Widgets.SpecializedWidget.createWidget2(); -} -export function createExportedWidget3() { - return Widgets1.createWidget3(); -} -export function createExportedWidget4() { - return Widgets1.SpecializedGlobalWidget.createWidget4(); -} - -// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts -import exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter"); -export class publicClassWithWithPrivateParmeterTypes { - static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error - } - private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { - } - myPublicMethod(param = exporter.createExportedWidget1()) { // Error - } - private myPrivateMethod(param = exporter.createExportedWidget1()) { - } - constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error - } -} -export class publicClassWithWithPrivateParmeterTypes1 { - static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error - } - private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { - } - myPublicMethod(param = exporter.createExportedWidget3()) { // Error - } - private myPrivateMethod(param = exporter.createExportedWidget3()) { - } - constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error - } -} - -class privateClassWithWithPrivateParmeterTypes { - static myPublicStaticMethod(param = exporter.createExportedWidget1()) { - } - private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { - } - myPublicMethod(param = exporter.createExportedWidget1()) { - } - private myPrivateMethod(param = exporter.createExportedWidget1()) { - } - constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { - } -} -class privateClassWithWithPrivateParmeterTypes2 { - static myPublicStaticMethod(param = exporter.createExportedWidget3()) { - } - private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { - } - myPublicMethod(param = exporter.createExportedWidget3()) { - } - private myPrivateMethod(param = exporter.createExportedWidget3()) { - } - constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { - } -} - -export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error -} -function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { -} -export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error -} -function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { -} - - -export class publicClassWithPrivateModuleParameterTypes { - static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error - } - myPublicMethod(param= exporter.createExportedWidget2()) { // Error - } - constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error - } -} -export class publicClassWithPrivateModuleParameterTypes2 { - static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error - } - myPublicMethod(param= exporter.createExportedWidget4()) { // Error - } - constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error - } -} -export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error -} -export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error -} - - -class privateClassWithPrivateModuleParameterTypes { - static myPublicStaticMethod(param= exporter.createExportedWidget2()) { - } - myPublicMethod(param= exporter.createExportedWidget2()) { - } - constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { - } -} -class privateClassWithPrivateModuleParameterTypes1 { - static myPublicStaticMethod(param= exporter.createExportedWidget4()) { - } - myPublicMethod(param= exporter.createExportedWidget4()) { - } - constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { - } -} -function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { -} -function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { +// @module: commonjs +// @declaration: true + + +// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export namespace SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export namespace SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts +/// +import Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts +import exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter"); +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { // Error + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error + } +} +export class publicClassWithWithPrivateParmeterTypes1 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { // Error + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { + } +} +class privateClassWithWithPrivateParmeterTypes2 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { + } +} + +export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error +} +function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { +} +export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error +} +function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { +} + + +export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error + } + myPublicMethod(param= exporter.createExportedWidget2()) { // Error + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error + } +} +export class publicClassWithPrivateModuleParameterTypes2 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error + } + myPublicMethod(param= exporter.createExportedWidget4()) { // Error + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error + } +} +export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error +} +export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error +} + + +class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { + } + myPublicMethod(param= exporter.createExportedWidget2()) { + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { + } +} +class privateClassWithPrivateModuleParameterTypes1 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { + } + myPublicMethod(param= exporter.createExportedWidget4()) { + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { + } +} +function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { +} +function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { } \ No newline at end of file diff --git a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts index cb1993286a4..cd97ef7fef0 100644 --- a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts +++ b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts @@ -1,163 +1,163 @@ -// @module: commonjs -// @declaration: true - - -// @Filename: privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts -declare module "GlobalWidgets" { - export class Widget3 { - name: string; - } - export function createWidget3(): Widget3; - - export module SpecializedGlobalWidget { - export class Widget4 { - name: string; - } - function createWidget4(): Widget4; - } -} - -// @Filename: privacyFunctionReturnTypeDeclFile_Widgets.ts -export class Widget1 { - name = 'one'; -} -export function createWidget1() { - return new Widget1(); -} - -export module SpecializedWidget { - export class Widget2 { - name = 'one'; - } - export function createWidget2() { - return new Widget2(); - } -} - -// @Filename:privacyFunctionReturnTypeDeclFile_exporter.ts -/// -import Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets"); -import Widgets1 = require("GlobalWidgets"); -export function createExportedWidget1() { - return Widgets.createWidget1(); -} -export function createExportedWidget2() { - return Widgets.SpecializedWidget.createWidget2(); -} -export function createExportedWidget3() { - return Widgets1.createWidget3(); -} -export function createExportedWidget4() { - return Widgets1.SpecializedGlobalWidget.createWidget4(); -} - -// @Filename:privacyFunctionReturnTypeDeclFile_consumer.ts -import exporter = require("./privacyFunctionReturnTypeDeclFile_exporter"); -export class publicClassWithWithPrivateParmeterTypes { - static myPublicStaticMethod() { // Error - return exporter.createExportedWidget1(); - } - private static myPrivateStaticMethod() { - return exporter.createExportedWidget1();; - } - myPublicMethod() { // Error - return exporter.createExportedWidget1();; - } - private myPrivateMethod() { - return exporter.createExportedWidget1();; - } - static myPublicStaticMethod1() { // Error - return exporter.createExportedWidget3(); - } - private static myPrivateStaticMethod1() { - return exporter.createExportedWidget3();; - } - myPublicMethod1() { // Error - return exporter.createExportedWidget3();; - } - private myPrivateMethod1() { - return exporter.createExportedWidget3();; - } -} - -class privateClassWithWithPrivateParmeterTypes { - static myPublicStaticMethod() { - return exporter.createExportedWidget1(); - } - private static myPrivateStaticMethod() { - return exporter.createExportedWidget1();; - } - myPublicMethod() { - return exporter.createExportedWidget1();; - } - private myPrivateMethod() { - return exporter.createExportedWidget1();; - } - static myPublicStaticMethod1() { - return exporter.createExportedWidget3(); - } - private static myPrivateStaticMethod1() { - return exporter.createExportedWidget3();; - } - myPublicMethod1() { - return exporter.createExportedWidget3();; - } - private myPrivateMethod1() { - return exporter.createExportedWidget3();; - } -} - -export function publicFunctionWithPrivateParmeterTypes() { // Error - return exporter.createExportedWidget1(); -} -function privateFunctionWithPrivateParmeterTypes() { - return exporter.createExportedWidget1(); -} -export function publicFunctionWithPrivateParmeterTypes1() { // Error - return exporter.createExportedWidget3(); -} -function privateFunctionWithPrivateParmeterTypes1() { - return exporter.createExportedWidget3(); -} - -export class publicClassWithPrivateModuleReturnTypes { - static myPublicStaticMethod() { // Error - return exporter.createExportedWidget2(); - } - myPublicMethod() { // Error - return exporter.createExportedWidget2(); - } - static myPublicStaticMethod1() { // Error - return exporter.createExportedWidget4(); - } - myPublicMethod1() { // Error - return exporter.createExportedWidget4(); - } -} -export function publicFunctionWithPrivateModuleReturnTypes() { // Error - return exporter.createExportedWidget2(); -} -export function publicFunctionWithPrivateModuleReturnTypes1() { // Error - return exporter.createExportedWidget4(); -} - -class privateClassWithPrivateModuleReturnTypes { - static myPublicStaticMethod() { - return exporter.createExportedWidget2(); - } - myPublicMethod() { - return exporter.createExportedWidget2(); - } - static myPublicStaticMethod1() { // Error - return exporter.createExportedWidget4(); - } - myPublicMethod1() { // Error - return exporter.createExportedWidget4(); - } -} -function privateFunctionWithPrivateModuleReturnTypes() { - return exporter.createExportedWidget2(); -} -function privateFunctionWithPrivateModuleReturnTypes1() { - return exporter.createExportedWidget4(); -} +// @module: commonjs +// @declaration: true + + +// @Filename: privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export namespace SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyFunctionReturnTypeDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export namespace SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyFunctionReturnTypeDeclFile_exporter.ts +/// +import Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyFunctionReturnTypeDeclFile_consumer.ts +import exporter = require("./privacyFunctionReturnTypeDeclFile_exporter"); +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { // Error + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { // Error + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { // Error + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } +} + +export function publicFunctionWithPrivateParmeterTypes() { // Error + return exporter.createExportedWidget1(); +} +function privateFunctionWithPrivateParmeterTypes() { + return exporter.createExportedWidget1(); +} +export function publicFunctionWithPrivateParmeterTypes1() { // Error + return exporter.createExportedWidget3(); +} +function privateFunctionWithPrivateParmeterTypes1() { + return exporter.createExportedWidget3(); +} + +export class publicClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { // Error + return exporter.createExportedWidget2(); + } + myPublicMethod() { // Error + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} +export function publicFunctionWithPrivateModuleReturnTypes() { // Error + return exporter.createExportedWidget2(); +} +export function publicFunctionWithPrivateModuleReturnTypes1() { // Error + return exporter.createExportedWidget4(); +} + +class privateClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + myPublicMethod() { + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} +function privateFunctionWithPrivateModuleReturnTypes() { + return exporter.createExportedWidget2(); +} +function privateFunctionWithPrivateModuleReturnTypes1() { + return exporter.createExportedWidget4(); +} diff --git a/tests/cases/compiler/spellingSuggestionModule.ts b/tests/cases/compiler/spellingSuggestionModule.ts index 4b3078630d4..464b0e5ae24 100644 --- a/tests/cases/compiler/spellingSuggestionModule.ts +++ b/tests/cases/compiler/spellingSuggestionModule.ts @@ -4,5 +4,5 @@ foobar; declare module 'barfoo' { export const x: number; } barfoo; -declare module farboo { export const x: number; } +declare namespace farboo { export const x: number; } faroo; diff --git a/tests/cases/compiler/systemDefaultImportCallable.ts b/tests/cases/compiler/systemDefaultImportCallable.ts index a0ea02823c3..88690f191ae 100644 --- a/tests/cases/compiler/systemDefaultImportCallable.ts +++ b/tests/cases/compiler/systemDefaultImportCallable.ts @@ -1,15 +1,15 @@ -// @module: system -// @filename: core-js.d.ts -declare module core { - var String: { - repeat(text: string, count: number): string; - }; -} -declare module "core-js/fn/string/repeat" { - var repeat: typeof core.String.repeat; - export default repeat; -} -// @filename: greeter.ts -import repeat from "core-js/fn/string/repeat"; - +// @module: system +// @filename: core-js.d.ts +declare namespace core { + var String: { + repeat(text: string, count: number): string; + }; +} +declare module "core-js/fn/string/repeat" { + var repeat: typeof core.String.repeat; + export default repeat; +} +// @filename: greeter.ts +import repeat from "core-js/fn/string/repeat"; + const _: string = repeat(new Date().toUTCString() + " ", 2); \ No newline at end of file