Minor refactoring related to module instantiation

Author: clbond

package.json

@@ -42,7 +42,7 @@
     "reflect-metadata": "^0.1.9",
     "rimraf": "^2.5.4",
     "rxjs": "^5.1.0",
-    "typescript": "^2.1.5"
+    "typescript": "^2.1.6"
   },
   "devDependencies": {
     "@angular/common": "^2.4.6",
@@ -59,12 +59,17 @@
     "zone.js": "^0.7.6"
   },
   "jest": {
-    "modulePaths": ["<rootDir>/source"],
+    "modulePaths": [
+      "<rootDir>/source"
+    ],
     "setupTestFrameworkScriptFile": "jasmine-promises",
     "transform": {
       ".ts": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "source/.*/tests/.*\\.ts$",
-    "moduleFileExtensions": ["ts", "js"]
+    "moduleFileExtensions": [
+      "ts",
+      "js"
+    ]
   }
 }

source/disposable.ts

@@ -0,0 +1,3 @@
+export interface Disposable {
+  dispose(): void;
+}

source/exception.ts

@@ -5,7 +5,7 @@ export class Exception extends Error {
 
   public get stack(): string {
     if (this.innerException) {
-      return `${super.stack} -> (inner ex) ${this.innerException.stack}`;
+      return `${super.stack} -> ${this.innerException.stack}`;
     }
 
     return super.stack;

source/index.ts

@@ -2,7 +2,7 @@ import './dependencies';
 
 export * from './exception';
 export * from './platform';
+export * from './publisher';
 export * from './service';
 export * from './transformation';
 export * from './variance';
-export * from './subscription';

source/platform/document/document.ts source/platform/document/container.tssource/platform/document/document.ts renamed to source/platform/document/container.ts

@@ -8,6 +8,8 @@ const domino = require('domino');
 
 import {TemplateDocument, RequestUri} from './tokens';
 
+import {PlatformException} from '../exception';
+
 @Injectable()
 export class DocumentContainer implements OnDestroy {
   private windowRef: Window;
@@ -20,15 +22,14 @@ export class DocumentContainer implements OnDestroy {
   }
 
   get window(): Window {
-    if (this.windowRef == null) {
-      throw new Error('No window container has been initialized');
-    }
-    return this.windowRef;
+    return this.windowRef || (() => {
+      throw new PlatformException('No window container has been initialized');
+    })();
   }
 
   get document(): Document {
     if (this.windowRef == null) {
-      throw new Error('No DOM has been initialized');
+      throw new PlatformException('No DOM has been initialized');
     }
     return this.windowRef.document;
   }
@@ -40,7 +41,15 @@ export class DocumentContainer implements OnDestroy {
   ngOnDestroy() {
     this.complete();
 
-    this.window.releaseEvents();
+    // This may seem pointless but we just want to release all references
+    // to the node elements in this document so that they can be garbage
+    // collected.
+    if (this.document) {
+      const child = () => this.document.body.firstChild;
+      while (child()) {
+        this.document.removeChild(child());
+      }
+    }
 
     this.windowRef = null;
   }

source/platform/document/index.ts

@@ -1,2 +1,2 @@
-export * from './document';
+export * from './container';
 export * from './tokens';

source/platform/exception-stream/exception-stream.ts

@@ -4,7 +4,7 @@ import {Observable, ReplaySubject} from 'rxjs';
 
 import {ErrorHandlerImpl} from './handler';
 
-import {Subscription} from 'subscription';
+import {Subscription} from 'publisher';
 
 @Injectable()
 export class ExceptionStream implements OnDestroy {

source/platform/exception-stream/handler.ts

@@ -1,6 +1,6 @@
 import {Injectable, ErrorHandler, OnDestroy} from '@angular/core';
 
-import {Subscription} from 'subscription';
+import {Publisher, Subscription} from 'publisher';
 
 export type ExceptionHandler = (exception: Error) => void;
 
@@ -10,23 +10,19 @@ export class ErrorHandlerImpl extends ErrorHandler implements OnDestroy {
     super(true);
   }
 
-  private subscriptions = new Set<ExceptionHandler>();
+  private subscriber = new Publisher<ExceptionHandler>();
 
   subscribe(handler: ExceptionHandler): Subscription {
-    this.subscriptions.add(handler);
-
-    return {
-      unsubscribe: () => this.subscriptions.delete(handler)
-    };
+    return this.subscriber.subscribe(handler);
   }
 
   handleError(exception: Error) {
-    this.subscriptions.forEach(subscription => subscription(exception));
+    this.subscriber.publish(exception);
 
     super.handleError(exception);
   }
 
   ngOnDestroy() {
-    this.subscriptions.clear();
+    this.subscriber.dispose();
   }
 }

source/platform/platform/exception.ts source/platform/exception.tssource/platform/platform/exception.ts renamed to source/platform/exception.ts

@@ -1,3 +1,3 @@
-import {Exception} from '../../exception';
+import {Exception} from '../exception';
 
 export class PlatformException extends Exception {}

source/platform/module/exception.ts

@@ -0,0 +1,3 @@
+import {Exception} from '../../exception';
+
+export class ModuleException extends Exception {}