Passed filePath to dependencyExtractor

CHANGELOG.md

@@ -40,7 +40,7 @@
 - `[expect/jest-matcher-utils]` Improve report when assertion fails, part 5 ([#7557](https://github.com/facebook/jest/pull/7557))
 - `[expect]` Check constructor equality in .toStrictEqual() ([#7005](https://github.com/facebook/jest/pull/7005))
 - `[jest-util]` Add `jest.getTimerCount()` to get the count of scheduled fake timers ([#7285](https://github.com/facebook/jest/pull/7285))
-- `[jest-config]` Add `dependencyExtractor` option to use a custom module to extract dependencies from files ([#7313](https://github.com/facebook/jest/pull/7313), [#7349](https://github.com/facebook/jest/pull/7349), [#7350](https://github.com/facebook/jest/pull/7350))
+- `[jest-config]` Add `dependencyExtractor` option to use a custom module to extract dependencies from files ([#7313](https://github.com/facebook/jest/pull/7313), [#7349](https://github.com/facebook/jest/pull/7349), [#7350](https://github.com/facebook/jest/pull/7350), [#7362](https://github.com/facebook/jest/pull/7362))
 - `[jest-haste-map]` Accept a `getCacheKey` method in `hasteImplModulePath` modules to reset the cache when the logic changes ([#7350](https://github.com/facebook/jest/pull/7350))
 - `[jest-config]` Add `haste.computeSha1` option to compute the sha-1 of the files in the haste map ([#7345](https://github.com/facebook/jest/pull/7345))
 - `[expect]` `expect(Infinity).toBeCloseTo(Infinity)` Treats `Infinity` as equal in toBeCloseTo matcher ([#7405](https://github.com/facebook/jest/pull/7405))

docs/Configuration.md

@@ -261,9 +261,28 @@ Jest will fail if:
 
 Default: `undefined`
 
-This option allows the use of a custom dependency extractor. It must be a node module that exports an object with an `extract` function expecting a string as the first argument for the code to analyze and Jest's dependency extractor as the second argument (in case you only want to extend it).
+This option allows the use of a custom dependency extractor. It must be a node module that exports an object with an `extract` function. E.g.:
 
-The function should return an iterable (`Array`, `Set`, etc.) with the dependencies found in the code.
+```javascript
+const fs = require('fs');
+const crypto = require('crypto');
+
+module.exports = {
+  extract(code, filePath, defaultExtract) {
+    const deps = defaultExtract(code, filePath);
+    // Scan the file and add dependencies in `deps` (which is a `Set`)
+    return deps;
+  },
+  getCacheKey() {
+    return crypto
+      .createHash('md5')
+      .update(fs.readFileSync(__filename))
+      .digest('hex');
+  },
+};
+```
+
+The `extract` function should return an iterable (`Array`, `Set`, etc.) with the dependencies found in the code.
 
 That module can also contain a `getCacheKey` function to generate a cache key to determine if the logic has changed and any cached artifacts relying on it should be discarded.
 

e2e/__tests__/findRelatedFiles.test.js

@@ -44,6 +44,12 @@ describe('--findRelatedTests flag', () => {
   test('runs tests related to filename with a custom dependency extractor', () => {
     writeFiles(DIR, {
       '.watchmanconfig': '',
+      '__tests__/test-skip-deps.test.js': `
+      const dynamicImport = path => Promise.resolve(require(path));
+      test('a', () => dynamicImport('../a').then(a => {
+        expect(a.foo).toBe(5);
+      }));
+      `,
       '__tests__/test.test.js': `
         const dynamicImport = path => Promise.resolve(require(path));
         test('a', () => dynamicImport('../a').then(a => {
@@ -54,8 +60,12 @@ describe('--findRelatedTests flag', () => {
       'dependencyExtractor.js': `
         const DYNAMIC_IMPORT_RE = /(?:^|[^.]\\s*)(\\bdynamicImport\\s*?\\(\\s*?)([\`'"])([^\`'"]+)(\\2\\s*?\\))/g;
         module.exports = {
-          extract(code) {
+          extract(code, filePath) {
             const dependencies = new Set();
+            if (filePath.includes('skip-deps')) {
+              return dependencies;
+            }
+
             const addDependency = (match, pre, quot, dep, post) => {
               dependencies.add(dep);
               return match;
@@ -78,6 +88,7 @@ describe('--findRelatedTests flag', () => {
 
     const {stderr} = runJest(DIR, ['--findRelatedTests', 'a.js']);
     expect(stderr).toMatch('PASS __tests__/test.test.js');
+    expect(stderr).not.toMatch('PASS __tests__/test-skip-deps.test.js');
 
     const summaryMsg = 'Ran all test suites related to files matching /a.js/i.';
     expect(stderr).toMatch(summaryMsg);

packages/jest-haste-map/src/__tests__/dependencyExtractor.js

@@ -11,7 +11,7 @@ const blockCommentRe = /\/\*[^]*?\*\//g;
 const lineCommentRe = /\/\/.*/g;
 const LOAD_MODULE_RE = /(?:^|[^.]\s*)(\bloadModule\s*?\(\s*?)([`'"])([^`'"]+)(\2\s*?\))/g;
 
-export function extract(code, defaultDependencyExtractor) {
+export function extract(code, filePath, defaultDependencyExtractor) {
   const dependencies = defaultDependencyExtractor(code);
 
   const addDependency = (match, pre, quot, dep, post) => {

packages/jest-haste-map/src/worker.js

@@ -83,6 +83,7 @@ export async function worker(data: WorkerMessage): Promise<WorkerMetadata> {
           ? // $FlowFixMe
             require(data.dependencyExtractor).extract(
               content,
+              filePath,
               dependencyExtractor.extract,
             )
           : dependencyExtractor.extract(content),