@reventlessdev/reventless-local 3.0.0-alpha.226 → 3.0.0-alpha.228

package/tests/adapter/QueryDbListResolverTest.res

@@ -102,7 +102,7 @@ let pageInfoString = (response: JSON.t, key: string): option<string> =>
 // Per-test fixture — fresh Bus + storage + registry + resolver
 // ─────────────────────────────────────────────────────────────
 
-let buildFixture = async (~name: string) => {
+let buildFixture = async (~name: string, ~indexes: array<Reventless.ReadModel.indexConfig>=[]) => {
   module Bus = LocalBus.Make()
   module Storage = LocalQueryDbStorage.Make(Bus)
   module Resolvers = QueryDbResolvers_GraphQL.Make(Bus)
@@ -151,7 +151,7 @@ let buildFixture = async (~name: string) => {
     ~api=(),
     ~apiRole=(),
     ~dataSourceName=""->Pulumi.Output.make,
-    ~indexes=[],
+    ~indexes,
     ~subIdField=None,
     ~idResolverConfigs=[],
     ~idsResolverConfigs=[],
@@ -440,3 +440,83 @@ describe("QueryDb list resolver — SQLite push-down path", () => {
     })
   )
 })
+
+// The by-index door answers a Relay connection, keyed on the index's column.
+// Both halves used to be wrong here and in the opposite direction on AppSync:
+// this backend promised `[String]` and returned whole rows, so every call failed
+// to serialise before a caller could reach the rows at all.
+describe("QueryDb by-index resolver", () => {
+  let statusIndex: array<Reventless.ReadModel.indexConfig> = [
+    {index: "status", type_: "S", projectionType: ALL},
+  ]
+
+  let indexResolver = async (~name) => {
+    let _ = await buildFixture(~name, ~indexes=statusIndex)
+    switch DomainGraphQL_Server.getQueryResolver(name ++ "ByStatus") {
+    | Some(r) => r
+    | None => JsError.throwWithMessage("index resolver not registered: " ++ name ++ "ByStatus")
+    }
+  }
+
+  beforeEach(() => {
+    DomainGraphQL_Server.reset()
+  })
+
+  testPromise("answers the rows carrying the index value, as edges", async () => {
+    let resolver = await indexResolver(~name="IdxA")
+    let response = await resolver(JSON.Encode.null, argsOf([("status", strJson("active"))]), emptyCtx)
+    let edges = getEdges(response)
+    expect(edges->Array.length)->toBe(3)
+    expect(edgeNodeField(edges->Array.getUnsafe(0), "productId"))->toBe("p-1")
+  })
+
+  testPromise("pages forward on first/after like every other connection", async () => {
+    let resolver = await indexResolver(~name="IdxB")
+    let page1 =
+      await resolver(
+        JSON.Encode.null,
+        argsOf([("status", strJson("active")), ("first", numJson(2))]),
+        emptyCtx,
+      )
+    expect(getEdges(page1)->Array.length)->toBe(2)
+    expect(pageInfoBool(page1, "hasNextPage"))->toBe(true)
+
+    let page2 =
+      await resolver(
+        JSON.Encode.null,
+        argsOf([
+          ("status", strJson("active")),
+          ("first", numJson(2)),
+          ("after", strJson(pageInfoString(page1, "endCursor")->Option.getOr(""))),
+        ]),
+        emptyCtx,
+      )
+    let edges2 = getEdges(page2)
+    expect(edges2->Array.length)->toBe(1)
+    expect(edgeNodeField(edges2->Array.getUnsafe(0), "productId"))->toBe("p-4")
+    expect(pageInfoBool(page2, "hasNextPage"))->toBe(false)
+  })
+
+  // Refused rather than ignored, and refused here because AppSync cannot do it:
+  // a door that paged backward on one backend and quietly returned the forward
+  // page on the other is the divergence this whole field was rebuilt to remove.
+  testPromise("refuses backward paging instead of answering forward", async () => {
+    let resolver = await indexResolver(~name="IdxC")
+    let outcome = try {
+      let _ =
+        await resolver(
+          JSON.Encode.null,
+          argsOf([("status", strJson("active")), ("last", numJson(2))]),
+          emptyCtx,
+        )
+      Ok()
+    } catch {
+    | e => Error(e->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr(""))
+    }
+    switch outcome {
+    | Ok() => expect("no error")->toBe("a BAD_USER_INPUT refusal")
+    | Error(message) =>
+      expect(message->String.includes("Backward pagination (last/before) is not supported"))->toBe(true)
+    }
+  })
+})

package/tests/adapter/QueryDbListResolverTest.res.mjs

@@ -1,13 +1,15 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
+import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
 import * as Identity$Reventless from "@reventlessdev/reventless-spec/src/types/Identity.res.mjs";
+import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as ReadModel$Reventless from "@reventlessdev/reventless-spec/src/components/ReadModel.res.mjs";
 import * as Component$ReventlessCore from "@reventlessdev/reventless-core/src/components/Component.res.mjs";
 import * as LocalBus$ReventlessLocal from "../../src/adapter/LocalBus.res.mjs";
@@ -24,13 +26,13 @@ import * as QueryDbResolvers_GraphQL$ReventlessLocal from "../../src/adapter/Que
 
 TestRunner$ReventlessLocal.setup();
 
-let rowStateSchema = S.schema(s => ({
+let rowStateSchema = Sury.$schema(s => ({
   productId: s.m(DcbTag$Reventless.string),
-  status: s.m(S.string),
-  name: s.m(S.string)
+  status: s.m(Sury.string),
+  name: s.m(Sury.string)
 }));
 
-let rowStateSchemaWithAnnotations = S.Metadata.set(rowStateSchema, StateAnnotations$Reventless.stateAnnotationsId, {
+let rowStateSchemaWithAnnotations = Sury.$Metadata_set(rowStateSchema, StateAnnotations$Reventless.stateAnnotationsId, {
   ids: ["productId"],
   compositeIds: [],
   subIds: [],
@@ -112,7 +114,8 @@ function pageInfoString(response, key) {
   return getString(pageInfo(response), key);
 }
 
-async function buildFixture(name) {
+async function buildFixture(name, indexesOpt) {
+  let indexes = indexesOpt !== undefined ? indexesOpt : [];
   let Bus = LocalBus$ReventlessLocal.Make({});
   let Storage = LocalQueryDbStorage$ReventlessLocal.Make(Bus);
   let Resolvers = QueryDbResolvers_GraphQL$ReventlessLocal.Make(Bus);
@@ -151,7 +154,7 @@ async function buildFixture(name) {
   Plugin_Helpers$ReventlessCore.stateSchemaRegistry[name] = rowStateSchemaWithAnnotations;
   let queryDb = Maker.make(undefined, undefined, undefined, undefined, undefined);
   let ops = await TestRunner$ReventlessLocal.resolve(Component$ReventlessCore.operations(queryDb));
-  Resolvers.make(name, undefined, undefined, Pulumi.output(""), [], undefined, [], [], "AllowAuthenticated", {});
+  Resolvers.make(name, undefined, undefined, Pulumi.output(""), indexes, undefined, [], [], "AllowAuthenticated", {});
   let r = DomainGraphQL_Server$ReventlessLocal.getQueryResolver(listFieldName);
   let resolver = r !== undefined ? r : Stdlib_JsError.throwWithMessage("resolver not registered: " + listFieldName);
   let rows = [
@@ -199,7 +202,7 @@ async function buildFixture(name) {
 globalThis.describe("QueryDb list resolver — keyset pagination", () => {
   globalThis.beforeEach(() => DomainGraphQL_Server$ReventlessLocal.reset());
   globalThis.test("first: 2 over a 5-row fixture returns 2 edges and hasNextPage = true", async () => {
-    let match = await buildFixture("PageA");
+    let match = await buildFixture("PageA", undefined);
     let response = await match[0](null, Object.fromEntries([[
         "first",
         2
@@ -212,7 +215,7 @@ globalThis.describe("QueryDb list resolver — keyset pagination", () => {
     globalThis.expect(edgeNodeField(edges[1], "productId")).toBe("p-2");
   });
   globalThis.test("after: <endCursor> walks forward without overlap", async () => {
-    let match = await buildFixture("PageB");
+    let match = await buildFixture("PageB", undefined);
     let resolver = match[0];
     let page1 = await resolver(null, Object.fromEntries([[
         "first",
@@ -251,7 +254,7 @@ globalThis.describe("QueryDb list resolver — keyset pagination", () => {
     globalThis.expect(pageInfoBool(page3, "hasNextPage")).toBe(false);
   });
   globalThis.test("last + before walks backward and flips hasPreviousPage", async () => {
-    let match = await buildFixture("PageC");
+    let match = await buildFixture("PageC", undefined);
     let resolver = match[0];
     let page1 = await resolver(null, Object.fromEntries([[
         "first",
@@ -314,7 +317,7 @@ globalThis.describe("QueryDb list resolver — keyset pagination", () => {
     globalThis.expect(pageInfoBool(firstPage, "hasPreviousPage")).toBe(false);
   });
   globalThis.test("filter.<field>Eq + first / after paginates only the narrowed subset", async () => {
-    let match = await buildFixture("PageD");
+    let match = await buildFixture("PageD", undefined);
     let resolver = match[0];
     let activeFilter = Object.fromEntries([[
         "statusEq",
@@ -356,7 +359,7 @@ globalThis.describe("QueryDb list resolver — keyset pagination", () => {
     globalThis.expect(pageInfoBool(page2, "hasNextPage")).toBe(false);
   });
   globalThis.test("orderBy DESC + first / after paginates the reverse-sorted view", async () => {
-    let match = await buildFixture("PageE");
+    let match = await buildFixture("PageE", undefined);
     let resolver = match[0];
     let orderBy = Object.fromEntries([
       [
@@ -404,7 +407,7 @@ globalThis.describe("QueryDb list resolver — keyset pagination", () => {
     globalThis.expect(edgeNodeField(edges2[1], "name")).toBe("Bravo");
   });
   globalThis.test("bare request (no first / after) returns a single bounded page", async () => {
-    let match = await buildFixture("PageF");
+    let match = await buildFixture("PageF", undefined);
     let response = await match[0](null, Object.fromEntries([]), emptyCtx);
     let edges = getEdges(response);
     globalThis.expect(edges.length).toBe(5);
@@ -424,7 +427,7 @@ globalThis.describe("QueryDb list resolver — SQLite push-down path", () => {
     return r;
   };
   globalThis.test("first:2 then after walks forward without overlap", () => withSqlite(async () => {
-    let match = await buildFixture("SqlPageA");
+    let match = await buildFixture("SqlPageA", undefined);
     let resolver = match[0];
     let page1 = await resolver(null, Object.fromEntries([[
         "first",
@@ -452,7 +455,7 @@ globalThis.describe("QueryDb list resolver — SQLite push-down path", () => {
     globalThis.expect(edgeNodeField(edges2[1], "productId")).toBe("p-4");
   }));
   globalThis.test("orderBy name DESC + first:2 returns the reverse-sorted head", () => withSqlite(async () => {
-    let match = await buildFixture("SqlPageB");
+    let match = await buildFixture("SqlPageB", undefined);
     let orderBy = Object.fromEntries([
       [
         "field",
@@ -479,7 +482,7 @@ globalThis.describe("QueryDb list resolver — SQLite push-down path", () => {
     globalThis.expect(edgeNodeField(edges1[1], "name")).toBe("Delta");
   }));
   globalThis.test("statusEq active narrows the pushed page", () => withSqlite(async () => {
-    let match = await buildFixture("SqlPageC");
+    let match = await buildFixture("SqlPageC", undefined);
     let activeFilter = Object.fromEntries([[
         "statusEq",
         "active"
@@ -495,6 +498,98 @@ globalThis.describe("QueryDb list resolver — SQLite push-down path", () => {
   }));
 });
 
+globalThis.describe("QueryDb by-index resolver", () => {
+  let statusIndex = [{
+      index: "status",
+      type_: "S",
+      projectionType: "ALL"
+    }];
+  let indexResolver = async name => {
+    await buildFixture(name, statusIndex);
+    let r = DomainGraphQL_Server$ReventlessLocal.getQueryResolver(name + "ByStatus");
+    if (r !== undefined) {
+      return r;
+    } else {
+      return Stdlib_JsError.throwWithMessage("index resolver not registered: " + name + "ByStatus");
+    }
+  };
+  globalThis.beforeEach(() => DomainGraphQL_Server$ReventlessLocal.reset());
+  globalThis.test("answers the rows carrying the index value, as edges", async () => {
+    let resolver = await indexResolver("IdxA");
+    let response = await resolver(null, Object.fromEntries([[
+        "status",
+        "active"
+      ]]), emptyCtx);
+    let edges = getEdges(response);
+    globalThis.expect(edges.length).toBe(3);
+    globalThis.expect(edgeNodeField(edges[0], "productId")).toBe("p-1");
+  });
+  globalThis.test("pages forward on first/after like every other connection", async () => {
+    let resolver = await indexResolver("IdxB");
+    let page1 = await resolver(null, Object.fromEntries([
+      [
+        "status",
+        "active"
+      ],
+      [
+        "first",
+        2
+      ]
+    ]), emptyCtx);
+    globalThis.expect(getEdges(page1).length).toBe(2);
+    globalThis.expect(pageInfoBool(page1, "hasNextPage")).toBe(true);
+    let page2 = await resolver(null, Object.fromEntries([
+      [
+        "status",
+        "active"
+      ],
+      [
+        "first",
+        2
+      ],
+      [
+        "after",
+        Stdlib_Option.getOr(getString(pageInfo(page1), "endCursor"), "")
+      ]
+    ]), emptyCtx);
+    let edges2 = getEdges(page2);
+    globalThis.expect(edges2.length).toBe(1);
+    globalThis.expect(edgeNodeField(edges2[0], "productId")).toBe("p-4");
+    globalThis.expect(pageInfoBool(page2, "hasNextPage")).toBe(false);
+  });
+  globalThis.test("refuses backward paging instead of answering forward", async () => {
+    let resolver = await indexResolver("IdxC");
+    let outcome;
+    try {
+      await resolver(null, Object.fromEntries([
+        [
+          "status",
+          "active"
+        ],
+        [
+          "last",
+          2
+        ]
+      ]), emptyCtx);
+      outcome = {
+        TAG: "Ok",
+        _0: undefined
+      };
+    } catch (raw_e) {
+      let e = Primitive_exceptions.internalToException(raw_e);
+      outcome = {
+        TAG: "Error",
+        _0: Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(e), Stdlib_JsExn.message), "")
+      };
+    }
+    if (outcome.TAG === "Ok") {
+      globalThis.expect("no error").toBe("a BAD_USER_INPUT refusal");
+      return;
+    }
+    globalThis.expect(outcome._0.includes("Backward pagination (last/before) is not supported")).toBe(true);
+  });
+});
+
 export {
   rowStateSchema,
   rowStateSchemaWithAnnotations,

package/tests/components/aggregate/AggregateFixtures.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as LocalBus$ReventlessLocal from "../../../src/adapter/LocalBus.res.mjs";
 import * as TestRunner$ReventlessLocal from "../../../src/test/TestRunner.res.mjs";
@@ -9,17 +9,17 @@ import * as Aggregate_Builder$ReventlessLocal from "../../../src/components/Aggr
 
 let name = "TestItem";
 
-let commandSchema = S.schema(s => ({
+let commandSchema = Sury.$schema(s => ({
   TAG: "CreateItem",
-  name: s.m(S.string)
+  name: s.m(Sury.string)
 }));
 
-let eventSchema = S.schema(s => ({
+let eventSchema = Sury.$schema(s => ({
   TAG: "ItemCreated",
-  name: s.m(S.string)
+  name: s.m(Sury.string)
 }));
 
-let errorSchema = S.literal("AlreadyExists");
+let errorSchema = Sury.literal("AlreadyExists");
 
 let moduleUrl = import.meta.url;
 

package/tests/components/automationslice/AutomationSliceFixtures.res

@@ -138,7 +138,7 @@ let testContext: Reventless.AutomationSlice.context = {
 // the event payload with a `meta.service` matching the source name so the
 // callback's per-source dispatch picks the right mapping.
 let encodeShipOrderEvent = (event: ShipOrderSource.event): JSON.t => {
-  let payloadJson = event->S.reverseConvertToJsonOrThrow(ShipOrderSource.eventSchema)
+  let payloadJson = event->Reventless.Util_Sury.toJson(ShipOrderSource.eventSchema)
   let dict = switch payloadJson->JSON.Decode.object {
   | Some(d) => d->Dict.copy
   | None =>
@@ -158,13 +158,13 @@ let encodeShipOrderEvent = (event: ShipOrderSource.event): JSON.t => {
     msgId: "msg-1",
     correlationId: "",
   }
-  dict->Dict.set("meta", meta->S.reverseConvertToJsonOrThrow(Reventless.Message.metaSchema))
+  dict->Dict.set("meta", meta->Reventless.Util_Sury.toJson(Reventless.Message.metaSchema))
   dict->Dict.set("id", JSON.Encode.string("env-id"))
   JSON.Encode.object(dict)
 }
 
 let encodeSkipProcessEvent = (event: SkipProcessSource.event): JSON.t => {
-  let payloadJson = event->S.reverseConvertToJsonOrThrow(SkipProcessSource.eventSchema)
+  let payloadJson = event->Reventless.Util_Sury.toJson(SkipProcessSource.eventSchema)
   let dict = switch payloadJson->JSON.Decode.object {
   | Some(d) => d->Dict.copy
   | None =>
@@ -183,7 +183,7 @@ let encodeSkipProcessEvent = (event: SkipProcessSource.event): JSON.t => {
     msgId: "msg-1",
     correlationId: "",
   }
-  dict->Dict.set("meta", meta->S.reverseConvertToJsonOrThrow(Reventless.Message.metaSchema))
+  dict->Dict.set("meta", meta->Reventless.Util_Sury.toJson(Reventless.Message.metaSchema))
   dict->Dict.set("id", JSON.Encode.string("env-id"))
   JSON.Encode.object(dict)
 }

package/tests/components/automationslice/AutomationSliceFixtures.res.mjs

@@ -1,21 +1,22 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
 import * as Message$Reventless from "@reventlessdev/reventless-spec/src/types/Message.res.mjs";
+import * as Util_Sury$Reventless from "@reventlessdev/reventless-spec/src/util/Util_Sury.res.mjs";
 import * as AutomationSlice$Reventless from "@reventlessdev/reventless-spec/src/components/AutomationSlice.res.mjs";
 
 let name = "ShipOrderDcbEventLog";
 
-let eventSchema = S.union([
-  S.schema(s => ({
+let eventSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "OrderPlaced",
     orderId: s.m(DcbTag$Reventless.string),
-    address: s.m(S.string)
+    address: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "ShipmentCreated",
     orderId: s.m(DcbTag$Reventless.string)
   }))
@@ -29,12 +30,12 @@ let ShipOrderSource = {
 
 let name$1 = "SkipProcessDcbEventLog";
 
-let eventSchema$1 = S.union([
-  S.schema(s => ({
+let eventSchema$1 = Sury.union([
+  Sury.$schema(s => ({
     TAG: "OrderPlaced",
     orderId: s.m(DcbTag$Reventless.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "ShipmentCreated",
     orderId: s.m(DcbTag$Reventless.string)
   }))
@@ -48,12 +49,12 @@ let SkipProcessSource = {
 
 let moduleUrl = import.meta.url;
 
-let todoItemSchema = S.schema(s => ({
-  orderId: s.m(S.string),
-  address: s.m(S.string)
+let todoItemSchema = Sury.$schema(s => ({
+  orderId: s.m(Sury.string),
+  address: s.m(Sury.string)
 }));
 
-let commandSchema = S.schema(s => ({
+let commandSchema = Sury.$schema(s => ({
   TAG: "CreateShipment",
   orderId: s.m(DcbTag$Reventless.string)
 }));
@@ -75,11 +76,11 @@ let ShipOrderSpec = {
 
 let moduleUrl$1 = import.meta.url;
 
-let todoItemSchema$1 = S.schema(s => ({
-  orderId: s.m(S.string)
+let todoItemSchema$1 = Sury.$schema(s => ({
+  orderId: s.m(Sury.string)
 }));
 
-let commandSchema$1 = S.literal("Noop");
+let commandSchema$1 = Sury.literal("Noop");
 
 function commandAuthorization$1(param) {
   return "AllowAuthenticated";
@@ -196,7 +197,7 @@ let SkipProcessAutomation = {
 };
 
 function encodeShipOrderEvent(event) {
-  let payloadJson = S.reverseConvertToJsonOrThrow(event, eventSchema);
+  let payloadJson = Util_Sury$Reventless.toJson(event, eventSchema);
   let d = Stdlib_JSON.Decode.object(payloadJson);
   let dict;
   if (d !== undefined) {
@@ -219,13 +220,13 @@ function encodeShipOrderEvent(event) {
     msgId: "msg-1",
     correlationId: ""
   };
-  dict["meta"] = S.reverseConvertToJsonOrThrow(meta, Message$Reventless.metaSchema);
+  dict["meta"] = Util_Sury$Reventless.toJson(meta, Message$Reventless.metaSchema);
   dict["id"] = "env-id";
   return dict;
 }
 
 function encodeSkipProcessEvent(event) {
-  let payloadJson = S.reverseConvertToJsonOrThrow(event, eventSchema$1);
+  let payloadJson = Util_Sury$Reventless.toJson(event, eventSchema$1);
   let d = Stdlib_JSON.Decode.object(payloadJson);
   let dict;
   if (d !== undefined) {
@@ -248,7 +249,7 @@ function encodeSkipProcessEvent(event) {
     msgId: "msg-1",
     correlationId: ""
   };
-  dict["meta"] = S.reverseConvertToJsonOrThrow(meta, Message$Reventless.metaSchema);
+  dict["meta"] = Util_Sury$Reventless.toJson(meta, Message$Reventless.metaSchema);
   dict["id"] = "env-id";
   return dict;
 }

package/tests/components/automationslice/AutomationSliceSelfDeadlockFixtures.res

@@ -207,7 +207,7 @@ let publishJsons: ReventlessInfra.CommandTopic.publishJsons = async cmdJsons =>
       let fullBody = JSON.Encode.object(
         Dict.fromArray([
           ("id", JSON.Encode.string(cmdJson.id)),
-          ("meta", cmdJson.meta->S.reverseConvertToJsonOrThrow(Reventless.Message.metaSchema)),
+          ("meta", cmdJson.meta->Reventless.Util_Sury.toJson(Reventless.Message.metaSchema)),
           ("command", cmdJson.commandJson),
         ]),
       )
@@ -266,7 +266,7 @@ let placeCmdJson = (orderId: string): Reventless.Message.commandJson => {
   id: orderId,
   meta: testMeta,
   commandJson: PlaceSpec.Place({orderId: orderId})
-    ->S.reverseConvertToJsonOrThrow(PlaceSpec.commandSchema),
+    ->Reventless.Util_Sury.toJson(PlaceSpec.commandSchema),
 }
 
 // Promise-based timeout used to fail fast if the chain self-deadlocks.

package/tests/components/automationslice/AutomationSliceSelfDeadlockFixtures.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Effect from "effect/Effect";
@@ -8,6 +8,7 @@ import * as Stream from "effect/Stream";
 import * as Pulumi from "@pulumi/pulumi";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
 import * as Message$Reventless from "@reventlessdev/reventless-spec/src/types/Message.res.mjs";
+import * as Util_Sury$Reventless from "@reventlessdev/reventless-spec/src/util/Util_Sury.res.mjs";
 import * as LocalBus$ReventlessLocal from "../../../src/adapter/LocalBus.res.mjs";
 import * as Component$ReventlessInfra from "@reventlessdev/reventless-infra/src/components/Component.res.mjs";
 import * as AutomationSlice$Reventless from "@reventlessdev/reventless-spec/src/components/AutomationSlice.res.mjs";
@@ -22,19 +23,19 @@ let name = "Place";
 
 let moduleUrl = import.meta.url;
 
-let eventSchema = S.schema(s => ({
+let eventSchema = Sury.$schema(s => ({
   TAG: "Placed",
   orderId: s.m(DcbTag$Reventless.string)
 }));
 
-let consumedEventSchema = S.literal("Placed");
+let consumedEventSchema = Sury.literal("Placed");
 
-let commandSchema = S.schema(s => ({
+let commandSchema = Sury.$schema(s => ({
   TAG: "Place",
   orderId: s.m(DcbTag$Reventless.string)
 }));
 
-let errorSchema = S.literal("AlreadyPlaced");
+let errorSchema = Sury.literal("AlreadyPlaced");
 
 function commandAuthorization(param) {
   return "AllowAuthenticated";
@@ -87,25 +88,25 @@ let name$1 = "Ship";
 
 let moduleUrl$2 = import.meta.url;
 
-let eventSchema$1 = S.schema(s => ({
+let eventSchema$1 = Sury.$schema(s => ({
   TAG: "Shipped",
   orderId: s.m(DcbTag$Reventless.string)
 }));
 
-let consumedEventSchema$1 = S.union([
-  S.schema(s => ({
+let consumedEventSchema$1 = Sury.union([
+  Sury.$schema(s => ({
     TAG: "Placed",
-    orderId: s.m(S.string)
+    orderId: s.m(Sury.string)
   })),
-  S.literal("Shipped")
+  Sury.literal("Shipped")
 ]);
 
-let commandSchema$1 = S.schema(s => ({
+let commandSchema$1 = Sury.$schema(s => ({
   TAG: "Ship",
   orderId: s.m(DcbTag$Reventless.string)
 }));
 
-let errorSchema$1 = S.literal("NotPlaced");
+let errorSchema$1 = Sury.literal("NotPlaced");
 
 function commandAuthorization$1(param) {
   return "AllowAuthenticated";
@@ -178,14 +179,14 @@ let ShipBehavior = {
 
 let name$2 = "TestLogDcbEventLog";
 
-let eventSchema$2 = S.union([
-  S.schema(s => ({
+let eventSchema$2 = Sury.union([
+  Sury.$schema(s => ({
     TAG: "Placed",
-    orderId: s.m(S.string)
+    orderId: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "Shipped",
-    orderId: s.m(S.string)
+    orderId: s.m(Sury.string)
   }))
 ]);
 
@@ -199,11 +200,11 @@ let name$3 = "AutoShip";
 
 let moduleUrl$4 = import.meta.url;
 
-let todoItemSchema = S.schema(s => ({
-  orderId: s.m(S.string)
+let todoItemSchema = Sury.$schema(s => ({
+  orderId: s.m(Sury.string)
 }));
 
-let commandSchema$2 = S.schema(s => ({
+let commandSchema$2 = Sury.$schema(s => ({
   TAG: "Ship",
   orderId: s.m(DcbTag$Reventless.string)
 }));
@@ -304,7 +305,7 @@ async function publishJsons(cmdJsons) {
       ],
       [
         "meta",
-        S.reverseConvertToJsonOrThrow(cmdJson.meta, Message$Reventless.metaSchema)
+        Util_Sury$Reventless.toJson(cmdJson.meta, Message$Reventless.metaSchema)
       ],
       [
         "command",
@@ -387,7 +388,7 @@ function placeCmdJson(orderId) {
   return {
     id: orderId,
     meta: TestFixtures$ReventlessLocal.testMeta,
-    commandJson: S.reverseConvertToJsonOrThrow({
+    commandJson: Util_Sury$Reventless.toJson({
       TAG: "Place",
       orderId: orderId
     }, commandSchema)

package/tests/components/automationslice/MixedSourceAutomationSliceFixtures.res

@@ -193,8 +193,8 @@ let publishAggregateEvent = async (id, event: OrderAggregateSource.event) => {
   let eventJson = JSON.Encode.object(
     Dict.fromArray([
       ("id", id->JSON.Encode.string),
-      ("meta", meta->S.reverseConvertToJsonOrThrow(Message.metaSchema)),
-      ("event", event->S.reverseConvertToJsonOrThrow(OrderAggregateSource.eventSchema)),
+      ("meta", meta->Reventless.Util_Sury.toJson(Message.metaSchema)),
+      ("event", event->Reventless.Util_Sury.toJson(OrderAggregateSource.eventSchema)),
     ]),
   )
   await Bus.publishEvent(OrderAggregateSource.name, "test", meta, eventJson)
@@ -205,8 +205,8 @@ let publishDcbEvent = async (id, event: InventoryDcbSource.event) => {
   let eventJson = JSON.Encode.object(
     Dict.fromArray([
       ("id", id->JSON.Encode.string),
-      ("meta", meta->S.reverseConvertToJsonOrThrow(Message.metaSchema)),
-      ("event", event->S.reverseConvertToJsonOrThrow(InventoryDcbSource.eventSchema)),
+      ("meta", meta->Reventless.Util_Sury.toJson(Message.metaSchema)),
+      ("event", event->Reventless.Util_Sury.toJson(InventoryDcbSource.eventSchema)),
     ]),
   )
   await Bus.publishEvent(InventoryDcbSource.name, "test", meta, eventJson)