@reventlessdev/reventless-postgres 3.0.0-alpha.15 → 3.0.0-alpha.150

package/lib/bs/src/QueryEnginePostgres.res.mjs

@@ -2,11 +2,10 @@
 
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
-import * as Pulumi from "@pulumi/pulumi";
 import * as Stdlib_Nullable from "@rescript/runtime/lib/es6/Stdlib_Nullable.js";
 import * as PgDriver$ReventlessPostgres from "./PgDriver.res.mjs";
 import * as QueryDbListQuery$ReventlessCore from "@reventlessdev/reventless-core/src/components/Api/QueryDbListQuery.res.mjs";
-import * as QueryDbStorage_Postgres$ReventlessPostgres from "./QueryDbStorage_Postgres.res.mjs";
+import * as QueryDbStorage_Postgres_Ops$ReventlessPostgres from "./QueryDbStorage_Postgres_Ops.res.mjs";
 
 function valueToText(v) {
   switch (v.TAG) {
@@ -105,25 +104,25 @@ function subIdSql(b, field, cmp, v) {
 }
 
 function decodeRow(withId, row) {
-  let item = QueryDbStorage_Postgres$ReventlessPostgres.decodeItem(row);
+  let item = QueryDbStorage_Postgres_Ops$ReventlessPostgres.decodeItem(row);
   if (!withId) {
     return item;
   }
   let match = row["partition_key"];
   let pk = typeof match === "string" ? match : "";
-  return QueryDbStorage_Postgres$ReventlessPostgres.withId(item, pk);
+  return QueryDbStorage_Postgres_Ops$ReventlessPostgres.withId(item, pk);
 }
 
 function Make(P) {
   let query = async (readModelName, key, id, subIdConfig, filterConfigs, ascending, limit) => {
-    let table = QueryDbStorage_Postgres$ReventlessPostgres.tableName(readModelName);
+    let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let keyStr = key !== undefined ? key : valueToText(id);
     let b = {
       params: []
     };
     let where = [
       `partition_key = ` + param(b, keyStr),
-      QueryDbStorage_Postgres$ReventlessPostgres.notExpiredClause
+      QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause
     ];
     if (subIdConfig !== undefined) {
       where.push(subIdSql(b, subIdConfig[0], subIdConfig[1], subIdConfig[2]));
@@ -137,11 +136,11 @@ function Make(P) {
     return (await PgDriver$ReventlessPostgres.query(P.pool, sql, b.params)).map(extra => decodeRow(false, extra));
   };
   let scan = async (readModelName, filterConfigs, limit) => {
-    let table = QueryDbStorage_Postgres$ReventlessPostgres.tableName(readModelName);
+    let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let b = {
       params: []
     };
-    let where = [QueryDbStorage_Postgres$ReventlessPostgres.notExpiredClause];
+    let where = [QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause];
     filterConfigs.forEach(param => {
       where.push(filterSql(b, param[0], param[1], param[2]));
     });
@@ -149,29 +148,45 @@ function Make(P) {
     return (await PgDriver$ReventlessPostgres.query(P.pool, sql, b.params)).map(extra => decodeRow(true, extra));
   };
   let indexLookup = async (readModelName, field, value) => {
-    let table = QueryDbStorage_Postgres$ReventlessPostgres.tableName(readModelName);
+    let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let b = {
       params: []
     };
-    let sql = `SELECT partition_key, item FROM ` + table + ` WHERE ` + col(field) + ` = ` + param(b, value) + ` AND ` + QueryDbStorage_Postgres$ReventlessPostgres.notExpiredClause;
+    let sql = `SELECT partition_key, item FROM ` + table + ` WHERE ` + col(field) + ` = ` + param(b, value) + ` AND ` + QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause;
     return (await PgDriver$ReventlessPostgres.query(P.pool, sql, b.params)).map(extra => decodeRow(true, extra));
   };
   let byIds = async (readModelName, ids) => {
     if (ids.length === 0) {
       return [];
     }
-    let table = QueryDbStorage_Postgres$ReventlessPostgres.tableName(readModelName);
+    let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let b = {
       params: []
     };
     let idsJson = ids.map(prim => prim);
-    let sql = `SELECT partition_key, item FROM ` + table + ` WHERE partition_key = ANY(` + param(b, idsJson) + `::text[]) AND ` + QueryDbStorage_Postgres$ReventlessPostgres.notExpiredClause;
+    let sql = `SELECT partition_key, item FROM ` + table + ` WHERE partition_key = ANY(` + param(b, idsJson) + `::text[]) AND ` + QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause;
     return (await PgDriver$ReventlessPostgres.query(P.pool, sql, b.params)).map(extra => decodeRow(true, extra));
   };
   let idExprC = `COALESCE(item->>'id', partition_key) COLLATE "C"`;
   let jsonTextC = field => col(field) + ` COLLATE "C"`;
-  let listPage = async (readModelName, argsDict, capability, param$1) => {
-    let table = QueryDbStorage_Postgres$ReventlessPostgres.tableName(readModelName);
+  let notRetiredC = scope => {
+    let key = scope.field.replaceAll("'", "''");
+    let states = scope.values;
+    if (states !== undefined) {
+      if (states.length !== 0) {
+        return "(" + states.map(state => {
+          let lit = `'"` + state.replaceAll("'", "''") + `"'::jsonb`;
+          return `(item->'` + key + `') IS DISTINCT FROM ` + lit;
+        }).join(" AND ") + ")";
+      } else {
+        return "TRUE";
+      }
+    } else {
+      return `(item->'` + key + `') IS DISTINCT FROM ` + "'true'::jsonb";
+    }
+  };
+  let listPage = async (readModelName, argsDict, capability, param$1, ownerScope, retiredScope) => {
+    let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let filterDict = Stdlib_Option.getOr(Stdlib_Option.flatMap(argsDict["filter"], Stdlib_JSON.Decode.object), {});
     let strNonEmpty = k => Stdlib_Option.mapOr(Stdlib_Option.flatMap(filterDict[k], Stdlib_JSON.Decode.string), false, s => s.length > 0);
     let hasIds = Stdlib_Option.mapOr(Stdlib_Option.flatMap(filterDict["ids"], Stdlib_JSON.Decode.array), false, a => a.length !== 0);
@@ -183,7 +198,13 @@ function Make(P) {
     let b = {
       params: []
     };
-    let whereParts = [QueryDbStorage_Postgres$ReventlessPostgres.notExpiredClause];
+    let whereParts = [QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause];
+    if (ownerScope !== undefined) {
+      whereParts.push(jsonTextC(ownerScope[0]) + ` = ` + param(b, ownerScope[1]));
+    }
+    if (retiredScope !== undefined) {
+      whereParts.push(notRetiredC(retiredScope));
+    }
     let valString = v => {
       let s = Stdlib_JSON.Decode.string(v);
       if (s !== undefined) {
@@ -214,11 +235,11 @@ function Make(P) {
     let orderByField = Stdlib_Option.flatMap(Stdlib_Option.flatMap(orderByDict, ob => ob["field"]), Stdlib_JSON.Decode.string);
     let isDesc = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_Option.flatMap(orderByDict, ob => ob["direction"]), Stdlib_JSON.Decode.string), "ASC") === "DESC";
     let cursorExpr = orderByField !== undefined ? jsonTextC(orderByField) : idExprC;
-    let c = Stdlib_Option.flatMap(argsDict["after"], Stdlib_JSON.Decode.string);
-    if (c !== undefined) {
+    let afterCursor = Stdlib_Option.flatMap(argsDict["after"], Stdlib_JSON.Decode.string);
+    if (afterCursor !== undefined) {
       whereParts.push(cursorExpr + ` ` + (
         isDesc ? "<" : ">"
-      ) + ` ` + param(b, QueryDbListQuery$ReventlessCore.decodeCursor(c)));
+      ) + ` ` + param(b, QueryDbListQuery$ReventlessCore.decodeCursor(afterCursor)));
     }
     let orderClause = orderByField !== undefined ? jsonTextC(orderByField) + ` ` + (
         isDesc ? "DESC" : "ASC"
@@ -230,10 +251,10 @@ function Make(P) {
     let pageItems = rows.slice(0, pageSize);
     let cursorField = Stdlib_Option.getOr(orderByField, "id");
     let cursorValueOf = item => Stdlib_Option.getOr(QueryDbListQuery$ReventlessCore.getFieldString(item, cursorField), QueryDbListQuery$ReventlessCore.getId(item));
-    return QueryDbListQuery$ReventlessCore.buildConnection(pageItems, hasMore, false, cursorValueOf);
+    return QueryDbListQuery$ReventlessCore.buildConnection(pageItems, hasMore, Stdlib_Option.isSome(afterCursor), cursorValueOf);
   };
-  let itemsPage = async (readModelName, param$1, id, argsDict) => {
-    let table = QueryDbStorage_Postgres$ReventlessPostgres.tableName(readModelName);
+  let itemsPage = async (readModelName, param$1, id, argsDict, ownerScope, retiredScope) => {
+    let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let filterDict = Stdlib_Option.getOr(Stdlib_Option.flatMap(argsDict["filter"], Stdlib_JSON.Decode.object), {});
     let fstr = k => Stdlib_Option.flatMap(filterDict[k], Stdlib_JSON.Decode.string);
     let orderDesc = Stdlib_Option.mapOr(fstr("order"), false, o => o === "DESC");
@@ -248,8 +269,14 @@ function Make(P) {
     };
     let where = [
       `partition_key = ` + param(b, id),
-      QueryDbStorage_Postgres$ReventlessPostgres.notExpiredClause
+      QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause
     ];
+    if (ownerScope !== undefined) {
+      where.push(jsonTextC(ownerScope[0]) + ` = ` + param(b, ownerScope[1]));
+    }
+    if (retiredScope !== undefined) {
+      where.push(notRetiredC(retiredScope));
+    }
     Stdlib_Option.forEach(fstr("prefix"), p => {
       where.push(`starts_with(sub_key, ` + param(b, p) + `)`);
     });
@@ -304,10 +331,6 @@ function Make(P) {
       }
     };
   };
-  let make = _allQueryDbs => Pulumi.output({
-    scan: scan,
-    query: query
-  });
   return {
     query: query,
     scan: scan,
@@ -315,13 +338,13 @@ function Make(P) {
     byIds: byIds,
     idExprC: idExprC,
     jsonTextC: jsonTextC,
+    notRetiredC: notRetiredC,
     listPage: listPage,
-    itemsPage: itemsPage,
-    make: make
+    itemsPage: itemsPage
   };
 }
 
-let notExpired = QueryDbStorage_Postgres$ReventlessPostgres.notExpiredClause;
+let notExpired = QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause;
 
 export {
   valueToText,
@@ -334,4 +357,4 @@ export {
   decodeRow,
   Make,
 }
-/* @pulumi/pulumi Not a pure module */
+/* PgDriver-ReventlessPostgres Not a pure module */

package/lib/bs/tests/PostgresIntegrationTest.res

@@ -100,7 +100,11 @@ switch processEnv->Dict.get("PG_URL") {
 
     testPromise("append + read round-trips events with tags", async () => {
       let (_n, ops, _s) = makeLog("dcb-rt")
-      let e1 = stored("ItemAdded", [{key: "itemId", value: "x1"}], jsonObj([("n", JSON.Encode.string("w"))]))
+      let e1 = stored(
+        "ItemAdded",
+        [{key: "itemId", value: "x1"}],
+        jsonObj([("n", JSON.Encode.string("w"))]),
+      )
       let r = await ops.append([e1])
       switch r {
       | Ok(_) => expect(true)->toBe(true)
@@ -116,7 +120,12 @@ switch processEnv->Dict.get("PG_URL") {
 
     testPromise("conditional append conflicts when the boundary already has an event", async () => {
       let (_n, ops, _s) = makeLog("dcb-cond")
-      let mk = who => stored("Reserved", [{key: "seatId", value: "s1"}], jsonObj([("who", JSON.Encode.string(who))]))
+      let mk = who =>
+        stored(
+          "Reserved",
+          [{key: "seatId", value: "s1"}],
+          jsonObj([("who", JSON.Encode.string(who))]),
+        )
       let r1 = await ops.append([mk("a")])
       switch r1 {
       | Ok(_) => expect(true)->toBe(true)
@@ -134,37 +143,46 @@ switch processEnv->Dict.get("PG_URL") {
     })
 
     let writeSkew = (strategy, logName) =>
-      testPromise(`write-skew: exactly one of two concurrent appends wins (${logName})`, async () => {
-        let (_n, ops, _s) = DcbEventLogStorage_Postgres.makeStorage(
-          ~pool,
-          ~name=logName,
-          ~indexes=[],
-          ~partitionTag=DcbTag.Simple({key: "k"}),
-          ~opts,
-          ~lockStrategy=strategy,
-        )
-        let cond: DcbTag.appendCondition = {
-          query: [{eventTypes: ["Reserved"], tags: [{key: "seatId", value: "hot"}]}],
-        }
-        let mk = who => stored("Reserved", [{key: "seatId", value: "hot"}], jsonObj([("who", JSON.Encode.string(who))]))
-        // Dispatch BOTH before awaiting either — genuinely concurrent on the pool.
-        let p1 = ops.append([mk("a")], ~condition=cond)
-        let p2 = ops.append([mk("b")], ~condition=cond)
-        let r1 = await p1
-        let r2 = await p2
-        let isOk = r => switch r {
-        | Ok(_) => true
-        | _ => false
-        }
-        let isConflict = r => r == Error(ReventlessInfra.DcbEventLog.Conflict)
-        let oks = [r1, r2]->Array.filter(isOk)->Array.length
-        let conflicts = [r1, r2]->Array.filter(isConflict)->Array.length
-        expect(oks)->toBe(1)
-        expect(conflicts)->toBe(1)
-        // And only one event actually landed on the boundary.
-        let read = await ops.read(~query=[{tags: [{key: "seatId", value: "hot"}]}])
-        expect(read.events->Array.length)->toBe(1)
-      })
+      testPromise(
+        `write-skew: exactly one of two concurrent appends wins (${logName})`,
+        async () => {
+          let (_n, ops, _s) = DcbEventLogStorage_Postgres.makeStorage(
+            ~pool,
+            ~name=logName,
+            ~indexes=[],
+            ~partitionTag=DcbTag.Simple({key: "k"}),
+            ~opts,
+            ~lockStrategy=strategy,
+          )
+          let cond: DcbTag.appendCondition = {
+            query: [{eventTypes: ["Reserved"], tags: [{key: "seatId", value: "hot"}]}],
+          }
+          let mk = who =>
+            stored(
+              "Reserved",
+              [{key: "seatId", value: "hot"}],
+              jsonObj([("who", JSON.Encode.string(who))]),
+            )
+          // Dispatch BOTH before awaiting either — genuinely concurrent on the pool.
+          let p1 = ops.append([mk("a")], ~condition=cond)
+          let p2 = ops.append([mk("b")], ~condition=cond)
+          let r1 = await p1
+          let r2 = await p2
+          let isOk = r =>
+            switch r {
+            | Ok(_) => true
+            | _ => false
+            }
+          let isConflict = r => r == Error(ReventlessInfra.DcbEventLog.Conflict)
+          let oks = [r1, r2]->Array.filter(isOk)->Array.length
+          let conflicts = [r1, r2]->Array.filter(isConflict)->Array.length
+          expect(oks)->toBe(1)
+          expect(conflicts)->toBe(1)
+          // And only one event actually landed on the boundary.
+          let read = await ops.read(~query=[{tags: [{key: "seatId", value: "hot"}]}])
+          expect(read.events->Array.length)->toBe(1)
+        },
+      )
 
     writeSkew(#AdvisoryLocks, "dcb-skew-advisory")
     writeSkew(#RowLocks, "dcb-skew-rows")
@@ -176,17 +194,31 @@ switch processEnv->Dict.get("PG_URL") {
       }
       let n = 12
       // Dispatch all N before awaiting any — genuinely concurrent on the pool.
-      let promises = Array.make(~length=n, 0)->Array.mapWithIndex((_, i) =>
-        ops.append(
-          [stored("Claimed", [{key: "prizeId", value: "p1"}], jsonObj([("who", JSON.Encode.int(i))]))],
-          ~condition=cond,
+      let promises =
+        Array.make(~length=n, 0)->Array.mapWithIndex(
+          (_, i) =>
+            ops.append(
+              [
+                stored(
+                  "Claimed",
+                  [{key: "prizeId", value: "p1"}],
+                  jsonObj([("who", JSON.Encode.int(i))]),
+                ),
+              ],
+              ~condition=cond,
+            ),
         )
-      )
       let results = await Promise.all(promises)
-      let oks = results->Array.filter(r => switch r {
-      | Ok(_) => true
-      | _ => false
-      })->Array.length
+      let oks =
+        results
+        ->Array.filter(
+          r =>
+            switch r {
+            | Ok(_) => true
+            | _ => false
+            },
+        )
+        ->Array.length
       expect(oks)->toBe(1)
       // No lost updates: exactly one Claimed landed on the boundary.
       let read = await ops.read(~query=[{tags: [{key: "prizeId", value: "p1"}]}])
@@ -195,7 +227,8 @@ switch processEnv->Dict.get("PG_URL") {
 
     testPromise("cursors are monotonic and usable as `after`", async () => {
       let (_n, ops, _s) = makeLog("dcb-cursor")
-      let mk = i => stored("Tick", [{key: "streamId", value: "c1"}], jsonObj([("i", JSON.Encode.int(i))]))
+      let mk = i =>
+        stored("Tick", [{key: "streamId", value: "c1"}], jsonObj([("i", JSON.Encode.int(i))]))
       let _ = await ops.append([mk(0)])
       let mid = switch await ops.append([mk(1)]) {
       | Ok(pos) => pos
@@ -222,83 +255,103 @@ switch processEnv->Dict.get("PG_URL") {
       let _ = await ops.append([mk(0), mk(1), mk(2)])
 
       let collected = ref(0)
-      let processed = await PgChangeFeed.drain(pool, ~logName="feed-log", ~subscriber="sub-1", ~handle=async evs => {
-        collected := collected.contents + evs->Array.length
-      })
+      let processed = await PgChangeFeed.drain(
+        pool,
+        ~logName="feed-log",
+        ~subscriber="sub-1",
+        ~handle=async evs => {
+          collected := collected.contents + evs->Array.length
+        },
+      )
       expect(processed)->toBe(3)
       expect(collected.contents)->toBe(3)
 
       // A second drain from the saved checkpoint sees nothing new.
-      let again = await PgChangeFeed.drain(pool, ~logName="feed-log", ~subscriber="sub-1", ~handle=async _ => ())
+      let again = await PgChangeFeed.drain(
+        pool,
+        ~logName="feed-log",
+        ~subscriber="sub-1",
+        ~handle=async _ => (),
+      )
       expect(again)->toBe(0)
     })
   })
 
   describe("classic change feed (event_log, B2.5)", () => {
-    testPromise("drains classic events in commit order, with fields, then checkpoints", async () => {
-      let (_n, ops, _s) = EventLogStorage_Postgres.makeStorage(~pool, ~name="cf-orders", ~opts)
-      let _ = await ops.append(0, "agg-1", [evJson("m0", 1), evJson("m1", 2)])
-      let _ = await ops.append(0, "agg-2", [evJson("m2", 3)])
+    testPromise(
+      "drains classic events in commit order, with fields, then checkpoints",
+      async () => {
+        let (_n, ops, _s) = EventLogStorage_Postgres.makeStorage(~pool, ~name="cf-orders", ~opts)
+        let _ = await ops.append(0, "agg-1", [evJson("m0", 1), evJson("m1", 2)])
+        let _ = await ops.append(0, "agg-2", [evJson("m2", 3)])
 
-      let collected = ref([])
-      let processed = await EventLogChangeFeed.drain(
-        pool,
-        ~logName="cf-orders",
-        ~subscriber="cf-sub",
-        ~handle=async evs => collected := collected.contents->Array.concat(evs),
-      )
-      expect(processed)->toBe(3)
-      expect(collected.contents->Array.length)->toBe(3)
+        let collected = ref([])
+        let processed = await EventLogChangeFeed.drain(
+          pool,
+          ~logName="cf-orders",
+          ~subscriber="cf-sub",
+          ~handle=async evs => collected := collected.contents->Array.concat(evs),
+        )
+        expect(processed)->toBe(3)
+        expect(collected.contents->Array.length)->toBe(3)
 
-      // Fields round-trip from the stored row.
-      let first = collected.contents->Array.getUnsafe(0)
-      expect(first.aggregateId)->toBe("agg-1")
-      expect(first.seqNr)->toBe(0)
-      expect(first.msgId)->toEqual(Some("m0"))
+        // Fields round-trip from the stored row.
+        let first = collected.contents->Array.getUnsafe(0)
+        expect(first.aggregateId)->toBe("agg-1")
+        expect(first.seqNr)->toBe(0)
+        expect(first.msgId)->toEqual(Some("m0"))
 
-      // Cursors are strictly increasing in drain order.
-      let cursors = collected.contents->Array.map(e => e.cursor)
-      let increasing = ref(true)
-      for i in 1 to cursors->Array.length - 1 {
-        if cursors->Array.getUnsafe(i) <= cursors->Array.getUnsafe(i - 1) {
-          increasing := false
+        // Cursors are strictly increasing in drain order.
+        let cursors = collected.contents->Array.map(e => e.cursor)
+        let increasing = ref(true)
+        for i in 1 to cursors->Array.length - 1 {
+          if cursors->Array.getUnsafe(i) <= cursors->Array.getUnsafe(i - 1) {
+            increasing := false
+          }
         }
-      }
-      expect(increasing.contents)->toBe(true)
+        expect(increasing.contents)->toBe(true)
 
-      // Second drain from the saved checkpoint sees nothing new.
-      let again = await EventLogChangeFeed.drain(
-        pool,
-        ~logName="cf-orders",
-        ~subscriber="cf-sub",
-        ~handle=async _ => (),
-      )
-      expect(again)->toBe(0)
-    })
+        // Second drain from the saved checkpoint sees nothing new.
+        let again = await EventLogChangeFeed.drain(
+          pool,
+          ~logName="cf-orders",
+          ~subscriber="cf-sub",
+          ~handle=async _ => (),
+        )
+        expect(again)->toBe(0)
+      },
+    )
 
-    testPromise("concurrent appends across aggregates: every event drained exactly once", async () => {
-      let (_n, ops, _s) = EventLogStorage_Postgres.makeStorage(~pool, ~name="cf-concurrent", ~opts)
-      let n = 20
-      // One event per aggregate, all dispatched before awaiting — genuinely
-      // concurrent on the pool, so global_seq is assigned in interleaved/undefined
-      // commit order. The xmin fence must still drain every event exactly once.
-      let promises =
-        Array.make(~length=n, 0)->Array.mapWithIndex((_, i) =>
-          ops.append(0, "agg-" ++ Int.toString(i), [evJson("m" ++ Int.toString(i), i)])
+    testPromise(
+      "concurrent appends across aggregates: every event drained exactly once",
+      async () => {
+        let (_n, ops, _s) = EventLogStorage_Postgres.makeStorage(
+          ~pool,
+          ~name="cf-concurrent",
+          ~opts,
         )
-      let _ = await Promise.all(promises)
+        let n = 20
+        // One event per aggregate, all dispatched before awaiting — genuinely
+        // concurrent on the pool, so global_seq is assigned in interleaved/undefined
+        // commit order. The xmin fence must still drain every event exactly once.
+        let promises =
+          Array.make(~length=n, 0)->Array.mapWithIndex(
+            (_, i) => ops.append(0, "agg-" ++ Int.toString(i), [evJson("m" ++ Int.toString(i), i)]),
+          )
+        let _ = await Promise.all(promises)
 
-      let collected = ref([])
-      let _ = await EventLogChangeFeed.drain(
-        pool,
-        ~logName="cf-concurrent",
-        ~subscriber="cf-conc-sub",
-        ~handle=async evs => collected := collected.contents->Array.concat(evs),
-      )
-      // No skips: all N events present. No dupes: N distinct cursors.
-      expect(collected.contents->Array.length)->toBe(n)
-      let distinctCursors = collected.contents->Array.map(e => e.cursor)->Set.fromArray
-      expect(distinctCursors->Set.size)->toBe(n)
-    })
+        let collected = ref([])
+        let _ = await EventLogChangeFeed.drain(
+          pool,
+          ~logName="cf-concurrent",
+          ~subscriber="cf-conc-sub",
+          ~handle=async evs => collected := collected.contents->Array.concat(evs),
+        )
+        // No skips: all N events present. No dupes: N distinct cursors.
+        expect(collected.contents->Array.length)->toBe(n)
+        let distinctCursors = collected.contents->Array.map(e => e.cursor)->Set.fromArray
+        expect(distinctCursors->Set.size)->toBe(n)
+      },
+    )
   })
 }

package/lib/bs/tests/QueryEnginePostgresListPageTest.res

@@ -135,7 +135,12 @@ switch processEnv->Dict.get("PG_URL") {
 
   // Assert the push-down declines this shape (resolver falls back to the spec).
   let checkFallback = async args => {
-    let r = await Eng.listPage(~readModelName=name, ~argsDict=argsOf(args), ~capability, ~labelField="name")
+    let r = await Eng.listPage(
+      ~readModelName=name,
+      ~argsDict=argsOf(args),
+      ~capability,
+      ~labelField="name",
+    )
     expect(r->Option.isSome)->toBe(false)
   }
 
@@ -204,7 +209,9 @@ switch processEnv->Dict.get("PG_URL") {
       checkFallback([("filter", filterOf([("searchPrefix", JSON.Encode.string("A"))]))])
     )
     testPromise("ids → fallback", () =>
-      checkFallback([("filter", filterOf([("ids", JSON.Encode.array([JSON.Encode.string("p-1")]))]))])
+      checkFallback([
+        ("filter", filterOf([("ids", JSON.Encode.array([JSON.Encode.string("p-1")]))])),
+      ])
     )
     testPromise("backward (last/before) → fallback", () =>
       checkFallback([("last", JSON.Encode.int(2)), ("before", JSON.Encode.string(cur("p-4")))])
@@ -265,10 +272,20 @@ switch processEnv->Dict.get("PG_URL") {
     ->Array.filterMap(e => e->field("node")->Option.flatMap(n => n->str("seq")))
 
   let pageInfoBool = (conn, key) =>
-    conn->field("pageInfo")->Option.getOr(JSON.Encode.null)->field(key)->Option.flatMap(JSON.Decode.bool)->Option.getOr(false)
+    conn
+    ->field("pageInfo")
+    ->Option.getOr(JSON.Encode.null)
+    ->field(key)
+    ->Option.flatMap(JSON.Decode.bool)
+    ->Option.getOr(false)
 
   let itemsPage = args =>
-    Eng.itemsPage(~readModelName=itemsName, ~subIdField="seq", ~id="order-1", ~argsDict=argsOf(args))
+    Eng.itemsPage(
+      ~readModelName=itemsName,
+      ~subIdField="seq",
+      ~id="order-1",
+      ~argsDict=argsOf(args),
+    )
 
   describe("QueryEnginePostgres itemsPage (sub-id keyset)", () => {
     testPromise("bare → all lines ASC, no next page", async () => {
@@ -282,7 +299,10 @@ switch processEnv->Dict.get("PG_URL") {
       expect(pageInfoBool(r, "hasNextPage"))->toBe(true)
     })
     testPromise("first:2 after b → [c,d]", async () => {
-      let r = await itemsPage([("first", JSON.Encode.int(2)), ("after", JSON.Encode.string(cur("b")))])
+      let r = await itemsPage([
+        ("first", JSON.Encode.int(2)),
+        ("after", JSON.Encode.string(cur("b"))),
+      ])
       expect(r->itemSeqs)->toEqual(["c", "d"])
     })
     testPromise("order DESC → [e..a]", async () => {
@@ -304,7 +324,10 @@ switch processEnv->Dict.get("PG_URL") {
       expect(r->itemSeqs)->toEqual(["c"])
     })
     testPromise("backward last:2 before d → [b,c] (logical ASC)", async () => {
-      let r = await itemsPage([("last", JSON.Encode.int(2)), ("before", JSON.Encode.string(cur("d")))])
+      let r = await itemsPage([
+        ("last", JSON.Encode.int(2)),
+        ("before", JSON.Encode.string(cur("d"))),
+      ])
       expect(r->itemSeqs)->toEqual(["b", "c"])
       expect(pageInfoBool(r, "hasPreviousPage"))->toBe(true)
     })

package/lib/bs/tests/QueryEnginePostgresListPageTest.res.mjs

@@ -122,7 +122,7 @@ function orderBy(f, dir) {
 }
 
 function expectedFor(argsDict) {
-  return norm(QueryDbListQuery$ReventlessCore.run(seededItems, argsDict, capability, "name", param => {}));
+  return norm(QueryDbListQuery$ReventlessCore.run(seededItems, argsDict, capability, "name", param => {}, undefined, undefined));
 }
 
 let url = process.env["PG_URL"];
@@ -148,7 +148,7 @@ if (url !== undefined) {
   });
   let checkPushed = async (label, args) => {
     let argsDict = Object.fromEntries(args);
-    let actual = await Eng.listPage(name, argsDict, capability, "name");
+    let actual = await Eng.listPage(name, argsDict, capability, "name", undefined, undefined);
     if (actual !== undefined) {
       globalThis.expect(norm(actual)).toEqual(expectedFor(argsDict));
     } else {
@@ -156,7 +156,7 @@ if (url !== undefined) {
     }
   };
   let checkFallback = async args => {
-    let r = await Eng.listPage(name, Object.fromEntries(args), capability, "name");
+    let r = await Eng.listPage(name, Object.fromEntries(args), capability, "name", undefined, undefined);
     globalThis.expect(Stdlib_Option.isSome(r)).toBe(false);
   };
   globalThis.describe("QueryDb list push-down parity (Postgres ≡ QueryDbListQuery spec)", () => {
@@ -322,7 +322,7 @@ if (url !== undefined) {
   });
   let itemSeqs = conn => Stdlib_Array.filterMap(Stdlib_Option.getOr(Stdlib_Option.flatMap(field(conn, "edges"), Stdlib_JSON.Decode.array), []), e => Stdlib_Option.flatMap(field(e, "node"), n => str(n, "seq")));
   let pageInfoBool = (conn, key) => Stdlib_Option.getOr(Stdlib_Option.flatMap(field(Stdlib_Option.getOr(field(conn, "pageInfo"), null), key), Stdlib_JSON.Decode.bool), false);
-  let itemsPage = args => Eng.itemsPage(itemsName, "seq", "order-1", Object.fromEntries(args));
+  let itemsPage = args => Eng.itemsPage(itemsName, "seq", "order-1", Object.fromEntries(args), undefined, undefined);
   globalThis.describe("QueryEnginePostgres itemsPage (sub-id keyset)", () => {
     globalThis.test("bare → all lines ASC, no next page", async () => {
       let r = await itemsPage([]);

package/lib/ocaml/.compiler.log

@@ -1,2 +1,2 @@
-#Start(1783671208398)
-#Done(1783671210443)
+#Start(1790854954084)
+#Done(1790854955201)