#74 DictionaryDisposable should have method containsKey(key)

#73 top level export should export DisposableBase

package.json

@@ -1,6 +1,6 @@
 {
   "name": "esp-js",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Evented State Processor (ESP) adds specific processing workflow around changes to a model's state",
   "keywords": [
     "state processor",

src/index.js

@@ -16,37 +16,32 @@
  */
 // notice_end
 
-import * as model from './model';
-import { ObservationStage, Router, SingleModelRouter, EventContext } from './router';
-
-import { observeEvent, observeModelChangedEvent } from './decorators/observeEvent';
-import { logging as logging } from './system';
-
-import { CompositeDisposable, DictionaryDisposable } from './system/disposables';
-import { Observable } from './reactive';
-
 // we export both a default object and individual items, this allows for both the following cases:
 // 1) import the entire namespace
-// import esp from 'esp';
+// import esp from 'esp-js';
 // let eventContext = new esp.EventContext();
 //
 // 1) import single items
-// import { EventContext } from 'esp';
+// import { EventContext } from 'esp-js';
 // let eventContext = new EventContext()
 
-export { ObservationStage, Router, SingleModelRouter, EventContext } from './router';
-export { model };
-export { observeEvent, observeModelChangedEvent };
-export { logging };
-export { CompositeDisposable };
-export { DictionaryDisposable };
-export { Observable };
+export { ObservationStage, Router, SingleModelRouter, EventContext, ModelChangedEvent } from './router';
+export { CompositeDisposable, DictionaryDisposable, DisposableBase } from './system/disposables';
+export { observeEvent, observeModelChangedEvent } from './decorators/observeEvent';
+export { logging } from './system';
+export { Observable } from './reactive';
 
+import { ObservationStage, Router, SingleModelRouter, EventContext, ModelChangedEvent } from './router';
+import { CompositeDisposable, DictionaryDisposable, DisposableBase } from './system/disposables';
+import { observeEvent, observeModelChangedEvent } from './decorators/observeEvent';
+import { logging as logging } from './system';
+import { Observable } from './reactive';
 export default {
     ObservationStage,
     Router,
     SingleModelRouter,
-    model,
+    DisposableBase,
+    ModelChangedEvent,
     observeEvent,
     observeModelChangedEvent,
     logging,

src/router/Router.js

@@ -18,10 +18,10 @@
 
 import { Const, Status, State, ModelRecord, ObservationStage, EventContext, SingleModelRouter } from './';
 import { CompositeDiagnosticMonitor } from './devtools';
-import { events, DisposableBase } from '../model';
-import { ModelChangedEvent } from '../model/events';
+import { default as ModelChangedEvent } from './ModelChangedEvent';
 import { Subject, Observable } from '../reactive/index';
 import { Guard, utils, logging, disposables } from '../system';
+import { DisposableBase, CompositeDisposable } from '../system/disposables';
 import { DecoratorTypes } from '../decorators';
 
 var _log = logging.Logger.create('Router');
@@ -425,7 +425,7 @@ export default class Router extends DisposableBase {
         return nextModel;
     }
     _observeEventsUsingDirectives(modelId, object){
-        var compositeDisposable = new disposables.CompositeDisposable();
+        var compositeDisposable = new CompositeDisposable();
         for (var i = 0; i < object._espDecoratorMetadata.events.length; i ++) {
             let details = object._espDecoratorMetadata.events[i];
             compositeDisposable.add(this.getEventObservable(modelId, details.eventName, details.observationStage).observe((e, c, m) => {
@@ -438,7 +438,7 @@ export default class Router extends DisposableBase {
         return compositeDisposable;
     }
     _observeEventsUsingConventions(modelId, object, methodPrefix) {
-        var compositeDisposable = new disposables.CompositeDisposable();
+        var compositeDisposable = new CompositeDisposable();
         var props = utils.getPropertyNames(object);
         for (var i = 0; i < props.length; i ++) {
             let prop = props[i];

src/router/devtools/compositeDiagnosticMonitor.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 // notice_end
-import { DisposableBase } from '../../model';
+import { DisposableBase } from '../../system/disposables';
 import DevToolsDiagnosticMonitor from './devToolsDiagnosticMonitor';
 import LoggingDiagnosticMonitor from './loggingDiagnosticMonitor';
 import NoopDiagnosticMonitor from './noopDiagnosticMonitor';

src/router/devtools/devToolsDiagnosticMonitor.js

@@ -16,7 +16,7 @@
  */
 // notice_end
 
-import { DisposableBase } from '../../model';
+import { DisposableBase } from '../../system/disposables';
 
 /**
  * hooks onto a global exposed by esp-js-devtools and forwards diagnostics to that

src/router/index.js

@@ -26,4 +26,5 @@ export { default as Router } from './Router';
 export { default as SingleModelRouter } from './SingleModelRouter';
 export { default as State } from './State';
 export { default as Status } from './Status';
-export { default as Const } from './Const';
+export { default as Const } from './Const';
+export { default as ModelChangedEvent } from './ModelChangedEvent';

src/system/disposables/DictionaryDisposable.js

@@ -38,6 +38,9 @@ export default class DictionaryDisposable {
             delete this[key];
         }
     }
+    containsKey(key) {
+        return this.hasOwnProperty(key);
+    }
     dispose() {
        // if(!this._isDisposed) {
             this._isDisposed = true;

src/model/DisposableBase.js → src/system/disposables/DisposableBase.js

@@ -16,11 +16,11 @@
  */
  // notice_end
 
-import { disposables } from '../system';
+import { default as CompositeDisposable } from './CompositeDisposable';
 
 export default class DisposableBase {
     constructor() {
-        this._disposables = new disposables.CompositeDisposable();
+        this._disposables = new CompositeDisposable();
     }
     get isDisposed() {
         return this._disposables.isDisposed;

src/system/disposables/index.js

@@ -18,4 +18,5 @@
 
 export { default as CompositeDisposable } from './CompositeDisposable';
 export { default as DictionaryDisposable } from './DictionaryDisposable';
-export { default as DisposableWrapper } from './DisposableWrapper';
+export { default as DisposableWrapper } from './DisposableWrapper';
+export { default as DisposableBase } from './DisposableBase';

tests/indexTests.js

@@ -7,6 +7,8 @@ import {
     EventContext,
     CompositeDisposable,
     DictionaryDisposable,
+    DisposableBase,
+    ModelChangedEvent,
     Observable,
     observeEvent,
     observeModelChangedEvent,
@@ -45,6 +47,11 @@ describe('index exports', () => {
         expect(DictionaryDisposable).toBeDefined();
     });
 
+    it('should export DisposableBase', () => {
+        expect(esp.DisposableBase).toBeDefined();
+        expect(DisposableBase).toBeDefined();
+    });
+
     it('should export Observable', () => {
         expect(esp.Observable).toBeDefined();
         expect(Observable).toBeDefined();
@@ -60,13 +67,9 @@ describe('index exports', () => {
         expect(observeModelChangedEvent).toBeDefined();
     });
 
-    it('should export model', () => {
-        expect(esp.model).toBeDefined();
-        expect(esp.model.DisposableBase).toBeDefined();
-        expect(esp.model.ModelBase).toBeDefined();
-        expect(esp.model.ModelRootBase).toBeDefined();
-        expect(esp.model.events.ModelChangedEvent).toBeDefined();
-        expect(model).toBeDefined();
+    it('should export ModelChangedEvent', () => {
+        expect(esp.ModelChangedEvent).toBeDefined();
+        expect(ModelChangedEvent).toBeDefined();
     });
 
     it('should export logging', () => {