refactor: move findTestFiles to a common directory where it can be reused in multiple builders

Author: dgp1130

packages/angular_devkit/build_angular/BUILD.bazel

@@ -227,6 +227,7 @@ ts_library(
         ":build_angular_test_utils",
         "//packages/angular_devkit/architect/testing",
         "//packages/angular_devkit/core",
+        "@npm//fast-glob",
         "@npm//prettier",
         "@npm//typescript",
         "@npm//webpack",
@@ -372,11 +373,6 @@ LARGE_SPECS = {
     },
     "prerender": {},
     "browser-esbuild": {},
-    "jest": {
-        "extra_deps": [
-            "@npm//fast-glob",
-        ],
-    },
     "ssr-dev-server": {
         "extra_deps": [
             "@npm//@types/browser-sync",

packages/angular_devkit/build_angular/src/builders/jest/index.ts

@@ -11,12 +11,12 @@ import { execFile as execFileCb } from 'child_process';
 import * as path from 'path';
 import { promisify } from 'util';
 import { colors } from '../../utils/color';
+import { findTestFiles } from '../../utils/test-files';
 import { buildApplicationInternal } from '../application';
 import { ApplicationBuilderInternalOptions } from '../application/options';
 import { OutputHashing } from '../browser-esbuild/schema';
 import { normalizeOptions } from './options';
 import { Schema as JestBuilderSchema } from './schema';
-import { findTestFiles } from './test-files';
 
 const execFile = promisify(execFileCb);
 
@@ -55,7 +55,7 @@ export default createBuilder(
     }
 
     // Build all the test files.
-    const testFiles = await findTestFiles(options, context.workspaceRoot);
+    const testFiles = await findTestFiles(options.include, options.exclude, context.workspaceRoot);
     const jestGlobal = path.join(__dirname, 'jest-global.mjs');
     const initTestBed = path.join(__dirname, 'init-test-bed.mjs');
     const buildResult = await build(context, {

packages/angular_devkit/build_angular/src/builders/jest/test-files.ts renamed to packages/angular_devkit/build_angular/src/utils/test-files.ts

@@ -7,7 +7,6 @@
  */
 
 import fastGlob, { Options as GlobOptions } from 'fast-glob';
-import { JestBuilderOptions } from './options';
 
 /**
  * Finds all test files in the project.
@@ -19,18 +18,19 @@ import { JestBuilderOptions } from './options';
  * @returns A set of all test files in the project.
  */
 export async function findTestFiles(
-  options: JestBuilderOptions,
+  include: string[],
+  exclude: string[],
   workspaceRoot: string,
   glob: typeof fastGlob = fastGlob,
 ): Promise<Set<string>> {
   const globOptions: GlobOptions = {
     cwd: workspaceRoot,
-    ignore: ['node_modules/**'].concat(options.exclude),
+    ignore: ['node_modules/**'].concat(exclude),
     braceExpansion: false, // Do not expand `a{b,c}` to `ab,ac`.
     extglob: false, // Disable "extglob" patterns.
   };
 
-  const included = await Promise.all(options.include.map((pattern) => glob(pattern, globOptions)));
+  const included = await Promise.all(include.map((pattern) => glob(pattern, globOptions)));
 
   // Flatten and deduplicate any files found in multiple include patterns.
   return new Set(included.flat());

packages/angular_devkit/build_angular/src/builders/jest/tests/test-files_spec.ts renamed to packages/angular_devkit/build_angular/src/utils/test-files_spec.ts

@@ -10,8 +10,7 @@
 import realGlob from 'fast-glob';
 import { promises as fs } from 'fs';
 import * as path from 'path';
-import { findTestFiles } from '../test-files';
-import { BASE_OPTIONS } from './options';
+import { findTestFiles } from './test-files';
 
 describe('test-files', () => {
   describe('findTestFiles()', () => {
@@ -31,11 +30,8 @@ describe('test-files', () => {
       await fs.writeFile(path.join(tempDir, 'nested', 'bar.spec.ts'), '');
 
       const testFiles = await findTestFiles(
-        {
-          ...BASE_OPTIONS,
-          include: ['**/*.spec.ts'],
-          exclude: [],
-        },
+        ['**/*.spec.ts'] /* include */,
+        [] /* exclude */,
         tempDir,
       );
 
@@ -49,11 +45,8 @@ describe('test-files', () => {
       await fs.writeFile(path.join(tempDir, 'node_modules', 'dep', 'baz.spec.ts'), '');
 
       const testFiles = await findTestFiles(
-        {
-          ...BASE_OPTIONS,
-          include: ['**/*.spec.ts'],
-          exclude: ['**/*.ignored.spec.ts'],
-        },
+        ['**/*.spec.ts'] /* include */,
+        ['**/*.ignored.spec.ts'] /* exclude */,
         tempDir,
       );
 
@@ -71,12 +64,9 @@ describe('test-files', () => {
       await fs.writeFile(path.join(tempDir, 'node_modules', 'dep', 'baz.test.ts'), '');
 
       const testFiles = await findTestFiles(
-        {
-          ...BASE_OPTIONS,
-          include: ['**/*.spec.ts', '**/*.test.ts'],
-          // Exclude should be applied to all `glob()` executions.
-          exclude: ['**/*.ignored.*.ts'],
-        },
+        ['**/*.spec.ts', '**/*.test.ts'] /* include */,
+        // Exclude should be applied to all `glob()` executions.
+        ['**/*.ignored.*.ts'] /* exclude */,
         tempDir,
       );
 
@@ -89,10 +79,8 @@ describe('test-files', () => {
       await fs.writeFile(path.join(tempDir, 'nested', 'bar.spec.ts'), '');
 
       const testFiles = await findTestFiles(
-        {
-          ...BASE_OPTIONS,
-          include: ['**/*.spec.ts'],
-        },
+        ['**/*.spec.ts'] /* include */,
+        [] /* exclude */,
         path.join(tempDir, 'nested'),
       );
 
@@ -111,10 +99,8 @@ describe('test-files', () => {
 
       await expectAsync(
         findTestFiles(
-          {
-            ...BASE_OPTIONS,
-            include: ['*.spec.ts', '*.stuff.ts', '*.test.ts'],
-          },
+          ['*.spec.ts', '*.stuff.ts', '*.test.ts'] /* include */,
+          [] /* exclude */,
           tempDir,
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           glob as any,
@@ -127,10 +113,8 @@ describe('test-files', () => {
       await fs.writeFile(path.join(tempDir, 'bar.spec.ts'), '');
 
       const testFiles = await findTestFiles(
-        {
-          ...BASE_OPTIONS,
-          include: ['{foo,bar}.spec.ts'],
-        },
+        ['{foo,bar}.spec.ts'] /* include */,
+        [] /* exclude */,
         tempDir,
       );
 
@@ -142,10 +126,8 @@ describe('test-files', () => {
       await fs.writeFile(path.join(tempDir, 'bar.spec.ts'), '');
 
       const testFiles = await findTestFiles(
-        {
-          ...BASE_OPTIONS,
-          include: ['+(foo|bar).spec.ts'],
-        },
+        ['+(foo|bar).spec.ts'] /* include */,
+        [] /* exclude */,
         tempDir,
       );
 
@@ -158,10 +140,8 @@ describe('test-files', () => {
       await fs.writeFile(path.join(tempDir, 'bar.spec.ts', 'baz.spec.ts'), '');
 
       const testFiles = await findTestFiles(
-        {
-          ...BASE_OPTIONS,
-          include: ['**/*.spec.ts'],
-        },
+        ['**/*.spec.ts'] /* include */,
+        [] /* exclude */,
         tempDir,
       );