Skip to content
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

Fix crash when checking module exports for export= #10538

Merged
merged 3 commits into from
Aug 25, 2016
Merged

Fix crash when checking module exports for export= #10538

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0309fa
Fix crash when checking module exports for export=
sandersn Aug 25, 2016
751b0a6
Clean up maxNodeModuleJsDepth test
sandersn Aug 25, 2016
6ee749f
Get rid of absolute paths
sandersn Aug 25, 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
14 changes: 7 additions & 7 deletions tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
c:/root/index.ts(4,5): error TS2339: Property 'y' does not exist on type 'typeof "shortid"'.
tests/cases/compiler/index.ts(4,5): error TS2339: Property 'y' does not exist on type 'typeof "shortid"'.


==== c:/root/index.ts (1 errors) ====
/// <reference path="c:/root/typings/index.d.ts" />
==== tests/cases/compiler/index.ts (1 errors) ====
/// <reference path="typings/index.d.ts" />
import * as foo from "shortid";
foo.x // found in index.d.ts
foo.y // ignored from shortid/index.ts
foo.y // ignored from shortid/index.js
~
!!! error TS2339: Property 'y' does not exist on type 'typeof "shortid"'.


==== c:/root/node_modules/shortid/node_modules/z/index.js (0 errors) ====
==== tests/cases/compiler/node_modules/shortid/node_modules/z/index.js (0 errors) ====
// z will not be found because maxNodeModulesJsDepth: 0
module.exports = { z: 'no' };

==== c:/root/node_modules/shortid/index.js (0 errors) ====
==== tests/cases/compiler/node_modules/shortid/index.js (0 errors) ====
var z = require('z');
var y = { y: 'foo' };
module.exports = y;

==== c:/root/typings/index.d.ts (0 errors) ====
==== tests/cases/compiler/typings/index.d.ts (0 errors) ====
declare module "shortid" {
export var x: number;
}
Expand Down
48 changes: 24 additions & 24 deletions tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.trace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[
"======== Resolving module 'shortid' from 'c:/root/index.ts'. ========",
"======== Resolving module 'shortid' from '/media/nathansa/src2/ts/tests/cases/compiler/index.ts'. ========",
"Explicitly specified module resolution kind: 'NodeJs'.",
"Loading module 'shortid' from 'node_modules' folder.",
"File 'c:/root/node_modules/shortid.ts' does not exist.",
"File 'c:/root/node_modules/shortid.tsx' does not exist.",
"File 'c:/root/node_modules/shortid.d.ts' does not exist.",
"File 'c:/root/node_modules/shortid.js' does not exist.",
"File 'c:/root/node_modules/shortid.jsx' does not exist.",
"File 'c:/root/node_modules/shortid/package.json' does not exist.",
"File 'c:/root/node_modules/shortid/index.ts' does not exist.",
"File 'c:/root/node_modules/shortid/index.tsx' does not exist.",
"File 'c:/root/node_modules/shortid/index.d.ts' does not exist.",
"File 'c:/root/node_modules/shortid/index.js' exist - use it as a name resolution result.",
"File 'c:/root/node_modules/@types/shortid.ts' does not exist.",
"File 'c:/root/node_modules/@types/shortid.tsx' does not exist.",
"File 'c:/root/node_modules/@types/shortid.d.ts' does not exist.",
"File 'c:/root/node_modules/@types/shortid.js' does not exist.",
"File 'c:/root/node_modules/@types/shortid.jsx' does not exist.",
"File 'c:/root/node_modules/@types/shortid/package.json' does not exist.",
"File 'c:/root/node_modules/@types/shortid/index.ts' does not exist.",
"File 'c:/root/node_modules/@types/shortid/index.tsx' does not exist.",
"File 'c:/root/node_modules/@types/shortid/index.d.ts' does not exist.",
"File 'c:/root/node_modules/@types/shortid/index.js' does not exist.",
"File 'c:/root/node_modules/@types/shortid/index.jsx' does not exist.",
"Resolving real path for 'c:/root/node_modules/shortid/index.js', result 'c:/root/node_modules/shortid/index.js'",
"======== Module name 'shortid' was successfully resolved to 'c:/root/node_modules/shortid/index.js'. ========"
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid.ts' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid.tsx' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid.d.ts' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid.js' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid.jsx' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid/package.json' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid/index.ts' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid/index.tsx' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid/index.d.ts' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid/index.js' exist - use it as a name resolution result.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid.ts' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid.tsx' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid.d.ts' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid.js' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid.jsx' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid/package.json' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid/index.ts' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid/index.tsx' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid/index.d.ts' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid/index.js' does not exist.",
"File '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/@types/shortid/index.jsx' does not exist.",
"Resolving real path for '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid/index.js', result '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid/index.js'",
"======== Module name 'shortid' was successfully resolved to '/media/nathansa/src2/ts/tests/cases/compiler/node_modules/shortid/index.js'. ========"
]
14 changes: 7 additions & 7 deletions tests/cases/compiler/maxNodeModuleJsDepthDefaultsToZero.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// @traceResolution: true
// @noEmit: true

// @filename: c:/root/tsconfig.json
// @filename: tsconfig.json
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to include the / in front or else your own directory will show up in the trace.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good to know, I didn't notice that. fixed.

{
"compileOnSave": true,
"compilerOptions": {
Expand All @@ -14,23 +14,23 @@
},
"exclude": [ "node_modules" ]
}
// @filename: c:/root/node_modules/shortid/node_modules/z/index.js
// @filename: node_modules/shortid/node_modules/z/index.js
// z will not be found because maxNodeModulesJsDepth: 0
module.exports = { z: 'no' };

// @filename: c:/root/node_modules/shortid/index.js
// @filename: node_modules/shortid/index.js
var z = require('z');
var y = { y: 'foo' };
module.exports = y;

// @filename: c:/root/typings/index.d.ts
// @filename: typings/index.d.ts
declare module "shortid" {
export var x: number;
}

// @filename: c:/root/index.ts
/// <reference path="c:/root/typings/index.d.ts" />
// @filename: index.ts
/// <reference path="typings/index.d.ts" />
import * as foo from "shortid";
foo.x // found in index.d.ts
foo.y // ignored from shortid/index.ts
foo.y // ignored from shortid/index.js