Fixed breaking change from previous update, a... (#19)

* Fixed breaking change from previous update, a...

README.md

@@ -20,6 +20,8 @@ Read more about Storeon **[article]**.
 
 ## Compatibility
 
+*@storeon/angular* **0.3.0**+ requires *storeon* **0.9.0**+
+
 *@storeon/angular* **0.2.0**+ supports Angular **8**
 
 *@storeon/angular* **0.1.0** supports Angular **7**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storeon/angular",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Storeon for Angular 🅰⚡",
   "scripts": {
     "ng": "ng",
@@ -24,28 +24,28 @@
     }
   ],
   "dependencies": {
-    "@angular/animations": "~8.2.0-next.0",
-    "@angular/common": "~8.2.0-next.0",
-    "@angular/compiler": "~8.2.0-next.0",
-    "@angular/core": "~8.2.0-next.0",
-    "@angular/forms": "~8.2.0-next.0",
-    "@angular/platform-browser": "~8.2.0-next.0",
-    "@angular/platform-browser-dynamic": "~8.2.0-next.0",
-    "@angular/router": "~8.2.0-next.0",
+    "@angular/animations": "~8.2.0-next.1",
+    "@angular/common": "~8.2.0-next.1",
+    "@angular/compiler": "~8.2.0-next.1",
+    "@angular/core": "~8.2.0-next.1",
+    "@angular/forms": "~8.2.0-next.1",
+    "@angular/platform-browser": "~8.2.0-next.1",
+    "@angular/platform-browser-dynamic": "~8.2.0-next.1",
+    "@angular/router": "~8.2.0-next.1",
     "core-js": "^3.1.4",
     "rxjs": "~6.5.2",
     "storeon": "^0.9.1",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.801.0",
-    "@angular-devkit/build-ng-packagr": "0.801.0",
-    "@angular/cli": "8.1.0",
-    "@angular/compiler-cli": "~8.2.0-next.0",
-    "@angular/language-service": "~8.2.0-next.0",
+    "@angular-devkit/build-angular": "0.802.0-next.0",
+    "@angular-devkit/build-ng-packagr": "0.802.0-next.0",
+    "@angular/cli": "8.2.0-next.0",
+    "@angular/compiler-cli": "~8.2.0-next.1",
+    "@angular/language-service": "~8.2.0-next.1",
     "@types/jasmine": "~3.3.13",
     "@types/jasminewd2": "~2.0.6",
-    "@types/node": "~12.0.12",
+    "@types/node": "~12.6.2",
     "codelyzer": "^5.1.0",
     "fibers": "^4.0.1",
     "jasmine-core": "~3.4.0",

projects/ng-storeon/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@storeon/angular",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Storeon for Angular 🅰⚡",
   "peerDependencies": {
-    "@angular/common": "^8.1.0",
-    "@angular/core": "^8.1.0",
+    "@angular/common": "^8.1.1",
+    "@angular/core": "^8.1.1",
     "storeon": "^0.9.1"
   },
   "license": "MIT",

projects/ng-storeon/src/lib/storeon.decorator.ts

@@ -1,14 +1,14 @@
 import { ɵɵdirectiveInject as directiveInject } from '@angular/core';
 import { StoreonService } from './storeon.service';
-
+import { StoreonEvents } from 'storeon';
 
 /***
  *
  * Experimental feature, works only with Ivy renderer
  * Patches the component with keys from storeon store
  *
  */
-export function UseStoreon<State, Events>(config: {
+export function UseStoreon<State, Events extends StoreonEvents<State> = any>(config: {
   keys: Array<keyof State>,
   dispatcher?: string
 }) {
@@ -17,13 +17,13 @@ export function UseStoreon<State, Events>(config: {
     cmpType.ngComponentDef.factory = () => {
       const cmp = originalFactory(cmpType.ngComponentDef.type);
 
-      const storeon = directiveInject<StoreonService<State, Events>>(StoreonService );
+      const storeon = directiveInject<StoreonService<State, Events>>(StoreonService);
 
       config.keys.forEach(key => cmp[key] = storeon.useStoreon(key));
 
-       if (config.dispatcher) {
-         cmp[config.dispatcher] = storeon.dispatch.bind(storeon);
-       }
+      if (config.dispatcher) {
+        cmp[config.dispatcher] = storeon.dispatch.bind(storeon);
+      }
 
       return cmp;
     };

projects/ng-storeon/src/lib/storeon.service.spec.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import createStore, { StoreonEvents } from 'storeon';
+import { Store, StoreonEvents } from 'storeon';
 import { StoreonService } from './storeon.service';
 import { STOREON } from './storeon.token';
 
@@ -8,7 +8,7 @@ interface MockEvents extends StoreonEvents<typeof mockState> {
   'action': { data: string };
 }
 
-const mockStore: createStore.Store<typeof mockState, MockEvents> = {
+const mockStore: Store<typeof mockState, MockEvents> = {
   on: jasmine.createSpy('on').and.callFake((event, callback) => {
     callback(mockState);
   }),

projects/ng-storeon/src/lib/storeon.service.ts

@@ -1,19 +1,19 @@
 import { Injectable, Inject, OnDestroy } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { distinctUntilChanged, map, pluck } from 'rxjs/operators';
-import createStore from 'storeon';
+import { Store, StoreonEvents } from 'storeon';
 import { STOREON } from './storeon.token';
 
 @Injectable({
   providedIn: 'root'
 })
-export class StoreonService<State, Events> implements OnDestroy {
+export class StoreonService<State, Events extends StoreonEvents<State> = any> implements OnDestroy {
 
   private state$ = new BehaviorSubject<State>(this.store.get());
 
   private readonly unbind: Function;
 
-  constructor(@Inject(STOREON) private store: createStore.Store<State>) {
+  constructor(@Inject(STOREON) private store: Store<State, Events>) {
     this.unbind = this.store.on('@changed', (state) => {
       this.state$.next({ ...state as any });
 
@@ -42,7 +42,8 @@ export class StoreonService<State, Events> implements OnDestroy {
     return mapped$.pipe(distinctUntilChanged());
   }
 
-  dispatch<E extends Events, K extends keyof E>(event: K, data?: E[K]) {
+  dispatch<K extends keyof Events>(event: K, data?: Events[K]) {
+    // @ts-ignore
     this.store.dispatch(event, data);
   }