From e6581c8d379f79d0212bc7dfd2b8bea7f5071f35 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Wed, 5 Sep 2018 14:48:24 +0200
Subject: [PATCH] fix(@schematics/angular): `module` imports paths are
 incorrect when `flat` option is used

Closes #12169
---
 packages/schematics/angular/module/index.ts      | 13 ++++++-------
 packages/schematics/angular/module/index_spec.ts |  9 +++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 52f91dd4ad9e..390033a0f433 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -5,7 +5,7 @@
 * 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
 */
-import { basename, dirname, normalize, relative, strings } from '@angular-devkit/core';
+import { normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
@@ -24,7 +24,7 @@ import * as ts from 'typescript';
 import { addImportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { getWorkspace } from '../utility/config';
-import { findModuleFromOptions } from '../utility/find-module';
+import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { parseName } from '../utility/parse-name';
 import { buildDefaultPath } from '../utility/project';
 import { Schema as ModuleOptions } from './schema';
@@ -36,7 +36,7 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
       return host;
     }
 
-    const modulePath = normalize('/' + options.module);
+    const modulePath = options.module;
 
     const text = host.read(modulePath);
     if (text === null) {
@@ -51,10 +51,9 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
       + strings.dasherize(options.name)
       + '.module',
     );
-    const relativeDir = relative(dirname(modulePath), dirname(importModulePath));
-    const relativePath = (relativeDir.startsWith('.') ? relativeDir : './' + relativeDir)
-      + '/' + basename(importModulePath);
-    const changes = addImportToModule(source, modulePath,
+    const relativePath = buildRelativePath(modulePath, importModulePath);
+    const changes = addImportToModule(source,
+                                      modulePath,
                                       strings.classify(`${options.name}Module`),
                                       relativePath);
 
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index 13ff0c8f6a73..a3d988d0c809 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.ts
@@ -63,6 +63,15 @@ describe('Module Schematic', () => {
     expect(content).toMatch(/imports: \[[^\]]*FooModule[^\]]*\]/m);
   });
 
+  it('should import into another module when using flat', () => {
+    const options = { ...defaultOptions, flat: true, module: 'app.module.ts' };
+
+    const tree = schematicRunner.runSchematic('module', options, appTree);
+    const content = tree.readContent('/projects/bar/src/app/app.module.ts');
+    expect(content).toMatch(/import { FooModule } from '.\/foo.module'/);
+    expect(content).toMatch(/imports: \[[^\]]*FooModule[^\]]*\]/m);
+  });
+
   it('should import into another module (deep)', () => {
     let tree = appTree;