feat(@angular/cli): expose test include list

The `karma` entry in `.angular-cli.json` now supports an `include` property, listing the test specific files to be included in the TypeScript compilation:

```
  "test": {
    "karma": {
      "config": "./karma.conf.js"
    },
    "include": [
      "**/*.spec.ts",
      "test.ts"
    ]
  },
```

Existing projects will default to the list abose.

This list will also be used as an exclude list for AoT Compilations.

Fix #3973

Author: filipesilva

packages/@angular/cli/lib/config/schema.json

@@ -262,6 +262,17 @@
             }
           },
           "additionalProperties": false
+        },
+        "include":{
+          "description": "Test files to include in the TypeScript compilation.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [
+            "**/*.spec.ts",
+            "test.ts"
+          ]
         }
       },
       "additionalProperties": false

packages/@angular/cli/models/webpack-configs/typescript.ts

@@ -2,6 +2,8 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { stripIndent } from 'common-tags';
 import {AotPlugin, AotPluginOptions} from '@ngtools/webpack';
+
+import { CliConfig } from '../config';
 import { WebpackConfigOptions } from '../webpack-config';
 
 const SilentError = require('silent-error');
@@ -13,9 +15,12 @@ const webpackLoader: string = g['angularCliIsLocal']
   : '@ngtools/webpack';
 
 
-function _createAotPlugin(wco: WebpackConfigOptions, options: any) {
+function _createAotPlugin(wco: WebpackConfigOptions, options: any = {}) {
   const { appConfig, projectRoot, buildOptions } = wco;
 
+  // Exclude test files by default.
+  options.exclude = CliConfig.fromProject().config.test.include;
+
   // Read the environment, and set it in the compiler host.
   let hostReplacementPaths: any = {};
   // process environment file replacement
@@ -76,12 +81,6 @@ function _createAotPlugin(wco: WebpackConfigOptions, options: any) {
 
 
 export const getNonAotConfig = function(wco: WebpackConfigOptions) {
-  const { projectRoot, appConfig } = wco;
-  let exclude = [ '**/*.spec.ts' ];
-  if (appConfig.test) {
-    exclude.push(path.join(projectRoot, appConfig.root, appConfig.test));
-  }
-
   return {
     module: {
       rules: [
@@ -93,15 +92,12 @@ export const getNonAotConfig = function(wco: WebpackConfigOptions) {
       ]
     },
     plugins: [
-      _createAotPlugin(wco, { exclude, skipCodeGeneration: true }),
+      _createAotPlugin(wco, { skipCodeGeneration: true }),
     ]
   };
 };
 
 export const getAotConfig = function(wco: WebpackConfigOptions) {
-  const { projectRoot, appConfig } = wco;
-  let exclude = [ '**/*.spec.ts' ];
-  if (appConfig.test) { exclude.push(path.join(projectRoot, appConfig.root, appConfig.test)); };
   return {
     module: {
       rules: [
@@ -113,7 +109,7 @@ export const getAotConfig = function(wco: WebpackConfigOptions) {
       ]
     },
     plugins: [
-      _createAotPlugin(wco, { exclude })
+      _createAotPlugin(wco)
     ]
   };
 };

packages/@ngtools/webpack/src/plugin.ts

@@ -113,35 +113,16 @@ export class AotPlugin implements Tapable {
     } catch (err) {
       throw new Error(`An error happened while parsing ${this._tsConfigPath} JSON: ${err}.`);
     }
+
+    // Default excludes to **/*.spec.ts files.
+    if (!options.hasOwnProperty('exclude')) {
+      options.exclude = ['**/*.spec.ts'];
+    }
+    tsConfigJson.exclude = (tsConfigJson.exclude || []).concat(options.exclude);
+
     const tsConfig = ts.parseJsonConfigFileContent(
       tsConfigJson, ts.sys, basePath, null, this._tsConfigPath);
-
     let fileNames = tsConfig.fileNames;
-    if (options.hasOwnProperty('exclude')) {
-      let exclude: string[] = typeof options.exclude == 'string'
-          ? [options.exclude as string] : (options.exclude as string[]);
-
-      exclude.forEach((pattern: string) => {
-        const basePathPattern = '(' + basePath.replace(/\\/g, '/')
-            .replace(/[\-\[\]\/{}()+?.\\^$|*]/g, '\\$&') + ')?';
-        pattern = pattern
-          // Replace windows path separators with forward slashes.
-          .replace(/\\/g, '/')
-          // Escape characters that are used normally in regexes, except stars.
-          .replace(/[\-\[\]{}()+?.\\^$|]/g, '\\$&')
-          // Two stars replacement.
-          .replace(/\*\*/g, '(?:.*)')
-          // One star replacement.
-          .replace(/\*/g, '(?:[^/]*)')
-          // Escape characters from the basePath and make sure it's forward slashes.
-          .replace(/^/, basePathPattern);
-
-        const re = new RegExp('^' + pattern + '$');
-        fileNames = fileNames.filter(x => !x.replace(/\\/g, '/').match(re));
-      });
-    } else {
-      fileNames = fileNames.filter(fileName => !/\.spec\.ts$/.test(fileName));
-    }
     this._rootFilePath = fileNames;
 
     // Check the genDir. We generate a default gendir that's under basepath; it will generate

tests/e2e/tests/build/aot/aot.ts

@@ -1,8 +1,14 @@
 import {ng} from '../../../utils/process';
-import {expectFileToMatch} from '../../../utils/fs';
+import {expectFileToMatch, writeFile, createDir} from '../../../utils/fs';
 
 export default function() {
   return ng('build', '--aot')
     .then(() => expectFileToMatch('dist/main.bundle.js',
-      /bootstrapModuleFactory.*\/\* AppModuleNgFactory \*\//));
+      /bootstrapModuleFactory.*\/\* AppModuleNgFactory \*\//))
+    // Check if **/*.spec.ts files are excluded by default. This import will cause aot to fail.
+    .then(() => createDir('./src/much/deep/folder'))
+    .then(() => writeFile('./src/much/deep/folder/unit-test.spec.ts', `
+      import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
+    `))
+    .then(() => ng('build', '--aot'));
 }