@reventlessdev/reventless-local 3.0.0-alpha.223 → 3.0.0-alpha.225

package/tests/adapter/QueryDbListPushdownParityTest.res.mjs

@@ -36,13 +36,16 @@ let capability = {
   sortFields: capability_sortFields
 };
 
-function mk(id, status, name, qty, owner) {
+function mk(id, status, name, qty, owner, archived) {
   let o = {};
   o["id"] = id;
   o["status"] = status;
   o["name"] = name;
   o["qty"] = qty;
   o["owner"] = owner;
+  if (archived !== undefined) {
+    o["archived"] = archived;
+  }
   return o;
 }
 
@@ -52,35 +55,40 @@ let rows = [
     "active",
     "Charlie",
     3,
-    "u-a"
+    "u-a",
+    false
   ],
   [
     "p-2",
     "active",
     "Alpha",
     1,
-    "u-b"
+    "u-b",
+    true
   ],
   [
     "p-3",
     "inactive",
     "Echo",
     5,
-    "u-a"
+    "u-a",
+    false
   ],
   [
     "p-4",
     "active",
     "Bravo",
     2,
-    "u-c"
+    "u-c",
+    true
   ],
   [
     "p-5",
     "inactive",
     "Delta",
     4,
-    "u-a"
+    "u-a",
+    undefined
   ]
 ];
 
@@ -96,7 +104,7 @@ async function build() {
   for (let i = 0, i_finish = rows.length; i < i_finish; ++i) {
     let match = rows[i];
     let id = match[0];
-    await ops.save(id, mk(id, match[1], match[2], match[3], match[4]), "Any", undefined);
+    await ops.save(id, mk(id, match[1], match[2], match[3], match[4], match[5]), "Any", undefined);
   }
   return {
     listPage: Stdlib_Option.getOrThrow(TestBus.getQueryDbListPage("items"), undefined),
@@ -148,11 +156,11 @@ function orderBy(f, dir) {
   ]);
 }
 
-async function checkPushed(label, ownerScope, args) {
+async function checkPushed(label, ownerScope, retiredScope, args) {
   let s = await build();
   let argsDict = Object.fromEntries(args);
-  let expected = norm(QueryDbListQuery$ReventlessCore.run(s.fullScan(), argsDict, capability, "name", param => {}, ownerScope));
-  let actual = s.listPage(argsDict, capability, "name", ownerScope);
+  let expected = norm(QueryDbListQuery$ReventlessCore.run(s.fullScan(), argsDict, capability, "name", param => {}, ownerScope, retiredScope));
+  let actual = s.listPage(argsDict, capability, "name", ownerScope, retiredScope);
   if (actual !== undefined) {
     globalThis.expect(norm(actual)).toEqual(expected);
   } else {
@@ -162,7 +170,20 @@ async function checkPushed(label, ownerScope, args) {
 
 async function checkFallback(args) {
   let s = await build();
-  globalThis.expect(Stdlib_Option.isSome(s.listPage(Object.fromEntries(args), capability, "name", undefined))).toBe(false);
+  globalThis.expect(Stdlib_Option.isSome(s.listPage(Object.fromEntries(args), capability, "name", undefined, undefined))).toBe(false);
+}
+
+async function liveIds(args) {
+  let s = await build();
+  let conn = s.listPage(Object.fromEntries(args), capability, "name", undefined, {
+    field: "archived",
+    values: undefined
+  });
+  if (conn !== undefined) {
+    return norm(conn).edges.map(e => e.id);
+  } else {
+    return [];
+  }
 }
 
 async function scopedIds(owner, args) {
@@ -170,7 +191,7 @@ async function scopedIds(owner, args) {
   let conn = s.listPage(Object.fromEntries(args), capability, "name", [
     "owner",
     owner
-  ]);
+  ], undefined);
   if (conn !== undefined) {
     return norm(conn).edges.map(e => e.id);
   } else {
@@ -179,12 +200,12 @@ async function scopedIds(owner, args) {
 }
 
 globalThis.describe("QueryDb list push-down parity (SQLite ≡ QueryDbListQuery spec)", () => {
-  globalThis.test("bare page", () => checkPushed("bare", undefined, []));
-  globalThis.test("first:2", () => checkPushed("first", undefined, [[
+  globalThis.test("bare page", () => checkPushed("bare", undefined, undefined, []));
+  globalThis.test("first:2", () => checkPushed("first", undefined, undefined, [[
       "first",
       2
     ]]));
-  globalThis.test("first:2 + after", () => checkPushed("after", undefined, [
+  globalThis.test("first:2 + after", () => checkPushed("after", undefined, undefined, [
     [
       "first",
       2
@@ -194,14 +215,14 @@ globalThis.describe("QueryDb list push-down parity (SQLite ≡ QueryDbListQuery
       QueryDbListQuery$ReventlessCore.encodeCursor("p-2")
     ]
   ]));
-  globalThis.test("statusEq active", () => checkPushed("eq", undefined, [[
+  globalThis.test("statusEq active", () => checkPushed("eq", undefined, undefined, [[
       "filter",
       Object.fromEntries([[
           "statusEq",
           "active"
         ]])
     ]]));
-  globalThis.test("statusEq active + first:2", () => checkPushed("eq+first", undefined, [
+  globalThis.test("statusEq active + first:2", () => checkPushed("eq+first", undefined, undefined, [
     [
       "filter",
       Object.fromEntries([[
@@ -214,15 +235,15 @@ globalThis.describe("QueryDb list push-down parity (SQLite ≡ QueryDbListQuery
       2
     ]
   ]));
-  globalThis.test("orderBy name ASC", () => checkPushed("order-asc", undefined, [[
+  globalThis.test("orderBy name ASC", () => checkPushed("order-asc", undefined, undefined, [[
       "orderBy",
       orderBy("name", "ASC")
     ]]));
-  globalThis.test("orderBy name DESC", () => checkPushed("order-desc", undefined, [[
+  globalThis.test("orderBy name DESC", () => checkPushed("order-desc", undefined, undefined, [[
       "orderBy",
       orderBy("name", "DESC")
     ]]));
-  globalThis.test("orderBy name DESC + first:2 + after", () => checkPushed("order-desc-after", undefined, [
+  globalThis.test("orderBy name DESC + first:2 + after", () => checkPushed("order-desc-after", undefined, undefined, [
     [
       "orderBy",
       orderBy("name", "DESC")
@@ -236,11 +257,11 @@ globalThis.describe("QueryDb list push-down parity (SQLite ≡ QueryDbListQuery
       QueryDbListQuery$ReventlessCore.encodeCursor("Delta")
     ]
   ]));
-  globalThis.test("orderBy status ASC (tiebreak by id)", () => checkPushed("order-tiebreak", undefined, [[
+  globalThis.test("orderBy status ASC (tiebreak by id)", () => checkPushed("order-tiebreak", undefined, undefined, [[
       "orderBy",
       orderBy("status", "ASC")
     ]]));
-  globalThis.test("qty range From/To (numeric-as-string)", () => checkPushed("range", undefined, [[
+  globalThis.test("qty range From/To (numeric-as-string)", () => checkPushed("range", undefined, undefined, [[
       "filter",
       Object.fromEntries([
         [
@@ -253,7 +274,7 @@ globalThis.describe("QueryDb list push-down parity (SQLite ≡ QueryDbListQuery
         ]
       ])
     ]]));
-  globalThis.test("orderBy qty ASC (numeric-as-string sort)", () => checkPushed("order-qty", undefined, [[
+  globalThis.test("orderBy qty ASC (numeric-as-string sort)", () => checkPushed("order-qty", undefined, undefined, [[
       "orderBy",
       orderBy("qty", "ASC")
     ]]));
@@ -288,22 +309,70 @@ globalThis.describe("QueryDb list push-down parity (SQLite ≡ QueryDbListQuery
       QueryDbListQuery$ReventlessCore.encodeCursor("p-4")
     ]
   ]));
+  globalThis.describe("retirement narrowing", () => {
+    globalThis.test("bare page, narrowed", () => checkPushed("retired-bare", undefined, {
+      field: "archived",
+      values: undefined
+    }, []));
+    globalThis.test("narrowed + orderBy", () => checkPushed("retired-order", undefined, {
+      field: "archived",
+      values: undefined
+    }, [[
+        "orderBy",
+        orderBy("name", "DESC")
+      ]]));
+    globalThis.test("narrowed + the caller's own filter", () => checkPushed("retired-filter", undefined, {
+      field: "archived",
+      values: undefined
+    }, [[
+        "filter",
+        Object.fromEntries([[
+            "statusEq",
+            "active"
+          ]])
+      ]]));
+    globalThis.test("narrowed + owner-scoped together", () => checkPushed("retired-owner", [
+      "owner",
+      "u-a"
+    ], {
+      field: "archived",
+      values: undefined
+    }, []));
+    globalThis.test("drops the archived rows and keeps the one with no flag", async () => {
+      let ids = await liveIds([]);
+      globalThis.expect(ids).toEqual([
+        "p-1",
+        "p-3",
+        "p-5"
+      ]);
+    });
+    globalThis.test("a page of first:2 is two live rows, not two rows minus the archived", async () => {
+      let ids = await liveIds([[
+          "first",
+          2
+        ]]);
+      globalThis.expect(ids).toEqual([
+        "p-1",
+        "p-3"
+      ]);
+    });
+  });
   globalThis.describe("owner scoping", () => {
     globalThis.test("bare page, scoped", () => checkPushed("owner-bare", [
       "owner",
       "u-a"
-    ], []));
+    ], undefined, []));
     globalThis.test("scoped + orderBy", () => checkPushed("owner-order", [
       "owner",
       "u-a"
-    ], [[
+    ], undefined, [[
         "orderBy",
         orderBy("name", "DESC")
       ]]));
     globalThis.test("scoped + client filter compose", () => checkPushed("owner-and-filter", [
       "owner",
       "u-a"
-    ], [[
+    ], undefined, [[
         "filter",
         Object.fromEntries([[
             "statusEq",
@@ -361,6 +430,7 @@ export {
   cur,
   checkPushed,
   checkFallback,
+  liveIds,
   scopedIds,
 }
 /*  Not a pure module */

package/tests/adapter/QueryDbListResolverTest.res

@@ -37,10 +37,11 @@ let rowStateSchemaWithAnnotations =
       scanSort: ["name"],
       semantic: [],
       metric: [],
-      status: None,
+      lifecycle: None,
       groupBy: None,
       visibility: None,
       live: None,
+      retired: None,
     },
   )
 

package/tests/adapter/QueryDbListResolverTest.res.mjs

@@ -45,10 +45,11 @@ let rowStateSchemaWithAnnotations = S.Metadata.set(rowStateSchema, StateAnnotati
   scanSort: ["name"],
   semantic: [],
   metric: [],
-  status: undefined,
+  lifecycle: undefined,
   groupBy: undefined,
   visibility: undefined,
-  live: undefined
+  live: undefined,
+  retired: undefined
 });
 
 let newrecord = {...Identity$Reventless.anonymous};