fix(routing): path wrongly resolved during routing analysis

fix #1170 #1225

src/app/compiler/angular-dependencies.ts

@@ -93,6 +93,8 @@ export class AngularDependencies extends FrameworkDependencies {
 
         const sourceFiles = this.program.getSourceFiles() || [];
 
+        RouterParserUtil.scannedFiles = sourceFiles;
+
         sourceFiles.map((file: ts.SourceFile) => {
             const filePath = file.fileName;
 

src/utils/router-parser.util.ts

@@ -15,6 +15,7 @@ const traverse = require('traverse');
 const ast = new Project();
 
 export class RouterParserUtil {
+    public scannedFiles: any[] = [];
     private routes: any[] = [];
     private incompleteRoutes = [];
     private modules = [];
@@ -595,15 +596,21 @@ export class RouterParserUtil {
             if (foundWithAliasInImports) {
                 if (typeof searchedImport !== 'undefined') {
                     const routePathIsBad = path => {
-                        return typeof ast.getSourceFile(path) == 'undefined';
+                        let result = true;
+                        this.scannedFiles.forEach(scannedFile => {
+                            if (path === scannedFile.path) {
+                                result = false;
+                            }
+                        });
+                        return result;
                     };
 
                     const getIndicesOf = (searchStr, str, caseSensitive) => {
-                        var searchStrLen = searchStr.length;
+                        const searchStrLen = searchStr.length;
                         if (searchStrLen == 0) {
                             return [];
                         }
-                        var startIndex = 0,
+                        let startIndex = 0,
                             index,
                             indices = [];
                         if (!caseSensitive) {

test/fixtures/todomvc-ng2-simple-routing/src/app/app-routing.module.ts

@@ -1,7 +1,9 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { LOGIN } from './login.routes';
 
 export const APP_ROUTES: Routes = [
+    ...LOGIN,
     { path: 'about', loadChildren: './about/about.module#AboutModule' },
     { path: '', redirectTo: 'home', pathMatch: 'full' },
     { path: '**', redirectTo: 'home', pathMatch: 'full' }

test/fixtures/todomvc-ng2-simple-routing/src/app/login.routes.ts

@@ -0,0 +1,5 @@
+export const LOGIN = [
+    {
+        path: 'login',
+    },
+];

test/src/cli/cli-routes-graph.spec.ts

@@ -164,4 +164,29 @@ describe('CLI Routes graph', () => {
             expect(file).to.contain('HomeComponent');
         });
     });
+
+    describe('should support route in external file', () => {
+        before(function (done) {
+            tmp.create(distFolder);
+            const ls = shell('node', [
+                './bin/index-cli.js',
+                '-p',
+                './test/fixtures/todomvc-ng2-simple-routing/src/tsconfig.json',
+                '-d',
+                distFolder
+            ]);
+
+            if (ls.stderr.toString() !== '') {
+                console.error(`shell error: ${ls.stderr.toString()}`);
+                done('error');
+            }
+            done();
+        });
+        after(() => tmp.clean(distFolder));
+
+        it('should correctly read external file', () => {
+            const file = read(`${distFolder}/js/routes/routes_index.js`);
+            expect(file).to.contain('login');
+        });
+    });
 });