Release 1.1.3

cacheable.decorator.ts

@@ -1,16 +1,16 @@
 import { empty, merge, Observable, of, Subject } from 'rxjs';
 import { delay, finalize, shareReplay, tap } from 'rxjs/operators';
 import { DEFAULT_CACHE_RESOLVER, makeCacheableDecorator } from './common';
-import { ICacheConfig } from './common/ICacheConfig';
+import { IObservableCacheConfig } from './common/IObservableCacheConfig';
 export const globalCacheBusterNotifier = new Subject<void>();
 
-export const Cacheable = makeCacheableDecorator<Observable<any>>(
+export const Cacheable = makeCacheableDecorator<Observable<any>, IObservableCacheConfig>(
   (
     propertyDescriptor,
     oldMethod,
     cachePairs,
     pendingCachePairs,
-    cacheConfig: ICacheConfig
+    cacheConfig
   ) => {
     /**
      * subscribe to the globalCacheBuster

common/ICacheConfig.ts

@@ -30,10 +30,4 @@ export interface ICacheConfig {
    * pass an Observable upon whose emission all caches will be busted
    */
   cacheBusterObserver?: Observable<any>;
-
-  /**
-   * cache will be resolved asynchronously - an extra change detection pass will be made by
-   * @description should cache be resolved asynchronously? - helps with declarative forms and two-way databinding via ngModel
-   */
-  async?: boolean;
 }

common/IObservableCacheConfig.ts

@@ -0,0 +1,9 @@
+import { ICacheConfig } from './ICacheConfig';
+
+export interface IObservableCacheConfig extends ICacheConfig {
+  /**
+   * cache will be resolved asynchronously - an extra change detection pass will be made by
+   * @description should cache be resolved asynchronously? - helps with declarative forms and two-way databinding via ngModel
+   */
+  async?: boolean;
+}

common/index.ts

@@ -14,16 +14,16 @@ export type IShouldCacheDecider = (response: any) => boolean;
 
 export type ICacheable<T> = (...args) => T;
 
-export const makeCacheableDecorator = <T>(
+export const makeCacheableDecorator = <T, K extends ICacheConfig = ICacheConfig>(
   decorate: (
     propertyDescriptor: TypedPropertyDescriptor<ICacheable<T>>,
     oldMethod: ICacheable<T>,
     cachePairs: Array<ICachePair<any>>,
     pendingCachePairs: Array<ICachePair<T>>,
-    cacheConfig: ICacheConfig
+    cacheConfig: K
   ) => void
 ) => {
-  return function Cacheable(cacheConfig?: ICacheConfig) {
+  return function Cacheable(cacheConfig?: K) {
     return function(
       _target: Object,
       _propertyKey: string,
@@ -38,7 +38,7 @@ export const makeCacheableDecorator = <T>(
           oldMethod,
           cachePairs,
           pendingCachePairs,
-          cacheConfig ? cacheConfig : ({} as ICacheConfig)
+          cacheConfig ? cacheConfig : ({} as K)
         );
       }
       return propertyDescriptor;

dist/cacheable.decorator.d.ts

@@ -1,4 +1,4 @@
 import { Observable, Subject } from 'rxjs';
-import { ICacheConfig } from './common/ICacheConfig';
+import { IObservableCacheConfig } from './common/IObservableCacheConfig';
 export declare const globalCacheBusterNotifier: Subject<void>;
-export declare const Cacheable: (cacheConfig?: ICacheConfig) => (_target: Object, _propertyKey: string, propertyDescriptor: TypedPropertyDescriptor<(...args: any[]) => Observable<any>>) => TypedPropertyDescriptor<(...args: any[]) => Observable<any>>;
+export declare const Cacheable: (cacheConfig?: IObservableCacheConfig) => (_target: Object, _propertyKey: string, propertyDescriptor: TypedPropertyDescriptor<(...args: any[]) => Observable<any>>) => TypedPropertyDescriptor<(...args: any[]) => Observable<any>>;

dist/common/ICacheConfig.d.ts

@@ -29,9 +29,4 @@ export interface ICacheConfig {
      * pass an Observable upon whose emission all caches will be busted
      */
     cacheBusterObserver?: Observable<any>;
-    /**
-     * cache will be resolved asynchronously - an extra change detection pass will be made by
-     * @description should cache be resolved asynchronously? - helps with declarative forms and two-way databinding via ngModel
-     */
-    async?: boolean;
 }

dist/common/IObservableCacheConfig.d.ts

@@ -0,0 +1,8 @@
+import { ICacheConfig } from './ICacheConfig';
+export interface IObservableCacheConfig extends ICacheConfig {
+    /**
+     * cache will be resolved asynchronously - an extra change detection pass will be made by
+     * @description should cache be resolved asynchronously? - helps with declarative forms and two-way databinding via ngModel
+     */
+    async?: boolean;
+}

dist/common/index.d.ts

@@ -5,5 +5,5 @@ export declare const DEFAULT_CACHE_RESOLVER: (oldParams: any, newParams: any) =>
 export declare type ICacheRequestResolver = (oldParameters: Array<any>, newParameters: Array<any>) => boolean;
 export declare type IShouldCacheDecider = (response: any) => boolean;
 export declare type ICacheable<T> = (...args) => T;
-export declare const makeCacheableDecorator: <T>(decorate: (propertyDescriptor: TypedPropertyDescriptor<ICacheable<T>>, oldMethod: ICacheable<T>, cachePairs: ICachePair<any>[], pendingCachePairs: ICachePair<T>[], cacheConfig: ICacheConfig) => void) => (cacheConfig?: ICacheConfig) => (_target: Object, _propertyKey: string, propertyDescriptor: TypedPropertyDescriptor<ICacheable<T>>) => TypedPropertyDescriptor<ICacheable<T>>;
+export declare const makeCacheableDecorator: <T, K extends ICacheConfig = ICacheConfig>(decorate: (propertyDescriptor: TypedPropertyDescriptor<ICacheable<T>>, oldMethod: ICacheable<T>, cachePairs: ICachePair<any>[], pendingCachePairs: ICachePair<T>[], cacheConfig: K) => void) => (cacheConfig?: K) => (_target: Object, _propertyKey: string, propertyDescriptor: TypedPropertyDescriptor<ICacheable<T>>) => TypedPropertyDescriptor<ICacheable<T>>;
 export declare const makeCacheBusterDecorator: <T>(decorate: (propertyDescriptor: TypedPropertyDescriptor<ICacheable<T>>, oldMethod: ICacheable<T>, cacheBusterConfig: ICacheBusterConfig) => void) => (cacheBusterConfig?: ICacheBusterConfig) => (_target: Object, _propertyKey: string, propertyDescriptor: TypedPropertyDescriptor<ICacheable<T>>) => TypedPropertyDescriptor<ICacheable<T>>;