Accept baselines

masaeedu · masaeedu · commit 2bf6456a3c42 · 2016-02-20T12:45:04.000-05:00
diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    }());
+    exports.A = A;
+});
diff --git a/tests/baselines/reference/project/declarationDir/amd/declarationDir.json b/tests/baselines/reference/project/declarationDir/amd/declarationDir.json
@@ -0,0 +1,26 @@
+{
+    "scenario": "declarationDir: specify declarationDir only",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "subfolder/b.js",
+        "declarations/subfolder/b.d.ts",
+        "a.js",
+        "declarations/a.d.ts",
+        "subfolder/c.js",
+        "declarations/subfolder/c.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/declarationDir/amd/declarations/a.d.ts b/tests/baselines/reference/project/declarationDir/amd/declarations/a.d.ts
@@ -0,0 +1,4 @@
+import { B } from './subfolder/b';
+export declare class A {
+    b: B;
+}
diff --git a/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/b.d.ts b/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/b.d.ts
@@ -0,0 +1,2 @@
+export declare class B {
+}
diff --git a/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/c.d.ts b/tests/baselines/reference/project/declarationDir/amd/declarations/subfolder/c.d.ts
@@ -0,0 +1,4 @@
+import { A } from '../a';
+export declare class C {
+    a: A;
+}
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var B = (function () {
+        function B() {
+        }
+        return B;
+    }());
+    exports.B = B;
+});
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    }());
+    exports.C = C;
+});
diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js
@@ -0,0 +1,7 @@
+"use strict";
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+exports.A = A;
diff --git a/tests/baselines/reference/project/declarationDir/node/declarationDir.json b/tests/baselines/reference/project/declarationDir/node/declarationDir.json
@@ -0,0 +1,26 @@
+{
+    "scenario": "declarationDir: specify declarationDir only",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "subfolder/b.js",
+        "declarations/subfolder/b.d.ts",
+        "a.js",
+        "declarations/a.d.ts",
+        "subfolder/c.js",
+        "declarations/subfolder/c.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/declarationDir/node/declarations/a.d.ts b/tests/baselines/reference/project/declarationDir/node/declarations/a.d.ts
@@ -0,0 +1,4 @@
+import { B } from './subfolder/b';
+export declare class A {
+    b: B;
+}
diff --git a/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/b.d.ts b/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/b.d.ts
@@ -0,0 +1,2 @@
+export declare class B {
+}
diff --git a/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/c.d.ts b/tests/baselines/reference/project/declarationDir/node/declarations/subfolder/c.d.ts
@@ -0,0 +1,4 @@
+import { A } from '../a';
+export declare class C {
+    a: A;
+}
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
@@ -0,0 +1,7 @@
+"use strict";
+var B = (function () {
+    function B() {
+    }
+    return B;
+}());
+exports.B = B;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
@@ -0,0 +1,7 @@
+"use strict";
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.C = C;
diff --git a/tests/baselines/reference/project/declarationDir2/amd/declarationDir2.json b/tests/baselines/reference/project/declarationDir2/amd/declarationDir2.json
@@ -0,0 +1,27 @@
+{
+    "scenario": "declarationDir: specify declarationDir with outDir",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "outDir": "out",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "out/subfolder/b.js",
+        "declarations/subfolder/b.d.ts",
+        "out/a.js",
+        "declarations/a.d.ts",
+        "out/subfolder/c.js",
+        "declarations/subfolder/c.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/declarationDir2/amd/declarations/a.d.ts b/tests/baselines/reference/project/declarationDir2/amd/declarations/a.d.ts
@@ -0,0 +1,4 @@
+import { B } from './subfolder/b';
+export declare class A {
+    b: B;
+}
diff --git a/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/b.d.ts b/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/b.d.ts
@@ -0,0 +1,2 @@
+export declare class B {
+}
diff --git a/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/c.d.ts b/tests/baselines/reference/project/declarationDir2/amd/declarations/subfolder/c.d.ts
@@ -0,0 +1,4 @@
+import { A } from '../a';
+export declare class C {
+    a: A;
+}
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    }());
+    exports.A = A;
+});
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var B = (function () {
+        function B() {
+        }
+        return B;
+    }());
+    exports.B = B;
+});
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
@@ -0,0 +1,9 @@
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    }());
+    exports.C = C;
+});
diff --git a/tests/baselines/reference/project/declarationDir2/node/declarationDir2.json b/tests/baselines/reference/project/declarationDir2/node/declarationDir2.json
@@ -0,0 +1,27 @@
+{
+    "scenario": "declarationDir: specify declarationDir with outDir",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "outDir": "out",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "out/subfolder/b.js",
+        "declarations/subfolder/b.d.ts",
+        "out/a.js",
+        "declarations/a.d.ts",
+        "out/subfolder/c.js",
+        "declarations/subfolder/c.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/declarationDir2/node/declarations/a.d.ts b/tests/baselines/reference/project/declarationDir2/node/declarations/a.d.ts
@@ -0,0 +1,4 @@
+import { B } from './subfolder/b';
+export declare class A {
+    b: B;
+}
diff --git a/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/b.d.ts b/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/b.d.ts
@@ -0,0 +1,2 @@
+export declare class B {
+}
diff --git a/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/c.d.ts b/tests/baselines/reference/project/declarationDir2/node/declarations/subfolder/c.d.ts
@@ -0,0 +1,4 @@
+import { A } from '../a';
+export declare class C {
+    a: A;
+}
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js
@@ -0,0 +1,7 @@
+"use strict";
+var A = (function () {
+    function A() {
+    }
+    return A;
+}());
+exports.A = A;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
@@ -0,0 +1,7 @@
+"use strict";
+var B = (function () {
+    function B() {
+    }
+    return B;
+}());
+exports.B = B;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
@@ -0,0 +1,7 @@
+"use strict";
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.C = C;
diff --git a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json
@@ -0,0 +1,23 @@
+{
+    "scenario": "declarationDir: specify declarationDir with bundled output file",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "out": "out.js",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "out.js",
+        "out.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.d.ts b/tests/baselines/reference/project/declarationDir3/amd/out.d.ts
@@ -0,0 +1,16 @@
+declare module "subfolder/b" {
+    export class B {
+    }
+}
+declare module "a" {
+    import { B } from "subfolder/b";
+    export class A {
+        b: B;
+    }
+}
+declare module "subfolder/c" {
+    import { A } from "a";
+    export class C {
+        a: A;
+    }
+}
diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js
@@ -0,0 +1,27 @@
+define("subfolder/b", ["require", "exports"], function (require, exports) {
+    "use strict";
+    var B = (function () {
+        function B() {
+        }
+        return B;
+    }());
+    exports.B = B;
+});
+define("a", ["require", "exports"], function (require, exports) {
+    "use strict";
+    var A = (function () {
+        function A() {
+        }
+        return A;
+    }());
+    exports.A = A;
+});
+define("subfolder/c", ["require", "exports"], function (require, exports) {
+    "use strict";
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    }());
+    exports.C = C;
+});
diff --git a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
@@ -0,0 +1,19 @@
+error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+
+
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+==== b.ts (0 errors) ====
+    export class B {
+        
+    }
+==== a.ts (0 errors) ====
+    import {B} from './subfolder/b';
+    export class A {
+        b: B;
+    }
+==== subfolder/c.ts (0 errors) ====
+    import {A} from '../a';
+    
+    export class C {
+        a: A;
+    }
diff --git a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json
@@ -0,0 +1,23 @@
+{
+    "scenario": "declarationDir: specify declarationDir with bundled output file",
+    "projectRoot": "tests/cases/projects/declarationDir",
+    "inputFiles": [
+        "a.ts",
+        "subfolder/b.ts",
+        "subfolder/c.ts"
+    ],
+    "out": "out.js",
+    "declaration": true,
+    "declarationDir": "declarations",
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "subfolder/b.ts",
+        "a.ts",
+        "subfolder/c.ts"
+    ],
+    "emittedFiles": [
+        "out.js",
+        "out.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/declarationDir3/node/out.d.ts b/tests/baselines/reference/project/declarationDir3/node/out.d.ts
diff --git a/tests/baselines/reference/project/declarationDir3/node/out.js b/tests/baselines/reference/project/declarationDir3/node/out.js

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +import { B } from './subfolder/b';
 +export declare class A {
 +    b: B;
 +}