From 9ee0823b7e4a97a2b1812847eaabdf6cf846655e Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 19 Oct 2016 23:55:58 +0200
Subject: introduce map for query streams

---
 lib/wallet/query.ts | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'lib/wallet/query.ts')

diff --git a/lib/wallet/query.ts b/lib/wallet/query.ts
index c369e4b67..acf9aa44d 100644
--- a/lib/wallet/query.ts
+++ b/lib/wallet/query.ts
@@ -66,7 +66,8 @@ export interface QueryStream<T> {
                                    keyFn: (obj: T) => I): QueryStream<JoinResult<T,S>>;
   filter(f: (T: any) => boolean): QueryStream<T>;
   reduce<S>(f: (v: T, acc: S) => S, start?: S): Promise<S>;
-  flatMap(f: (x: T) => T[]): QueryStream<T>;
+  map<S>(f: (x:T) => S): QueryStream<S>;
+  flatMap<S>(f: (x: T) => S[]): QueryStream<S>;
   toArray(): Promise<T[]>;
 }
 
@@ -102,10 +103,14 @@ abstract class QueryStreamBase<T> implements QueryStream<T> {
     this.root = root;
   }
 
-  flatMap(f: (x: T) => T[]): QueryStream<T> {
+  flatMap<S>(f: (x: T) => T[]): QueryStream<S> {
     return new QueryStreamFlatMap(this, f);
   }
 
+  map<S>(f: (x: T) => S): QueryStream<T> {
+    return new QueryStreamMap(this, f);
+  }
+
   indexJoin<S,I extends IDBValidKey>(index: Index<I,S>,
                                      keyFn: (obj: T) => I): QueryStream<JoinResult<T, S>> {
     this.root.addStoreAccess(index.storeName, false);
@@ -213,6 +218,29 @@ class QueryStreamFlatMap<T> extends QueryStreamBase<T> {
 }
 
 
+class QueryStreamMap<T> extends QueryStreamBase<T> {
+  s: QueryStreamBase<T>;
+  mapFn: (v: T) => T[];
+
+  constructor(s: QueryStreamBase<T>, mapFn: (v: T) => T[]) {
+    super(s.root);
+    this.s = s;
+    this.mapFn = mapFn;
+  }
+
+  subscribe(f: SubscribeFn) {
+    this.s.subscribe((isDone, value, tx) => {
+      if (isDone) {
+        f(true, undefined, tx);
+        return;
+      }
+      let mappedValue = this.mapFn(value);
+      f(false, mappedValue, tx);
+    });
+  }
+}
+
+
 class QueryStreamIndexJoin<T, S> extends QueryStreamBase<JoinResult<T, S>> {
   s: QueryStreamBase<T>;
   storeName: string;
-- 
cgit v1.2.3