chore(jest-environment) - update types and type usage in jest-runtime (…

…#8439)
jestjs · May 8, 2019 · db5e472 · db5e472
1 parent 351abe8
commit db5e472
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/packages/jest-environment/src/index.ts b/packages/jest-environment/src/index.ts
@@ -22,8 +22,17 @@ export type EnvironmentContext = Partial<{
   testPath: Config.Path;
 }>;
 
-// TODO: type this better: https://nodejs.org/api/modules.html#modules_the_module_wrapper
-type ModuleWrapper = (...args: Array<unknown>) => unknown;
+// Different Order than https://nodejs.org/api/modules.html#modules_the_module_wrapper , however needs to be in the form [jest-transform]ScriptTransformer accepts
+export type ModuleWrapper = (
+  module: Module,
+  exports: Module['exports'],
+  require: Module['require'],
+  __dirname: string,
+  __filename: Module['filename'],
+  global: Global.Global,
+  jest: Jest,
+  ...extraGlobals: Array<Global.Global[keyof Global.Global]>
+) => unknown;
 
 export declare class JestEnvironment {
   constructor(config: Config.ProjectConfig, context?: EnvironmentContext);
@@ -38,7 +47,7 @@ export declare class JestEnvironment {
   handleTestEvent?(event: Circus.Event, state: Circus.State): void;
 }
 
-export type Module = typeof module;
+export type Module = NodeModule;
 
 export interface LocalModuleRequire extends NodeRequire {
   requireActual(moduleName: string): unknown;

diff --git a/packages/jest-runtime/src/index.ts b/packages/jest-runtime/src/index.ts
@@ -743,11 +743,12 @@ class Runtime {
       return;
     }
 
-    const wrapper = runScript[ScriptTransformer.EVAL_RESULT_VARIABLE];
-    const moduleArguments = new Set([
-      localModule, // module object
+    //Wrapper
+    runScript[ScriptTransformer.EVAL_RESULT_VARIABLE].call(
+      localModule.exports,
+      localModule as NodeModule, // module object
       localModule.exports, // module exports
-      localModule.require, // require implementation
+      localModule.require as NodeRequireFunction, // require implementation
       dirname, // __dirname
       filename, // __filename
       this._environment.global, // global object
@@ -764,8 +765,7 @@ class Runtime {
           `You have requested '${globalVariable}' as a global variable, but it was not present. Please check your config or your global environment.`,
         );
       }),
-    ]);
-    wrapper.call(localModule.exports, ...Array.from(moduleArguments));
+    );
 
     this._isCurrentlyExecutingManualMock = origCurrExecutingManualMock;
     this._currentlyExecutingModulePath = lastExecutingModulePath;