Accepted baselines.

This commit is contained in:
Daniel Rosenwasser
2015-07-27 10:23:05 -07:00
parent cf801efb20
commit b84e4071a5
2 changed files with 89 additions and 0 deletions
@@ -0,0 +1,47 @@
tests/cases/conformance/es6/modules/m1.ts(2,22): error TS2651: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl;' declaration.
tests/cases/conformance/es6/modules/m1.ts(5,11): error TS2518: Only an ambient class can be merged with an interface.
tests/cases/conformance/es6/modules/m1.ts(5,11): error TS2651: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl;' declaration.
tests/cases/conformance/es6/modules/m2.ts(3,1): error TS2348: Value of type 'typeof Decl' is not callable. Did you mean to include 'new'?
tests/cases/conformance/es6/modules/m2.ts(6,8): error TS2503: Cannot find namespace 'Entity'.
tests/cases/conformance/es6/modules/m2.ts(8,13): error TS2339: Property 'p1' does not exist on type 'Decl'.
tests/cases/conformance/es6/modules/m2.ts(8,20): error TS2339: Property 'p2' does not exist on type 'Decl'.
==== tests/cases/conformance/es6/modules/m1.ts (3 errors) ====
export default class Decl {
~~~~
!!! error TS2651: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl;' declaration.
}
interface Decl {
~~~~
!!! error TS2518: Only an ambient class can be merged with an interface.
~~~~
!!! error TS2651: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl;' declaration.
p1: number;
p2: number;
}
namespace Decl {
interface I {
}
}
==== tests/cases/conformance/es6/modules/m2.ts (4 errors) ====
import Entity from "m1"
Entity();
~~~~~~~~
!!! error TS2348: Value of type 'typeof Decl' is not callable. Did you mean to include 'new'?
var x: Entity;
var y: Entity.I;
~~~~~~
!!! error TS2503: Cannot find namespace 'Entity'.
var z = new Entity();
var sum = z.p1 + z.p2
~~
!!! error TS2339: Property 'p1' does not exist on type 'Decl'.
~~
!!! error TS2339: Property 'p2' does not exist on type 'Decl'.
@@ -0,0 +1,42 @@
//// [tests/cases/conformance/es6/modules/defaultExportsCannotMerge03.ts] ////
//// [m1.ts]
export default class Decl {
}
interface Decl {
p1: number;
p2: number;
}
namespace Decl {
interface I {
}
}
//// [m2.ts]
import Entity from "m1"
Entity();
var x: Entity;
var y: Entity.I;
var z = new Entity();
var sum = z.p1 + z.p2
//// [m1.js]
var Decl = (function () {
function Decl() {
}
return Decl;
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = Decl;
//// [m2.js]
var m1_1 = require("m1");
m1_1.default();
var x;
var y;
var z = new m1_1.default();
var sum = z.p1 + z.p2;