@reventlessdev/reventless-postgres 3.0.0-alpha.11 → 3.0.0-alpha.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-postgres",
-  "version": "3.0.0-alpha.11",
+  "version": "3.0.0-alpha.110",
   "description": "Postgres storage backend for Reventless (classic + DCB event logs, query DB, change feed). Connection-string only — RDS/Aurora, any managed provider, or a local container.",
   "license": "Apache-2.0",
   "jest": {
@@ -21,22 +21,22 @@
   },
   "dependencies": {
     "pg": "^8.13.1",
-    "sury": "11.0.0-alpha.4",
-    "@reventlessdev/rescript-effect": "0.1.0-alpha.25",
-    "@reventlessdev/reventless-core": "3.0.0-alpha.147",
-    "@reventlessdev/rescript-jest": "1.0.0-alpha.6",
-    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.14",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.91",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.69"
+    "sury": "11.0.0-rc.2",
+    "@reventlessdev/rescript-effect": "0.1.0-alpha.32",
+    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.19",
+    "@reventlessdev/reventless-core": "3.0.0-alpha.246",
+    "@reventlessdev/rescript-jest": "1.0.0-alpha.10",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.149",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.121"
   },
   "devDependencies": {
     "@types/pg": "^8.11.10",
-    "rescript": "^12.3.0",
-    "sury-ppx": "11.0.0-alpha.2",
-    "@reventlessdev/reventless-ppx": "1.0.0-alpha.51"
+    "rescript": "12.3.0",
+    "sury-ppx": "11.0.0-rc.2",
+    "@reventlessdev/reventless-ppx": "1.0.0-alpha.72"
   },
   "peerDependencies": {
-    "rescript": "^12.3.0"
+    "rescript": "12.3.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -44,7 +44,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ReventlessDev/reventless-core.git",
-    "directory": "reventless/reventless-postgres"
+    "directory": "reventless/postgres"
   },
   "scripts": {
     "build": "rescript build",

package/rescript.json

@@ -19,7 +19,8 @@
     },
     {
       "dir": "tests",
-      "subdirs": true
+      "subdirs": true,
+      "type": "dev"
     }
   ],
   "dependencies": [

package/src/DcbEventLogStorage_Postgres.res

@@ -8,7 +8,7 @@
 // existing `DcbEventLogStorage_Postgres.*` reference keeps working) and adds only
 // the deploy-time `DcbEventLog_Adapter` shape, keeping the historic `makeStorage`
 // 3-tuple `(name, ops, adapter)` API unchanged.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 include DcbEventLogStorage_Postgres_Ops

package/src/DcbEventLogStorage_Postgres_Ops.res

@@ -6,7 +6,7 @@
 // would leak into the Lambda import graph and fail resolution on real Lambda. The
 // thin `DcbEventLogStorage_Postgres` wrapper `include`s this and adds the
 // deploy-time `Pulumi.Output`-shaped adapter for local/deploy consumers.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless
@@ -67,7 +67,7 @@ let rowToEvent = (row: dict<JSON.t>): DcbEventLog_Adapter.rawSequencedEvent => {
     | _ => ""
     }
   let meta = switch row->Dict.get("meta") {
-  | Some(metaJson) => metaJson->S.parseJsonOrThrow(Reventless.Message.metaSchema)
+  | Some(metaJson) => metaJson->Reventless.Util_Sury.fromJson(Reventless.Message.metaSchema)
   | None => JsError.throwWithMessage("missing meta column in dcb_event row")
   }
   {
@@ -236,7 +236,7 @@ let makeOps = (
               JSON.Array(ev.tags->Array.map(t => JSON.Encode.string(t.key ++ "=" ++ t.value))),
             ),
             ("data", ev.data),
-            ("meta", ev.meta->S.reverseConvertToJsonOrThrow(Reventless.Message.metaSchema)),
+            ("meta", ev.meta->Reventless.Util_Sury.toJson(Reventless.Message.metaSchema)),
           ]),
         )
       ),

package/src/DcbEventLogStorage_Postgres_Ops.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
 import * as Stream from "@reventlessdev/rescript-effect/src/Stream.res.mjs";
 import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
@@ -11,6 +10,7 @@ import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as Message$Reventless from "@reventlessdev/reventless-spec/src/types/Message.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as Util_Sury$Reventless from "@reventlessdev/reventless-spec/src/util/Util_Sury.res.mjs";
 import * as PgDriver$ReventlessPostgres from "./PgDriver.res.mjs";
 
 function strategyParam(s) {
@@ -68,7 +68,7 @@ function rowToEvent(row) {
     }
   };
   let metaJson = row["meta"];
-  let meta = metaJson !== undefined ? S.parseJsonOrThrow(metaJson, Message$Reventless.metaSchema) : Stdlib_JsError.throwWithMessage("missing meta column in dcb_event row");
+  let meta = metaJson !== undefined ? Util_Sury$Reventless.fromJson(metaJson, Message$Reventless.metaSchema) : Stdlib_JsError.throwWithMessage("missing meta column in dcb_event row");
   return {
     position: str("cursor"),
     eventType: str("event_type"),
@@ -226,7 +226,7 @@ function makeOps(pool, name, param, param$1, param$2, param$3, lockStrategyOpt,
       ],
       [
         "meta",
-        S.reverseConvertToJsonOrThrow(ev.meta, Message$Reventless.metaSchema)
+        Util_Sury$Reventless.toJson(ev.meta, Message$Reventless.metaSchema)
       ]
     ])));
     let conditionParam;
@@ -377,4 +377,4 @@ export {
   countAll,
   makeOps,
 }
-/* S Not a pure module */
+/* Stream Not a pure module */

package/src/EventLogChangeFeed.res

@@ -15,8 +15,11 @@
 // later commit) is never skipped by a checkpointing reader. `global_seq` alone,
 // being an IDENTITY assigned at INSERT, could NOT provide that guarantee.
 
-// Reuse the shared `<a>:<b>` cursor codec from the DCB storage — identical format.
-module Dcb = DcbEventLogStorage_Postgres
+// Reuse the shared `<a>:<b>` cursor codec from the DCB storage — identical
+// format. Point at the runtime-pure `_Ops` module (no `@pulumi/pulumi`): this
+// feed is drained by the deployed change-feed relay Lambda, whose cold-start
+// graph must stay Pulumi-free.
+module Dcb = DcbEventLogStorage_Postgres_Ops
 
 // One classic event as the feed surfaces it. `payload` is the stored event JSON
 // verbatim; a bus/topic relay transforms it into its target shape (e.g. the AWS

package/src/EventLogChangeFeed.res.mjs

@@ -3,7 +3,7 @@
 import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as PgDriver$ReventlessPostgres from "./PgDriver.res.mjs";
-import * as DcbEventLogStorage_Postgres$ReventlessPostgres from "./DcbEventLogStorage_Postgres.res.mjs";
+import * as DcbEventLogStorage_Postgres_Ops$ReventlessPostgres from "./DcbEventLogStorage_Postgres_Ops.res.mjs";
 
 let selectColumns = "\n  lpad(transaction_id::text, 20, '0') || ':' || lpad(global_seq::text, 20, '0') AS cursor,\n  aggregate_id,\n  seq_nr,\n  payload,\n  msg_id\n";
 
@@ -43,7 +43,7 @@ async function readBatch(pool, logName, after, limitOpt) {
   let limit = limitOpt !== undefined ? limitOpt : 500;
   let params = [logName];
   let where = "log_name = $1 AND transaction_id < pg_snapshot_xmin(pg_current_snapshot())";
-  let match = Stdlib_Option.flatMap(after, DcbEventLogStorage_Postgres$ReventlessPostgres.decodeCursor);
+  let match = Stdlib_Option.flatMap(after, DcbEventLogStorage_Postgres_Ops$ReventlessPostgres.decodeCursor);
   if (match !== undefined) {
     params.push(match[0]);
     params.push(match[1]);
@@ -72,7 +72,7 @@ async function loadCheckpoint(pool, subscriber) {
 }
 
 async function saveCheckpoint(pool, subscriber, cursor) {
-  let match = DcbEventLogStorage_Postgres$ReventlessPostgres.decodeCursor(cursor);
+  let match = DcbEventLogStorage_Postgres_Ops$ReventlessPostgres.decodeCursor(cursor);
   if (match !== undefined) {
     await PgDriver$ReventlessPostgres.query(pool, "INSERT INTO event_log_subscription(subscriber, last_tx, last_global_seq)\n       VALUES ($1, $2::xid8, $3::bigint)\n       ON CONFLICT (subscriber)\n       DO UPDATE SET last_tx = EXCLUDED.last_tx, last_global_seq = EXCLUDED.last_global_seq", [
       subscriber,

package/src/EventLogStorage_Postgres.res

@@ -7,7 +7,7 @@
 // real Lambda). This module `include`s that pure module and adds only the
 // deploy-time `EventLog_Adapter` shape (`operations` wrapped in `Pulumi.Output`),
 // keeping the historic `makeStorage` 3-tuple `(name, ops, adapter)` API unchanged.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 include EventLogStorage_Postgres_Ops

package/src/EventLogStorage_Postgres_Ops.res

@@ -7,7 +7,7 @@
 // in no Lambda — not the layer, not `/var/runtime`). The thin
 // `EventLogStorage_Postgres` wrapper adds the deploy-time `Pulumi.Output`-shaped
 // adapter on top for local/deploy consumers; the runtime imports `makeOps` here.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 

package/src/PgChangeFeed.res

@@ -18,7 +18,12 @@
 open ReventlessCore
 open Reventless
 
-module Dcb = DcbEventLogStorage_Postgres
+// Runtime-pure ops module (no `@pulumi/pulumi`) — this feed is drained by the
+// deployed change-feed relay Lambda, so its cold-start graph must stay
+// Pulumi-free. `_Ops` carries every helper used below (mkBuilder,
+// buildReadWhere, decodeCursor, selectColumns, rowToEvent); the deploy-time
+// DcbEventLogStorage_Postgres only `include`s it and adds the Pulumi adapter.
+module Dcb = DcbEventLogStorage_Postgres_Ops
 
 // One page of the feed. `events` are in (transaction_id, position) order;
 // `cursor` is the checkpoint to persist and to pass as the next `after` (None

package/src/PgChangeFeed.res.mjs

@@ -2,15 +2,15 @@
 
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as PgDriver$ReventlessPostgres from "./PgDriver.res.mjs";
-import * as DcbEventLogStorage_Postgres$ReventlessPostgres from "./DcbEventLogStorage_Postgres.res.mjs";
+import * as DcbEventLogStorage_Postgres_Ops$ReventlessPostgres from "./DcbEventLogStorage_Postgres_Ops.res.mjs";
 
 async function readBatch(pool, logName, after, limitOpt) {
   let limit = limitOpt !== undefined ? limitOpt : 500;
-  let b = DcbEventLogStorage_Postgres$ReventlessPostgres.mkBuilder();
-  let where = DcbEventLogStorage_Postgres$ReventlessPostgres.buildReadWhere(b, logName, [], Stdlib_Option.flatMap(after, DcbEventLogStorage_Postgres$ReventlessPostgres.decodeCursor), true);
-  let sql = `SELECT ` + DcbEventLogStorage_Postgres$ReventlessPostgres.selectColumns + ` FROM dcb_event WHERE ` + where + ` ORDER BY transaction_id ASC, position ASC LIMIT ` + limit.toString();
+  let b = DcbEventLogStorage_Postgres_Ops$ReventlessPostgres.mkBuilder();
+  let where = DcbEventLogStorage_Postgres_Ops$ReventlessPostgres.buildReadWhere(b, logName, [], Stdlib_Option.flatMap(after, DcbEventLogStorage_Postgres_Ops$ReventlessPostgres.decodeCursor), true);
+  let sql = `SELECT ` + DcbEventLogStorage_Postgres_Ops$ReventlessPostgres.selectColumns + ` FROM dcb_event WHERE ` + where + ` ORDER BY transaction_id ASC, position ASC LIMIT ` + limit.toString();
   let rows = await PgDriver$ReventlessPostgres.query(pool, sql, b.params);
-  let events = rows.map(DcbEventLogStorage_Postgres$ReventlessPostgres.rowToEvent);
+  let events = rows.map(DcbEventLogStorage_Postgres_Ops$ReventlessPostgres.rowToEvent);
   let last = events[events.length - 1 | 0];
   let cursor = last !== undefined ? last.position : undefined;
   return {
@@ -31,7 +31,7 @@ async function loadCheckpoint(pool, subscriber) {
 }
 
 async function saveCheckpoint(pool, subscriber, cursor) {
-  let match = DcbEventLogStorage_Postgres$ReventlessPostgres.decodeCursor(cursor);
+  let match = DcbEventLogStorage_Postgres_Ops$ReventlessPostgres.decodeCursor(cursor);
   if (match !== undefined) {
     await PgDriver$ReventlessPostgres.query(pool, "INSERT INTO dcb_subscription(subscriber, last_tx, last_position)\n       VALUES ($1, $2::xid8, $3::bigint)\n       ON CONFLICT (subscriber)\n       DO UPDATE SET last_tx = EXCLUDED.last_tx, last_position = EXCLUDED.last_position", [
       subscriber,

package/src/QueryDbStorage_Postgres.res

@@ -6,7 +6,7 @@
 // that pure module (so every existing `QueryDbStorage_Postgres.*` reference keeps
 // working) and adds only the deploy-time `Pulumi.Output`-shaped `storage` record
 // and the `Make` provider functor.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless.ReadModel
@@ -37,6 +37,6 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~ttl as _=?,
     ~api as _,
     ~apiRole as _,
-    ~opts as _,
+    ~owner as _, ~opts as _,
   ) => makeStorage(~pool=P.pool, ~name, ~indexes, ~subIdField)
 }

package/src/QueryDbStorage_Postgres.res.mjs

@@ -12,7 +12,7 @@ function makeStorage(pool, name, indexes, subIdField) {
 }
 
 function Make(P) {
-  let make = (name, indexes, subIdField, param, param$1, param$2, param$3) => makeStorage(P.pool, name, indexes, subIdField);
+  let make = (name, indexes, subIdField, param, param$1, param$2, param$3, param$4) => makeStorage(P.pool, name, indexes, subIdField);
   return {
     make: make
   };

package/src/QueryDbStorage_Postgres_Ops.res

@@ -6,7 +6,7 @@
 // a deploy-time dep into its ESM import graph (which fails resolution on real
 // Lambda). The thin `QueryDbStorage_Postgres` wrapper `include`s this and adds the
 // deploy-time `Pulumi.Output`-shaped `storage` record + the `Make` functor.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless.ReadModel

package/src/QueryEnginePostgres.res

@@ -63,18 +63,18 @@ let subIdSql = (b: paramBuilder, field: string, cmp: QueryEngine.SubId.comparato
   }
 }
 
-let notExpired = QueryDbStorage_Postgres.notExpiredClause
+let notExpired = QueryDbStorage_Postgres_Ops.notExpiredClause
 
 // Add `id` (from partition_key) when absent — matches allRows/scan in the SQLite
 // engine; partition-key queries return items as stored.
 let decodeRow = (~withId, row: dict<JSON.t>): JSON.t => {
-  let item = QueryDbStorage_Postgres.decodeItem(row)
+  let item = QueryDbStorage_Postgres_Ops.decodeItem(row)
   if withId {
     let pk = switch row->Dict.get("partition_key") {
     | Some(JSON.String(s)) => s
     | _ => ""
     }
-    QueryDbStorage_Postgres.withId(item, pk)
+    QueryDbStorage_Postgres_Ops.withId(item, pk)
   } else {
     item
   }
@@ -90,7 +90,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~ascending=?,
     ~limit=?,
   ): array<JSON.t> => {
-    let table = QueryDbStorage_Postgres.tableName(readModelName)
+    let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let keyStr = switch key {
     | Some(k) => k
     | None => valueToText(id)
@@ -114,7 +114,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
   }
 
   let scan = async (~readModelName, ~filterConfigs, ~limit): array<JSON.t> => {
-    let table = QueryDbStorage_Postgres.tableName(readModelName)
+    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)))
@@ -138,7 +138,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
   // (`ensureIndexes`) instead of scanning. String comparison mirrors the
   // resolver's JS path (which only matched string-typed fields).
   let indexLookup = async (~readModelName, field: string, value: string): array<JSON.t> => {
-    let table = QueryDbStorage_Postgres.tableName(readModelName)
+    let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let b = {params: []}
     let sql = `SELECT partition_key, item FROM ${table} WHERE ${col(field)} = ${b->param(
         JSON.Encode.string(value),
@@ -154,7 +154,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     if ids->Array.length == 0 {
       []
     } else {
-      let table = QueryDbStorage_Postgres.tableName(readModelName)
+      let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
       let b = {params: []}
       let idsJson = JSON.Encode.array(ids->Array.map(JSON.Encode.string))
       let sql = `SELECT partition_key, item FROM ${table} WHERE partition_key = ANY(${b->param(
@@ -168,6 +168,39 @@ module Make = (P: {let pool: PgDriver.pool}) => {
   let idExprC = `COALESCE(item->>'id', partition_key) COLLATE "C"`
   let jsonTextC = (field: string): string => `${col(field)} COLLATE "C"`
 
+  // "not retired", as jsonb rather than text. `->` keeps the value typed, so a
+  // JSON boolean true is distinguishable from the JSON string "true"; `->>`
+  // would render both as 'true' and hide a row the shared spec keeps, since that
+  // spec decodes strictly and reads a non-boolean as "no flag". `IS DISTINCT
+  // FROM` rather than `<>` so an absent key — NULL — keeps the row instead of
+  // making the whole predicate NULL and dropping it.
+  //
+  // The state form compares against JSON strings instead of `true`, one
+  // `IS DISTINCT FROM` per state, ANDed. Not `NOT IN`: that is ordinary
+  // equality, so an absent key makes the predicate NULL and drops a row this
+  // spec keeps. Same shape and same index behaviour as the single-state form —
+  // a handful of equality predicates over an enum-valued attribute cost what one
+  // over a boolean does — so the `@index` guidance carries over unchanged.
+  //
+  // A set naming no states withdraws nothing, so the predicate is vacuously
+  // true, matching what `isRetiredValue` answers for it.
+  let notRetiredC = (scope: Reventless.OwnerScope.retiredScope): string => {
+    let key = scope.field->String.replaceAll("'", "''")
+    let distinctFrom = lit => `(item->'${key}') IS DISTINCT FROM ${lit}`
+    switch scope.values {
+    | None => distinctFrom("'true'::jsonb")
+    | Some([]) => "TRUE"
+    | Some(states) =>
+      // Parenthesised though every caller ANDs these together already: a clause
+      // that is safe only because of where it is spliced is a clause that breaks
+      // the first time it is spliced somewhere else.
+      "(" ++
+      states
+      ->Array.map(state => distinctFrom(`'"${state->String.replaceAll("'", "''")}"'::jsonb`))
+      ->Array.join(" AND ") ++ ")"
+    }
+  }
+
   // Connection-list push-down. Builds `item->>'field'` predicates + keyset
   // WHERE + `ORDER BY … LIMIT pageSize+1` so a page reads only what it returns
   // rather than the whole read model. Reproduces `QueryDbListQuery` semantics
@@ -183,8 +216,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~argsDict: dict<JSON.t>,
     ~capability: GraphQL_FragmentGenerator.serverCapability,
     ~labelField as _,
+    ~ownerScope: option<(string, string)>=?,
+    ~retiredScope: option<Reventless.OwnerScope.retiredScope>=?,
   ): option<JSON.t> => {
-    let table = QueryDbStorage_Postgres.tableName(readModelName)
+    let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let filterDict =
       argsDict->Dict.get("filter")->Option.flatMap(JSON.Decode.object)->Option.getOr(Dict.make())
     let strNonEmpty = k =>
@@ -210,6 +245,19 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     } else {
       let b = {params: []}
       let whereParts = [notExpired]
+      // Into the SQL, before the LIMIT — narrowing the returned page instead
+      // would hand back fewer rows than asked for while still claiming a next
+      // page. Mirrors the SQLite push-down; the parity harness holds the two
+      // and the shared spec to the same answer.
+      switch ownerScope {
+      | Some((field, required)) =>
+        whereParts->Array.push(`${jsonTextC(field)} = ${b->param(JSON.Encode.string(required))}`)
+      | None => ()
+      }
+      switch retiredScope {
+      | Some(scope) => whereParts->Array.push(notRetiredC(scope))
+      | None => ()
+      }
       let valString = v =>
         switch v->JSON.Decode.string {
         | Some(s) => Some(s)
@@ -309,8 +357,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~subIdField as _: string,
     ~id: string,
     ~argsDict: dict<JSON.t>,
+    ~ownerScope: option<(string, string)>=?,
+    ~retiredScope: option<Reventless.OwnerScope.retiredScope>=?,
   ): JSON.t => {
-    let table = QueryDbStorage_Postgres.tableName(readModelName)
+    let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let filterDict =
       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)
@@ -324,6 +374,16 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     let sk = `sub_key COLLATE "C"`
     let b = {params: []}
     let where = [`partition_key = ${b->param(JSON.Encode.string(id))}`, notExpired]
+    // Before the keyset window and the LIMIT, for the same reason as `listPage`.
+    switch ownerScope {
+    | Some((field, required)) =>
+      where->Array.push(`${jsonTextC(field)} = ${b->param(JSON.Encode.string(required))}`)
+    | None => ()
+    }
+    switch retiredScope {
+    | Some(scope) => where->Array.push(notRetiredC(scope))
+    | None => ()
+    }
     fstr("prefix")->Option.forEach(p =>
       where->Array.push(`starts_with(sub_key, ${b->param(JSON.Encode.string(p))})`)
     )
@@ -380,7 +440,4 @@ module Make = (P: {let pool: PgDriver.pool}) => {
       },
     })
   }
-
-  let make: QueryDb_Adapter.queryEngineMaker = _allQueryDbs =>
-    Pulumi.Output.make({QueryEngine.scan, query})
 }

package/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) {
@@ -232,8 +253,8 @@ function Make(P) {
     let cursorValueOf = item => Stdlib_Option.getOr(QueryDbListQuery$ReventlessCore.getFieldString(item, cursorField), QueryDbListQuery$ReventlessCore.getId(item));
     return QueryDbListQuery$ReventlessCore.buildConnection(pageItems, hasMore, false, 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 */