refactor(@ngtools/webpack): add forwardSlashPath util

I figured one day I'd get tired of repeating this replace. Today was that day.

Author: filipesilva

packages/ngtools/webpack/src/angular_compiler_plugin.ts

@@ -69,7 +69,7 @@ import {
   MESSAGE_KIND,
   UpdateMessage,
 } from './type_checker_messages';
-import { flattenArray, workaroundResolve } from './utils';
+import { flattenArray, forwardSlashPath, workaroundResolve } from './utils';
 import {
   VirtualFileSystemDecorator,
   VirtualWatchFileSystemDecorator,
@@ -163,7 +163,7 @@ export class AngularCompilerPlugin {
       throw new Error('Must specify "tsConfigPath" in the configuration of @ngtools/webpack.');
     }
     // TS represents paths internally with '/' and expects the tsconfig path to be in this format
-    this._tsConfigPath = options.tsConfigPath.replace(/\\/g, '/');
+    this._tsConfigPath = forwardSlashPath(options.tsConfigPath);
 
     // Check the base path.
     const maybeBasePath = path.resolve(process.cwd(), this._tsConfigPath);
@@ -482,7 +482,7 @@ export class AngularCompilerPlugin {
           return;
         }
 
-        const lazyRouteTSFile = discoveredLazyRoutes[lazyRouteKey].replace(/\\/g, '/');
+        const lazyRouteTSFile = forwardSlashPath(discoveredLazyRoutes[lazyRouteKey]);
         let modulePath: string, moduleKey: string;
 
         if (this._useFactories) {

packages/ngtools/webpack/src/lazy_routes.ts

@@ -8,6 +8,7 @@
 import { dirname, join } from 'path';
 import * as ts from 'typescript';
 import { findAstNodes, resolve } from './refactor';
+import { forwardSlashPath } from './utils';
 
 
 function _getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {
@@ -38,7 +39,7 @@ export function findLazyRoutes(
     }
     compilerOptions = program.getCompilerOptions();
   }
-  const fileName = resolve(filePath, host, compilerOptions).replace(/\\/g, '/');
+  const fileName = forwardSlashPath(resolve(filePath, host, compilerOptions));
   let sourceFile: ts.SourceFile | undefined;
   if (program) {
     sourceFile = program.getSourceFile(fileName);

packages/ngtools/webpack/src/refactor.ts

@@ -7,6 +7,7 @@
  */
 import * as path from 'path';
 import * as ts from 'typescript';
+import { forwardSlashPath } from './utils';
 
 
 /**
@@ -95,7 +96,7 @@ export class TypeScriptFileRefactor {
     let sourceFile: ts.SourceFile | null = null;
 
     if (_program) {
-      fileName = resolve(fileName, _host, _program.getCompilerOptions()).replace(/\\/g, '/');
+      fileName = forwardSlashPath(resolve(fileName, _host, _program.getCompilerOptions()));
       this._fileName = fileName;
 
       if (source) {

packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts

@@ -8,6 +8,7 @@
 import * as path from 'path';
 import * as ts from 'typescript';
 import { LazyRouteMap } from '../lazy_routes';
+import { forwardSlashPath } from '../utils';
 import { getFirstNode, getLastNode } from './ast_helpers';
 import { AddNodeOperation, StandardTransform, TransformOperation } from './interfaces';
 import { makeTransform } from './make_transform';
@@ -46,7 +47,7 @@ export function exportLazyModuleMap(
         return;
       }
 
-      let relativePath = path.relative(dirName, modulePath).replace(/\\/g, '/');
+      let relativePath = forwardSlashPath(path.relative(dirName, modulePath));
       if (!(relativePath.startsWith('./') || relativePath.startsWith('../'))) {
         // 'a/b/c' is a relative path for Node but an absolute path for TS, so we must convert it.
         relativePath = `./${relativePath}`;

packages/ngtools/webpack/src/transformers/export_ngfactory.ts

@@ -7,6 +7,7 @@
  */
 import { dirname, relative } from 'path';
 import * as ts from 'typescript';
+import { forwardSlashPath } from '../utils';
 import { collectDeepNodes, getFirstNode } from './ast_helpers';
 import { AddNodeOperation, StandardTransform, TransformOperation } from './interfaces';
 import { makeTransform } from './make_transform';
@@ -35,7 +36,7 @@ export function exportNgFactory(
     }
 
     const relativeEntryModulePath = relative(dirname(sourceFile.fileName), entryModule.path);
-    const normalizedEntryModulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/');
+    const normalizedEntryModulePath = forwardSlashPath(`./${relativeEntryModulePath}`);
 
     // Get the module path from the import.
     entryModuleIdentifiers.forEach((entryModuleIdentifier) => {

packages/ngtools/webpack/src/transformers/replace_bootstrap.ts

@@ -7,6 +7,7 @@
  */
 import { dirname, relative } from 'path';
 import * as ts from 'typescript';
+import { forwardSlashPath } from '../utils';
 import { collectDeepNodes } from './ast_helpers';
 import { insertStarImport } from './insert_import';
 import { ReplaceNodeOperation, StandardTransform, TransformOperation } from './interfaces';
@@ -79,7 +80,7 @@ export function replaceBootstrap(
       // Add the transform operations.
       const relativeEntryModulePath = relative(dirname(sourceFile.fileName), entryModule.path);
       let className = entryModule.className;
-      let modulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/');
+      let modulePath = forwardSlashPath(`./${relativeEntryModulePath}`);
       let bootstrapIdentifier = 'bootstrapModule';
 
       if (useFactories) {

packages/ngtools/webpack/src/transformers/replace_server_bootstrap.ts

@@ -7,6 +7,7 @@
  */
 import { dirname, relative } from 'path';
 import * as ts from 'typescript';
+import { forwardSlashPath } from '../utils';
 import { collectDeepNodes } from './ast_helpers';
 import { insertStarImport } from './insert_import';
 import { ReplaceNodeOperation, StandardTransform, TransformOperation } from './interfaces';
@@ -37,7 +38,7 @@ export function replaceServerBootstrap(
     }
 
     const relativeEntryModulePath = relative(dirname(sourceFile.fileName), entryModule.path);
-    const normalizedEntryModulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/');
+    const normalizedEntryModulePath = forwardSlashPath(`./${relativeEntryModulePath}`);
     const factoryClassName = entryModule.className + 'NgFactory';
     const factoryModulePath = normalizedEntryModulePath + '.ngfactory';
 

packages/ngtools/webpack/src/utils.ts

@@ -12,9 +12,14 @@ import { Path, getSystemPath, normalize } from '@angular-devkit/core';
 // To work around this we must provide the same path format as TS internally uses in
 // the SourceFile paths.
 export function workaroundResolve(path: Path | string) {
-  return getSystemPath(normalize(path)).replace(/\\/g, '/');
+  return forwardSlashPath(getSystemPath(normalize(path)));
 }
 
 export function flattenArray<T>(value: Array<T | T[]>): T[] {
   return [].concat.apply([], value);
 }
+
+// TS represents paths internally with '/' and expects paths to be in this format.
+export function forwardSlashPath(path: string) {
+  return path.replace(/\\/g, '/');
+}