Skip to content

Fix #9542 (allow files under node_modules to be included in the compilation). #9607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
billti merged 7 commits into from
Jul 11, 2016
Merged

Fix #9542 (allow files under node_modules to be included in the compilation). #9607

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca874bd
Fix module tracking
billti Jul 10, 2016
db54bda
Updated test with relative import
billti Jul 10, 2016
2ab1143
Fixed the node tracking and a harness bug
billti Jul 11, 2016
a7467a1
fixed lint error
billti Jul 11, 2016
b75053c
Fixed implicit any
billti Jul 11, 2016
97025d0
Added missing test files
billti Jul 11, 2016
21bf801
Removed duplicate logic
billti Jul 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated test with relative import
  • Loading branch information
@billti
billti committed Jul 10, 2016
commit db54bda17b86e3a81f2d45e57e4fca732d66725b
1 change: 1 addition & 0 deletions tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/root.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
"use strict";
m1.f1("test");
m1.f2.a = "10"; // Error: Should be number
m1.rel = 42; // Error: Should be boolean
m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
});
13 changes: 12 additions & 1 deletion .../reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
maxDepthExceeded/root.ts(4,1): error TS2322: Type 'number' is not assignable to type 'boolean'.


==== entry.js (0 errors) ====
Expand All @@ -10,8 +11,12 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to
"person": m3.person
};

==== relative.js (0 errors) ====
exports.relativeProp = true;

==== index.js (0 errors) ====
var m2 = require('m2');
var rel = require('./relative');

/**
* @param {string} p1 The first param
Expand All @@ -22,11 +27,17 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to

exports.f2 = m2;

==== maxDepthExceeded/root.ts (1 errors) ====
exports.rel = rel.relativeProp;

==== maxDepthExceeded/root.ts (2 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.rel = 42; // Error: Should be boolean
~~~~~~
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.

m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".

1 change: 1 addition & 0 deletions ...elines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"resolvedInputFiles": [
"lib.d.ts",
"maxDepthExceeded/node_modules/m2/entry.js",
"maxDepthExceeded/node_modules/m1/relative.js",
"maxDepthExceeded/node_modules/m1/index.js",
"maxDepthExceeded/root.ts"
],
Expand Down
1 change: 1 addition & 0 deletions tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/root.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
var m1 = require("m1");
m1.f1("test");
m1.f2.a = "10"; // Error: Should be number
m1.rel = 42; // Error: Should be boolean
m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
13 changes: 12 additions & 1 deletion ...reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
maxDepthExceeded/root.ts(4,1): error TS2322: Type 'number' is not assignable to type 'boolean'.


==== entry.js (0 errors) ====
Expand All @@ -10,8 +11,12 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to
"person": m3.person
};

==== relative.js (0 errors) ====
exports.relativeProp = true;

==== index.js (0 errors) ====
var m2 = require('m2');
var rel = require('./relative');

/**
* @param {string} p1 The first param
Expand All @@ -22,11 +27,17 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to

exports.f2 = m2;

==== maxDepthExceeded/root.ts (1 errors) ====
exports.rel = rel.relativeProp;

==== maxDepthExceeded/root.ts (2 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.rel = 42; // Error: Should be boolean
~~~~~~
!!! error TS2322: Type 'number' is not assignable to type 'boolean'.

m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".

1 change: 1 addition & 0 deletions ...lines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"resolvedInputFiles": [
"lib.d.ts",
"maxDepthExceeded/node_modules/m2/entry.js",
"maxDepthExceeded/node_modules/m1/relative.js",
"maxDepthExceeded/node_modules/m1/index.js",
"maxDepthExceeded/root.ts"
],
Expand Down
3 changes: 3 additions & 0 deletions tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/relative.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions tests/cases/projects/NodeModulesSearch/maxDepthExceeded/root.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import * as m1 from "m1";
m1.f1("test");
m1.f2.a = "10"; // Error: Should be number
m1.rel = 42; // Error: Should be boolean

m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".