fix(@angular/cli): simplify import path if possible

Fixes #6183

Author: cexbrayat

packages/@angular/cli/blueprints/component/index.ts

@@ -222,7 +222,8 @@ export default Blueprint.extend({
     const className = stringUtils.classify(`${options.entity.name}Component`);
     const fileName = stringUtils.dasherize(`${options.entity.name}.component`);
     const componentDir = path.relative(path.dirname(this.pathToModule), this.generatePath);
-    const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
+    const normalizeRelativeDir = componentDir.startsWith('.') ? componentDir : `./${componentDir}`;
+    const importPath = componentDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`;
 
     if (!options.skipImport) {
       if (options.dryRun) {

packages/@angular/cli/blueprints/directive/index.ts

@@ -136,7 +136,8 @@ export default Blueprint.extend({
     const fullGeneratePath = path.join(this.project.root, this.generatePath);
     const moduleDir = path.parse(this.pathToModule).dir;
     const relativeDir = path.relative(moduleDir, fullGeneratePath);
-    const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
+    const normalizeRelativeDir = relativeDir.startsWith('.') ? relativeDir : `./${relativeDir}`;
+    const importPath = relativeDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`;
 
     if (!options.skipImport) {
       if (options.dryRun) {

packages/@angular/cli/blueprints/guard/index.ts

@@ -103,7 +103,8 @@ export default Blueprint.extend({
       const fullGeneratePath = path.join(this.project.root, this.generatePath);
       const moduleDir = path.parse(this.pathToModule).dir;
       const relativeDir = path.relative(moduleDir, fullGeneratePath);
-      const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
+      const normalizeRelativeDir = relativeDir.startsWith('.') ? relativeDir : `./${relativeDir}`;
+      const importPath = relativeDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`;
       returns.push(
         astUtils.addProviderToModule(this.pathToModule, className, importPath)
           .then((change: any) => change.apply(NodeHost)));

packages/@angular/cli/blueprints/pipe/index.ts

@@ -121,7 +121,8 @@ export default Blueprint.extend({
     const fullGeneratePath = path.join(this.project.root, this.generatePath);
     const moduleDir = path.parse(this.pathToModule).dir;
     const relativeDir = path.relative(moduleDir, fullGeneratePath);
-    const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
+    const normalizeRelativeDir = relativeDir.startsWith('.') ? relativeDir : `./${relativeDir}`;
+    const importPath = relativeDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`;
 
     if (!options.skipImport) {
       if (options.dryRun) {

packages/@angular/cli/blueprints/service/index.ts

@@ -115,7 +115,8 @@ export default Blueprint.extend({
       const fullGeneratePath = path.join(this.project.root, this.generatePath);
       const moduleDir = path.parse(this.pathToModule).dir;
       const relativeDir = path.relative(moduleDir, fullGeneratePath);
-      const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
+      const normalizeRelativeDir = relativeDir.startsWith('.') ? relativeDir : `./${relativeDir}`;
+      const importPath = relativeDir ? `${normalizeRelativeDir}/${fileName}` : `./${fileName}`;
       returns.push(
         astUtils.addProviderToModule(this.pathToModule, className, importPath)
           .then((change: any) => change.apply(NodeHost)));