@reventlessdev/reventless-postgres 3.0.0-alpha.124 → 3.0.0-alpha.125

package/src/PgChangeFeed.res

@@ -49,7 +49,9 @@ let readBatch = async (
     ~after=after->Option.flatMap(Dcb.decodeCursor),
     ~applyFence=true,
   )
-  let sql = `SELECT ${Dcb.selectColumns} FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(limit)}`
+  let sql = `SELECT ${Dcb.selectColumns} FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(
+      limit,
+    )}`
   let rows = await pool->PgDriver.query(sql, b.params)
   let events = rows->Array.map(Dcb.rowToEvent)
   let cursor = switch events->Array.get(events->Array.length - 1) {
@@ -63,10 +65,9 @@ let readBatch = async (
 
 // The persisted checkpoint for `subscriber`, encoded as a cursor, or None if the
 // subscriber has never committed (→ replay from the beginning).
-let loadCheckpoint = async (
-  pool: PgDriver.pool,
-  ~subscriber: string,
-): option<DcbTag.sequencePosition> =>
+let loadCheckpoint = async (pool: PgDriver.pool, ~subscriber: string): option<
+  DcbTag.sequencePosition,
+> =>
   switch await pool->PgDriver.queryOne(
     "SELECT lpad(last_tx::text, 20, '0') || ':' || lpad(last_position::text, 20, '0') AS cursor
        FROM dcb_subscription WHERE subscriber = $1 AND last_position > 0",
@@ -105,8 +106,9 @@ let saveCheckpoint = async (
 // dedicated client (caller owns it — release via PgDriver.unlisten). Pair with a
 // low-frequency fallback tick in the consumer loop so a missed NOTIFY only adds
 // latency, never a permanent stall.
-let listen = (pool: PgDriver.pool, ~logName: string, ~onWake: unit => unit): promise<PgDriver.client> =>
-  pool->PgDriver.listen(~channel="dcb_" ++ logName, ~onNotify=_ => onWake())
+let listen = (pool: PgDriver.pool, ~logName: string, ~onWake: unit => unit): promise<
+  PgDriver.client,
+> => pool->PgDriver.listen(~channel="dcb_" ++ logName, ~onNotify=_ => onWake())
 
 let unlisten = (client: PgDriver.client, ~logName: string): promise<unit> =>
   client->PgDriver.unlisten(~channel="dcb_" ++ logName)
@@ -129,7 +131,12 @@ let drain = async (
   let cursor = ref(await loadCheckpoint(pool, ~subscriber))
   let continue = ref(true)
   while continue.contents {
-    let {events, cursor: newCursor} = await readBatch(pool, ~logName, ~after=?cursor.contents, ~limit)
+    let {events, cursor: newCursor} = await readBatch(
+      pool,
+      ~logName,
+      ~after=?cursor.contents,
+      ~limit,
+    )
     if events->Array.length == 0 {
       continue := false
     } else {

package/src/PgDriver.res

@@ -47,8 +47,7 @@ type queryResult = {rows: array<dict<JSON.t>>}
 
 let query = async (pool, sql, params) => (await _query(pool, sql, params)).rows
 
-let queryOne = async (pool, sql, params) =>
-  (await _query(pool, sql, params)).rows->Array.get(0)
+let queryOne = async (pool, sql, params) => (await _query(pool, sql, params)).rows->Array.get(0)
 
 let exec = async (pool, sql) => {
   let _ = await _queryText(pool, sql)

package/src/QueryDbStorage_Postgres.res

@@ -26,7 +26,11 @@ let makeStorage = (
 }
 
 // Standalone/deploy storage: inject the pool via a provider module.
-module Make = (P: {let pool: PgDriver.pool}) => {
+module Make = (
+  P: {
+    let pool: PgDriver.pool
+  },
+) => {
   type api = unit
   type role = unit
 
@@ -37,6 +41,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~ttl as _=?,
     ~api as _,
     ~apiRole as _,
-    ~owner as _, ~opts as _,
+    ~owner as _,
+    ~opts as _,
   ) => makeStorage(~pool=P.pool, ~name, ~indexes, ~subIdField)
 }

package/src/QueryDbStorage_Postgres_Ops.res

@@ -14,14 +14,12 @@ open Reventless.ReadModel
 let tableName = (name: string): string => "qdb_" ++ name->String.replaceAll("-", "_")
 
 // Collapse anything outside [A-Za-z0-9_] to _ — predictable, injection-safe idents.
-let sanitizeIdent = (s: string): string =>
-  s->String.replaceRegExp(%re("/[^A-Za-z0-9_]/g"), "_")
+let sanitizeIdent = (s: string): string => s->String.replaceRegExp(/[^A-Za-z0-9_]/g, "_")
 
 let notExpiredClause = "(expires_at IS NULL OR expires_at > extract(epoch from now()))"
 
 // JSONB text extraction for a single top-level field.
-let jsonField = (field: string): string =>
-  `(item->>'${field->String.replaceAll("'", "''")}')`
+let jsonField = (field: string): string => `(item->>'${field->String.replaceAll("'", "''")}')`
 
 let compositeExpr = (fields: array<string>, sep: string): string => {
   let escapedSep = sep->String.replaceAll("'", "''")
@@ -120,10 +118,13 @@ let makeOperations = (
 
   let rowsFor = async (id: string): array<JSON.t> => {
     await ready()
-    (await pool->PgDriver.query(
-      `SELECT item FROM ${table} WHERE partition_key = $1 AND ${notExpiredClause} ORDER BY sub_key ASC`,
-      [JSON.Encode.string(id)],
-    ))->Array.map(decodeItem)
+
+    (
+      await pool->PgDriver.query(
+        `SELECT item FROM ${table} WHERE partition_key = $1 AND ${notExpiredClause} ORDER BY sub_key ASC`,
+        [JSON.Encode.string(id)],
+      )
+    )->Array.map(decodeItem)
   }
 
   let saveOne = async (id: string, state: JSON.t, ttl: option<int>) => {
@@ -149,11 +150,10 @@ let makeOperations = (
 
   let load: QueryDb.load<string, JSON.t> = async id => Ok(await rowsFor(id))
 
-  let loadStream: QueryDb.loadStream<string, JSON.t> =
-    id =>
-      Effect.promise(() => rowsFor(id))
-      ->Stream.fromEffect
-      ->Stream.flatMap(arr => Stream.fromIterable(arr))
+  let loadStream: QueryDb.loadStream<string, JSON.t> = id =>
+    Effect.promise(() => rowsFor(id))
+    ->Stream.fromEffect
+    ->Stream.flatMap(arr => Stream.fromIterable(arr))
 
   let save: QueryDb.save<string, JSON.t> = async (id, state, _saveMode, ttl) => {
     await saveOne(id, state, ttl)

package/src/QueryEnginePostgres.res

@@ -28,7 +28,12 @@ let param = (b: paramBuilder, v: JSON.t): string => {
 let col = (field: string): string => `(item->>'${field->String.replaceAll("'", "''")}')`
 
 // One Filter.config → SQL predicate, appending any bound params.
-let filterSql = (b: paramBuilder, field: string, cmp: QueryEngine.Filter.comparator, v: QueryEngine.value): string => {
+let filterSql = (
+  b: paramBuilder,
+  field: string,
+  cmp: QueryEngine.Filter.comparator,
+  v: QueryEngine.value,
+): string => {
   let c = col(field)
   let bind = () => b->param(JSON.Encode.string(valueToText(v)))
   let cmpSql = op =>
@@ -48,10 +53,16 @@ let filterSql = (b: paramBuilder, field: string, cmp: QueryEngine.Filter.compara
   }
 }
 
-let subIdSql = (b: paramBuilder, field: string, cmp: QueryEngine.SubId.comparator, v: QueryEngine.value): string => {
+let subIdSql = (
+  b: paramBuilder,
+  field: string,
+  cmp: QueryEngine.SubId.comparator,
+  v: QueryEngine.value,
+): string => {
   let c = col(field)
   let bind = () => b->param(JSON.Encode.string(valueToText(v)))
-  let cmpSql = op => isNumeric(v) ? `${c}::numeric ${op} ${bind()}::numeric` : `${c} ${op} ${bind()}`
+  let cmpSql = op =>
+    isNumeric(v) ? `${c}::numeric ${op} ${bind()}::numeric` : `${c} ${op} ${bind()}`
   switch cmp {
   | QueryEngine.SubId.Equal => cmpSql("=")
   | Unequal => cmpSql("<>")
@@ -80,7 +91,11 @@ let decodeRow = (~withId, row: dict<JSON.t>): JSON.t => {
   }
 }
 
-module Make = (P: {let pool: PgDriver.pool}) => {
+module Make = (
+  P: {
+    let pool: PgDriver.pool
+  },
+) => {
   let query = async (
     ~readModelName,
     ~key=?,
@@ -109,7 +124,9 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     | Some(n) => ` LIMIT ${b->param(JSON.Encode.int(n))}`
     | None => ""
     }
-    let sql = `SELECT partition_key, item FROM ${table} WHERE ${where->Array.join(" AND ")} ORDER BY sub_key ${dir}${limitClause}`
+    let sql = `SELECT partition_key, item FROM ${table} WHERE ${where->Array.join(
+        " AND ",
+      )} ORDER BY sub_key ${dir}${limitClause}`
     (await P.pool->PgDriver.query(sql, b.params))->Array.map(decodeRow(~withId=false, ...))
   }
 
@@ -117,8 +134,12 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let b = {params: []}
     let where = [notExpired]
-    filterConfigs->Array.forEach(((field, cmp, v)) => where->Array.push(filterSql(b, field, cmp, v)))
-    let sql = `SELECT partition_key, item FROM ${table} WHERE ${where->Array.join(" AND ")} ORDER BY partition_key, sub_key LIMIT ${b->param(JSON.Encode.int(limit))}`
+    filterConfigs->Array.forEach(((field, cmp, v)) =>
+      where->Array.push(filterSql(b, field, cmp, v))
+    )
+    let sql = `SELECT partition_key, item FROM ${table} WHERE ${where->Array.join(
+        " AND ",
+      )} ORDER BY partition_key, sub_key LIMIT ${b->param(JSON.Encode.int(limit))}`
     (await P.pool->PgDriver.query(sql, b.params))->Array.map(decodeRow(~withId=true, ...))
   }
 
@@ -265,15 +286,17 @@ module Make = (P: {let pool: PgDriver.pool}) => {
         }
       capability.filterFields->Array.forEach(f => {
         switch filterDict->Dict.get(f.name ++ "Eq") {
-        | Some(v) when v != JSON.Encode.null =>
+        | Some(v) if v != JSON.Encode.null =>
           whereParts->Array.push(
-            `${jsonTextC(f.name)} = ${b->param(JSON.Encode.string(valString(v)->Option.getOr("")))}`,
+            `${jsonTextC(f.name)} = ${b->param(
+                JSON.Encode.string(valString(v)->Option.getOr("")),
+              )}`,
           )
         | _ => ()
         }
         if f.range {
           switch filterDict->Dict.get(f.name ++ "From") {
-          | Some(v) when v != JSON.Encode.null =>
+          | Some(v) if v != JSON.Encode.null =>
             whereParts->Array.push(
               `${jsonTextC(f.name)} >= ${b->param(
                   JSON.Encode.string(valString(v)->Option.getOr("")),
@@ -282,7 +305,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
           | _ => ()
           }
           switch filterDict->Dict.get(f.name ++ "To") {
-          | Some(v) when v != JSON.Encode.null =>
+          | Some(v) if v != JSON.Encode.null =>
             whereParts->Array.push(
               `${jsonTextC(f.name)} <= ${b->param(
                   JSON.Encode.string(valString(v)->Option.getOr("")),
@@ -304,7 +327,8 @@ module Make = (P: {let pool: PgDriver.pool}) => {
       | Some(f) => jsonTextC(f)
       | None => idExprC
       }
-      switch argsDict->Dict.get("after")->Option.flatMap(JSON.Decode.string) {
+      let afterCursor = argsDict->Dict.get("after")->Option.flatMap(JSON.Decode.string)
+      switch afterCursor {
       | Some(c) =>
         whereParts->Array.push(
           `${cursorExpr} ${isDesc ? "<" : ">"} ${b->param(
@@ -326,7 +350,8 @@ module Make = (P: {let pool: PgDriver.pool}) => {
       let sql = `SELECT partition_key, item FROM ${table} WHERE ${whereParts->Array.join(
           " AND ",
         )} ORDER BY ${orderClause} LIMIT ${b->param(JSON.Encode.int(pageSize + 1))}`
-      let rows = (await P.pool->PgDriver.query(sql, b.params))->Array.map(decodeRow(~withId=true, ...))
+      let rows =
+        (await P.pool->PgDriver.query(sql, b.params))->Array.map(decodeRow(~withId=true, ...))
       let hasMore = rows->Array.length > pageSize
       let pageItems = rows->Array.slice(~start=0, ~end=pageSize)
       let cursorField = orderByField->Option.getOr("id")
@@ -338,7 +363,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
         ReventlessCore.QueryDbListQuery.buildConnection(
           ~pageItems,
           ~hasNextPage=hasMore,
-          ~hasPreviousPage=false,
+          // Same rule the spec uses, because the parity suite compares them: a
+          // forward page reached by a cursor has one behind it. Hardcoding false
+          // made Prev disappear on exactly the pages that have a previous one.
+          ~hasPreviousPage=afterCursor->Option.isSome,
           ~cursorValueOf,
         ),
       )
@@ -365,8 +393,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
       argsDict->Dict.get("filter")->Option.flatMap(JSON.Decode.object)->Option.getOr(Dict.make())
     let fstr = k => filterDict->Dict.get(k)->Option.flatMap(JSON.Decode.string)
     let orderDesc = fstr("order")->Option.mapOr(false, o => o == "DESC")
-    let last = argsDict->Dict.get("last")->Option.flatMap(JSON.Decode.float)->Option.map(Float.toInt)
-    let first = argsDict->Dict.get("first")->Option.flatMap(JSON.Decode.float)->Option.map(Float.toInt)
+    let last =
+      argsDict->Dict.get("last")->Option.flatMap(JSON.Decode.float)->Option.map(Float.toInt)
+    let first =
+      argsDict->Dict.get("first")->Option.flatMap(JSON.Decode.float)->Option.map(Float.toInt)
     let after = argsDict->Dict.get("after")->Option.flatMap(JSON.Decode.string)
     let before = argsDict->Dict.get("before")->Option.flatMap(JSON.Decode.string)
     let isBackward = last->Option.isSome
@@ -387,25 +417,36 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     fstr("prefix")->Option.forEach(p =>
       where->Array.push(`starts_with(sub_key, ${b->param(JSON.Encode.string(p))})`)
     )
-    fstr("from")->Option.forEach(f => where->Array.push(`${sk} >= ${b->param(JSON.Encode.string(f))}`))
-    fstr("to")->Option.forEach(t => where->Array.push(`${sk} <= ${b->param(JSON.Encode.string(t))}`))
+    fstr("from")->Option.forEach(f =>
+      where->Array.push(`${sk} >= ${b->param(JSON.Encode.string(f))}`)
+    )
+    fstr("to")->Option.forEach(t =>
+      where->Array.push(`${sk} <= ${b->param(JSON.Encode.string(t))}`)
+    )
     fstr("eq")->Option.forEach(e => where->Array.push(`${sk} = ${b->param(JSON.Encode.string(e))}`))
     // Keyset: forward excludes ≤ after; backward excludes ≥ before.
     switch (isBackward, after, before) {
     | (false, Some(c), _) =>
-      where->Array.push(`${sk} > ${b->param(JSON.Encode.string(ReventlessCore.QueryDbListQuery.decodeCursor(c)))}`)
+      where->Array.push(
+        `${sk} > ${b->param(JSON.Encode.string(ReventlessCore.QueryDbListQuery.decodeCursor(c)))}`,
+      )
     | (true, _, Some(c)) =>
-      where->Array.push(`${sk} < ${b->param(JSON.Encode.string(ReventlessCore.QueryDbListQuery.decodeCursor(c)))}`)
+      where->Array.push(
+        `${sk} < ${b->param(JSON.Encode.string(ReventlessCore.QueryDbListQuery.decodeCursor(c)))}`,
+      )
     | _ => ()
     }
     // Page-fetch direction is the LOGICAL order forward, and its OPPOSITE
     // backward (take the N nearest `before`, then reverse to logical) — mirrors
     // the resolver's `reverse = isBackward ? !orderDesc : orderDesc`.
     let fetchDesc = isBackward ? !orderDesc : orderDesc
-    let pageSize = (isBackward ? last : first)->Option.getOr(ReventlessCore.QueryDbListQuery.defaultListPageSize)
+    let pageSize =
+      (isBackward ? last : first)->Option.getOr(ReventlessCore.QueryDbListQuery.defaultListPageSize)
     let sql = `SELECT partition_key, sub_key, item FROM ${table} WHERE ${where->Array.join(
         " AND ",
-      )} ORDER BY ${sk} ${fetchDesc ? "DESC" : "ASC"} LIMIT ${b->param(JSON.Encode.int(pageSize + 1))}`
+      )} ORDER BY ${sk} ${fetchDesc ? "DESC" : "ASC"} LIMIT ${b->param(
+        JSON.Encode.int(pageSize + 1),
+      )}`
     let rows = await P.pool->PgDriver.query(sql, b.params)
     let hasMore = rows->Array.length > pageSize
     let taken = rows->Array.slice(~start=0, ~end=pageSize)
@@ -419,17 +460,18 @@ module Make = (P: {let pool: PgDriver.pool}) => {
       | _ => ""
       }
     let cursors = logical->Array.map(subKeyOf)
-    let edges =
-      pageItems->Array.mapWithIndex((item, i) =>
-        Obj.magic({
-          "node": item,
-          "cursor": ReventlessCore.QueryDbListQuery.encodeCursor(cursors->Array.getUnsafe(i)),
-        })
-      )
+    let edges = pageItems->Array.mapWithIndex((item, i) =>
+      Obj.magic({
+        "node": item,
+        "cursor": ReventlessCore.QueryDbListQuery.encodeCursor(cursors->Array.getUnsafe(i)),
+      })
+    )
     let startCursor =
       cursors->Array.get(0)->Option.map(ReventlessCore.QueryDbListQuery.encodeCursor)
     let endCursor =
-      cursors->Array.get(cursors->Array.length - 1)->Option.map(ReventlessCore.QueryDbListQuery.encodeCursor)
+      cursors
+      ->Array.get(cursors->Array.length - 1)
+      ->Option.map(ReventlessCore.QueryDbListQuery.encodeCursor)
     Obj.magic({
       "edges": edges,
       "pageInfo": {

package/src/QueryEnginePostgres.res.mjs

@@ -235,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"
@@ -251,7 +251,7 @@ 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, ownerScope, retiredScope) => {
     let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);