@reventlessdev/reventless-postgres 3.0.0-alpha.5 → 3.0.0-alpha.51

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

@@ -2,10 +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) {
@@ -104,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]));
@@ -136,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]));
     });
@@ -148,29 +148,29 @@ 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 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);
@@ -182,7 +182,7 @@ function Make(P) {
     let b = {
       params: []
     };
-    let whereParts = [QueryDbStorage_Postgres$ReventlessPostgres.notExpiredClause];
+    let whereParts = [QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause];
     let valString = v => {
       let s = Stdlib_JSON.Decode.string(v);
       if (s !== undefined) {
@@ -231,10 +231,78 @@ 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 make = _allQueryDbs => Pulumi.output({
-    scan: scan,
-    query: query
-  });
+  let itemsPage = async (readModelName, param$1, id, argsDict) => {
+    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");
+    let last = Stdlib_Option.map(Stdlib_Option.flatMap(argsDict["last"], Stdlib_JSON.Decode.float), prim => prim | 0);
+    let first = Stdlib_Option.map(Stdlib_Option.flatMap(argsDict["first"], Stdlib_JSON.Decode.float), prim => prim | 0);
+    let after = Stdlib_Option.flatMap(argsDict["after"], Stdlib_JSON.Decode.string);
+    let before = Stdlib_Option.flatMap(argsDict["before"], Stdlib_JSON.Decode.string);
+    let isBackward = Stdlib_Option.isSome(last);
+    let sk = `sub_key COLLATE "C"`;
+    let b = {
+      params: []
+    };
+    let where = [
+      `partition_key = ` + param(b, id),
+      QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause
+    ];
+    Stdlib_Option.forEach(fstr("prefix"), p => {
+      where.push(`starts_with(sub_key, ` + param(b, p) + `)`);
+    });
+    Stdlib_Option.forEach(fstr("from"), f => {
+      where.push(sk + ` >= ` + param(b, f));
+    });
+    Stdlib_Option.forEach(fstr("to"), t => {
+      where.push(sk + ` <= ` + param(b, t));
+    });
+    Stdlib_Option.forEach(fstr("eq"), e => {
+      where.push(sk + ` = ` + param(b, e));
+    });
+    if (isBackward) {
+      if (before !== undefined) {
+        where.push(sk + ` < ` + param(b, QueryDbListQuery$ReventlessCore.decodeCursor(before)));
+      }
+    } else if (after !== undefined) {
+      where.push(sk + ` > ` + param(b, QueryDbListQuery$ReventlessCore.decodeCursor(after)));
+    }
+    let fetchDesc = isBackward ? !orderDesc : orderDesc;
+    let pageSize = Stdlib_Option.getOr(isBackward ? last : first, QueryDbListQuery$ReventlessCore.defaultListPageSize);
+    let sql = `SELECT partition_key, sub_key, item FROM ` + table + ` WHERE ` + where.join(" AND ") + ` ORDER BY ` + sk + ` ` + (
+      fetchDesc ? "DESC" : "ASC"
+    ) + ` LIMIT ` + param(b, pageSize + 1 | 0);
+    let rows = await PgDriver$ReventlessPostgres.query(P.pool, sql, b.params);
+    let hasMore = rows.length > pageSize;
+    let taken = rows.slice(0, pageSize);
+    let logical = isBackward ? taken.toReversed() : taken;
+    let pageItems = logical.map(extra => decodeRow(false, extra));
+    let subKeyOf = row => {
+      let match = row["sub_key"];
+      if (typeof match === "string") {
+        return match;
+      } else {
+        return "";
+      }
+    };
+    let cursors = logical.map(subKeyOf);
+    let edges = pageItems.map((item, i) => ({
+      node: item,
+      cursor: QueryDbListQuery$ReventlessCore.encodeCursor(cursors[i])
+    }));
+    let startCursor = Stdlib_Option.map(cursors[0], QueryDbListQuery$ReventlessCore.encodeCursor);
+    let endCursor = Stdlib_Option.map(cursors[cursors.length - 1 | 0], QueryDbListQuery$ReventlessCore.encodeCursor);
+    return {
+      edges: edges,
+      pageInfo: {
+        hasNextPage: !isBackward && hasMore,
+        hasPreviousPage: isBackward && hasMore,
+        startCursor: Stdlib_Nullable.fromOption(startCursor),
+        endCursor: Stdlib_Nullable.fromOption(endCursor)
+      }
+    };
+  };
   return {
     query: query,
     scan: scan,
@@ -243,11 +311,11 @@ function Make(P) {
     idExprC: idExprC,
     jsonTextC: jsonTextC,
     listPage: listPage,
-    make: make
+    itemsPage: itemsPage
   };
 }
 
-let notExpired = QueryDbStorage_Postgres$ReventlessPostgres.notExpiredClause;
+let notExpired = QueryDbStorage_Postgres_Ops$ReventlessPostgres.notExpiredClause;
 
 export {
   valueToText,
@@ -260,4 +328,4 @@ export {
   decodeRow,
   Make,
 }
-/* @pulumi/pulumi Not a pure module */
+/* PgDriver-ReventlessPostgres Not a pure module */

package/lib/bs/tests/QueryEnginePostgresListPageTest.res

@@ -233,4 +233,80 @@ switch processEnv->Dict.get("PG_URL") {
       expect(items->Array.length)->toBe(0)
     })
   })
+
+  // ── itemsPage (sub-id connection) ─────────────────────────────────────────
+  // A sub-id read model: partition "order-1" holds 5 lines keyed by `seq`.
+  let itemsName = "itemsparity"
+  let mkLine = seq => {
+    let o = Dict.make()
+    o->Dict.set("id", JSON.Encode.string("order-1"))
+    o->Dict.set("seq", JSON.Encode.string(seq))
+    JSON.Encode.object(o)
+  }
+  let seqs = ["a", "b", "c", "d", "e"]
+  beforeAllAsync(async () => {
+    let ops = QueryDbStorage_Postgres.makeOperations(
+      ~pool,
+      ~name=itemsName,
+      ~indexes=[],
+      ~subIdField=Some("seq"),
+    )
+    for i in 0 to seqs->Array.length - 1 {
+      let _ = await ops.save("order-1", mkLine(seqs->Array.getUnsafe(i)), QueryDb.Any, None)
+    }
+  })
+
+  // Extract node `seq` values in edge order.
+  let itemSeqs = (conn: JSON.t) =>
+    conn
+    ->field("edges")
+    ->Option.flatMap(JSON.Decode.array)
+    ->Option.getOr([])
+    ->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)
+
+  let itemsPage = 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 () => {
+      let r = await itemsPage([])
+      expect(r->itemSeqs)->toEqual(["a", "b", "c", "d", "e"])
+      expect(pageInfoBool(r, "hasNextPage"))->toBe(false)
+    })
+    testPromise("first:2 → [a,b], hasNextPage", async () => {
+      let r = await itemsPage([("first", JSON.Encode.int(2))])
+      expect(r->itemSeqs)->toEqual(["a", "b"])
+      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")))])
+      expect(r->itemSeqs)->toEqual(["c", "d"])
+    })
+    testPromise("order DESC → [e..a]", async () => {
+      let r = await itemsPage([("filter", filterOf([("order", JSON.Encode.string("DESC"))]))])
+      expect(r->itemSeqs)->toEqual(["e", "d", "c", "b", "a"])
+    })
+    testPromise("filter eq c → [c]", async () => {
+      let r = await itemsPage([("filter", filterOf([("eq", JSON.Encode.string("c"))]))])
+      expect(r->itemSeqs)->toEqual(["c"])
+    })
+    testPromise("filter from b to d → [b,c,d]", async () => {
+      let r = await itemsPage([
+        ("filter", filterOf([("from", JSON.Encode.string("b")), ("to", JSON.Encode.string("d"))])),
+      ])
+      expect(r->itemSeqs)->toEqual(["b", "c", "d"])
+    })
+    testPromise("prefix c → [c]", async () => {
+      let r = await itemsPage([("filter", filterOf([("prefix", JSON.Encode.string("c"))]))])
+      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")))])
+      expect(r->itemSeqs)->toEqual(["b", "c"])
+      expect(pageInfoBool(r, "hasPreviousPage"))->toBe(true)
+    })
+  })
 }

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

@@ -300,6 +300,142 @@ if (url !== undefined) {
       globalThis.expect(items.length).toBe(0);
     });
   });
+  let itemsName = "itemsparity";
+  let mkLine = seq => {
+    let o = {};
+    o["id"] = "order-1";
+    o["seq"] = seq;
+    return o;
+  };
+  let seqs = [
+    "a",
+    "b",
+    "c",
+    "d",
+    "e"
+  ];
+  globalThis.beforeAll(async () => {
+    let ops = QueryDbStorage_Postgres$ReventlessPostgres.makeOperations(pool, itemsName, [], "seq");
+    for (let i = 0, i_finish = seqs.length; i < i_finish; ++i) {
+      await ops.save("order-1", mkLine(seqs[i]), "Any", 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));
+  globalThis.describe("QueryEnginePostgres itemsPage (sub-id keyset)", () => {
+    globalThis.test("bare → all lines ASC, no next page", async () => {
+      let r = await itemsPage([]);
+      globalThis.expect(itemSeqs(r)).toEqual([
+        "a",
+        "b",
+        "c",
+        "d",
+        "e"
+      ]);
+      globalThis.expect(pageInfoBool(r, "hasNextPage")).toBe(false);
+    });
+    globalThis.test("first:2 → [a,b], hasNextPage", async () => {
+      let r = await itemsPage([[
+          "first",
+          2
+        ]]);
+      globalThis.expect(itemSeqs(r)).toEqual([
+        "a",
+        "b"
+      ]);
+      globalThis.expect(pageInfoBool(r, "hasNextPage")).toBe(true);
+    });
+    globalThis.test("first:2 after b → [c,d]", async () => {
+      let r = await itemsPage([
+        [
+          "first",
+          2
+        ],
+        [
+          "after",
+          QueryDbListQuery$ReventlessCore.encodeCursor("b")
+        ]
+      ]);
+      globalThis.expect(itemSeqs(r)).toEqual([
+        "c",
+        "d"
+      ]);
+    });
+    globalThis.test("order DESC → [e..a]", async () => {
+      let r = await itemsPage([[
+          "filter",
+          Object.fromEntries([[
+              "order",
+              "DESC"
+            ]])
+        ]]);
+      globalThis.expect(itemSeqs(r)).toEqual([
+        "e",
+        "d",
+        "c",
+        "b",
+        "a"
+      ]);
+    });
+    globalThis.test("filter eq c → [c]", async () => {
+      let r = await itemsPage([[
+          "filter",
+          Object.fromEntries([[
+              "eq",
+              "c"
+            ]])
+        ]]);
+      globalThis.expect(itemSeqs(r)).toEqual(["c"]);
+    });
+    globalThis.test("filter from b to d → [b,c,d]", async () => {
+      let r = await itemsPage([[
+          "filter",
+          Object.fromEntries([
+            [
+              "from",
+              "b"
+            ],
+            [
+              "to",
+              "d"
+            ]
+          ])
+        ]]);
+      globalThis.expect(itemSeqs(r)).toEqual([
+        "b",
+        "c",
+        "d"
+      ]);
+    });
+    globalThis.test("prefix c → [c]", async () => {
+      let r = await itemsPage([[
+          "filter",
+          Object.fromEntries([[
+              "prefix",
+              "c"
+            ]])
+        ]]);
+      globalThis.expect(itemSeqs(r)).toEqual(["c"]);
+    });
+    globalThis.test("backward last:2 before d → [b,c] (logical ASC)", async () => {
+      let r = await itemsPage([
+        [
+          "last",
+          2
+        ],
+        [
+          "before",
+          QueryDbListQuery$ReventlessCore.encodeCursor("d")
+        ]
+      ]);
+      globalThis.expect(itemSeqs(r)).toEqual([
+        "b",
+        "c"
+      ]);
+      globalThis.expect(pageInfoBool(r, "hasPreviousPage")).toBe(true);
+    });
+  });
 } else {
   globalThis.test("Postgres list push-down parity (skipped — set PG_URL to run)", () => {
     globalThis.expect(true).toBe(true);

package/lib/ocaml/.compiler.log

@@ -1,2 +1,2 @@
-#Start(1783298008858)
-#Done(1783298010813)
+#Start(1785245385791)
+#Done(1785245389698)