From baadeae3a5c1e1d4cd415074d80d93c4c9cf9198 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 7 Oct 2017 12:54:59 +0200 Subject: [PATCH] Tighten type definition of `Module` --- .../src/__tests__/runtime_require_module.test.js | 3 ++- packages/jest-runtime/src/index.js | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/jest-runtime/src/__tests__/runtime_require_module.test.js b/packages/jest-runtime/src/__tests__/runtime_require_module.test.js index 9280528dde13..2ec967bc25af 100644 --- a/packages/jest-runtime/src/__tests__/runtime_require_module.test.js +++ b/packages/jest-runtime/src/__tests__/runtime_require_module.test.js @@ -33,11 +33,11 @@ describe('Runtime requireModule', () => { 'RegularModule', ); expect(Object.keys(exports.module)).toEqual([ + 'children', 'exports', 'filename', 'id', 'loaded', - 'children', 'parent', 'paths', ]); @@ -50,6 +50,7 @@ describe('Runtime requireModule', () => { 'RegularModule', ); expect(exports.parent).toEqual({ + children: [], exports: {}, filename: 'mock.js', id: 'mockParent', diff --git a/packages/jest-runtime/src/index.js b/packages/jest-runtime/src/index.js index 66dd0227428a..b3ce1b7b8098 100644 --- a/packages/jest-runtime/src/index.js +++ b/packages/jest-runtime/src/index.js @@ -29,14 +29,14 @@ import {run as cilRun} from './cli'; import {options as cliOptions} from './cli/args'; type Module = {| - children?: Array, + children: Array, exports: any, filename: string, id: string, loaded: boolean, parent?: Module, paths?: Array, - require?: Function, + require?: (id: string) => any, |}; type HasteMapOptions = {| @@ -77,6 +77,7 @@ const getModuleNameMapper = (config: ProjectConfig) => { }; const mockParentModule: Module = { + children: [], exports: {}, filename: 'mock.js', id: 'mockParent', @@ -318,6 +319,7 @@ class Runtime { // circular dependencies that may arise while evaluating the module can // be satisfied. const localModule: Module = { + children: [], exports: {}, filename: modulePath, id: modulePath, @@ -391,6 +393,7 @@ class Runtime { if (manualMock) { const localModule: Module = { + children: [], exports: {}, filename: modulePath, id: modulePath,