7068de280 refactor(@angular-devkit/build-angular): clean find tests logic

Author: Angular Builds

package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.3.0-next.0",
+  "version": "14.0.0-next.0",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.1.1",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#8278b56c9",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#8278b56c9",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#8278b56c9",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#7068de280",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#7068de280",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#7068de280",
     "@babel/core": "7.16.12",
     "@babel/generator": "7.16.8",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.16.7",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.6",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#8278b56c9",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#7068de280",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",

src/builders/karma/find-tests.d.ts

@@ -5,4 +5,4 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-export declare function findTests(patterns: string[], cwd: string, workspaceRoot: string): string[];
+export declare function findTests(patterns: string[], workspaceRoot: string, projectSourceRoot: string): Promise<string[]>;

src/builders/karma/find-tests.js

@@ -28,48 +28,62 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findTests = void 0;
 const fs_1 = require("fs");
-const glob = __importStar(require("glob"));
+const glob_1 = __importStar(require("glob"));
 const path_1 = require("path");
-const is_directory_1 = require("../../utils/is-directory");
+const util_1 = require("util");
+const globPromise = (0, util_1.promisify)(glob_1.default);
 // go through all patterns and find unique list of files
-function findTests(patterns, cwd, workspaceRoot) {
-    return patterns.reduce((files, pattern) => {
-        const relativePathToMain = cwd.replace(workspaceRoot, '').substr(1); // remove leading slash
-        const tests = findMatchingTests(pattern, cwd, relativePathToMain);
-        tests.forEach((file) => {
-            if (!files.includes(file)) {
-                files.push(file);
-            }
-        });
-        return files;
-    }, []);
+async function findTests(patterns, workspaceRoot, projectSourceRoot) {
+    const matchingTestsPromises = patterns.map((pattern) => findMatchingTests(pattern, workspaceRoot, projectSourceRoot));
+    const files = await Promise.all(matchingTestsPromises);
+    // Unique file names
+    return [...new Set(files.flat())];
 }
 exports.findTests = findTests;
-function findMatchingTests(pattern, cwd, relativePathToMain) {
+const normalizePath = (path) => path.replace(/\\/g, '/');
+async function findMatchingTests(pattern, workspaceRoot, projectSourceRoot) {
     // normalize pattern, glob lib only accepts forward slashes
-    pattern = pattern.replace(/\\/g, '/');
-    relativePathToMain = relativePathToMain.replace(/\\/g, '/');
-    // remove relativePathToMain to support relative paths from root
+    let normalizedPattern = normalizePath(pattern);
+    const relativeProjectRoot = normalizePath((0, path_1.relative)(workspaceRoot, projectSourceRoot) + '/');
+    // remove relativeProjectRoot to support relative paths from root
     // such paths are easy to get when running scripts via IDEs
-    if (pattern.startsWith(relativePathToMain + '/')) {
-        pattern = pattern.substr(relativePathToMain.length + 1); // +1 to include slash
+    if (normalizedPattern.startsWith(relativeProjectRoot)) {
+        normalizedPattern = normalizedPattern.substring(relativeProjectRoot.length);
     }
     // special logic when pattern does not look like a glob
-    if (!glob.hasMagic(pattern)) {
-        if ((0, is_directory_1.isDirectory)((0, path_1.join)(cwd, pattern))) {
-            pattern = `${pattern}/**/*.spec.@(ts|tsx)`;
+    if (!(0, glob_1.hasMagic)(normalizedPattern)) {
+        if (await isDirectory((0, path_1.join)(projectSourceRoot, normalizedPattern))) {
+            normalizedPattern = `${normalizedPattern}/**/*.spec.@(ts|tsx)`;
         }
         else {
             // see if matching spec file exists
-            const extension = (0, path_1.extname)(pattern);
-            const matchingSpec = `${(0, path_1.basename)(pattern, extension)}.spec${extension}`;
-            if ((0, fs_1.existsSync)((0, path_1.join)(cwd, (0, path_1.dirname)(pattern), matchingSpec))) {
-                pattern = (0, path_1.join)((0, path_1.dirname)(pattern), matchingSpec).replace(/\\/g, '/');
+            const fileExt = (0, path_1.extname)(normalizedPattern);
+            // Replace extension to `.spec.ext`. Example: `src/app/app.component.ts`-> `src/app/app.component.spec.ts`
+            const potentialSpec = (0, path_1.join)((0, path_1.dirname)(normalizedPattern), `${(0, path_1.basename)(normalizedPattern, fileExt)}.spec${fileExt}`);
+            if (await exists((0, path_1.join)(projectSourceRoot, potentialSpec))) {
+                return [normalizePath(potentialSpec)];
             }
         }
     }
-    const files = glob.sync(pattern, {
-        cwd,
+    return globPromise(normalizedPattern, {
+        cwd: projectSourceRoot,
     });
-    return files;
+}
+async function isDirectory(path) {
+    try {
+        const stats = await fs_1.promises.stat(path);
+        return stats.isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+async function exists(path) {
+    try {
+        await fs_1.promises.access(path, fs_1.constants.F_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
 }

src/builders/karma/index.js

@@ -80,7 +80,7 @@ function execute(options, context, transforms = {}) {
         singleRun = !options.watch;
     }
     return (0, rxjs_1.from)(initialize(options, context, transforms.webpackConfiguration)).pipe((0, operators_1.switchMap)(async ([karma, webpackConfig]) => {
-        var _a;
+        var _a, _b, _c, _d, _e;
         const karmaOptions = {
             singleRun,
         };
@@ -98,23 +98,28 @@ function execute(options, context, transforms = {}) {
             }
         }
         // prepend special webpack loader that will transform test.ts
-        if (options.include && options.include.length > 0) {
-            const mainFilePath = (0, core_1.getSystemPath)((0, core_1.join)((0, core_1.normalize)(context.workspaceRoot), options.main));
-            const files = (0, find_tests_1.findTests)(options.include, (0, path_1.dirname)(mainFilePath), context.workspaceRoot);
+        if ((_a = options.include) === null || _a === void 0 ? void 0 : _a.length) {
+            const projectName = (_b = context.target) === null || _b === void 0 ? void 0 : _b.project;
+            if (!projectName) {
+                throw new Error('The builder requires a target.');
+            }
+            const projectMetadata = await context.getProjectMetadata(projectName);
+            const projectSourceRoot = (0, core_1.getSystemPath)((0, core_1.join)((0, core_1.normalize)(context.workspaceRoot), (_c = projectMetadata.root) !== null && _c !== void 0 ? _c : '', (_d = projectMetadata.sourceRoot) !== null && _d !== void 0 ? _d : ''));
+            const files = await (0, find_tests_1.findTests)(options.include, context.workspaceRoot, projectSourceRoot);
             // early exit, no reason to start karma
             if (!files.length) {
                 throw new Error(`Specified patterns: "${options.include.join(', ')}" did not match any spec files.`);
             }
             // Get the rules and ensure the Webpack configuration is setup properly
-            const rules = ((_a = webpackConfig.module) === null || _a === void 0 ? void 0 : _a.rules) || [];
+            const rules = ((_e = webpackConfig.module) === null || _e === void 0 ? void 0 : _e.rules) || [];
             if (!webpackConfig.module) {
                 webpackConfig.module = { rules };
             }
             else if (!webpackConfig.module.rules) {
                 webpackConfig.module.rules = rules;
             }
             rules.unshift({
-                test: mainFilePath,
+                test: (0, path_1.resolve)(context.workspaceRoot, options.main),
                 use: {
                     // cannot be a simple path as it differs between environments
                     loader: single_test_transform_1.SingleTestTransformLoader,

src/utils/is-directory.d.ts

@@ -1 +1 @@
-Wed Jan 26 2022 22:12:31 GMT+0000 (Coordinated Universal Time)
+Thu Jan 27 2022 19:37:29 GMT+0000 (Coordinated Universal Time)