fix: introduce window modules

Author: patrickmichalina

fuse.ts

@@ -2,7 +2,7 @@ import { FuseBox, QuantumPlugin, JSONPlugin, RawPlugin } from 'fuse-box'
 import { src, task } from 'fuse-box/sparky'
 import { resolve } from 'path'
 import { argv } from 'yargs'
-import { spawn } from 'child_process'
+import { execSync } from 'child_process'
 import shabang from './tools/scripts/fuse-shebang'
 // import { unlinkSync } from 'fs'
 
@@ -61,10 +61,9 @@ task('bundle', ['cp.jest', 'ng.modules'], () => {
 
 task('ng.modules', () => {
   return new Promise((res, rej) => {
-    const tsc = spawn(resolve('node_modules/.bin/ngc'), [
-      '--p',
-      resolve('src/modules/tsconfig.aot.json')
-    ])
-    tsc.on('close', res)
+    const tsc = execSync(
+      resolve('node_modules/.bin/ngc --p src/modules/tsconfig.aot.json')
+    ).toString()
+    return tsc ? rej() : res()
   })
 })

src/modules/http-cache-tag/http-cache-tag-interceptor.service.ts

@@ -3,7 +3,8 @@ import {
   HttpHandler,
   HttpInterceptor,
   HttpRequest,
-  HttpResponse
+  HttpResponse,
+  HttpEvent
 } from '@angular/common/http'
 import {
   CACHE_TAG_CONFIG,
@@ -12,6 +13,7 @@ import {
   CacheTagConfig
 } from './http-cache-tag.server.module'
 import { map } from 'rxjs/operators'
+import { Observable } from 'rxjs'
 
 // tslint:disable:no-class
 // tslint:disable:no-this
@@ -36,7 +38,10 @@ export class HttpCacheTagInterceptor implements HttpInterceptor {
     return this.config.cacheableUrls.test(url)
   }
 
-  intercept(req: HttpRequest<any>, next: HttpHandler) {
+  intercept(
+    req: HttpRequest<any>,
+    next: HttpHandler
+  ): Observable<HttpEvent<any>> {
     return next.handle(req).pipe(
       map(event => {
         if (

src/modules/util/index.ts

@@ -1,3 +1,3 @@
 export { WINDOW } from './tokens'
 
-export { IWindowService, WindowService } from './window.service'
+export { IWindowService, WindowService } from './window/window.service'

src/modules/util/window/window-browser.module.ts

@@ -0,0 +1,31 @@
+import {
+  ModuleWithProviders,
+  NgModule,
+  Optional,
+  SkipSelf
+} from '@angular/core'
+import { WINDOW } from '../tokens'
+import { WindowService } from './window.service'
+
+// tslint:disable-next-line:no-class
+@NgModule()
+export class WindowBrowserModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: WindowBrowserModule,
+      providers: [{ provide: WINDOW, useValue: window }, WindowService]
+    }
+  }
+
+  constructor(
+    @Optional()
+    @SkipSelf()
+    parentModule: WindowBrowserModule
+  ) {
+    // tslint:disable-next-line:no-if-statement
+    if (parentModule)
+      throw new Error(
+        'WindowBrowserModule already loaded. Import in root module only.'
+      )
+  }
+}

src/modules/util/window/window-server.module.ts

@@ -0,0 +1,34 @@
+import {
+  ModuleWithProviders,
+  NgModule,
+  Optional,
+  SkipSelf
+} from '@angular/core'
+import { WINDOW } from '../tokens'
+import { WindowService } from './window.service'
+
+// tslint:disable-next-line:no-class
+@NgModule()
+export class WindowServerModule {
+  static forRoot(windowObject: any): ModuleWithProviders {
+    return {
+      ngModule: WindowServerModule,
+      providers: [
+        { provide: WINDOW, useValue: windowObject || {} },
+        WindowService
+      ]
+    }
+  }
+
+  constructor(
+    @Optional()
+    @SkipSelf()
+    parentModule: WindowServerModule
+  ) {
+    // tslint:disable-next-line:no-if-statement
+    if (parentModule)
+      throw new Error(
+        'WindowServerModule already loaded. Import in root module only.'
+      )
+  }
+}

src/modules/util/window.service.ts renamed to src/modules/util/window/window.service.ts

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@angular/core'
-import { WINDOW } from './tokens'
+import { WINDOW } from '../tokens'
 
 export interface IWindowService {
   readonly window: <T>() => Window & T