on-zero 0.0.95 → 0.0.96

package/dist/cjs/helpers/batchQuery.cjs

@@ -20,30 +20,31 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var batchQuery_exports = {};
 __export(batchQuery_exports, {
-  batchQuery: () => batchQuery
+  createBatchQuery: () => createBatchQuery
 });
 module.exports = __toCommonJS(batchQuery_exports);
 var import_helpers = require("@take-out/helpers");
-async function batchQuery(q, mapper, {
-  chunk,
-  pause = 0,
-  stopAfter = 1e5
-} = {
-  chunk: 20
-}) {
-  let hasMore = !0,
-    last = null,
-    iterations = 0;
-  for (; hasMore;) {
-    let query = q.limit(chunk);
-    last && (query = query.start(last));
-    const results = await query.run({
-      type: "complete"
-    });
-    if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
-      console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
-      break;
+function createBatchQuery(server) {
+  return async function (buildQuery, mapper, {
+    chunk,
+    pause = 0,
+    stopAfter = 1e5
+  } = {
+    chunk: 20
+  }) {
+    let hasMore = !0,
+      last = null,
+      iterations = 0;
+    for (; hasMore;) {
+      const results = await server.query(q => {
+        let query = buildQuery(q).limit(chunk);
+        return last && (query = query.start(last)), query;
+      });
+      if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
+        console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
+        break;
+      }
+      pause && (await (0, import_helpers.sleep)(pause));
     }
-    pause && (await (0, import_helpers.sleep)(pause));
-  }
+  };
 }

package/dist/cjs/helpers/batchQuery.js

@@ -14,25 +14,28 @@ var __export = (target, all) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
 var batchQuery_exports = {};
 __export(batchQuery_exports, {
-  batchQuery: () => batchQuery
+  createBatchQuery: () => createBatchQuery
 });
 module.exports = __toCommonJS(batchQuery_exports);
 var import_helpers = require("@take-out/helpers");
-async function batchQuery(q, mapper, {
-  chunk,
-  pause = 0,
-  stopAfter = 1e5
-} = { chunk: 20 }) {
-  let hasMore = !0, last = null, iterations = 0;
-  for (; hasMore; ) {
-    let query = q.limit(chunk);
-    last && (query = query.start(last));
-    const results = await query.run({ type: "complete" });
-    if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
-      console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
-      break;
+function createBatchQuery(server) {
+  return async function(buildQuery, mapper, {
+    chunk,
+    pause = 0,
+    stopAfter = 1e5
+  } = { chunk: 20 }) {
+    let hasMore = !0, last = null, iterations = 0;
+    for (; hasMore; ) {
+      const results = await server.query((q) => {
+        let query = buildQuery(q).limit(chunk);
+        return last && (query = query.start(last)), query;
+      });
+      if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
+        console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
+        break;
+      }
+      pause && await (0, import_helpers.sleep)(pause);
     }
-    pause && await (0, import_helpers.sleep)(pause);
-  }
+  };
 }
 //# sourceMappingURL=batchQuery.js.map

package/dist/cjs/helpers/batchQuery.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/batchQuery.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAsB;AAItB,eAAsB,WACpB,GACA,QACA;AAAA,EACE;AAAA,EACA,QAAQ;AAAA,EACR,YAAY;AACd,IAII,EAAE,OAAO,GAAG,GAChB;AACA,MAAI,UAAU,IACV,OAAoB,MACpB,aAAa;AAEjB,SAAO,WAAS;AACd,QAAI,QAAQ,EAAE,MAAM,KAAK;AAEzB,IAAI,SACF,QAAQ,MAAM,MAAM,IAAI;AAG1B,UAAM,UAAU,MAAM,MAAM,IAAI,EAAE,MAAM,WAAW,CAAC;AAQpD,QANA,MAAM,OAAO,OAAiB,GAE1B,QAAQ,SAAS,UACnB,UAAU,KAGR,aAAa,WAAW;AAC1B,cAAQ,MAAM,iDAAuC,SAAS,SAAS;AACvE;AAAA,IACF;AAEA,IAAI,SACF,UAAM,sBAAM,KAAK;AAAA,EAErB;AACF;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAsB;AAQf,SAAS,iBAAiB,QAAyB;AACxD,SAAO,eACL,YACA,QACA;AAAA,IACE;AAAA,IACA,QAAQ;AAAA,IACR,YAAY;AAAA,EACd,IAII,EAAE,OAAO,GAAG,GAChB;AACA,QAAI,UAAU,IACV,OAAoB,MACpB,aAAa;AAEjB,WAAO,WAAS;AACd,YAAM,UAAU,MAAM,OAAO,MAAM,CAAC,MAAW;AAC7C,YAAI,QAAQ,WAAW,CAAC,EAAE,MAAM,KAAK;AAErC,eAAI,SACF,QAAQ,MAAM,MAAM,IAAI,IAGnB;AAAA,MACT,CAAC;AAQD,UANA,MAAM,OAAO,OAAiB,GAE1B,QAAQ,SAAS,UACnB,UAAU,KAGR,aAAa,WAAW;AAC1B,gBAAQ,MAAM,iDAAuC,SAAS,SAAS;AACvE;AAAA,MACF;AAEA,MAAI,SACF,UAAM,sBAAM,KAAK;AAAA,IAErB;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/cjs/helpers/batchQuery.native.js

@@ -22,28 +22,29 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var batchQuery_exports = {};
 __export(batchQuery_exports, {
-  batchQuery: () => batchQuery
+  createBatchQuery: () => createBatchQuery
 });
 module.exports = __toCommonJS(batchQuery_exports);
 var import_helpers = require("@take-out/helpers");
-async function batchQuery(q, mapper) {
-  for (var {
-      chunk,
-      pause = 0,
-      stopAfter = 1e5
-    } = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {
-      chunk: 20
-    }, hasMore = !0, last = null, iterations = 0; hasMore;) {
-    var query = q.limit(chunk);
-    last && (query = query.start(last));
-    var results = await query.run({
-      type: "complete"
-    });
-    if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
-      console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
-      break;
+function createBatchQuery(server) {
+  return async function (buildQuery, mapper) {
+    for (var {
+        chunk,
+        pause = 0,
+        stopAfter = 1e5
+      } = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {
+        chunk: 20
+      }, hasMore = !0, last = null, iterations = 0; hasMore;) {
+      var results = await server.query(function (q) {
+        var query = buildQuery(q).limit(chunk);
+        return last && (query = query.start(last)), query;
+      });
+      if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
+        console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
+        break;
+      }
+      pause && (await (0, import_helpers.sleep)(pause));
     }
-    pause && (await (0, import_helpers.sleep)(pause));
-  }
+  };
 }
 //# sourceMappingURL=batchQuery.native.js.map

package/dist/cjs/helpers/batchQuery.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","batchQuery_exports","__export","batchQuery","module","exports","import_helpers","require","q","mapper","chunk","pause","stopAfter","arguments","length","hasMore","last","iterations","query","limit","start","results","run","type","console","error","sleep"],"sources":["../../../src/helpers/batchQuery.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAsB,CAAAK,kBAAA;AAItB,IAAAK,cAAsB,GAAAC,OACpB,CACA,mBACA;AAAA,eACEJ,WAAAK,CAAA,EAAAC,MAAA;EACA,SAAQ;MAAAC,KAAA;MAAAC,KAAA;MAAAC,SAAA;IAAA,IAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;MACRH,KAAA;IACF,GAIIK,OAAE,GAAO,CAAG,GAChBC,IAAA,SAAAC,UAAA,MAAAF,OAAA;IACA,IAAIG,KAAA,GAAUV,CAAA,CAAAW,KACV,CAAAT,KAAoB;IAGxBM,IAAA,KAAOE,KAAA,GAASA,KAAA,CAAAE,KAAA,CAAAJ,IAAA;IACd,IAAIK,OAAA,GAAU,MAAMH,KAAK,CAAAI,GAAA;MAErBC,IAAA;IAIJ;IAQA,IANA,MAAMd,MAAA,CAAOY,OAAiB,GAE1BA,OAAA,CAAQP,MAAA,GAASJ,KAAA,KACnBK,OAAA,GAAU,KAGRE,UAAA,GAAaL,SAAA,EAAW;MAC1BY,OAAA,CAAQC,KAAA,CAAM,iDAAuCb,SAAS,SAAS;MACvE;IACF;IAEID,KAAA,KACF,UAAML,cAAA,CAAAoB,KAAA,EAAMf,KAAK;EAErB;AACF","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","batchQuery_exports","__export","createBatchQuery","module","exports","import_helpers","require","server","buildQuery","mapper","chunk","pause","stopAfter","arguments","length","hasMore","last","iterations","results","query","q","limit","start","console","error","sleep"],"sources":["../../../src/helpers/batchQuery.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,gBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAsB,CAAAK,kBAAA;AAQf,IAAAK,cAAS,GAAAC,OAAiB,oBAAyB;AACxD,SAAOJ,gBACLA,CAAAK,MAAA;EAEA,OACE,gBAAAC,UAAA,EAAAC,MAAA;IACA,SAAQ;QAAAC,KAAA;QAAAC,KAAA;QAAAC,SAAA;MAAA,IAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;QACRH,KAAA;MACF,GAIIK,OAAE,GAAO,CAAG,GAChBC,IAAA,SAAAC,UAAA,MAAAF,OAAA;MACA,IAAIG,OAAA,GAAU,MACVX,MAAoB,CAAAY,KACpB,WAAaC,CAAA;QAEjB,IAAOD,KAAA,GAAAX,UAAS,CAAAY,CAAA,EAAAC,KAAA,CAAAX,KAAA;QACd,OAAMM,IAAA,KAAUG,KAAM,GAAAA,KAAO,CAAAG,KAAO,CAAAN,IAAW,IAAAG,KAAA;MAC7C;MAEA,UAAIV,MAAA,CAAAS,OACF,GAAQA,OAAM,CAAAJ,MAAM,GAAIJ,KAGnB,KAAAK,OAAA,QAAAE,UAAA,GAAAL,SAAA;QACRW,OAAA,CAAAC,KAAA,kDAAAZ,SAAA;QAQD;MACE;MACAD,KAAA,eAAAN,cAAA,CAAAoB,KAAA,EAAAd,KAAA;IAAA;EAGF;AACmB","ignoreList":[]}

package/dist/esm/helpers/batchQuery.js

@@ -1,22 +1,25 @@
 import { sleep } from "@take-out/helpers";
-async function batchQuery(q, mapper, {
-  chunk,
-  pause = 0,
-  stopAfter = 1e5
-} = { chunk: 20 }) {
-  let hasMore = !0, last = null, iterations = 0;
-  for (; hasMore; ) {
-    let query = q.limit(chunk);
-    last && (query = query.start(last));
-    const results = await query.run({ type: "complete" });
-    if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
-      console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
-      break;
+function createBatchQuery(server) {
+  return async function(buildQuery, mapper, {
+    chunk,
+    pause = 0,
+    stopAfter = 1e5
+  } = { chunk: 20 }) {
+    let hasMore = !0, last = null, iterations = 0;
+    for (; hasMore; ) {
+      const results = await server.query((q) => {
+        let query = buildQuery(q).limit(chunk);
+        return last && (query = query.start(last)), query;
+      });
+      if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
+        console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
+        break;
+      }
+      pause && await sleep(pause);
     }
-    pause && await sleep(pause);
-  }
+  };
 }
 export {
-  batchQuery
+  createBatchQuery
 };
 //# sourceMappingURL=batchQuery.js.map

package/dist/esm/helpers/batchQuery.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/batchQuery.ts"],
-  "mappings": "AAAA,SAAS,aAAa;AAItB,eAAsB,WACpB,GACA,QACA;AAAA,EACE;AAAA,EACA,QAAQ;AAAA,EACR,YAAY;AACd,IAII,EAAE,OAAO,GAAG,GAChB;AACA,MAAI,UAAU,IACV,OAAoB,MACpB,aAAa;AAEjB,SAAO,WAAS;AACd,QAAI,QAAQ,EAAE,MAAM,KAAK;AAEzB,IAAI,SACF,QAAQ,MAAM,MAAM,IAAI;AAG1B,UAAM,UAAU,MAAM,MAAM,IAAI,EAAE,MAAM,WAAW,CAAC;AAQpD,QANA,MAAM,OAAO,OAAiB,GAE1B,QAAQ,SAAS,UACnB,UAAU,KAGR,aAAa,WAAW;AAC1B,cAAQ,MAAM,iDAAuC,SAAS,SAAS;AACvE;AAAA,IACF;AAEA,IAAI,SACF,MAAM,MAAM,KAAK;AAAA,EAErB;AACF;",
+  "mappings": "AAAA,SAAS,aAAa;AAQf,SAAS,iBAAiB,QAAyB;AACxD,SAAO,eACL,YACA,QACA;AAAA,IACE;AAAA,IACA,QAAQ;AAAA,IACR,YAAY;AAAA,EACd,IAII,EAAE,OAAO,GAAG,GAChB;AACA,QAAI,UAAU,IACV,OAAoB,MACpB,aAAa;AAEjB,WAAO,WAAS;AACd,YAAM,UAAU,MAAM,OAAO,MAAM,CAAC,MAAW;AAC7C,YAAI,QAAQ,WAAW,CAAC,EAAE,MAAM,KAAK;AAErC,eAAI,SACF,QAAQ,MAAM,MAAM,IAAI,IAGnB;AAAA,MACT,CAAC;AAQD,UANA,MAAM,OAAO,OAAiB,GAE1B,QAAQ,SAAS,UACnB,UAAU,KAGR,aAAa,WAAW;AAC1B,gBAAQ,MAAM,iDAAuC,SAAS,SAAS;AACvE;AAAA,MACF;AAEA,MAAI,SACF,MAAM,MAAM,KAAK;AAAA,IAErB;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/esm/helpers/batchQuery.mjs

@@ -1,26 +1,27 @@
 import { sleep } from "@take-out/helpers";
-async function batchQuery(q, mapper, {
-  chunk,
-  pause = 0,
-  stopAfter = 1e5
-} = {
-  chunk: 20
-}) {
-  let hasMore = !0,
-    last = null,
-    iterations = 0;
-  for (; hasMore;) {
-    let query = q.limit(chunk);
-    last && (query = query.start(last));
-    const results = await query.run({
-      type: "complete"
-    });
-    if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
-      console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
-      break;
+function createBatchQuery(server) {
+  return async function (buildQuery, mapper, {
+    chunk,
+    pause = 0,
+    stopAfter = 1e5
+  } = {
+    chunk: 20
+  }) {
+    let hasMore = !0,
+      last = null,
+      iterations = 0;
+    for (; hasMore;) {
+      const results = await server.query(q => {
+        let query = buildQuery(q).limit(chunk);
+        return last && (query = query.start(last)), query;
+      });
+      if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
+        console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
+        break;
+      }
+      pause && (await sleep(pause));
     }
-    pause && (await sleep(pause));
-  }
+  };
 }
-export { batchQuery };
+export { createBatchQuery };
 //# sourceMappingURL=batchQuery.mjs.map

package/dist/esm/helpers/batchQuery.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["sleep","batchQuery","q","mapper","chunk","pause","stopAfter","hasMore","last","iterations","query","limit","start","results","run","type","length","console","error"],"sources":["../../../src/helpers/batchQuery.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,KAAA,QAAa;AAItB,eAAsBC,WACpBC,CAAA,EACAC,MAAA,EACA;EACEC,KAAA;EACAC,KAAA,GAAQ;EACRC,SAAA,GAAY;AACd,IAII;EAAEF,KAAA,EAAO;AAAG,GAChB;EACA,IAAIG,OAAA,GAAU;IACVC,IAAA,GAAoB;IACpBC,UAAA,GAAa;EAEjB,OAAOF,OAAA,GAAS;IACd,IAAIG,KAAA,GAAQR,CAAA,CAAES,KAAA,CAAMP,KAAK;IAErBI,IAAA,KACFE,KAAA,GAAQA,KAAA,CAAME,KAAA,CAAMJ,IAAI;IAG1B,MAAMK,OAAA,GAAU,MAAMH,KAAA,CAAMI,GAAA,CAAI;MAAEC,IAAA,EAAM;IAAW,CAAC;IAQpD,IANA,MAAMZ,MAAA,CAAOU,OAAiB,GAE1BA,OAAA,CAAQG,MAAA,GAASZ,KAAA,KACnBG,OAAA,GAAU,KAGRE,UAAA,GAAaH,SAAA,EAAW;MAC1BW,OAAA,CAAQC,KAAA,CAAM,iDAAuCZ,SAAS,SAAS;MACvE;IACF;IAEID,KAAA,KACF,MAAML,KAAA,CAAMK,KAAK;EAErB;AACF","ignoreList":[]}
+{"version":3,"names":["sleep","createBatchQuery","server","buildQuery","mapper","chunk","pause","stopAfter","hasMore","last","iterations","results","query","q","limit","start","length","console","error"],"sources":["../../../src/helpers/batchQuery.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,KAAA,QAAa;AAQf,SAASC,iBAAiBC,MAAA,EAAyB;EACxD,OAAO,gBACLC,UAAA,EACAC,MAAA,EACA;IACEC,KAAA;IACAC,KAAA,GAAQ;IACRC,SAAA,GAAY;EACd,IAII;IAAEF,KAAA,EAAO;EAAG,GAChB;IACA,IAAIG,OAAA,GAAU;MACVC,IAAA,GAAoB;MACpBC,UAAA,GAAa;IAEjB,OAAOF,OAAA,GAAS;MACd,MAAMG,OAAA,GAAU,MAAMT,MAAA,CAAOU,KAAA,CAAOC,CAAA,IAAW;QAC7C,IAAID,KAAA,GAAQT,UAAA,CAAWU,CAAC,EAAEC,KAAA,CAAMT,KAAK;QAErC,OAAII,IAAA,KACFG,KAAA,GAAQA,KAAA,CAAMG,KAAA,CAAMN,IAAI,IAGnBG,KAAA;MACT,CAAC;MAQD,IANA,MAAMR,MAAA,CAAOO,OAAiB,GAE1BA,OAAA,CAAQK,MAAA,GAASX,KAAA,KACnBG,OAAA,GAAU,KAGRE,UAAA,GAAaH,SAAA,EAAW;QAC1BU,OAAA,CAAQC,KAAA,CAAM,iDAAuCX,SAAS,SAAS;QACvE;MACF;MAEID,KAAA,KACF,MAAMN,KAAA,CAAMM,KAAK;IAErB;EACF;AACF","ignoreList":[]}

package/dist/esm/helpers/batchQuery.native.js

@@ -1,23 +1,24 @@
 import { sleep } from "@take-out/helpers";
-async function batchQuery(q, mapper) {
-  for (var {
-      chunk,
-      pause = 0,
-      stopAfter = 1e5
-    } = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {
-      chunk: 20
-    }, hasMore = !0, last = null, iterations = 0; hasMore;) {
-    var query = q.limit(chunk);
-    last && (query = query.start(last));
-    var results = await query.run({
-      type: "complete"
-    });
-    if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
-      console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
-      break;
+function createBatchQuery(server) {
+  return async function (buildQuery, mapper) {
+    for (var {
+        chunk,
+        pause = 0,
+        stopAfter = 1e5
+      } = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {
+        chunk: 20
+      }, hasMore = !0, last = null, iterations = 0; hasMore;) {
+      var results = await server.query(function (q) {
+        var query = buildQuery(q).limit(chunk);
+        return last && (query = query.start(last)), query;
+      });
+      if (await mapper(results), results.length < chunk && (hasMore = !1), iterations > stopAfter) {
+        console.error(`[batchQuery] \u203C\uFE0F stopping batch, ran ${stopAfter} chunks`);
+        break;
+      }
+      pause && (await sleep(pause));
     }
-    pause && (await sleep(pause));
-  }
+  };
 }
-export { batchQuery };
+export { createBatchQuery };
 //# sourceMappingURL=batchQuery.native.js.map

package/dist/esm/helpers/batchQuery.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["sleep","batchQuery","q","mapper","chunk","pause","stopAfter","arguments","length","hasMore","last","iterations","query","limit","start","results","run","type","console","error"],"sources":["../../../src/helpers/batchQuery.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,KAAA,QAAa;AAItB,eAAsBC,WACpBC,CAAA,EACAC,MAAA,EACA;EACE;MAAAC,KAAA;MAAAC,KAAA;MAAAC,SAAA;IAAA,IAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;MACAH,KAAA,EAAQ;IACR,GAAAK,OAAA,GAAY,IAAAC,IAAA,SAAAC,UAAA,MAAAF,OAAA;IAKV,IAAEG,KAAO,GAAGV,CAAA,CAAAW,KAChB,CAAAT,KAAA;IACAM,IAAI,KAAAE,KAAU,GACVA,KAAA,CAAoBE,KAAA,CACpBJ,IAAA;IAEJ,IAAAK,OAAO,SAASH,KAAA,CAAAI,GAAA;MACdC,IAAI;IAEA;IAIJ,UAAMd,MAAU,CAAAY,OAAM,GAAAA,OAAY,CAAAP,MAAM,GAAAJ,KAAA,KAAYK,OAAA,QAAAE,UAAA,GAAAL,SAAA;MAQpDY,OANA,CAAMC,KAAA,kDAGMb,SAGR,SAAa;MACf;IACA;IACFD,KAAA,WAAAL,KAAA,CAAAK,KAAA;EAEA;AACmB;AAGvB,S","ignoreList":[]}
+{"version":3,"names":["sleep","createBatchQuery","server","buildQuery","mapper","chunk","pause","stopAfter","arguments","length","hasMore","last","iterations","results","query","q","limit","start","console","error"],"sources":["../../../src/helpers/batchQuery.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,KAAA,QAAa;AAQf,SAASC,iBAAiBC,MAAA,EAAyB;EACxD,OAAO,gBACLC,UAAA,EACAC,MAAA,EACA;IACE;QAAAC,KAAA;QAAAC,KAAA;QAAAC,SAAA;MAAA,IAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;QACAH,KAAA,EAAQ;MACR,GAAAK,OAAA,GAAY,IAAAC,IAAA,SAAAC,UAAA,MAAAF,OAAA;MAKV,IAAEG,OAAO,GAAG,MAChBX,MAAA,CAAAY,KAAA,WAAAC,CAAA;QACI,IAAAD,KAAA,GAAUX,UACU,CAAAY,CAAA,EAAAC,KACpB,CAAAX,KAAA;QAEJ,OAAOM,IAAA,KAASG,KAAA,GAAAA,KAAA,CAAAG,KAAA,CAAAN,IAAA,IAAAG,KAAA;MACd;MACE,UAAIV,MAAQ,CAAAS,OAAA,CAAW,EAACA,OAAQ,CAAAJ,MAAK,GAAAJ,KAAA,KAAAK,OAAA,QAAAE,UAAA,GAAAL,SAAA;QAErCW,OAAI,CAAAC,KAAA,kDAIGZ,SAAA;QACR;MAQD;MACED,KAAA,WAAQN,KAAM,CAAAM,KAAA;IACd;EAAA;AAGF;AACmB,SAGvBL,gBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "on-zero",
-  "version": "0.0.95",
+  "version": "0.0.96",
   "description": "A typed layer over @rocicorp/zero with queries, mutations, and permissions",
   "sideEffects": false,
   "source": "src/index.ts",
@@ -64,7 +64,7 @@
     }
   },
   "dependencies": {
-    "@take-out/helpers": "0.0.95",
+    "@take-out/helpers": "0.0.96",
     "@sinclair/typebox-codegen": "^0.11.1",
     "chokidar": "^4.0.3",
     "citty": "^0.1.6",

package/src/helpers/batchQuery.ts

@@ -2,45 +2,53 @@ import { sleep } from '@take-out/helpers'
 
 import type { Query, Row } from '@rocicorp/zero'
 
-export async function batchQuery<Q extends Query<any, any, any>, Item extends Row<Q>>(
-  q: Q,
-  mapper: (items: Item[]) => Promise<void>,
-  {
-    chunk,
-    pause = 0,
-    stopAfter = 100_000,
-  }: {
-    chunk: number
-    pause?: number
-    stopAfter?: number
-  } = { chunk: 20 }
-) {
-  let hasMore = true
-  let last: Item | null = null
-  let iterations = 0
-
-  while (hasMore) {
-    let query = q.limit(chunk)
-
-    if (last) {
-      query = query.start(last)
-    }
-
-    const results = await query.run({ type: 'complete' })
-
-    await mapper(results as Item[])
-
-    if (results.length < chunk) {
-      hasMore = false
-    }
-
-    if (iterations > stopAfter) {
-      console.error(`[batchQuery] ‼️ stopping batch, ran ${stopAfter} chunks`)
-      break
-    }
+type ServerWithQuery = {
+  query: (cb: (q: any) => any) => Promise<any>
+}
 
-    if (pause) {
-      await sleep(pause)
+export function createBatchQuery(server: ServerWithQuery) {
+  return async function batchQuery<Q extends Query<any, any, any>, Item extends Row<Q>>(
+    buildQuery: (q: any) => Q,
+    mapper: (items: Item[]) => Promise<void>,
+    {
+      chunk,
+      pause = 0,
+      stopAfter = 100_000,
+    }: {
+      chunk: number
+      pause?: number
+      stopAfter?: number
+    } = { chunk: 20 }
+  ) {
+    let hasMore = true
+    let last: Item | null = null
+    let iterations = 0
+
+    while (hasMore) {
+      const results = await server.query((q: any) => {
+        let query = buildQuery(q).limit(chunk)
+
+        if (last) {
+          query = query.start(last)
+        }
+
+        return query
+      })
+
+      await mapper(results as Item[])
+
+      if (results.length < chunk) {
+        hasMore = false
+      }
+
+      if (iterations > stopAfter) {
+        console.error(`[batchQuery] ‼️ stopping batch, ran ${stopAfter} chunks`)
+        break
+      }
+
+      if (pause) {
+        await sleep(pause)
+      }
     }
   }
 }

package/types/helpers/batchQuery.d.ts

@@ -1,7 +1,11 @@
 import type { Query, Row } from '@rocicorp/zero';
-export declare function batchQuery<Q extends Query<any, any, any>, Item extends Row<Q>>(q: Q, mapper: (items: Item[]) => Promise<void>, { chunk, pause, stopAfter, }?: {
+type ServerWithQuery = {
+    query: (cb: (q: any) => any) => Promise<any>;
+};
+export declare function createBatchQuery(server: ServerWithQuery): <Q extends Query<any, any, any>, Item extends Row<Q>>(buildQuery: (q: any) => Q, mapper: (items: Item[]) => Promise<void>, { chunk, pause, stopAfter, }?: {
     chunk: number;
     pause?: number;
     stopAfter?: number;
-}): Promise<void>;
+}) => Promise<void>;
+export {};
 //# sourceMappingURL=batchQuery.d.ts.map

package/types/helpers/batchQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batchQuery.d.ts","sourceRoot":"","sources":["../../src/helpers/batchQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAEhD,wBAAsB,UAAU,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,EAClF,CAAC,EAAE,CAAC,EACJ,MAAM,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,EACxC,EACE,KAAK,EACL,KAAS,EACT,SAAmB,GACpB,GAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;CACH,iBA8BlB"}
+{"version":3,"file":"batchQuery.d.ts","sourceRoot":"","sources":["../../src/helpers/batchQuery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAEhD,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CAC7C,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,eAAe,IACrB,CAAC,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,EAClF,YAAY,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,EACzB,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,EACxC,+BAIG;IACD,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;CACH,mBAiCpB"}