Skip to content

Implement module.parent #4614

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
cpojer merged 11 commits into from
Oct 7, 2017
Merged

Implement module.parent #4614

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cd3becf
Implement module.parent.require
SimenB Oct 6, 2017
e0b5bdc
Implement module.parent.filename
SimenB Oct 6, 2017
f9658fd
Implement module.parent.id
SimenB Oct 6, 2017
074ad47
Try to set parent to actual parent module
SimenB Oct 6, 2017
1d9c1a6
Fix tests
SimenB Oct 6, 2017
637a4c0
styel nit to minimize diff
SimenB Oct 6, 2017
32ba23c
Fix failing test
SimenB Oct 6, 2017
1976de4
Make module.parent a lazy getter
SimenB Oct 6, 2017
9545e9a
make `parent` enumerable
SimenB Oct 6, 2017
0d234d5
Share type definition for ModuleRegistry
SimenB Oct 6, 2017
2bd0c6d
module.parent should be null not undefined for entrypoints
SimenB Oct 7, 2017
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
Try to set parent to actual parent module
  • Loading branch information
@SimenB
SimenB committed Oct 6, 2017
commit 074ad478c951de528c4c57370d2a0082cca6687e
18 changes: 7 additions & 11 deletions packages/jest-runtime/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ class Runtime {
// $FlowFixMe
localModule.exports = require(modulePath);
} else {
this._execModule(localModule, options);
this._execModule(localModule, options, moduleRegistry[from]);
}
}
return moduleRegistry[modulePath].exports;
Expand Down Expand Up @@ -472,7 +472,11 @@ class Runtime {
return to ? this._resolver.resolveModule(from, to) : from;
}

_execModule(localModule: Module, options: ?InternalModuleOptions) {
_execModule(
localModule: Module,
options: ?InternalModuleOptions,
parent?: Module,
) {
// If the environment was disposed, prevent this module from being executed.
if (!this._environment.global) {
return;
Expand All @@ -489,15 +493,7 @@ class Runtime {
localModule.children = [];
localModule.paths = this._resolver.getModulePaths(dirname);
localModule.require = this._createRequireImplementation(filename, options);
localModule.parent = {
exports: {},
filename: lastExecutingModulePath,
id: lastExecutingModulePath,
require: this._createRequireImplementation(
lastExecutingModulePath,
options,
),
};
localModule.parent = parent;

const transformedFile = this._scriptTransformer.transform(
filename,
Expand Down