fix(core): fixes ts types, added missing import

Author: thekiba

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngxf",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

projects/platform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngxf/platform",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "description": "NGXF - Non-State Management for Angular",
   "keywords": [
     "non-ngxs",
@@ -37,9 +37,9 @@
   },
   "homepage": "https://github.com/ngxf/platform",
   "peerDependencies": {
-    "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
-    "@angular/core": "^6.0.0-rc.0 || ^6.0.0",
-    "@angular/router": "^6.0.0-rc.0 || ^6.0.0",
+    "@angular/common": "^6.0.0-rc.0 || ^6.0.0 || ^7.0.0",
+    "@angular/core": "^6.0.0-rc.0 || ^6.0.0 || ^7.0.0",
+    "@angular/router": "^6.0.0-rc.0 || ^6.0.0 || ^7.0.0",
     "rxjs": ">=6.0.0 || ^5.6.0-forward-compat.4"
   }
-}
+}

projects/platform/src/lib/directives/async.directive.ts

@@ -14,7 +14,7 @@ interface SubscriptionStrategy {
 }
 
 class ObservableStrategy implements SubscriptionStrategy {
-  createSubscription(async: ObservableOrPromise<any>, next: any, error: any, complete: any): SubscriptionLike {
+  createSubscription(async: Observable<any>, next: any, error: any, complete: any): SubscriptionLike {
     return async.subscribe(next, error, complete);
   }
 
@@ -26,8 +26,14 @@ class ObservableStrategy implements SubscriptionStrategy {
 }
 
 class PromiseStrategy implements SubscriptionStrategy {
-  createSubscription(async: Observable<any> | Promise<any>, next: any, error: any, complete: any): Promise<any> {
-    return async.then(next, error).finally(complete);
+  createSubscription(async: Promise<any>, next: any, error: any, complete: any): Promise<any> {
+    const promise = async.then(next, error);
+
+    if ('finally' in promise) {
+      return (promise as any).finally(complete);
+    }
+
+    return promise;
   }
 
   dispose(subscription: Promise<any>): void {}
@@ -97,7 +103,7 @@ export class AsyncDirective implements OnChanges, OnDestroy {
     }
   }
 
-  private subscribe(async: ObservableOrPromise<async>) {
+  private subscribe(async: ObservableOrPromise<any>) {
     this.strategy = resolveStrategy(async);
     this.subscription = this.strategy.createSubscription(
       async,

projects/platform/src/lib/platform.module.ts

@@ -1,28 +1,20 @@
 import { NgModule } from '@angular/core';
-import {
-    HttpDirective,
-    RouteDirective,
-    InitDirective,
-    TimeoutDirective,
-    ComposeDirective,
-    ReturnDirective,
-    CookiesDirective
-} from './directives';
+import { AsyncDirective, ComposeDirective, CookiesDirective, HttpDirective, InitDirective, ReturnDirective, RouteDirective, TimeoutDirective } from './directives';
 
 const DIRECTIVES = [
-    HttpDirective,
-    RouteDirective,
-    InitDirective,
-    TimeoutDirective,
-    ComposeDirective,
-    ReturnDirective,
-    CookiesDirective
+  AsyncDirective,
+  ComposeDirective,
+  CookiesDirective,
+  HttpDirective,
+  InitDirective,
+  ReturnDirective,
+  RouteDirective,
+  TimeoutDirective
 ];
 
 @NgModule({
-    imports: [],
-    declarations: [DIRECTIVES],
-    exports: [DIRECTIVES]
+  imports: [],
+  declarations: [ DIRECTIVES ],
+  exports: [ DIRECTIVES ]
 })
-export class NgxfModule {
-}
+export class NgxfModule {}