fix(routing): scan also static value in class

fix #394
compodoc · Jan 14, 2018 · 26dd154 · 26dd154
1 parent 4b599b2
commit 26dd154
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 7 deletions.
diff --git a/src/utils/imports.util.ts b/src/utils/imports.util.ts
@@ -1,7 +1,7 @@
 import * as path from 'path';
 import * as ts from 'typescript';
 
-import Ast from 'ts-simple-ast';
+import Ast, { PropertyDeclaration } from 'ts-simple-ast';
 
 const ast = new Ast();
 
@@ -27,6 +27,25 @@ export class ImportsUtil {
         return res;
     }
 
+    /**
+     * Find for a sourceFile a variable value in a local static class
+     * @param srcFile
+     * @param variableName
+     * @param variableValue
+     */
+    private findInClasses(srcFile, variableName: string, variableValue: string) {
+        let res = '';
+        srcFile.getClass(c => {
+            let staticProperty: PropertyDeclaration = c.getStaticProperty(variableValue);
+            if (staticProperty) {
+                if (staticProperty.getInitializer()) {
+                    res = staticProperty.getInitializer().getText();
+                }
+            }
+        });
+        return res;
+    }
+
     /**
      * Find a value in a local variable declaration like an object
      * @param variableDeclaration
@@ -214,9 +233,13 @@ export class ImportsUtil {
         // Try find it in enums
         if (variablesAttributes.length > 0) {
             if (typeof fileToSearchIn !== 'undefined') {
-                let en = this.findInEnums(fileToSearchIn, metadataVariableName, variablesAttributes[1]);
-                if (en !== '') {
-                    return en;
+                let val = this.findInEnums(fileToSearchIn, metadataVariableName, variablesAttributes[1]);
+                if (val !== '') {
+                    return val;
+                }
+                val = this.findInClasses(fileToSearchIn, metadataVariableName, variablesAttributes[1]);
+                if (val !== '') {
+                    return val;
                 }
             }
         }

diff --git a/test/src/cli/cli-generation-big-app.spec.ts b/test/src/cli/cli-generation-big-app.spec.ts
@@ -456,6 +456,7 @@ describe('CLI simple generation - big app', () => {
         expect(routesFile).to.contain('homeimported');
         expect(routesFile).to.contain('homeenumimported');
         expect(routesFile).to.contain('homeenuminfile');
+        expect(routesFile).to.contain('todomvcinstaticclass');
     });
 
     it('should support Object Literal Property Value Shorthand support for metadatas for modules', () => {

diff --git a/test/src/todomvc-ng2/src/app/about/about-routes.enum.ts b/test/src/todomvc-ng2/src/app/about/about-routes.enum.ts
@@ -0,0 +1,3 @@
+export class ABOUT_ENUMS {
+    static todomvc = 'todomvcinstaticclass';
+}
diff --git a/test/src/todomvc-ng2/src/app/about/about-routing.module.ts b/test/src/todomvc-ng2/src/app/about/about-routing.module.ts
@@ -5,14 +5,16 @@ import { AboutComponent } from './about.component';
 import { TodoMVCComponent } from './todomvc/todomvc.component';
 import { CompodocComponent } from './compodoc/compodoc.component';
 
+import { ABOUT_ENUMS } from './about-routes.enum';
+
 const ABOUT_ROUTES: Routes = [
-    {
-        path: '', component: AboutComponent,
+    {
+        path: ABOUT_ENUMS.todomvc, component: AboutComponent,
         children: [
             { path: '', redirectTo: 'todomvc', pathMatch: 'full' },
             { path: 'todomvc', component: TodoMVCComponent },
             { path: 'compodoc', component: CompodocComponent }
-        ],
+        ]
     }
 ];