fix: generate firebase module script

Author: patrickmichalina

src/commands/create.ts

@@ -38,6 +38,7 @@ import generateTsConfig from '../generators/tsconfig.gen'
 import generateTsDeclartionFile from '../generators/declarations.gen'
 import generateDotEnv from '../generators/env.gen'
 import generateIdeStubs from '../generators/ide.gen'
+import generateFirebase from '../generators/firebase.gen'
 
 command(
   'create [overwrite]',
@@ -64,16 +65,14 @@ interface QustionResponse {
 
 interface AnswersDictionary {
   readonly fullname: string
-  readonly isUniversalApp: boolean
-  readonly ide: IDE
+  readonly shortname?: string
+  readonly ide?: IDE
+  readonly firebase?: boolean
+  readonly firebaseModules?: ReadonlyArray<string>
 }
 
-interface WorkingAnswersDictionary {
+interface WorkingAnswersDictionary extends AnswersDictionary {
   readonly [key: string]: any
-  readonly fullname?: string
-  readonly ide?: string
-  readonly firebase?: boolean
-  readonly firebaseModules?: ReadonlyArray<string>
 }
 
 interface QuestionWrapper {
@@ -139,7 +138,7 @@ const Q_IDE = {
 const Q_INCLUDE_FIREBASE = {
   question: {
     type: 'confirm',
-    name: 'useFirebase',
+    name: 'firebase',
     message: 'Are you using Firebase?',
     default: false
   },
@@ -234,7 +233,7 @@ const QUESTION_DICT = [
 
 const source = new Subject<any>()
 const finalConfigSource = new Subject()
-const collector = new BehaviorSubject<WorkingAnswersDictionary>({})
+const collector = new BehaviorSubject<WorkingAnswersDictionary>({} as any)
 const prompts = source.pipe(
   startWith(Q_FULL_NAME.question),
   shareReplay()
@@ -383,19 +382,22 @@ function create(overwriteExisting = false) {
       flatMap(im => {
         const path = resolve(im.config.fullname)
         return forkJoin([
-          genNpmPackageJson(
-            im.config.fullname,
-            im.config.isUniversalApp,
-            overwriteExisting
-          ).pipe(flatMap(test(im.config.fullname))),
+          genNpmPackageJson(im.config.fullname, true, overwriteExisting).pipe(
+            flatMap(test(im.config.fullname))
+          ),
           generateCoreAngular(im.config.fullname),
           generateGitIgnore(path, overwriteExisting),
           generateTsLint(path, overwriteExisting),
           generateDotEnv(path, overwriteExisting),
           generateFngConfig(path, overwriteExisting),
           generateTsConfig(path, overwriteExisting),
           generateTsDeclartionFile(path, overwriteExisting),
-          generateIdeStubs(im.config.ide, path, overwriteExisting)
+          im.config.ide
+            ? generateIdeStubs(im.config.ide, path, overwriteExisting)
+            : of(undefined),
+          im.config.firebase
+            ? generateFirebase(path, overwriteExisting)
+            : of(undefined)
         ])
       }, im => im),
       take(1)

src/generators/firebase.gen.ts

@@ -0,0 +1,11 @@
+import { resolve } from 'path'
+import { writeFile_, writeFileSafely_ } from '../utilities/rx-fs'
+import { firebaseModule } from '../templates/core/app'
+
+const configPath = 'src/app/firebase.module.ts'
+
+export default function generateFirebase(dir: string, overwrite = false) {
+  return overwrite
+    ? writeFile_(resolve(dir, configPath), firebaseModule)
+    : writeFileSafely_(resolve(dir, configPath), firebaseModule)
+}

src/templates/core/app/firebase.module.ts.txt

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core'
 import { FirebaseNameOrConfigToken, FirebaseOptionsToken, AngularFireModule } from 'angularfire2'
-import { FIREBASE_USER_AUTH_TOKEN } from '../firebase/common/server'
+import { FIREBASE_USER_AUTH_TOKEN } from 'fusing-angular-cli/.build/modules/src/modules/firebase'
 
 export function firebaseAuthFactory() {
   return undefined
@@ -18,19 +18,11 @@ export function firebaseEnvironmentFactory() {
 }
 
 @NgModule({
-  imports: [
-    AngularFireModule
-  ],
+  imports: [AngularFireModule],
   providers: [
     { provide: FIREBASE_USER_AUTH_TOKEN, useFactory: firebaseAuthFactory },
-    {
-      provide: FirebaseNameOrConfigToken,
-      useValue: 'universal-webapp'
-    },
-    {
-      provide: FirebaseOptionsToken,
-      useFactory: firebaseEnvironmentFactory
-    }
+    { provide: FirebaseNameOrConfigToken, useValue: 'universal-webapp' },
+    { provide: FirebaseOptionsToken, useFactory: firebaseEnvironmentFactory }
   ]
 })
 export class FirebaseModule { }

src/templates/core/app/index.ts

@@ -6,6 +6,7 @@ import * as appComponentCssTemplate from './app.component.scss.txt'
 import * as appComponentHtmlTemplate from './app.component.html.txt'
 import * as homeComponentTemplate from './home.component.ts.txt'
 import * as appIndex from './index.pug.txt'
+import * as firebaseModule from './firebase.module.ts.txt'
 
 export {
   appModuleTemplate,
@@ -15,5 +16,6 @@ export {
   homeComponentTemplate,
   appComponentCssTemplate,
   appComponentHtmlTemplate,
-  appIndex
+  appIndex,
+  firebaseModule
 }