chore: split query methods

Author: achingbrain

src/blockstore.js

@@ -45,19 +45,18 @@ function createBaseStore (store) {
       return store.open()
     },
 
-    // @ts-ignore TODO: ts does not think we will yield only CIDs or only Blocks
     async * query (query, options) {
       for await (const { key, value } of store.query(query, options)) {
-        // TODO: we should make this a different method
-        if (query.keysOnly) {
-          yield keyToCid(key)
-          continue
-        }
-
         yield new Block(value, keyToCid(key))
       }
     },
 
+    async * queryKeys (query, options) {
+      for await (const key of store.queryKeys(query, options)) {
+        yield keyToCid(key)
+      }
+    },
+
     async get (cid, options) {
       const key = cidToKey(cid)
       const blockData = await store.get(key, options)

src/idstore.js

@@ -31,11 +31,14 @@ function createIdStore (store) {
       return store.open()
     },
 
-    // @ts-ignore TODO: ts does not think we will yield only CIDs or only Blocks
     query (query, options) {
       return store.query(query, options)
     },
 
+    queryKeys (query, options) {
+      return store.queryKeys(query, options)
+    },
+
     async get (cid, options) {
       const extracted = extractContents(cid)
       if (extracted.isIdentity) {

src/types.d.ts

@@ -1,5 +1,5 @@
 
-import type { Datastore, Options as DatastoreOptions, Query, Key } from 'interface-datastore'
+import type { Datastore, Options as DatastoreOptions, Query, KeyQuery, Key } from 'interface-datastore'
 import type CID from 'cids'
 import type Block from 'ipld-block'
 
@@ -65,7 +65,12 @@ export interface Blockstore {
   /**
    * Query the store
    */
-  query: ((query: Query & { keysOnly: true }, options?: DatastoreOptions) => AsyncIterable<CID>) & ((query: Query, options?: DatastoreOptions) => AsyncIterable<Block>)
+  query: (Query, options?: DatastoreOptions) => AsyncIterable<Block>
+
+  /**
+   * Query the store, returning only keys
+   */
+   queryKeys: (query: KeyQuery, options?: DatastoreOptions) => AsyncIterable<CID>
 
   /**
    * Get a single block by CID