Skip to content

Load JavaScript modules from Node packages #7075

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 20 commits into from
Jun 28, 2016
Merged

Load JavaScript modules from Node packages #7075

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
dfb0dcd
Load JS from node_modules
billti Feb 13, 2016
6126f7b
Added tests
billti Feb 14, 2016
e2df645
Updated tests
billti Feb 14, 2016
c76dc72
Merge remote-tracking branch 'upstream/master' into loadJsFromModules
billti May 24, 2016
ac54194
Fixed diagnostic message wording
billti May 24, 2016
75d84dc
Merge remote-tracking branch 'upstream/master' into loadJsFromModules
billti May 24, 2016
dd31bf9
Updated test
billti May 24, 2016
073f16e
Fixed whitespace
billti May 24, 2016
4d4f679
Merge branch 'master' into loadJsFromModules
billti Jun 21, 2016
07bfbab
Changed implementation to use closure
billti Jun 21, 2016
d01d5b1
Updated tests
billti Jun 21, 2016
8ff2c1a
Fixed linting error
billti Jun 21, 2016
6fba804
Remove extra baselines
billti Jun 26, 2016
e9a0c56
Fixed bugs and linting
billti Jun 27, 2016
885b0e9
Added project tests for node_modules JavaScript searches
billti Jun 27, 2016
0174bda
Merge branch 'master' into loadJsFromModules
billti Jun 27, 2016
1b43bd8
Removed old TODO comment
billti Jun 27, 2016
de559fb
Fixed the regexp for removing full paths
billti Jun 27, 2016
d8e3bd9
Added emitHost method to return source from node modules
billti Jun 27, 2016
ddad35a
Marked new method internal
billti Jun 27, 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
Added tests
  • Loading branch information
@billti
billti committed Feb 14, 2016
commit 6126f7b493d1ebae5ff74332591c8d92bc39d0d9
18 changes: 18 additions & 0 deletions tests/cases/fourslash/importJsNodeModule1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
///<reference path="fourslash.ts" />

// @allowJs: true
// @Filename: node_modules/myMod/index.js
//// module.exports = { n: 3, s: 'foo', b: true };

// @Filename: consumer.js
//// var x = require('myMod');
//// x/**/;

goTo.file('consumer.js');
goTo.marker();
edit.insert('.');
verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
edit.insert('n.');
verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
23 changes: 23 additions & 0 deletions tests/cases/fourslash/importJsNodeModule2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
///<reference path="fourslash.ts" />

// @allowJs: true

// @Filename: node_modules/myMod/package.json
//// {"main": "entry.js"}


// @Filename: node_modules/myMod/entry.js
//// module.exports = { n: 3, s: 'foo', b: true };

// @Filename: consumer.js
//// var x = require('myMod');
//// x/**/;

goTo.file('consumer.js');
goTo.marker();
edit.insert('.');
verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
edit.insert('n.');
verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
31 changes: 31 additions & 0 deletions tests/cases/fourslash/importJsNodeModule3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
///<reference path="fourslash.ts" />

// @allowJs: true

// @Filename: node_modules/myMod/index.js
//// exports.n = 3;
//// exports.s = 'foo';
//// exports.b = true;

// @Filename: node_modules/anotherMod/index.js
//// exports.x = 3;
//// exports.y = 'foo';
//// exports.z = true;

// @Filename: consumer.js
//// import * as x from 'myMod';
//// import {y,z} from 'anotherMod';
//// x/**/;

goTo.file('consumer.js');
goTo.marker();
edit.insert('.');
verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
edit.insert('n.');
verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");

edit.backspace(4);
edit.insert('y.');
verify.completionListContains("toUpperCase", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
20 changes: 20 additions & 0 deletions tests/cases/fourslash/importJsNodeModule4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
///<reference path="fourslash.ts" />

// @allowJs: true

// @Filename: node_modules/myMod/index.js
//// module.exports = { n: 3, s: 'foo', b: true };

// @Filename: consumer.js
//// import * as x from 'myMod';
//// x/**/;

goTo.file('consumer.js');
goTo.marker();
edit.insert('.');
// TODO: Bug: Fix ES6 import of assignments to module.exports
// verify.completionListContains("n", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
// verify.completionListContains("s", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
// verify.completionListContains("b", /*displayText:*/ undefined, /*documentation*/ undefined, "property");
// edit.insert('n.');
// verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");