Solve issue related to ContainerRegistry class

karma.conf.js

@@ -3,28 +3,40 @@ process.env.NODE_ENV = 'test';
 
 const webpack = require("webpack");
 const path = require("path");
-const webpackConfig = require('./webpack.config.js')({isTest: true});
+const webpackConfig = require('./webpack.config.js')({ isTest: true });
 
 delete webpackConfig.entry;
 
+let frameworks = [
+  "mocha",
+  "chai",
+  "sinon",
+  "es6-shim"
+];
+
+let plugins = [
+  "karma-webpack",
+  "karma-sourcemap-writer",
+  "karma-sourcemap-loader",
+  "karma-mocha-reporter",
+  "karma-mocha",
+  "karma-chai",
+  "karma-sinon",
+  "karma-es6-shim",
+  "karma-remap-istanbul",
+  "karma-coverage-istanbul-reporter"
+];
+
 module.exports = function(config) {
 
   var configuration = {
     basePath: "",
-    frameworks: [
-      "mocha",
-      "chai",
-      "sinon",
-      "es6-shim"
-    ],
+    frameworks: frameworks,
     files: [
-      "./test/**/**/**.test.ts",
-      {
-        pattern: '**/*.map',
-        served: true,
-        included: false,
-        watched: true
-      }
+      { pattern: "node_modules/reflect-metadata/Reflect.js", include: true },
+      { pattern: "node_modules/bluebird/js/browser/bluebird.js", include: true },
+      { pattern: "./test/**/**/**.test.ts", include: true },
+      { pattern: '**/*.map', served: true, included: false, watched: true }
     ],
     preprocessors: {
       "./**/**/**/**.ts": ["sourcemap"],
@@ -34,18 +46,7 @@ module.exports = function(config) {
     webpackMiddleware: {
       noInfo: true
     },
-    plugins: [
-      "karma-webpack",
-      "karma-sourcemap-writer",
-      "karma-sourcemap-loader",
-      "karma-remap-istanbul",
-      "karma-mocha-reporter",
-      "karma-mocha",
-      "karma-chai",
-      "karma-sinon",
-      "karma-es6-shim",
-      "karma-coverage-istanbul-reporter"
-    ],
+    plugins: plugins,
     reporters: (
       config.singleRun ?
         ["dots", "mocha", "coverage-istanbul"] :
@@ -65,7 +66,7 @@ module.exports = function(config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['Chrome']
+    browsers: []
   };
 
   if (process.env.TRAVIS) {

src/robotlegs/bender/extensions/contextView/impl/ContextViewListenerConfig.ts

@@ -5,9 +5,7 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
-import { injectable, inject } from "inversify";
-
-import { IConfig } from "@robotlegsjs/core";
+import { injectable, inject, IConfig } from "@robotlegsjs/core";
 
 import { IContextView } from "../api/IContextView";
 import { IViewManager } from "../../viewManager/api/IViewManager";

src/robotlegs/bender/extensions/mediatorMap/impl/Mediator.ts

@@ -5,9 +5,13 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
-import { injectable, inject } from "inversify";
-
-import { IEventMap, IEventDispatcher, Event } from "@robotlegsjs/core";
+import {
+    injectable,
+    inject,
+    IEventMap,
+    IEventDispatcher,
+    Event
+} from "@robotlegsjs/core";
 
 import { IMediator } from "../api/IMediator";
 

src/robotlegs/bender/extensions/mediatorMap/impl/MediatorMap.ts

@@ -6,6 +6,8 @@
 // ------------------------------------------------------------------------------
 
 import {
+    injectable,
+    inject,
     IContext,
     ILogger,
     ITypeMatcher,
@@ -23,8 +25,6 @@ import { MediatorViewHandler } from "./MediatorViewHandler";
 import { NullMediatorUnmapper } from "./NullMediatorUnmapper";
 import { MediatorMapper } from "./MediatorMapper";
 
-import { injectable, inject } from "inversify";
-
 /**
  * @private
  */

src/robotlegs/bender/extensions/viewManager/impl/ContainerBinding.ts

@@ -100,7 +100,7 @@ export class ContainerBinding extends EventDispatcher {
     public handleView(view: any, type: FunctionConstructor): void {
         let length: number = this._handlers.length;
         for (let i: number = 0; i < length; i++) {
-            let handler: IViewHandler = <IViewHandler>this._handlers[i];
+            let handler: IViewHandler = this._handlers[i];
             handler.handleView(view, type);
         }
     }

src/robotlegs/bender/extensions/viewManager/impl/ContainerBindingEvent.ts

@@ -5,6 +5,8 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
+import { Event } from "@robotlegsjs/core";
+
 /**
  * @private
  */
@@ -33,7 +35,7 @@ export class ContainerBindingEvent extends Event {
     /**
      * @inheritDoc
      */
-    public clone(): Event {
+    public clone(): ContainerBindingEvent {
         return new ContainerBindingEvent(this.type);
     }
 }

src/robotlegs/bender/extensions/viewManager/impl/ContainerRegistry.ts

@@ -7,6 +7,8 @@
 
 import { EventDispatcher } from "@robotlegsjs/core";
 
+import { contains } from "./contains";
+
 import { ContainerBinding } from "./ContainerBinding";
 import { ContainerBindingEvent } from "./ContainerBindingEvent";
 import { ContainerRegistryEvent } from "./ContainerRegistryEvent";
@@ -60,20 +62,18 @@ export class ContainerRegistry extends EventDispatcher {
      */
     public addContainer(container: any): ContainerBinding {
         let binding = this._bindingByContainer.get(container);
-        if (binding) return binding;
-
-        binding = this.createBinding(container);
-        this._bindingByContainer.set(container, binding);
+        if (!binding) {
+            binding = this.createBinding(container);
+            this._bindingByContainer.set(container, binding);
+        }
         return binding;
     }
 
     /**
      * @private
      */
     public removeContainer(container: any): ContainerBinding {
-        const binding: ContainerBinding = this._bindingByContainer.get(
-            container
-        );
+        let binding: ContainerBinding = this._bindingByContainer.get(container);
 
         if (binding) {
             this.removeBinding(binding);
@@ -90,7 +90,7 @@ export class ContainerRegistry extends EventDispatcher {
     public findParentBinding(target: any): ContainerBinding {
         let parent: any = target.parent;
         while (parent) {
-            const binding: ContainerBinding = this._bindingByContainer.get(
+            let binding: ContainerBinding = this._bindingByContainer.get(
                 parent
             );
             if (binding) {
@@ -119,7 +119,7 @@ export class ContainerRegistry extends EventDispatcher {
         // Add a listener so that we can remove this binding when it has no handlers
         binding.addEventListener(
             ContainerBindingEvent.BINDING_EMPTY,
-            this.onBindingEmpty
+            this.onBindingEmpty.bind(this)
         );
 
         // If the new binding doesn't have a parent it is a Root
@@ -132,11 +132,13 @@ export class ContainerRegistry extends EventDispatcher {
         // A. Don't have a parent, OR
         // B. Have a parent that is not contained within the new binding
         this._bindingByContainer.forEach(childBinding => {
-            if (container.contains(childBinding.container)) {
+            if (contains(container, childBinding.container)) {
                 if (!childBinding.parent) {
                     this.removeRootBinding(childBinding);
                     childBinding.parent = binding;
-                } else if (!container.contains(childBinding.parent.container)) {
+                } else if (
+                    !contains(container, childBinding.parent.container)
+                ) {
                     childBinding.parent = binding;
                 }
             }

src/robotlegs/bender/extensions/viewManager/impl/ViewManager.ts

@@ -5,9 +5,9 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
-import { injectable } from "inversify";
+import { injectable, EventDispatcher } from "@robotlegsjs/core";
 
-import { EventDispatcher } from "@robotlegsjs/core";
+import { contains } from "./contains";
 
 import { IViewHandler } from "../api/IViewHandler";
 import { IViewManager } from "../api/IViewManager";
@@ -73,11 +73,10 @@ export class ViewManager extends EventDispatcher implements IViewManager {
         }
 
         this._containers.push(container);
-
-        for (let i in this._handlers) {
-            let handler: IViewHandler = this._handlers[i];
+        this._handlers.forEach(handler => {
             this._registry.addContainer(container).addHandler(handler);
-        }
+        });
+
         this.dispatchEvent(
             new ViewManagerEvent(ViewManagerEvent.CONTAINER_ADD, container)
         );
@@ -88,17 +87,19 @@ export class ViewManager extends EventDispatcher implements IViewManager {
      */
     public removeContainer(container: any): void {
         let index: number = this._containers.indexOf(container);
+
         if (index === -1) {
             return;
         }
 
         this._containers.splice(index, 1);
 
         let binding: ContainerBinding = this._registry.getBinding(container);
-        for (let i in this._handlers) {
-            let handler: IViewHandler = this._handlers[i];
+
+        this._handlers.forEach(handler => {
             binding.removeHandler(handler);
-        }
+        });
+
         this.dispatchEvent(
             new ViewManagerEvent(ViewManagerEvent.CONTAINER_REMOVE, container)
         );
@@ -113,11 +114,9 @@ export class ViewManager extends EventDispatcher implements IViewManager {
         }
 
         this._handlers.push(handler);
-
-        for (let i in this._containers) {
-            let container: any = this._containers[i];
+        this._containers.forEach(container => {
             this._registry.addContainer(container).addHandler(handler);
-        }
+        });
 
         this.dispatchEvent(
             new ViewManagerEvent(ViewManagerEvent.HANDLER_ADD, null, handler)
@@ -136,10 +135,9 @@ export class ViewManager extends EventDispatcher implements IViewManager {
 
         this._handlers.splice(index, 1);
 
-        for (let i in this._containers) {
-            let container: any = this._containers[i];
+        this._containers.forEach(container => {
             this._registry.getBinding(container).removeHandler(handler);
-        }
+        });
 
         this.dispatchEvent(
             new ViewManagerEvent(ViewManagerEvent.HANDLER_REMOVE, null, handler)
@@ -150,36 +148,33 @@ export class ViewManager extends EventDispatcher implements IViewManager {
      * @inheritDoc
      */
     public removeAllHandlers(): void {
-        for (let i in this._containers) {
-            let container: any = this._containers[i];
-            var binding: ContainerBinding = this._registry.getBinding(
-                container
-            );
-            for (let j in this._handlers) {
-                let handler: IViewHandler = this._handlers[j];
+        let binding: ContainerBinding = null;
+        this._containers.forEach(container => {
+            binding = this._registry.getBinding(container);
+            this._handlers.forEach(handler => {
                 binding.removeHandler(handler);
-            }
-        }
+            });
+        });
     }
 
     /*============================================================================*/
     /* Private Functions                                                          */
     /*============================================================================*/
 
     private validContainer(container: any): boolean {
-        for (let i in this._containers) {
-            let registeredContainer: any = this._containers[i];
+        this._containers.forEach(registeredContainer => {
             if (container === registeredContainer) {
                 return false;
             }
 
             if (
-                registeredContainer.contains(container) ||
-                container.contains(registeredContainer)
+                contains(registeredContainer, container) ||
+                contains(container, registeredContainer)
             ) {
                 throw new Error("Containers can not be nested");
             }
-        }
+        });
+
         return true;
     }
 }

src/robotlegs/bender/extensions/viewManager/impl/contains.ts

@@ -0,0 +1,35 @@
+// ------------------------------------------------------------------------------
+//  Copyright (c) 2017 RobotlegsJS. All Rights Reserved.
+//
+//  NOTICE: You are permitted to use, modify, and distribute this file
+//  in accordance with the terms of the license agreement accompanying it.
+// ------------------------------------------------------------------------------
+
+/*============================================================================*/
+/* Public Functions                                                           */
+/*============================================================================*/
+
+/**
+ * Determines whether the specified child object is a child of the containter instance or the instance itself.
+ * The search includes the entire display list including the containter instance.
+ * Grandchildren, great-grandchildren, and so on each return true.
+ *
+ * @param container The container.
+ * @param child The child object to test.
+ *
+ * @return true if the child object is a child of the container or the container itself; otherwise false.
+ */
+export function contains(container: any, child: any): boolean {
+    let found: boolean = false;
+    if (container === child || container.children.indexOf(child) >= 0) {
+        found = true;
+    } else {
+        for (let c of container.children) {
+            if (this.contains(c, child)) {
+                found = true;
+                break;
+            }
+        }
+    }
+    return found;
+}

test/entry.ts

@@ -1,4 +1,5 @@
-import "reflect-metadata";
+/// <reference types="mocha" />
+
 import "bluebird/js/browser/bluebird";
 import "es6-symbol/implement";
 import "es6-map/implement";