Added project tests for node_modules JavaScript searches

microsoft · billti · Jun 28, 2016 · Feb 13, 2016 · Feb 14, 2016 · Feb 14, 2016
commit 885b0e902aa74e36874479aa5e2f038fdbaac2c2
diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,4 @@ internal/
 **/.vscode
 !**/.vscode/tasks.json
 !tests/cases/projects/projectOption/**/node_modules
+!tests/cases/projects/NodeModulesSearch/**/*
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
@@ -0,0 +1,6 @@
+define(["require", "exports", "m1"], function (require, exports, m1) {
+    "use strict";
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
+});
diff --git a/...aselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt b/...aselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
@@ -0,0 +1,40 @@
+importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+
+    exports.f2 = m2;
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+    exports.person = {
+        "name": "John Doe",
+        "age": 42
+    }
+
+==== importHigher/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    import * as m2 from "m2";
+
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
+    ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.json b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "Verify that a higher import loads a module that was previously skipped",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "importHigher",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "importHigher/node_modules/m2/entry.js",
+        "importHigher/node_modules/m1/index.js",
+        "importHigher/node_modules/m2/node_modules/m3/index.js",
+        "importHigher/root.ts"
+    ],
+    "emittedFiles": [
+        "importHigher/root.js"
+    ]
+}
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
@@ -0,0 +1,5 @@
+"use strict";
+var m1 = require("m1");
+m1.f1("test");
+m1.f2.a = 10;
+m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
diff --git a/...selines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt b/...selines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
@@ -0,0 +1,40 @@
+importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+
+    exports.f2 = m2;
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+    exports.person = {
+        "name": "John Doe",
+        "age": 42
+    }
+
+==== importHigher/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    import * as m2 from "m2";
+
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
+    ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.json b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "Verify that a higher import loads a module that was previously skipped",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "importHigher",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "importHigher/node_modules/m2/entry.js",
+        "importHigher/node_modules/m1/index.js",
+        "importHigher/node_modules/m2/node_modules/m3/index.js",
+        "importHigher/root.ts"
+    ],
+    "emittedFiles": [
+        "importHigher/root.js"
+    ]
+}
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/root.js
@@ -0,0 +1,6 @@
+define(["require", "exports", "m1"], function (require, exports, m1) {
+    "use strict";
+    m1.f1("test");
+    m1.f2.a = "10"; // Error: Should be number
+    m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+});
diff --git a/.../reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt b/.../reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
@@ -0,0 +1,32 @@
+maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+
+    exports.f2 = m2;
+
+==== maxDepthExceeded/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    m1.f1("test");
+    m1.f2.a = "10"; // Error: Should be number
+    ~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+    m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+
diff --git a/...elines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json b/...elines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json
@@ -0,0 +1,17 @@
+{
+    "scenario": "Verify that JavaScript modules are not resolved if too many hops",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "maxDepthExceeded",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "maxDepthExceeded/node_modules/m2/entry.js",
+        "maxDepthExceeded/node_modules/m1/index.js",
+        "maxDepthExceeded/root.ts"
+    ],
+    "emittedFiles": [
+        "maxDepthExceeded/root.js"
+    ]
+}
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/root.js
@@ -0,0 +1,5 @@
+"use strict";
+var m1 = require("m1");
+m1.f1("test");
+m1.f2.a = "10"; // Error: Should be number
+m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
diff --git a/...reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt b/...reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
@@ -0,0 +1,32 @@
+maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+
+    exports.f2 = m2;
+
+==== maxDepthExceeded/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    m1.f1("test");
+    m1.f2.a = "10"; // Error: Should be number
+    ~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+    m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
+
diff --git a/...lines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json b/...lines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json
@@ -0,0 +1,17 @@
+{
+    "scenario": "Verify that JavaScript modules are not resolved if too many hops",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "maxDepthExceeded",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "maxDepthExceeded/node_modules/m2/entry.js",
+        "maxDepthExceeded/node_modules/m1/index.js",
+        "maxDepthExceeded/root.ts"
+    ],
+    "emittedFiles": [
+        "maxDepthExceeded/root.js"
+    ]
+}
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
@@ -0,0 +1,6 @@
+define(["require", "exports", "m1"], function (require, exports, m1) {
+    "use strict";
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number
+});
diff --git a/...eference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt b/...eference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
@@ -0,0 +1,38 @@
+maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+    exports.person = {
+        "name": "John Doe",
+        "age": 42
+    }
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+
+    exports.f2 = m2;
+
+==== maxDepthIncreased/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number
+    ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+
diff --git a/...ines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.json b/...ines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "Verify that the setting to search node_modules deeper takes effect",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "maxDepthIncreased",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "maxDepthIncreased/node_modules/m2/node_modules/m3/index.js",
+        "maxDepthIncreased/node_modules/m2/entry.js",
+        "maxDepthIncreased/node_modules/m1/index.js",
+        "maxDepthIncreased/root.ts"
+    ],
+    "emittedFiles": [
+        "maxDepthIncreased/root.js"
+    ]
+}
diff --git a/...s/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/...s/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
@@ -0,0 +1,5 @@
+"use strict";
+var m1 = require("m1");
+m1.f1("test");
+m1.f2.a = 10;
+m1.f2.person.age = "10"; // Error: Should be number
diff --git a/...ference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt b/...ference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
@@ -0,0 +1,38 @@
+maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to type 'number'.
+
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+    exports.person = {
+        "name": "John Doe",
+        "age": 42
+    }
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js (0 errors) ====
+    var m3 = require("m3");
+
+    module.exports = {
+    	"a": 42,
+    	"b": "hello, world",
+    	"person": m3.person
+    };
+
+==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js (0 errors) ====
+    var m2 = require('m2');
+
+    /**
+     * @param {string} p1 The first param
+     */
+    exports.f1 = function(p1) {
+    	return 42;
+    };
+
+    exports.f2 = m2;
+
+==== maxDepthIncreased/root.ts (1 errors) ====
+    import * as m1 from "m1";
+    m1.f1("test");
+    m1.f2.a = 10;
+    m1.f2.person.age = "10"; // Error: Should be number
+    ~~~~~~~~~~~~~~~~
+!!! error TS2322: Type 'string' is not assignable to type 'number'.
+
diff --git a/...nes/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.json b/...nes/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "Verify that the setting to search node_modules deeper takes effect",
+    "projectRoot": "tests/cases/projects/NodeModulesSearch",
+    "baselineCheck": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "project": "maxDepthIncreased",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "maxDepthIncreased/node_modules/m2/node_modules/m3/index.js",
+        "maxDepthIncreased/node_modules/m2/entry.js",
+        "maxDepthIncreased/node_modules/m1/index.js",
+        "maxDepthIncreased/root.ts"
+    ],
+    "emittedFiles": [
+        "maxDepthIncreased/root.js"
+    ]
+}