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

Fixes #6183
angular · May 9, 2017 · c0c03f9 · c0c03f9
1 parent a9baddf
commit c0c03f9
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 25 deletions.
diff --git a/packages/@angular/cli/blueprints/component/index.ts b/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) {

diff --git a/packages/@angular/cli/blueprints/directive/index.ts b/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) {

diff --git a/packages/@angular/cli/blueprints/guard/index.ts b/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)));

diff --git a/packages/@angular/cli/blueprints/pipe/index.ts b/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) {

diff --git a/packages/@angular/cli/blueprints/service/index.ts b/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)));

diff --git a/tests/acceptance/generate-component.spec.js b/tests/acceptance/generate-component.spec.js
@@ -267,7 +267,7 @@ describe('Acceptance: ng generate component', function () {
         .then(() => ng(['generate', 'component', 'baz', '--module', path.join('foo', 'foo.module.ts')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazComponent.*from '.\/..\/baz\/baz.component';/);
+          expect(content).matches(/import.*BazComponent.*from '..\/baz\/baz.component';/);
           expect(content).matches(/declarations:\s+\[BazComponent]/m);
         });
     });
@@ -281,7 +281,7 @@ describe('Acceptance: ng generate component', function () {
         .then(() => ng(['generate', 'component', 'baz', '--module', path.join('foo', 'foo')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazComponent.*from '.\/..\/baz\/baz.component';/);
+          expect(content).matches(/import.*BazComponent.*from '..\/baz\/baz.component';/);
           expect(content).matches(/declarations:\s+\[BazComponent]/m);
         });
     });
@@ -295,7 +295,7 @@ describe('Acceptance: ng generate component', function () {
         .then(() => ng(['generate', 'component', 'baz', '--module', 'foo']))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazComponent.*from '.\/..\/baz\/baz.component';/);
+          expect(content).matches(/import.*BazComponent.*from '..\/baz\/baz.component';/);
           expect(content).matches(/declarations:\s+\[BazComponent]/m);
         });
     });
@@ -310,7 +310,7 @@ describe('Acceptance: ng generate component', function () {
         .then(() => ng(['generate', 'component', 'baz', '--module', path.join('foo', 'bar')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazComponent.*from '.\/..\/..\/baz\/baz.component';/);
+          expect(content).matches(/import.*BazComponent.*from '..\/..\/baz\/baz.component';/);
           expect(content).matches(/declarations:\s+\[BazComponent]/m);
         });
     });

diff --git a/tests/acceptance/generate-directive.spec.js b/tests/acceptance/generate-directive.spec.js
@@ -222,7 +222,7 @@ describe('Acceptance: ng generate directive', function () {
         .then(() => ng(['generate', 'directive', 'baz', '--module', path.join('foo', 'foo.module.ts')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazDirective.*from '.\/..\/baz.directive';/);
+          expect(content).matches(/import.*BazDirective.*from '..\/baz.directive';/);
           expect(content).matches(/declarations:\s+\[BazDirective]/m);
         });
     });
@@ -236,7 +236,7 @@ describe('Acceptance: ng generate directive', function () {
         .then(() => ng(['generate', 'directive', 'baz', '--module', path.join('foo', 'foo')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazDirective.*from '.\/..\/baz.directive';/);
+          expect(content).matches(/import.*BazDirective.*from '..\/baz.directive';/);
           expect(content).matches(/declarations:\s+\[BazDirective]/m);
         });
     });
@@ -250,7 +250,7 @@ describe('Acceptance: ng generate directive', function () {
         .then(() => ng(['generate', 'directive', 'baz', '--module', 'foo']))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazDirective.*from '.\/..\/baz.directive';/);
+          expect(content).matches(/import.*BazDirective.*from '..\/baz.directive';/);
           expect(content).matches(/declarations:\s+\[BazDirective]/m);
         });
     });
@@ -265,7 +265,7 @@ describe('Acceptance: ng generate directive', function () {
         .then(() => ng(['generate', 'directive', 'baz', '--module', path.join('foo', 'bar')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazDirective.*from '.\/..\/..\/baz.directive';/);
+          expect(content).matches(/import.*BazDirective.*from '..\/..\/baz.directive';/);
           expect(content).matches(/declarations:\s+\[BazDirective]/m);
         });
     });

diff --git a/tests/acceptance/generate-guard.spec.js b/tests/acceptance/generate-guard.spec.js
@@ -209,7 +209,7 @@ describe('Acceptance: ng generate guard', function () {
         .then(() => ng(['generate', 'guard', 'baz', '--module', path.join('foo', 'foo.module.ts')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).to.matches(/import.*BazGuard.*from '.\/..\/baz.guard';/);
+          expect(content).to.matches(/import.*BazGuard.*from '..\/baz.guard';/);
           expect(content).to.matches(/providers:\s*\[BazGuard\]/m);
         });
     });
@@ -223,7 +223,7 @@ describe('Acceptance: ng generate guard', function () {
         .then(() => ng(['generate', 'guard', 'baz', '--module', path.join('foo', 'foo')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).to.matches(/import.*BazGuard.*from '.\/..\/baz.guard';/);
+          expect(content).to.matches(/import.*BazGuard.*from '..\/baz.guard';/);
           expect(content).to.matches(/providers:\s*\[BazGuard\]/m);
         });
     });
@@ -237,7 +237,7 @@ describe('Acceptance: ng generate guard', function () {
         .then(() => ng(['generate', 'guard', 'baz', '--module', 'foo']))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).to.matches(/import.*BazGuard.*from '.\/..\/baz.guard';/);
+          expect(content).to.matches(/import.*BazGuard.*from '..\/baz.guard';/);
           expect(content).to.matches(/providers:\s*\[BazGuard\]/m);
         });
     });
@@ -252,7 +252,7 @@ describe('Acceptance: ng generate guard', function () {
         .then(() => ng(['generate', 'guard', 'baz', '--module', path.join('foo', 'bar')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).to.matches(/import.*BazGuard.*from '.\/..\/..\/baz.guard';/);
+          expect(content).to.matches(/import.*BazGuard.*from '..\/..\/baz.guard';/);
           expect(content).to.matches(/providers:\s*\[BazGuard\]/m);
         });
     });

diff --git a/tests/acceptance/generate-pipe.spec.js b/tests/acceptance/generate-pipe.spec.js
@@ -200,7 +200,7 @@ describe('Acceptance: ng generate pipe', function () {
         .then(() => ng(['generate', 'pipe', 'baz', '--module', path.join('foo', 'foo.module.ts')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazPipe.*from '.\/..\/baz.pipe';/);
+          expect(content).matches(/import.*BazPipe.*from '..\/baz.pipe';/);
           expect(content).matches(/declarations:\s+\[BazPipe]/m);
         });
     });
@@ -214,7 +214,7 @@ describe('Acceptance: ng generate pipe', function () {
         .then(() => ng(['generate', 'pipe', 'baz', '--module', path.join('foo', 'foo')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazPipe.*from '.\/..\/baz.pipe';/);
+          expect(content).matches(/import.*BazPipe.*from '..\/baz.pipe';/);
           expect(content).matches(/declarations:\s+\[BazPipe]/m);
         });
     });
@@ -228,7 +228,7 @@ describe('Acceptance: ng generate pipe', function () {
         .then(() => ng(['generate', 'pipe', 'baz', '--module', 'foo']))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazPipe.*from '.\/..\/baz.pipe';/);
+          expect(content).matches(/import.*BazPipe.*from '..\/baz.pipe';/);
           expect(content).matches(/declarations:\s+\[BazPipe]/m);
         });
     });
@@ -243,7 +243,7 @@ describe('Acceptance: ng generate pipe', function () {
         .then(() => ng(['generate', 'pipe', 'baz', '--module', path.join('foo', 'bar')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).matches(/import.*BazPipe.*from '.\/..\/..\/baz.pipe';/);
+          expect(content).matches(/import.*BazPipe.*from '..\/..\/baz.pipe';/);
           expect(content).matches(/declarations:\s+\[BazPipe]/m);
         });
     });

diff --git a/tests/acceptance/generate-service.spec.js b/tests/acceptance/generate-service.spec.js
@@ -210,7 +210,7 @@ describe('Acceptance: ng generate service', function () {
         .then(() => ng(['generate', 'service', 'baz', '--module', path.join('foo', 'foo.module.ts')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).to.matches(/import.*BazService.*from '.\/..\/baz.service';/);
+          expect(content).to.matches(/import.*BazService.*from '..\/baz.service';/);
           expect(content).to.matches(/providers:\s*\[BazService\]/m);
         });
     });
@@ -224,7 +224,7 @@ describe('Acceptance: ng generate service', function () {
         .then(() => ng(['generate', 'service', 'baz', '--module', path.join('foo', 'foo')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).to.matches(/import.*BazService.*from '.\/..\/baz.service';/);
+          expect(content).to.matches(/import.*BazService.*from '..\/baz.service';/);
           expect(content).to.matches(/providers:\s*\[BazService\]/m);
         });
     });
@@ -238,7 +238,7 @@ describe('Acceptance: ng generate service', function () {
         .then(() => ng(['generate', 'service', 'baz', '--module', 'foo']))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).to.matches(/import.*BazService.*from '.\/..\/baz.service';/);
+          expect(content).to.matches(/import.*BazService.*from '..\/baz.service';/);
           expect(content).to.matches(/providers:\s*\[BazService\]/m);
         });
     });
@@ -253,7 +253,7 @@ describe('Acceptance: ng generate service', function () {
         .then(() => ng(['generate', 'service', 'baz', '--module', path.join('foo', 'bar')]))
         .then(() => readFile(modulePath, 'utf-8'))
         .then(content => {
-          expect(content).to.matches(/import.*BazService.*from '.\/..\/..\/baz.service';/);
+          expect(content).to.matches(/import.*BazService.*from '..\/..\/baz.service';/);
           expect(content).to.matches(/providers:\s*\[BazService\]/m);
         });
     });