From c6d8712e28609bd102c6de84800825b2dc5f5bcf Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 18 Apr 2016 14:44:44 -0700 Subject: [PATCH] Update baselines --- .../declarationEmit_UnknownImport2.js | 2 +- ...ecoratedDefaultExportsGetExportedSystem.js | 2 +- .../reference/dottedNamesInSystem.js | 2 +- .../emptyAssignmentPatterns03_ES5.js | 4 +-- .../reference/es3defaultAliasIsQuoted.js | 2 +- .../reference/es6ImportNamedImportDts.js | 2 +- .../es6ImportNamedImportWithExport.js | 2 +- .../exportDeclarationInInternalModule.js | 1 - tests/baselines/reference/externModule.js | 1 - .../reference/importImportOnlyModule.js | 2 +- .../baselines/reference/importInsideModule.js | 1 - .../reference/invalidInstantiatedModule.js | 4 +-- .../reference/moduleDuplicateIdentifiers.js | 2 +- .../reference/moduleElementsInWrongContext.js | 13 ++++++-- .../moduleElementsInWrongContext2.js | 13 ++++++-- .../moduleElementsInWrongContext3.js | 13 ++++++-- tests/baselines/reference/multipleExports.js | 1 - .../objectLiteralMemberWithoutBlock1.js | 2 +- .../reference/outModuleConcatCommonjs.js | 31 ------------------- .../baselines/reference/outModuleConcatES6.js | 26 ---------------- .../baselines/reference/outModuleConcatUmd.js | 31 ------------------- ...parseRegularExpressionMixedWithComments.js | 4 +-- .../privacyCannotNameVarTypeDeclFile.js | 4 +-- ...privacyCheckAnonymousFunctionParameter2.js | 2 +- .../reference/superInConstructorParam1.js | 2 +- .../systemModuleNonTopLevelModuleMembers.js | 4 +-- 26 files changed, 52 insertions(+), 121 deletions(-) delete mode 100644 tests/baselines/reference/outModuleConcatCommonjs.js delete mode 100644 tests/baselines/reference/outModuleConcatES6.js delete mode 100644 tests/baselines/reference/outModuleConcatUmd.js diff --git a/tests/baselines/reference/declarationEmit_UnknownImport2.js b/tests/baselines/reference/declarationEmit_UnknownImport2.js index 213b4fc7369..09fa4718614 100644 --- a/tests/baselines/reference/declarationEmit_UnknownImport2.js +++ b/tests/baselines/reference/declarationEmit_UnknownImport2.js @@ -4,5 +4,5 @@ import Foo From './Foo'; // Syntax error export default Foo //// [declarationEmit_UnknownImport2.js] -"use strict"; './Foo'; // Syntax error +"use strict"; diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js index 0b336bdd546..4628fc5e81c 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js @@ -45,7 +45,7 @@ System.register([], function (exports_1, context_1) { return c > 3 && r && Object.defineProperty(target, key, r), r; }; var __moduleName = context_1 && context_1.id; - var decorator, default_1_1; + var decorator, default_1; return { setters: [], execute: function () { diff --git a/tests/baselines/reference/dottedNamesInSystem.js b/tests/baselines/reference/dottedNamesInSystem.js index e337e8cb123..c4bb44f03cf 100644 --- a/tests/baselines/reference/dottedNamesInSystem.js +++ b/tests/baselines/reference/dottedNamesInSystem.js @@ -28,7 +28,7 @@ System.register([], function (exports_1, context_1) { C.foo = foo; })(C = B.C || (B.C = {})); })(B = A.B || (A.B = {})); - })(A || (A = {})); + })(A = A || (A = {})); exports_1("A", A); } }; diff --git a/tests/baselines/reference/emptyAssignmentPatterns03_ES5.js b/tests/baselines/reference/emptyAssignmentPatterns03_ES5.js index a1b605fa2e0..adaad2e3b63 100644 --- a/tests/baselines/reference/emptyAssignmentPatterns03_ES5.js +++ b/tests/baselines/reference/emptyAssignmentPatterns03_ES5.js @@ -7,8 +7,8 @@ var a: any; //// [emptyAssignmentPatterns03_ES5.js] var a; -({} = a); -([] = a); +(a); +(a); //// [emptyAssignmentPatterns03_ES5.d.ts] diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js index 89fd0c47a7e..2ce6113b4fe 100644 --- a/tests/baselines/reference/es3defaultAliasIsQuoted.js +++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js @@ -21,8 +21,8 @@ var Foo = (function () { } return Foo; }()); -Foo.CONSTANT = "Foo"; exports.Foo = Foo; +Foo.CONSTANT = "Foo"; function assert(value) { if (!value) throw new Error("Assertion failed!"); diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js index 7fdf620164b..9070080df08 100644 --- a/tests/baselines/reference/es6ImportNamedImportDts.js +++ b/tests/baselines/reference/es6ImportNamedImportDts.js @@ -154,7 +154,7 @@ exports.xxxx9 = new server_7.x111(); var server_8 = require("./server"); exports.z111 = new server_8.z1(); var server_9 = require("./server"); -exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error +exports.z2 = new server_9.z2(); //// [server.d.ts] diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js index 21ccb29a57b..464be99817a 100644 --- a/tests/baselines/reference/es6ImportNamedImportWithExport.js +++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js @@ -72,7 +72,7 @@ exports.xxxx = server_7.x1; var server_8 = require("./server"); exports.z111 = server_8.z1; var server_9 = require("./server"); -exports.z2 = server_9.z2; // z2 shouldn't give redeclare error +exports.z2 = server_9.z2; //// [server.d.ts] diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js index 9f469ccac3c..a9ea4bf5eda 100644 --- a/tests/baselines/reference/exportDeclarationInInternalModule.js +++ b/tests/baselines/reference/exportDeclarationInInternalModule.js @@ -53,7 +53,6 @@ var Bbb; return SomeType; }()); Bbb.SomeType = SomeType; - export * from Aaa; // this line causes the nullref })(Bbb || (Bbb = {})); var a; diff --git a/tests/baselines/reference/externModule.js b/tests/baselines/reference/externModule.js index d5684ea1f46..a7f58e4f30c 100644 --- a/tests/baselines/reference/externModule.js +++ b/tests/baselines/reference/externModule.js @@ -48,7 +48,6 @@ module; } return XDate; }()); - exports.XDate = XDate; } var d = new XDate(); d.getDay(); diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js index 013999321f9..38ffc08d65e 100644 --- a/tests/baselines/reference/importImportOnlyModule.js +++ b/tests/baselines/reference/importImportOnlyModule.js @@ -24,8 +24,8 @@ define(["require", "exports"], function (require, exports) { } return C1; }()); - C1.s1 = true; exports.C1 = C1; + C1.s1 = true; }); //// [foo_1.js] define(["require", "exports"], function (require, exports) { diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js index 32fe7f5ddb3..d4f12d0c1b6 100644 --- a/tests/baselines/reference/importInsideModule.js +++ b/tests/baselines/reference/importInsideModule.js @@ -13,6 +13,5 @@ export module myModule { "use strict"; var myModule; (function (myModule) { - import foo = require("importInsideModule_file1"); var a = foo.x; })(myModule = exports.myModule || (exports.myModule = {})); diff --git a/tests/baselines/reference/invalidInstantiatedModule.js b/tests/baselines/reference/invalidInstantiatedModule.js index 65328dc15b5..708e2c3b807 100644 --- a/tests/baselines/reference/invalidInstantiatedModule.js +++ b/tests/baselines/reference/invalidInstantiatedModule.js @@ -21,9 +21,9 @@ var M; var Point = (function () { function Point() { } - return Point; + return M.Point; }()); - M.Point = Point; + M.Point = M.Point; M.Point = 1; // Error })(M || (M = {})); var M2; diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js index 1d64c0490c5..a8689aa486d 100644 --- a/tests/baselines/reference/moduleDuplicateIdentifiers.js +++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js @@ -43,7 +43,7 @@ export enum Utensils { // Shouldn't error //// [moduleDuplicateIdentifiers.js] "use strict"; exports.Foo = 2; -exports.Foo = 42; // Should error +exports.Foo = 42; var FooBar; (function (FooBar) { FooBar.member1 = 2; diff --git a/tests/baselines/reference/moduleElementsInWrongContext.js b/tests/baselines/reference/moduleElementsInWrongContext.js index 26fd511a955..7cd2af405e2 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext.js +++ b/tests/baselines/reference/moduleElementsInWrongContext.js @@ -32,15 +32,22 @@ //// [moduleElementsInWrongContext.js] { + export = M; var v; function foo() { } - exports["default"] = v; + export * from "ambient"; + export { foo }; + export { baz as b } from "ambient"; + export default v; var C = (function () { function C() { } return C; }()); - exports["default"] = C; function bee() { } - exports.bee = bee; + import I2 = require("foo"); + import * as Foo from "ambient"; + import bar from "ambient"; + import { baz } from "ambient"; + import "ambient"; } diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.js b/tests/baselines/reference/moduleElementsInWrongContext2.js index 24fccc02dc5..55dd133ec95 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext2.js +++ b/tests/baselines/reference/moduleElementsInWrongContext2.js @@ -32,15 +32,22 @@ function blah () { //// [moduleElementsInWrongContext2.js] function blah() { + export = M; var v; function foo() { } - exports["default"] = v; + export * from "ambient"; + export { foo }; + export { baz as b } from "ambient"; + export default v; var C = (function () { function C() { } return C; }()); - exports["default"] = C; function bee() { } - exports.bee = bee; + import I2 = require("foo"); + import * as Foo from "ambient"; + import bar from "ambient"; + import { baz } from "ambient"; + import "ambient"; } diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.js b/tests/baselines/reference/moduleElementsInWrongContext3.js index c5c0d491cd3..76220eab251 100644 --- a/tests/baselines/reference/moduleElementsInWrongContext3.js +++ b/tests/baselines/reference/moduleElementsInWrongContext3.js @@ -35,16 +35,25 @@ module P { var P; (function (P) { { + export = M; var v; function foo() { } - P["default"] = v; + export * from "ambient"; + export { foo }; + export { baz as b } from "ambient"; + export default v; var C = (function () { function C() { } return C; }()); - exports["default"] = C; + P.C = C; function bee() { } P.bee = bee; + import I2 = require("foo"); + import * as Foo from "ambient"; + import bar from "ambient"; + import { baz } from "ambient"; + import "ambient"; } })(P || (P = {})); diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js index 2e287aa241c..c70a5005aab 100644 --- a/tests/baselines/reference/multipleExports.js +++ b/tests/baselines/reference/multipleExports.js @@ -22,5 +22,4 @@ var x = 0; var M; (function (M) { M.v; - export { x }; })(M = exports.M || (exports.M = {})); diff --git a/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js b/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js index d6a8579be04..7e5f63255af 100644 --- a/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js +++ b/tests/baselines/reference/objectLiteralMemberWithoutBlock1.js @@ -2,4 +2,4 @@ var v = { foo(); } //// [objectLiteralMemberWithoutBlock1.js] -var v = { foo: function () { } }; +var v = {}; diff --git a/tests/baselines/reference/outModuleConcatCommonjs.js b/tests/baselines/reference/outModuleConcatCommonjs.js deleted file mode 100644 index 0dbaee88004..00000000000 --- a/tests/baselines/reference/outModuleConcatCommonjs.js +++ /dev/null @@ -1,31 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatCommonjs.ts] //// - -//// [a.ts] - -// This should be an error - -export class A { } - -//// [b.ts] -import {A} from "./ref/a"; -export class B extends A { } - -//// [all.js] -var __extends = (this && this.__extends) || function (d, b) { - for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); -}; -// This should be an error -//# sourceMappingURL=all.js.map - -//// [all.d.ts] -declare module "ref/a" { - export class A { - } -} -declare module "b" { - import { A } from "ref/a"; - export class B extends A { - } -} diff --git a/tests/baselines/reference/outModuleConcatES6.js b/tests/baselines/reference/outModuleConcatES6.js deleted file mode 100644 index 45e58d2d773..00000000000 --- a/tests/baselines/reference/outModuleConcatES6.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatES6.ts] //// - -//// [a.ts] - -// This should be an error - -export class A { } - -//// [b.ts] -import {A} from "./ref/a"; -export class B extends A { } - -//// [all.js] -// This should be an error -//# sourceMappingURL=all.js.map - -//// [all.d.ts] -declare module "ref/a" { - export class A { - } -} -declare module "b" { - import { A } from "ref/a"; - export class B extends A { - } -} diff --git a/tests/baselines/reference/outModuleConcatUmd.js b/tests/baselines/reference/outModuleConcatUmd.js deleted file mode 100644 index 6c60a13c892..00000000000 --- a/tests/baselines/reference/outModuleConcatUmd.js +++ /dev/null @@ -1,31 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatUmd.ts] //// - -//// [a.ts] - -// This should error - -export class A { } - -//// [b.ts] -import {A} from "./ref/a"; -export class B extends A { } - -//// [all.js] -var __extends = (this && this.__extends) || function (d, b) { - for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); -}; -// This should error -//# sourceMappingURL=all.js.map - -//// [all.d.ts] -declare module "ref/a" { - export class A { - } -} -declare module "b" { - import { A } from "ref/a"; - export class B extends A { - } -} diff --git a/tests/baselines/reference/parseRegularExpressionMixedWithComments.js b/tests/baselines/reference/parseRegularExpressionMixedWithComments.js index 78752a77f75..a955ba31f2f 100644 --- a/tests/baselines/reference/parseRegularExpressionMixedWithComments.js +++ b/tests/baselines/reference/parseRegularExpressionMixedWithComments.js @@ -10,5 +10,5 @@ var regex5 = /**// asdf/**/ /; var regex1 = / asdf /; var regex2 = / asdf /; var regex3 = 1; -var regex4 = Math.pow(/ /, /asdf /); -var regex5 = Math.pow(/ asdf/, / /); +var regex4 = Math.pow(/**/ / /, /asdf /); +var regex5 = Math.pow(/**/ / asdf/, / /); diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js index c139b6279fd..cebf700aa59 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js @@ -161,11 +161,11 @@ var publicClassWithWithPrivatePropertyTypes = (function () { } return publicClassWithWithPrivatePropertyTypes; }()); +exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1(); // Error publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1(); publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3(); -exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; var privateClassWithWithPrivatePropertyTypes = (function () { function privateClassWithWithPrivatePropertyTypes() { this.myPublicProperty = exporter.createExportedWidget1(); @@ -190,9 +190,9 @@ var publicClassWithPrivateModulePropertyTypes = (function () { } return publicClassWithPrivateModulePropertyTypes; }()); +exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); // Error publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error -exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; exports.publicVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); // Error exports.publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error var privateClassWithPrivateModulePropertyTypes = (function () { diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js index 9965f472d75..1c4fa771199 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js @@ -17,7 +17,7 @@ module Q { //// [privacyCheckAnonymousFunctionParameter2.js] define(["require", "exports"], function (require, exports) { "use strict"; - exports.x = 1; // Makes this an external module + exports.x = 1; var Q; (function (Q) { function foo(x) { diff --git a/tests/baselines/reference/superInConstructorParam1.js b/tests/baselines/reference/superInConstructorParam1.js index 9c3c11d105c..3c6eb0bdad2 100644 --- a/tests/baselines/reference/superInConstructorParam1.js +++ b/tests/baselines/reference/superInConstructorParam1.js @@ -27,7 +27,7 @@ var B = (function () { var C = (function (_super) { __extends(C, _super); function C(a) { - if (a === void 0) { a = _super.prototype.foo.call(this); } + if (a === void 0) { a = _super.foo.call(this); } } return C; }(B)); diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js index fef8524146c..b0498b23f79 100644 --- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js +++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js @@ -30,7 +30,7 @@ System.register([], function (exports_1, context_1) { exports_1("TopLevelClass", TopLevelClass); (function (TopLevelModule) { var v; - })(TopLevelModule || (TopLevelModule = {})); + })(TopLevelModule = TopLevelModule || (TopLevelModule = {})); exports_1("TopLevelModule", TopLevelModule); (function (TopLevelEnum) { TopLevelEnum[TopLevelEnum["E"] = 0] = "E"; @@ -53,7 +53,7 @@ System.register([], function (exports_1, context_1) { NonTopLevelEnum[NonTopLevelEnum["E"] = 0] = "E"; })(TopLevelModule2.NonTopLevelEnum || (TopLevelModule2.NonTopLevelEnum = {})); var NonTopLevelEnum = TopLevelModule2.NonTopLevelEnum; - })(TopLevelModule2 || (TopLevelModule2 = {})); + })(TopLevelModule2 = TopLevelModule2 || (TopLevelModule2 = {})); exports_1("TopLevelModule2", TopLevelModule2); } };