Verify the output file paths for the json module emit

sheetalkamat · sheetalkamat · commit 4f1640d8e1f3 · 2018-02-24T10:15:32.000-08:00
diff --git a/tests/baselines/reference/requireOfJsonFile.js b/tests/baselines/reference/requireOfJsonFile.js
@@ -15,12 +15,12 @@ if (x) {
     "b": "hello"
 }
 
-//// [b.json]
+//// [out/b.json]
 {
     "a": true,
     "b": "hello"
 }
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var b1 = require("./b.json");
diff --git a/tests/baselines/reference/requireOfJsonFileNonRelative.js b/tests/baselines/reference/requireOfJsonFileNonRelative.js
@@ -21,7 +21,7 @@ if (x) {
     "b": "hello"
 }
 
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var b1 = require("b.json");
diff --git a/tests/baselines/reference/requireOfJsonFileNonRelativeWithoutExtension.js b/tests/baselines/reference/requireOfJsonFileNonRelativeWithoutExtension.js
@@ -22,6 +22,6 @@ import e = require("e"); // Should fail
     "b": "hello"
 }
 
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/requireOfJsonFileNonRelativeWithoutExtensionResolvesToTs.js b/tests/baselines/reference/requireOfJsonFileNonRelativeWithoutExtensionResolvesToTs.js
@@ -13,10 +13,10 @@ let fnumber: number = f;
 //// [f.ts]
 export = 10;
 
-//// [f.js]
+//// [out/node_modules/f.js]
 "use strict";
 module.exports = 10;
-//// [file1.js]
+//// [out/projects/file1.js]
 "use strict";
 exports.__esModule = true;
 var f = require("f"); // should work to f.ts
diff --git a/tests/baselines/reference/requireOfJsonFileTypes.js b/tests/baselines/reference/requireOfJsonFileTypes.js
@@ -45,24 +45,24 @@ booleanLiteral = g[0];
 //// [g.json]
 [true, false]
 
-//// [b.json]
+//// [out/b.json]
 {
     "a": true,
     "b": "hello",
     "c": null,
     "d": false
 }
-//// [c.json]
+//// [out/c.json]
 ["a", null, "string"]
-//// [d.json]
+//// [out/d.json]
 "dConfig"
-//// [e.json]
+//// [out/e.json]
 -10
-//// [f.json]
+//// [out/f.json]
 [-10, 30]
-//// [g.json]
+//// [out/g.json]
 [true, false]
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var b = require("./b.json");
diff --git a/tests/baselines/reference/requireOfJsonFileWithAmd.js b/tests/baselines/reference/requireOfJsonFileWithAmd.js
@@ -15,7 +15,7 @@ if (x) {
     "b": "hello"
 }
 
-//// [file1.js]
+//// [out/file1.js]
 define(["require", "exports", "./b", "./b.json"], function (require, exports, b1, b2) {
     "use strict";
     exports.__esModule = true;
diff --git a/tests/baselines/reference/requireOfJsonFileWithEmptyObject.js b/tests/baselines/reference/requireOfJsonFileWithEmptyObject.js
@@ -12,9 +12,9 @@ if (x) {
 {
 }
 
-//// [b.json]
+//// [out/b.json]
 {}
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var b1 = require("./b.json");
diff --git a/tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.js b/tests/baselines/reference/requireOfJsonFileWithEmptyObjectWithErrors.js
@@ -13,9 +13,9 @@ if (x) {
 {
 }
 
-//// [b.json]
+//// [out/b.json]
 {}
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var b1 = require("./b.json");
diff --git a/tests/baselines/reference/requireOfJsonFileWithErrors.js b/tests/baselines/reference/requireOfJsonFileWithErrors.js
@@ -15,12 +15,12 @@ if (x) {
     "b": "hello"
 }
 
-//// [b.json]
+//// [out/b.json]
 {
     'a': true,
     "b": "hello"
 }
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var b1 = require("./b.json");
diff --git a/tests/baselines/reference/requireOfJsonFileWithNoContent.js b/tests/baselines/reference/requireOfJsonFileWithNoContent.js
@@ -12,8 +12,8 @@ if (x) {
 //// [b.json]
 
 
-//// [b.json]
-//// [file1.js]
+//// [out/b.json]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var b1 = require("./b.json");
diff --git a/tests/baselines/reference/requireOfJsonFileWithoutAllowJs.js b/tests/baselines/reference/requireOfJsonFileWithoutAllowJs.js
@@ -15,12 +15,12 @@ if (x) {
     "b": "hello"
 }
 
-//// [b.json]
+//// [out/b.json]
 {
     "a": true,
     "b": "hello"
 }
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var b1 = require("./b.json");
diff --git a/tests/baselines/reference/requireOfJsonFileWithoutExtension.js b/tests/baselines/reference/requireOfJsonFileWithoutExtension.js
@@ -15,12 +15,12 @@ if (x) {
     "b": "hello"
 }
 
-//// [b.json]
+//// [out/b.json]
 {
     "a": true,
     "b": "hello"
 }
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var b1 = require("./b"); // This should not resolve
diff --git a/tests/baselines/reference/requireOfJsonFileWithoutExtensionResolvesToTs.js b/tests/baselines/reference/requireOfJsonFileWithoutExtensionResolvesToTs.js
@@ -24,15 +24,15 @@ if (x2) {
 //// [c.ts]
 export = { a: true, b: "hello" };
 
-//// [c.js]
+//// [out/c.js]
 "use strict";
 module.exports = { a: true, b: "hello" };
-//// [c.json]
+//// [out/c.json]
 {
     "a": true,
     "b": "hello"
 }
-//// [file1.js]
+//// [out/file1.js]
 "use strict";
 exports.__esModule = true;
 var c1 = require("./c"); // resolves to c.ts 
diff --git a/tests/baselines/reference/requireOfJsonFileWithoutOutDir.errors.txt b/tests/baselines/reference/requireOfJsonFileWithoutOutDir.errors.txt
@@ -0,0 +1,20 @@
+error TS5055: Cannot write file 'tests/cases/compiler/b.json' because it would overwrite input file.
+  Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
+
+
+!!! error TS5055: Cannot write file 'tests/cases/compiler/b.json' because it would overwrite input file.
+!!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
+==== tests/cases/compiler/file1.ts (0 errors) ====
+    import b1 = require('./b.json');
+    let x = b1.a;
+    import b2 = require('./b.json');
+    if (x) {
+        let b = b2.b;
+        x = (b1.b === b);
+    }
+    
+==== tests/cases/compiler/b.json (0 errors) ====
+    {
+        "a": true,
+        "b": "hello"
+    }
diff --git a/tests/baselines/reference/requireOfJsonFileWithoutOutDir.js b/tests/baselines/reference/requireOfJsonFileWithoutOutDir.js
@@ -0,0 +1,27 @@
+//// [tests/cases/compiler/requireOfJsonFileWithoutOutDir.ts] ////
+
+//// [file1.ts]
+import b1 = require('./b.json');
+let x = b1.a;
+import b2 = require('./b.json');
+if (x) {
+    let b = b2.b;
+    x = (b1.b === b);
+}
+
+//// [b.json]
+{
+    "a": true,
+    "b": "hello"
+}
+
+//// [tests/cases/compiler/file1.js]
+"use strict";
+exports.__esModule = true;
+var b1 = require("./b.json");
+var x = b1.a;
+var b2 = require("./b.json");
+if (x) {
+    var b = b2.b;
+    x = (b1.b === b);
+}
diff --git a/tests/baselines/reference/requireOfJsonFileWithoutOutDir.symbols b/tests/baselines/reference/requireOfJsonFileWithoutOutDir.symbols
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/file1.ts ===
+import b1 = require('./b.json');
+>b1 : Symbol(b1, Decl(file1.ts, 0, 0))
+
+let x = b1.a;
+>x : Symbol(x, Decl(file1.ts, 1, 3))
+>b1.a : Symbol("a", Decl(b.json, 0, 1))
+>b1 : Symbol(b1, Decl(file1.ts, 0, 0))
+>a : Symbol("a", Decl(b.json, 0, 1))
+
+import b2 = require('./b.json');
+>b2 : Symbol(b2, Decl(file1.ts, 1, 13))
+
+if (x) {
+>x : Symbol(x, Decl(file1.ts, 1, 3))
+
+    let b = b2.b;
+>b : Symbol(b, Decl(file1.ts, 4, 7))
+>b2.b : Symbol("b", Decl(b.json, 1, 14))
+>b2 : Symbol(b2, Decl(file1.ts, 1, 13))
+>b : Symbol("b", Decl(b.json, 1, 14))
+
+    x = (b1.b === b);
+>x : Symbol(x, Decl(file1.ts, 1, 3))
+>b1.b : Symbol("b", Decl(b.json, 1, 14))
+>b1 : Symbol(b1, Decl(file1.ts, 0, 0))
+>b : Symbol("b", Decl(b.json, 1, 14))
+>b : Symbol(b, Decl(file1.ts, 4, 7))
+}
+
+=== tests/cases/compiler/b.json ===
+{
+    "a": true,
+>"a" : Symbol("a", Decl(b.json, 0, 1))
+
+    "b": "hello"
+>"b" : Symbol("b", Decl(b.json, 1, 14))
+}
diff --git a/tests/baselines/reference/requireOfJsonFileWithoutOutDir.types b/tests/baselines/reference/requireOfJsonFileWithoutOutDir.types
@@ -0,0 +1,45 @@
+=== tests/cases/compiler/file1.ts ===
+import b1 = require('./b.json');
+>b1 : { "a": boolean; "b": string; }
+
+let x = b1.a;
+>x : boolean
+>b1.a : boolean
+>b1 : { "a": boolean; "b": string; }
+>a : boolean
+
+import b2 = require('./b.json');
+>b2 : { "a": boolean; "b": string; }
+
+if (x) {
+>x : boolean
+
+    let b = b2.b;
+>b : string
+>b2.b : string
+>b2 : { "a": boolean; "b": string; }
+>b : string
+
+    x = (b1.b === b);
+>x = (b1.b === b) : boolean
+>x : boolean
+>(b1.b === b) : boolean
+>b1.b === b : boolean
+>b1.b : string
+>b1 : { "a": boolean; "b": string; }
+>b : string
+>b : string
+}
+
+=== tests/cases/compiler/b.json ===
+{
+>{    "a": true,    "b": "hello"} : { "a": boolean; "b": string; }
+
+    "a": true,
+>"a" : boolean
+>true : true
+
+    "b": "hello"
+>"b" : string
+>"hello" : "hello"
+}
diff --git a/tests/cases/compiler/requireOfJsonFile.ts b/tests/cases/compiler/requireOfJsonFile.ts
@@ -1,6 +1,7 @@
 // @module: commonjs
 // @outdir: out/
 // @allowJs: true
+// @fullEmitPaths: true
 
 // @Filename: file1.ts
 import b1 = require('./b.json');
diff --git a/tests/cases/compiler/requireOfJsonFileNonRelative.ts b/tests/cases/compiler/requireOfJsonFileNonRelative.ts
@@ -1,6 +1,7 @@
 // @module: commonjs
 // @outdir: out/
 // @allowJs: true
+// @fullEmitPaths: true
 
 // @Filename: /src/projects/file1.ts
 import b1 = require('b.json');
diff --git a/tests/cases/compiler/requireOfJsonFileNonRelativeWithoutExtension.ts b/tests/cases/compiler/requireOfJsonFileNonRelativeWithoutExtension.ts
@@ -1,6 +1,7 @@
 // @module: commonjs
 // @outdir: out/
 // @allowJs: true
+// @fullEmitPaths: true
 
 // @Filename: /src/projects/file1.ts
 import d = require("d.json"); // Should fail
diff --git a/tests/cases/compiler/requireOfJsonFileNonRelativeWithoutExtensionResolvesToTs.ts b/tests/cases/compiler/requireOfJsonFileNonRelativeWithoutExtensionResolvesToTs.ts
@@ -1,6 +1,7 @@
 // @module: commonjs
 // @outdir: out/
 // @allowJs: true
+// @fullEmitPaths: true
 
 // @Filename: /src/projects/file1.ts
 import f = require("f"); // should work to f.ts
diff --git a/tests/cases/compiler/requireOfJsonFileTypes.ts b/tests/cases/compiler/requireOfJsonFileTypes.ts
@@ -2,6 +2,7 @@
 // @outdir: out/
 // @allowJs: true
 // @strictNullChecks: true
+// @fullEmitPaths: true
 
 // @Filename: file1.ts
 import b = require('./b.json');
diff --git a/tests/cases/compiler/requireOfJsonFileWithAmd.ts b/tests/cases/compiler/requireOfJsonFileWithAmd.ts
@@ -1,6 +1,7 @@
 // @module: amd
 // @outdir: out/
 // @allowJs: true
+// @fullEmitPaths: true
 
 // @Filename: file1.ts
 import b1 = require('./b');
diff --git a/tests/cases/compiler/requireOfJsonFileWithEmptyObject.ts b/tests/cases/compiler/requireOfJsonFileWithEmptyObject.ts
@@ -1,6 +1,7 @@
 // @module: commonjs
 // @outdir: out/
 // @allowJs: true
+// @fullEmitPaths: true
 
 // @Filename: file1.ts
 import b1 = require('./b.json');
diff --git a/tests/cases/compiler/requireOfJsonFileWithEmptyObjectWithErrors.ts b/tests/cases/compiler/requireOfJsonFileWithEmptyObjectWithErrors.ts
@@ -1,6 +1,7 @@
 // @module: commonjs
 // @outdir: out/
 // @allowJs: true
+// @fullEmitPaths: true
 
 // @Filename: file1.ts
 import b1 = require('./b.json');
diff --git a/tests/cases/compiler/requireOfJsonFileWithErrors.ts b/tests/cases/compiler/requireOfJsonFileWithErrors.ts
@@ -1,6 +1,7 @@
 // @module: commonjs
 // @outdir: out/
 // @allowJs: true
+// @fullEmitPaths: true
 
 // @Filename: file1.ts
 import b1 = require('./b.json');
diff --git a/tests/cases/compiler/requireOfJsonFileWithNoContent.ts b/tests/cases/compiler/requireOfJsonFileWithNoContent.ts
@@ -1,6 +1,7 @@
 // @module: commonjs
 // @outdir: out/
 // @allowJs: true
+// @fullEmitPaths: true
 
 // @Filename: file1.ts
 import b1 = require('./b.json');
diff --git a/tests/cases/compiler/requireOfJsonFileWithoutAllowJs.ts b/tests/cases/compiler/requireOfJsonFileWithoutAllowJs.ts
diff --git a/tests/cases/compiler/requireOfJsonFileWithoutExtension.ts b/tests/cases/compiler/requireOfJsonFileWithoutExtension.ts
diff --git a/tests/cases/compiler/requireOfJsonFileWithoutExtensionResolvesToTs.ts b/tests/cases/compiler/requireOfJsonFileWithoutExtensionResolvesToTs.ts
diff --git a/tests/cases/compiler/requireOfJsonFileWithoutOutDir.ts b/tests/cases/compiler/requireOfJsonFileWithoutOutDir.ts

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,12 @@ if (x) {`
`15`	`15`	`"b": "hello"`
`16`	`16`	`}`
`17`	`17`
`18`		`-//// [b.json]`
	`18`	`+//// [out/b.json]`
`19`	`19`	`{`
`20`	`20`	`"a": true,`
`21`	`21`	`"b": "hello"`
`22`	`22`	`}`
`23`		`-//// [file1.js]`
	`23`	`+//// [out/file1.js]`
`24`	`24`	`"use strict";`
`25`	`25`	`exports.__esModule = true;`
`26`	`26`	`var b1 = require("./b.json");`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ if (x) {`
`21`	`21`	`"b": "hello"`
`22`	`22`	`}`
`23`	`23`
`24`		`-//// [file1.js]`
	`24`	`+//// [out/file1.js]`
`25`	`25`	`"use strict";`
`26`	`26`	`exports.__esModule = true;`
`27`	`27`	`var b1 = require("b.json");`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ import e = require("e"); // Should fail`
`22`	`22`	`"b": "hello"`
`23`	`23`	`}`
`24`	`24`
`25`		`-//// [file1.js]`
	`25`	`+//// [out/file1.js]`
`26`	`26`	`"use strict";`
`27`	`27`	`exports.__esModule = true;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ if (x) {`
`15`	`15`	`"b": "hello"`
`16`	`16`	`}`
`17`	`17`
`18`		`-//// [file1.js]`
	`18`	`+//// [out/file1.js]`
`19`	`19`	`define(["require", "exports", "./b", "./b.json"], function (require, exports, b1, b2) {`
`20`	`20`	`"use strict";`
`21`	`21`	`exports.__esModule = true;`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ if (x) {`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`		`-//// [b.json]`
	`15`	`+//// [out/b.json]`
`16`	`16`	`{}`
`17`		`-//// [file1.js]`
	`17`	`+//// [out/file1.js]`
`18`	`18`	`"use strict";`
`19`	`19`	`exports.__esModule = true;`
`20`	`20`	`var b1 = require("./b.json");`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ if (x) {`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`-//// [b.json]`
	`16`	`+//// [out/b.json]`
`17`	`17`	`{}`
`18`		`-//// [file1.js]`
	`18`	`+//// [out/file1.js]`
`19`	`19`	`"use strict";`
`20`	`20`	`exports.__esModule = true;`
`21`	`21`	`var b1 = require("./b.json");`