Merged from the master

Author: Vlad Balin

Diff for: dist/index.js.map

@@ -14,9 +14,10 @@ export declare type Property = PropertyDescriptor | (() => any);
 export interface MessengersByCid {
     [cid: string]: Messenger;
 }
-export declare type CallbacksByEvents = {
-    [events: string]: Function;
+export declare type EventCallbacks<Context> = {
+    [events: string]: EventCallback<Context>;
 };
+export declare type EventCallback<Context> = (this: Context, ...args: any[]) => void;
 export declare class Messenger implements Mixable, EventSource {
     static __super__: object;
     static mixins: MixinsState;
@@ -30,13 +31,13 @@ export declare class Messenger implements Mixable, EventSource {
     _localEvents: EventMap;
     constructor();
     initialize(): void;
-    on(events: string | CallbacksByEvents, callback: any, context?: any): this;
-    once(events: string | CallbacksByEvents, callback: any, context?: any): this;
-    off(events?: string | CallbacksByEvents, callback?: any, context?: any): this;
+    on(events: string | EventCallbacks<this>, callback?: any, context?: any): this;
+    once(events: string | EventCallbacks<this>, callback?: any, context?: any): this;
+    off(events?: string | EventCallbacks<this>, callback?: any, context?: any): this;
     trigger(name: string, a?: any, b?: any, c?: any, d?: any, e?: any): this;
-    listenTo(source: Messenger, a: string | CallbacksByEvents, b?: Function): this;
-    listenToOnce(source: Messenger, a: string | CallbacksByEvents, b?: Function): this;
-    stopListening(a_source?: Messenger, a?: string | CallbacksByEvents, b?: Function): this;
+    listenTo(source: Messenger, a: string | EventCallbacks<this>, b?: Function): this;
+    listenToOnce(source: Messenger, a: string | EventCallbacks<this>, b?: Function): this;
+    stopListening(a_source?: Messenger, a?: string | EventCallbacks<this>, b?: Function): this;
     _disposed: boolean;
     dispose(): void;
 }

Diff for: endpoints/attributes/dist/index.js.map

@@ -1,6 +1,6 @@
 {
   "name": "type-r",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Serializable, validated, and observable data layer for modern JS applications",
   "main": "./dist/index.js",
   "jsnext:main": "./lib/index.js",
@@ -18,8 +18,9 @@
     "test": "tests"
   },
   "scripts": {
-    "build:lib": "npm run compile:lib && npm run bundle:lib",
-    "compile:lib": "rm -rf ./lib && node_modules/.bin/tsc",
+    "build:lib": "yarn compile:lib && yarn bundle:lib",
+    "build:cleanup":"node_modules/.bin/rimraf ./lib",
+    "compile:lib": "yarn build:cleanup && ./node_modules/.bin/tsc",
     "bundle:lib": "node_modules/.bin/rollup --config",
     "test:backbone": "node_modules/.bin/qunit 'tests/backbone-regression/*.tst.js'",
     "test:type-r": "node_modules/.bin/jest",
@@ -80,7 +81,8 @@
     "sinon-chai": "*",
     "ts-jest": "*",
     "typescript": "*",
-    "underscore": "*"
+    "underscore": "*",
+    "rimraf": "^2.6.3"
   },
   "dependencies": {
     "isomorphic-fetch": "*",

Diff for: endpoints/localStorage/dist/index.js.map

@@ -34,7 +34,8 @@ export interface MessengersByCid {
 }
 
 /** @hidden */
-export type CallbacksByEvents = { [ events : string ] : Function }
+export type EventCallbacks<Context> = { [ events : string ] : EventCallback<Context> }
+export type EventCallback<Context> = ( this : Context, ...args : any[] ) => void
 
 /*************************
  * Messenger is mixable class with capabilities of sending and receiving synchronous events.
@@ -93,21 +94,21 @@ export class Messenger implements Mixable, EventSource {
     /** Method is called at the end of the constructor */
     initialize() : void {}
 
-    on( events : string | CallbacksByEvents, callback, context? ) : this {
+    on( events : string | EventCallbacks<this>, callback?, context? ) : this {
         if( typeof events === 'string' ) strings( on, this, events, callback, context );
         else for( let name in events ) strings( on, this, name, events[ name ], context || callback );
 
         return this;
     }
 
-    once( events : string | CallbacksByEvents, callback, context? ) : this {
+    once( events : string | EventCallbacks<this>, callback?, context? ) : this {
         if( typeof events === 'string' ) strings( once, this, events, callback, context );
         else for( let name in events ) strings( once, this, name, events[ name ], context || callback );
 
         return this;
     }
 
-    off( events? : string | CallbacksByEvents, callback?, context? ) : this {
+    off( events? : string | EventCallbacks<this>, callback?, context? ) : this {
         if( !events ) off( this, void 0, callback, context );
         else if( typeof events === 'string' ) strings( off, this, events, callback, context );
         else for( let name in events ) strings( off, this, name, events[ name ], context || callback );
@@ -126,7 +127,7 @@ export class Messenger implements Mixable, EventSource {
         return this;
     }
 
-    listenTo( source : Messenger, a : string | CallbacksByEvents, b? : Function ) : this {
+    listenTo( source : Messenger, a : string | EventCallbacks<this>, b? : Function ) : this {
         if( source ){
             addReference( this, source );
             source.on( a, !b && typeof a === 'object' ? this : b, this );
@@ -135,7 +136,7 @@ export class Messenger implements Mixable, EventSource {
         return this;
     }
 
-    listenToOnce( source : Messenger, a : string | CallbacksByEvents, b? : Function ) : this {
+    listenToOnce( source : Messenger, a : string | EventCallbacks<this>, b? : Function ) : this {
         if( source ){
             addReference( this, source );
             source.once( a, !b && typeof a === 'object' ? this : b, this );
@@ -144,7 +145,7 @@ export class Messenger implements Mixable, EventSource {
         return this;
     }
 
-    stopListening( a_source? : Messenger, a? : string | CallbacksByEvents, b? : Function ) : this {
+    stopListening( a_source? : Messenger, a? : string | EventCallbacks<this>, b? : Function ) : this {
         const { _listeningTo } = this;
         if( _listeningTo ){
             const removeAll = !( a || b ),

Diff for: endpoints/memory/dist/index.js.map

@@ -1,5 +1,5 @@
 import { abortIO, IOEndpoint, IONode, IOPromise } from './io-tools';
-import { CallbacksByEvents, define, definitions, eventsApi, Logger, LogLevel, Messenger, MessengerDefinition, MessengersByCid, mixinRules, mixins, MixinsState, throwingLogger } from './object-plus';
+import { EventCallbacks, define, definitions, eventsApi, Logger, LogLevel, Messenger, MessengerDefinition, MessengersByCid, mixinRules, mixins, MixinsState, throwingLogger } from './object-plus';
 import { resolveReference, Traversable } from './traversable';
 import { ChildrenErrors, Validatable, ValidationError } from './validation';
 

Diff for: endpoints/proxy/dist/index.js.map

@@ -1338,7 +1338,7 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -3355,6 +3355,13 @@ rimraf@^2.5.4, rimraf@^2.6.1:
   dependencies:
     glob "^7.0.5"
 
+rimraf@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 rollup-plugin-commonjs@*:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz#4604e25069e0c78a09e08faa95dc32dec27f7c89"