refactor(@schematics/angular): clean up module schematic template

Author: alan-agius4

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

@@ -11,8 +11,8 @@ const routes: Routes = [
 @NgModule({
   declarations: [],
   imports: [<% if (commonModule) { %>
-    CommonModule<%= routing || lazyRouteWithRouteModule ? ',' : '' %><% } %><% if (routing || lazyRouteWithRouteModule) { %>
-    <%= classify(name) %>RoutingModule<% } %><%= lazyRouteWithoutRouteModule ? ',' : '' %><% if (lazyRouteWithoutRouteModule) { %>
+    CommonModule<% } %><% if (routing || lazyRouteWithRouteModule) { %>,
+    <%= classify(name) %>RoutingModule<% } %><% if (lazyRouteWithoutRouteModule) { %>,
     RouterModule.forChild(routes)<% } %>
   ]
 })

packages/schematics/angular/module/index.ts

@@ -139,7 +139,7 @@ export default function (options: ModuleOptions): Rule {
     }
 
     let routingModulePath: Path | undefined;
-    const isLazyLoadedModuleGen = options.route && options.module;
+    const isLazyLoadedModuleGen = !!(options.route && options.module);
     if (isLazyLoadedModuleGen) {
       options.routingScope = RoutingScope.Child;
       routingModulePath = getRoutingModulePath(host, options.module as string);
@@ -150,15 +150,15 @@ export default function (options: ModuleOptions): Rule {
     options.path = parsedPath.path;
 
     const templateSource = apply(url('./files'), [
-      options.routing || isLazyLoadedModuleGen && !!routingModulePath
+      options.routing || (isLazyLoadedModuleGen && routingModulePath)
         ? noop()
         : filter(path => !path.endsWith('-routing.module.ts.template')),
       applyTemplates({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         lazyRoute: isLazyLoadedModuleGen,
         lazyRouteWithoutRouteModule: isLazyLoadedModuleGen && !routingModulePath,
-        lazyRouteWithRouteModule: isLazyLoadedModuleGen && routingModulePath,
+        lazyRouteWithRouteModule: isLazyLoadedModuleGen && !!routingModulePath,
         ...options,
       }),
       move(parsedPath.path),