refactor(@schematics/angular): use more comprehensive template vars in module gen

Author: hawkgs

packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template

@@ -1,18 +1,18 @@
 import { NgModule } from '@angular/core';<% if (commonModule) { %>
-import { CommonModule } from '@angular/common';<% } %><% if (lazyRoute && routeDeclarationInlined) { %>
+import { CommonModule } from '@angular/common';<% } %><% if (lazyRouteWithoutRouteModule) { %>
 import { Routes, RouterModule } from '@angular/router';<% } %>
-<% if (routing || lazyRoute && !routeDeclarationInlined) { %>
+<% if (routing || lazyRouteWithRouteModule) { %>
 import { <%= classify(name) %>RoutingModule } from './<%= dasherize(name) %>-routing.module';<% } %>
-<% if (lazyRoute && routeDeclarationInlined) { %>
+<% if (lazyRouteWithoutRouteModule) { %>
 const routes: Routes = [
   { path: '', component: <%= classify(name) %>Component }
 ];<% } %>
 
 @NgModule({
   declarations: [],
   imports: [<% if (commonModule) { %>
-    CommonModule<%= routing || lazyRoute && !routeDeclarationInlined ? ',' : '' %><% } %><% if (routing || lazyRoute && !routeDeclarationInlined) { %>
-    <%= classify(name) %>RoutingModule<% } %><%= lazyRoute && routeDeclarationInlined ? ',' : '' %><% if (lazyRoute && routeDeclarationInlined) { %>
+    CommonModule<%= routing || lazyRouteWithRouteModule ? ',' : '' %><% } %><% if (routing || lazyRouteWithRouteModule) { %>
+    <%= classify(name) %>RoutingModule<% } %><%= lazyRouteWithoutRouteModule ? ',' : '' %><% if (lazyRouteWithoutRouteModule) { %>
     RouterModule.forChild(routes)<% } %>
   ]
 })

packages/schematics/angular/module/index.ts

@@ -158,7 +158,8 @@ export default function (options: ModuleOptions): Rule {
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         lazyRoute: isLazyLoadedModuleGen,
-        routeDeclarationInlined: !routingModulePath,
+        lazyRouteWithoutRouteModule: isLazyLoadedModuleGen && !routingModulePath,
+        lazyRouteWithRouteModule: isLazyLoadedModuleGen && routingModulePath,
         ...options,
       }),
       move(parsedPath.path),