Merge pull request #21 from ngbox/fix/options-not-passed

Passed options given to ObserveFn to value and collection methods
ngbox · May 2, 2021 · 5b5b7d0 · 5b5b7d0
2 parents 838fad4 + eac07a9
commit 5b5b7d0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/projects/ng-observe/src/lib/ng-observe.ts b/projects/ng-observe/src/lib/ng-observe.ts
@@ -102,8 +102,12 @@ export const OBSERVE_PROVIDER = [
 
 export function observeFactory(service: ObserveService): ObserveFn {
   return <ValueOrCollection extends any>(
-    source: Observable<ValueOrCollection> | ObservableCollection<ValueOrCollection>
-  ) => (isObservable(source) ? service.value(source) : service.collection(source));
+    source: Observable<ValueOrCollection> | ObservableCollection<ValueOrCollection>,
+    options?: ObserveValueOptions | ObserveCollectionOptions<ValueOrCollection>
+  ) =>
+    isObservable(source)
+      ? service.value(source, options as ObserveValueOptions)
+      : service.collection(source, options as ObserveCollectionOptions<ValueOrCollection>);
 }
 
 type ObserveCollectionFn = <Collection>(
@@ -136,7 +140,7 @@ export type ObservableCollection<Collection> = Collection extends Array<infer Va
 export type ObserveCollectionOptions<Collection> = Collection extends Array<any>
   ? Array<ObserveValueOptions>
   : {
-      [Key in keyof Collection]: ObserveValueOptions;
+      [Key in keyof Collection]?: ObserveValueOptions;
     };
 
 export type ObservedValues<Collection> = Collection extends Array<infer Value>