Merge pull request #41 from ReactiveDB/fix/qt-combine

fix(QueryToken): 修复 combine() 误用 Selector.prototype.concat 的问题

Author: Saviio

src/storage/modules/QueryToken.ts

@@ -76,7 +76,7 @@ export class QueryToken<T> {
       combineAll<Observable<Selector<T>>, Selector<T>[]>(),
       map((r) => {
         const first = r.shift()
-        return first!.concat(...r)
+        return first!.combine(...r)
       })
     )
     return new QueryToken<T>(newSelector$)

test/specs/storage/modules/QueryToken.spec.ts

@@ -101,6 +101,9 @@ export default describe('QueryToken Testcase', () => {
         mockSelector2 = new MockSelector(generateMockTestdata(tasks2))
         queryToken2 = new QueryToken(Observable.of(mockSelector2) as any)
         combined = queryToken.combine(queryToken2)
+        combined.selector$.subscribe((mock) => {
+          expect(mock['__test_label_selector_kind__']).to.equal('by combine')
+        })
       })
 
       it('should get a new QueryToken', () => {
@@ -169,6 +172,9 @@ export default describe('QueryToken Testcase', () => {
         mockSelector2 = new MockSelector(generateMockTestdata(tasks2))
         queryToken2 = new QueryToken(Observable.of(mockSelector2) as any)
         concated = queryToken.concat(queryToken2)
+        concated.selector$.subscribe((mock) => {
+          expect(mock['__test_label_selector_kind__']).to.equal('by concat')
+        })
       })
 
       it('should get new QueryToken', () => {

test/utils/mocks/Selector.ts

@@ -43,7 +43,11 @@ export class MockSelector<T> {
     return this.mapFn(this.change$.take(1))
   }
 
-  concat = this.combine
+  concat(... metas: MockSelector<T>[]) {
+    const dist = this.combine(...metas)
+    dist['__test_label_selector_kind__'] = 'by concat'
+    return dist
+  }
 
   combine(... metas: MockSelector<T>[]) {
     metas.unshift(this)
@@ -60,6 +64,7 @@ export class MockSelector<T> {
         .combineAll()
         .map((r: T[][]) => r.reduce((acc, val) => acc.concat(val)))
     }
+    dist['__test_label_selector_kind__'] = 'by combine'
     return dist
   }