Resolve some bugs that were found when running ng-render on a client project

Author: clbond

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ssr",
-  "version": "0.10.6",
+  "version": "0.10.7",
   "description": "Angular server-side rendering implementation",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
@@ -79,7 +79,7 @@
     "bluebird": "^3.4.7",
     "chalk": "^1.1.3",
     "commander": "2.9.0",
-    "domino": "https://github.com/clbond/domino/archive/1.0.44.tar.gz",
+    "domino": "https://github.com/clbond/domino/archive/1.0.45.tar.gz",
     "jsonschema": "^1.1.1",
     "lru_map": "^0.3.3",
     "mkdir-recursive": "^0.3.0",
@@ -90,7 +90,7 @@
     "rimraf": "2.5.4",
     "rxjs": "^5.0.1",
     "scoped-logger": "^0.0.19",
-    "source-map-support": "^0.4.11",
+    "source-map-support": ">=0.1.0",
     "symbol-observable": "^1.0.4",
     "xhr2": "^0.1.4"
   },

source/runtime/browser-emulation/create.ts

@@ -16,10 +16,25 @@ import {bindTypes} from './types';
 
 Object.assign(global, {__domino_frozen__: false}); // allow overwrite
 
+const conditionalOverwrite = (target, fills: Array<any>) => {
+  for (const [overwrite, properties] of fills) {
+    for (const k in properties) {
+      if (overwrite || typeof target[k] === 'undefined') {
+        Object.defineProperty(target, k, {
+          configurable: true,
+          enumerable: false,
+          value: properties[k],
+          writable: true,
+        });
+      }
+    }
+  }
+};
+
 export const upgradeWindow = (target, window: () => Window): void => {
   const {impl: DOM} = domino;
 
-  const fills = [
+  conditionalOverwrite(target, [
     [true, DOM],
     [true, bindTypes],
     bindAnimation(window),
@@ -34,19 +49,12 @@ export const upgradeWindow = (target, window: () => Window): void => {
     bindSelection(window),
     bindStorage(window),
     bindStyle(window),
-  ];
+  ]);
 
-  for (const [overwrite, properties] of fills) {
-    for (const k in properties) {
-      if (overwrite || typeof target[k] === 'undefined') {
-        Object.defineProperty(target, k, {
-          configurable: true,
-          enumerable: false,
-          value: properties[k],
-          writable: true,
-        });
-      }
-    }
+  if (target.document) {
+    conditionalOverwrite(target.document, [
+      bindSelection(() => window().document)
+    ]);
   }
 };
 

source/runtime/browser-emulation/selection.ts

@@ -82,4 +82,4 @@ export class Selection implements Selection {
 
 const getSelection = () => new Selection();
 
-export const bindSelection = (target: () => Window) => [true, {getSelection}];
+export const bindSelection = (target: () => Window | Document) => [true, {getSelection}];

source/runtime/browser-emulation/tests/window.ts

@@ -27,11 +27,13 @@ describe('window', () => {
 
   it('focus', async () => {
     expect(() => window.focus()).not.toThrow();
+    expect(() => typeof HTMLElement.prototype.focus === 'function').toBeTruthy();
   });
 
   it('getSelection', async () => {
     let selection: Selection;
     expect(() => selection = window.getSelection()).not.toThrow();
+    expect(() => selection = window.document.getSelection()).not.toThrow();
     expect(selection).not.toBeNull();
     expect(selection.anchorNode).toBeNull();
     expect(selection.baseNode).toBeNull();