@gmod/bbi 2.0.4 → 3.0.0

package/src/bbi.ts

@@ -1,7 +1,7 @@
 import { Parser } from 'binary-parser'
 import { LocalFile, RemoteFile, GenericFilehandle } from 'generic-filehandle'
-import { Observable, Observer } from 'rxjs'
-import { reduce } from 'rxjs/operators'
+import { firstValueFrom, Observable, Observer } from 'rxjs'
+import { toArray } from 'rxjs/operators'
 import { BlockView } from './blockView'
 
 const BIG_WIG_MAGIC = -2003829722
@@ -367,12 +367,10 @@ export abstract class BBI {
     opts: RequestOptions & { scale?: number; basesPerSpan?: number } = {
       scale: 1,
     },
-  ): Promise<Feature[]> {
+  ) {
     const ob = await this.getFeatureStream(refName, start, end, opts)
 
-    const ret = await ob
-      .pipe(reduce((acc, curr) => acc.concat(curr)))
-      .toPromise()
-    return ret || []
+    const ret = await firstValueFrom(ob.pipe(toArray()))
+    return ret.flat()
   }
 }

package/src/bigbed.ts

@@ -1,5 +1,5 @@
 import { Parser } from 'binary-parser'
-import { Observable, merge } from 'rxjs'
+import { Observable, merge, firstValueFrom } from 'rxjs'
 import { map, reduce } from 'rxjs/operators'
 import AbortablePromiseCache from 'abortable-promise-cache'
 import QuickLRU from 'quick-lru'
@@ -216,10 +216,7 @@ export class BigBed extends BBI {
    * @param opts - a SearchOptions argument with optional signal
    * @return a Promise for an array of Feature
    */
-  public async searchExtraIndex(
-    name: string,
-    opts: RequestOptions = {},
-  ): Promise<Feature[]> {
+  public async searchExtraIndex(name: string, opts: RequestOptions = {}) {
     const blocks = await this.searchExtraIndexBlocks(name, opts)
     if (!blocks.length) {
       return []
@@ -238,7 +235,7 @@ export class BigBed extends BBI {
         }),
       )
     })
-    const ret = await merge(...res).toPromise()
+    const ret = await firstValueFrom(merge(...res))
     return ret.filter(f => f.rest?.split('\t')[(f.field || 0) - 3] === name)
   }
 }