@reventlessdev/reventless-core 3.0.0-alpha.238 → 3.0.0-alpha.240

package/tests/eventmapper/EventMapperFixtures.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_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Message$Reventless from "@reventlessdev/reventless-spec/src/types/Message.res.mjs";
@@ -8,21 +8,19 @@ import * as ReadModel$Reventless from "@reventlessdev/reventless-spec/src/compon
 import * as Projection$Reventless from "@reventlessdev/reventless-spec/src/types/Projection.res.mjs";
 import * as EventMapper_Callback$ReventlessCore from "../../src/components/EventMapper/EventMapper_Callback.res.mjs";
 
-S.enableJson();
-
 let name = "SourceAggregate";
 
-let eventSchema = S.union([
-  S.schema(s => ({
+let eventSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "ItemCreated",
-    name: s.m(S.string),
-    price: s.m(S.float)
+    name: s.m(Sury.string),
+    price: s.m(Sury.float)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "ItemPriceUpdated",
-    newPrice: s.m(S.float)
+    newPrice: s.m(Sury.float)
   })),
-  S.literal("ItemRemoved")
+  Sury.literal("ItemRemoved")
 ]);
 
 let moduleUrl = import.meta.url;
@@ -36,9 +34,9 @@ let SourceSpec = {
 
 let name$1 = "ItemCatalog";
 
-let stateSchema = S.schema(s => ({
-  name: s.m(S.string),
-  price: s.m(S.float)
+let stateSchema = Sury.$schema(s => ({
+  name: s.m(Sury.string),
+  price: s.m(Sury.float)
 }));
 
 let config = ReadModel$Reventless.config(undefined, undefined, undefined);
@@ -114,15 +112,15 @@ function makeSourceEvent$p(id, event) {
 
 let name$2 = "TestCmdSource";
 
-let eventSchema$1 = S.union([
-  S.schema(s => ({
+let eventSchema$1 = Sury.union([
+  Sury.$schema(s => ({
     TAG: "OrderPlaced",
-    orderId: s.m(S.string),
-    amount: s.m(S.float)
+    orderId: s.m(Sury.string),
+    amount: s.m(Sury.float)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "OrderShipped",
-    orderId: s.m(S.string)
+    orderId: s.m(Sury.string)
   }))
 ]);
 
@@ -137,15 +135,15 @@ let CmdSourceSpec = {
 
 let name$3 = "TestCmdTarget";
 
-let commandSchema = S.union([
-  S.schema(s => ({
+let commandSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "ProcessOrder",
-    orderId: s.m(S.string),
-    amount: s.m(S.float)
+    orderId: s.m(Sury.string),
+    amount: s.m(Sury.float)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "ShipOrder",
-    orderId: s.m(S.string)
+    orderId: s.m(Sury.string)
   }))
 ]);
 
@@ -437,4 +435,4 @@ export {
   makeEventJson,
   resetMocks,
 }
-/*  Not a pure module */
+/* eventSchema Not a pure module */

package/tests/eventtopic/EventTopicFixtures.res

@@ -1,4 +1,3 @@
-S.enableJson()
 
 // Test event spec for EventTopic
 module ItemEventTopicSpec = {

package/tests/eventtopic/EventTopicFixtures.res.mjs

@@ -1,17 +1,15 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 
-S.enableJson();
-
-let eventSchema = S.union([
-  S.schema(s => ({
+let eventSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "ItemPublished",
-    name: s.m(S.string)
+    name: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "ItemRemoved",
-    id: s.m(S.string)
+    id: s.m(Sury.string)
   }))
 ]);
 
@@ -62,4 +60,4 @@ export {
   makeEvent$p,
   reset,
 }
-/*  Not a pure module */
+/* eventSchema Not a pure module */

package/tests/extensionpoint/ExtensionPointFixtures.res

@@ -1,5 +1,4 @@
 // Fixtures for ExtensionPoint callback unit tests.
-S.enableJson()
 
 // ─────────────────────────────────────────────────────────────
 // ExtensionPoint spec (command + directive types)

package/tests/extensionpoint/ExtensionPointFixtures.res.mjs

@@ -1,30 +1,28 @@
 // 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 ExtensionPoint_Callback$ReventlessCore from "../../src/components/ExtensionPoint/ExtensionPoint_Callback.res.mjs";
 
-S.enableJson();
-
 let name = "TestExtensionPoint";
 
-let commandSchema = S.union([
-  S.schema(s => ({
+let commandSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "RouteToAgg",
-    aggId: s.m(S.string)
+    aggId: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "TriggerDirective",
-    value: s.m(S.string)
+    value: s.m(Sury.string)
   }))
 ]);
 
-let eventSchema = S.schema(s => ({
+let eventSchema = Sury.$schema(s => ({
   TAG: "Done",
-  result: s.m(S.string)
+  result: s.m(Sury.string)
 }));
 
-let directiveSchema = S.literal("DirectiveA");
+let directiveSchema = Sury.literal("DirectiveA");
 
 let moduleUrl = import.meta.url;
 
@@ -202,4 +200,4 @@ export {
   makeTopicItem,
   reset,
 }
-/*  Not a pure module */
+/* commandSchema Not a pure module */

package/tests/extensionpoint/ExtensionPointOperationsTest.res

@@ -3,7 +3,6 @@
 
 open JestGlobals
 
-S.enableJson()
 
 // ─────────────────────────────────────────────────────────────
 // EP Spec — minimal types for operations tests
@@ -189,7 +188,7 @@ let makeEventJsonForAgg = (aggregateName: string): JSON.t => {
   }
   JSON.Encode.object(
     Dict.fromArray([
-      ("meta", meta->S.reverseConvertToJsonOrThrow(Reventless.Message.metaSchema)),
+      ("meta", meta->Reventless.Util_Sury.toJson(Reventless.Message.metaSchema)),
       ("event", JSON.Encode.string("SomeEvent")),
     ]),
   )

package/tests/extensionpoint/ExtensionPointOperationsTest.res.mjs

@@ -1,24 +1,23 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 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 ExtensionPoint_Operations$ReventlessCore from "../../src/components/ExtensionPoint/ExtensionPoint_Operations.res.mjs";
 
-S.enableJson();
-
 let name = "OpsTestEP";
 
-let commandSchema = S.schema(s => ({
+let commandSchema = Sury.$schema(s => ({
   TAG: "OpsEPCmd",
-  id: s.m(S.string)
+  id: s.m(Sury.string)
 }));
 
-let eventSchema = S.schema(s => ({
+let eventSchema = Sury.$schema(s => ({
   TAG: "OpsEPEvent",
-  result: s.m(S.string)
+  result: s.m(Sury.string)
 }));
 
-let directiveSchema = S.literal("OpsEPNoDirective");
+let directiveSchema = Sury.literal("OpsEPNoDirective");
 
 let moduleUrl = import.meta.url;
 
@@ -225,7 +224,7 @@ function makeEventJsonForAgg(aggregateName) {
   return Object.fromEntries([
     [
       "meta",
-      S.reverseConvertToJsonOrThrow(meta, Message$Reventless.metaSchema)
+      Util_Sury$Reventless.toJson(meta, Message$Reventless.metaSchema)
     ],
     [
       "event",
@@ -301,4 +300,4 @@ export {
   makeEventJsonForAgg,
   reset,
 }
-/*  Not a pure module */
+/* commandSchema Not a pure module */

package/tests/logger/LogFormatTest.res

@@ -1,7 +1,6 @@
 open JestGlobals
 open LogFormat
 
-S.enableJson()
 
 // Sink detection (Reventless.AnsiStyle) defaults a non-TTY stdout — Jest
 // included — to JSON, which no-ops `bold`/`fmtComp`. The human-format
@@ -121,7 +120,9 @@ describe("LogFormat", () => {
         let eventJson' = event'->Message.encodeEvent'(S.string, eventSchema)
         let msg = event'JsonToLogMessage(eventJson')
 
-        let expected = `\x1b[1mVersionDetected\x1b[0m(testId): {"event":{"TAG":"VersionDetected","_0":"0.0.0"},"meta":{"service":"testService","time":"testTime","ip":"testIp","user":"testUser","msgId":"testMsgId","correlationId":"testCorrelationId"},"id":"testId"}`
+        // sury 11 (alpha.8) serialises meta keys in a different order than alpha.4
+        // (msgId/correlationId before ip/user) — same data, JSON-equivalent.
+        let expected = `\x1b[1mVersionDetected\x1b[0m(testId): {"event":{"TAG":"VersionDetected","_0":"0.0.0"},"meta":{"service":"testService","time":"testTime","msgId":"testMsgId","correlationId":"testCorrelationId","ip":"testIp","user":"testUser"},"id":"testId"}`
 
         expect(msg)->toEqual(expected)
       },

package/tests/logger/LogFormatTest.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 Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -15,8 +15,6 @@ import * as LogFormat$ReventlessCore from "../../src/util/LogFormat.res.mjs";
 import * as PluginSpec$ReventlessCore from "../../src/plugin/lifecycle/PluginSpec.res.mjs";
 import * as EffectLogger$ReventlessCore from "../../src/util/EffectLogger.res.mjs";
 
-S.enableJson();
-
 process.env["REVENTLESS_LOG_FORMAT"] = "text";
 
 AnsiStyle$Reventless.reload();
@@ -119,17 +117,17 @@ globalThis.describe("LogFormat", () => {
           TAG: "VersionDetected",
           _0: "0.0.0"
         }
-      }, S.string, PluginSpec$ReventlessCore.eventSchema);
+      }, Sury.string, PluginSpec$ReventlessCore.eventSchema);
       let msg = LogFormat$ReventlessCore.event$pJsonToLogMessage(eventJson$p);
-      globalThis.expect(msg).toEqual(`\x1b[1mVersionDetected\x1b[0m(testId): {"event":{"TAG":"VersionDetected","_0":"0.0.0"},"meta":{"service":"testService","time":"testTime","ip":"testIp","user":"testUser","msgId":"testMsgId","correlationId":"testCorrelationId"},"id":"testId"}`);
+      globalThis.expect(msg).toEqual(`\x1b[1mVersionDetected\x1b[0m(testId): {"event":{"TAG":"VersionDetected","_0":"0.0.0"},"meta":{"service":"testService","time":"testTime","msgId":"testMsgId","correlationId":"testCorrelationId","ip":"testIp","user":"testUser"},"id":"testId"}`);
     });
   });
   globalThis.describe("variantFields", () => {
-    let commandSchema = S.schema(s => ({
+    let commandSchema = Sury.$schema(s => ({
       TAG: "AddProduct",
-      productId: s.m(S.string),
-      name: s.m(S.string),
-      imageUrl: s.m(S.option(S.string))
+      productId: s.m(Sury.string),
+      name: s.m(Sury.string),
+      imageUrl: s.m(Sury.$option(Sury.string))
     }));
     globalThis.test("omits an absent optional field", () => {
       let json = Message$ReventlessCore.encode({

package/tests/message/MessageTest.res

@@ -167,7 +167,7 @@ describe("Message should", () => {
       }`)(json)
 
     // Strict decode must reject the stale JSON — the tolerance is what saves it.
-    let strictThrew = switch oldJson->S.parseJsonOrThrow(
+    let strictThrew = switch oldJson->Reventless.Util_Sury.fromJson(
       Message.toEventSchema'(S.string, PluginSpec.eventSchema),
     ) {
     | _ => false
@@ -222,7 +222,7 @@ describe("Message should", () => {
       )
 
     // Strict decode of the stale variant throws (reproduces the production brick).
-    let strictThrew = switch staleJson->S.parseJsonOrThrow(PluginSpec.eventSchema) {
+    let strictThrew = switch staleJson->Reventless.Util_Sury.fromJson(PluginSpec.eventSchema) {
     | _ => false
     | exception _ => true
     }

package/tests/message/MessageTest.res.mjs

@@ -1,8 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Offload$Reventless from "@reventlessdev/reventless-spec/src/semantic/Offload.res.mjs";
+import * as Util_Sury$Reventless from "@reventlessdev/reventless-spec/src/util/Util_Sury.res.mjs";
 import * as Message$ReventlessCore from "../../src/Message.res.mjs";
 import * as PluginSpec$ReventlessCore from "../../src/plugin/lifecycle/PluginSpec.res.mjs";
 
@@ -66,7 +67,7 @@ globalThis.describe("Message should", () => {
         TAG: "VersionDetected",
         _0: "0.0.0"
       }
-    }, S.string, PluginSpec$ReventlessCore.eventSchema);
+    }, Sury.string, PluginSpec$ReventlessCore.eventSchema);
     let eventName = Message$ReventlessCore.eventNameOfEvent$pJson(eventJson$p);
     globalThis.expect(eventName).toBe("VersionDetected");
   });
@@ -85,7 +86,7 @@ globalThis.describe("Message should", () => {
         TAG: "VersionDetected",
         _0: "0.0.0"
       }
-    }, S.string, PluginSpec$ReventlessCore.eventSchema);
+    }, Sury.string, PluginSpec$ReventlessCore.eventSchema);
     let eventId = Stdlib_Option.getOrThrow(Message$ReventlessCore.idOfEvent$pJson(eventJson$p), undefined);
     globalThis.expect(eventId).toBe("testId");
   });
@@ -146,7 +147,7 @@ globalThis.describe("Message should", () => {
       meta: event$p_meta,
       event: event$p_event
     };
-    let json = Message$ReventlessCore.encodeEvent$p(event$p, S.string, PluginSpec$ReventlessCore.eventSchema);
+    let json = Message$ReventlessCore.encodeEvent$p(event$p, Sury.string, PluginSpec$ReventlessCore.eventSchema);
     let oldJson = (function(j){
         var c = JSON.parse(JSON.stringify(j));
         var d = c.event._0;
@@ -159,13 +160,13 @@ globalThis.describe("Message should", () => {
       })(json);
     let strictThrew;
     try {
-      S.parseJsonOrThrow(oldJson, Message$ReventlessCore.toEventSchema$p(S.string, PluginSpec$ReventlessCore.eventSchema));
+      Util_Sury$Reventless.fromJson(oldJson, Message$ReventlessCore.toEventSchema$p(Sury.string, PluginSpec$ReventlessCore.eventSchema));
       strictThrew = false;
     } catch (exn) {
       strictThrew = true;
     }
     globalThis.expect(strictThrew).toBe(true);
-    let decoded = Message$ReventlessCore.decodeEvent$p(oldJson, S.string, PluginSpec$ReventlessCore.eventSchema);
+    let decoded = Message$ReventlessCore.decodeEvent$p(oldJson, Sury.string, PluginSpec$ReventlessCore.eventSchema);
     let d = decoded.event;
     if (d.TAG === "VersionConnected") {
       let d$1 = d._0;
@@ -204,7 +205,7 @@ globalThis.describe("Message should", () => {
     let staleJson = (function(j){ var c = JSON.parse(JSON.stringify(j)); delete c._0.kind; return c; })(variantJson);
     let strictThrew;
     try {
-      S.parseJsonOrThrow(staleJson, PluginSpec$ReventlessCore.eventSchema);
+      Util_Sury$Reventless.fromJson(staleJson, PluginSpec$ReventlessCore.eventSchema);
       strictThrew = false;
     } catch (exn) {
       strictThrew = true;

package/tests/message/MetaEnvelopeTest.res

@@ -15,7 +15,7 @@ open Message
 describe("Message.meta optional fields:", () => {
   testSync("generateMeta() with no ~ip/~user omits those keys from JSON", () => {
     let meta = generateMeta(~service="svc")
-    let json = meta->S.reverseConvertToJsonOrThrow(metaSchema)
+    let json = meta->Reventless.Util_Sury.toJson(metaSchema)
     let obj = json->JSON.Decode.object->Option.getOrThrow
     expect(obj->Dict.get("ip"))->toEqual(None)->ignore
     expect(obj->Dict.get("user"))->toEqual(None)->ignore
@@ -37,8 +37,8 @@ describe("Message.meta optional fields:", () => {
 
   testSync("generateMeta(~user=alice) round-trips Some(alice)", () => {
     let meta = generateMeta(~service="svc", ~user="alice")
-    let json = meta->S.reverseConvertToJsonOrThrow(metaSchema)
-    let decoded = json->S.parseJsonOrThrow(metaSchema)
+    let json = meta->Reventless.Util_Sury.toJson(metaSchema)
+    let decoded = json->Reventless.Util_Sury.fromJson(metaSchema)
     expect(decoded.user)->toEqual(Some("alice"))
   })
 
@@ -54,8 +54,8 @@ describe("Message.meta optional fields:", () => {
       ~schemaVersion="1.2.0",
       ~headers,
     )
-    let json = meta->S.reverseConvertToJsonOrThrow(metaSchema)
-    let decoded = json->S.parseJsonOrThrow(metaSchema)
+    let json = meta->Reventless.Util_Sury.toJson(metaSchema)
+    let decoded = json->Reventless.Util_Sury.fromJson(metaSchema)
     expect(decoded.ip)->toEqual(Some("10.0.0.1"))->ignore
     expect(decoded.user)->toEqual(Some("bob"))->ignore
     expect(decoded.causationId)->toEqual(Some("parent-msg-id"))->ignore

package/tests/message/MetaEnvelopeTest.res.mjs

@@ -1,14 +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_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Util_Sury$Reventless from "@reventlessdev/reventless-spec/src/util/Util_Sury.res.mjs";
 import * as Message$ReventlessCore from "../../src/Message.res.mjs";
 
 globalThis.describe("Message.meta optional fields:", () => {
   globalThis.test("generateMeta() with no ~ip/~user omits those keys from JSON", () => {
     let meta = Message$ReventlessCore.generateMeta("svc", undefined, undefined, undefined, undefined, undefined, undefined, undefined);
-    let json = S.reverseConvertToJsonOrThrow(meta, Message$ReventlessCore.metaSchema);
+    let json = Util_Sury$Reventless.toJson(meta, Message$ReventlessCore.metaSchema);
     let obj = Stdlib_Option.getOrThrow(Stdlib_JSON.Decode.object(json), undefined);
     globalThis.expect(obj["ip"]).toEqual(undefined);
     globalThis.expect(obj["user"]).toEqual(undefined);
@@ -27,8 +28,8 @@ globalThis.describe("Message.meta optional fields:", () => {
   });
   globalThis.test("generateMeta(~user=alice) round-trips Some(alice)", () => {
     let meta = Message$ReventlessCore.generateMeta("svc", undefined, "alice", undefined, undefined, undefined, undefined, undefined);
-    let json = S.reverseConvertToJsonOrThrow(meta, Message$ReventlessCore.metaSchema);
-    let decoded = S.parseJsonOrThrow(json, Message$ReventlessCore.metaSchema);
+    let json = Util_Sury$Reventless.toJson(meta, Message$ReventlessCore.metaSchema);
+    let decoded = Util_Sury$Reventless.fromJson(json, Message$ReventlessCore.metaSchema);
     globalThis.expect(decoded.user).toEqual("alice");
   });
   globalThis.test("all new optional fields round-trip when set", () => {
@@ -43,8 +44,8 @@ globalThis.describe("Message.meta optional fields:", () => {
       ]
     ]);
     let meta = Message$ReventlessCore.generateMeta("svc", "10.0.0.1", "bob", "parent-msg-id", "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01", "root-msg-id", "1.2.0", headers);
-    let json = S.reverseConvertToJsonOrThrow(meta, Message$ReventlessCore.metaSchema);
-    let decoded = S.parseJsonOrThrow(json, Message$ReventlessCore.metaSchema);
+    let json = Util_Sury$Reventless.toJson(meta, Message$ReventlessCore.metaSchema);
+    let decoded = Util_Sury$Reventless.fromJson(json, Message$ReventlessCore.metaSchema);
     globalThis.expect(decoded.ip).toEqual("10.0.0.1");
     globalThis.expect(decoded.user).toEqual("bob");
     globalThis.expect(decoded.causationId).toEqual("parent-msg-id");
@@ -116,8 +117,8 @@ globalThis.describe("StoredEvent encode/decode round-trip:", () => {
       meta: meta,
       recordedAt: "2026-05-13T10:00:00.000Z"
     };
-    let flat = Message$ReventlessCore.storedEventToFlatJson(stored, S.string);
-    let roundTrip = Message$ReventlessCore.flatJsonToStoredEvent(flat, S.string);
+    let flat = Message$ReventlessCore.storedEventToFlatJson(stored, Sury.string);
+    let roundTrip = Message$ReventlessCore.flatJsonToStoredEvent(flat, Sury.string);
     globalThis.expect(roundTrip.id).toBe("agg-1");
     globalThis.expect(roundTrip.position).toBe("000000001");
     globalThis.expect(roundTrip.event).toBe("ItemCreated");
@@ -151,8 +152,8 @@ globalThis.describe("StoredEvent encode/decode round-trip:", () => {
       recordedAt: "2026-05-13T10:00:00.000Z",
       tags: stored_tags
     };
-    let flat = Message$ReventlessCore.storedEventToFlatJson(stored, S.string);
-    let roundTrip = Message$ReventlessCore.flatJsonToStoredEvent(flat, S.string);
+    let flat = Message$ReventlessCore.storedEventToFlatJson(stored, Sury.string);
+    let roundTrip = Message$ReventlessCore.flatJsonToStoredEvent(flat, Sury.string);
     globalThis.expect(roundTrip.id).toBe("productId:p-1");
     globalThis.expect(roundTrip.position).toBe("1736782800000-abc-uuid");
     globalThis.expect(roundTrip.event).toBe("ProductAdded");
@@ -174,7 +175,7 @@ globalThis.describe("StoredEvent encode/decode round-trip:", () => {
       meta: meta,
       recordedAt: "2026-05-13T10:00:00.000Z"
     };
-    let flat = Message$ReventlessCore.storedEventToFlatJson(stored, S.string);
+    let flat = Message$ReventlessCore.storedEventToFlatJson(stored, Sury.string);
     let obj = Stdlib_Option.getOrThrow(Stdlib_JSON.Decode.object(flat), undefined);
     globalThis.expect(obj["meta"]).toEqual(undefined);
     globalThis.expect(obj["service"]).toEqual("catalog");

package/tests/plugin/ManifestVisibilityTest.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 Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
@@ -11,9 +11,9 @@ let name = "PublicView";
 
 let moduleUrl = "";
 
-let stateSchema = S.schema(s => ({
-  id: s.m(S.string),
-  name: s.m(S.string)
+let stateSchema = Sury.$schema(s => ({
+  id: s.m(Sury.string),
+  name: s.m(Sury.string)
 }));
 
 let config = ReadModel$Reventless.config(undefined, undefined, undefined);
@@ -33,9 +33,9 @@ let name$1 = "InternalView";
 
 let moduleUrl$1 = "";
 
-let stateSchema$1 = S.schema(s => ({
-  id: s.m(S.string),
-  name: s.m(S.string)
+let stateSchema$1 = Sury.$schema(s => ({
+  id: s.m(Sury.string),
+  name: s.m(Sury.string)
 }));
 
 let config$1 = ReadModel$Reventless.config(undefined, undefined, undefined);

package/tests/plugin/PluginDefinitionScalars.res

@@ -41,14 +41,16 @@ let collect = (root: S.t<'a>): array<string> => {
 
   let rec walk = (schema: S.t<unknown>, path: string) =>
     switch schema {
-    | Object({items}) =>
+    | Object({properties}) =>
       if !(seen->Set.has(schema)) {
         seen->Set.add(schema)
-        items->Array.forEach(item => walk(item.schema, `${path}.${item.location}`))
+        properties
+        ->Dict.toArray
+        ->Array.forEach(((name, fieldSchema)) => walk(fieldSchema, `${path}.${name}`))
         seen->Set.delete(schema)->ignore
       }
     | Array({additionalItems: Schema(element)}) => walk(element, `${path}[]`)
-    | Union({anyOf, has}) =>
+    | AnyOf({anyOf, has}) =>
       // A union of literals is an enum: absent heals to the first variant.
       let isEnum = anyOf->Array.every(member =>
         switch member {

package/tests/plugin/PluginDefinitionScalars.res.mjs

@@ -59,13 +59,13 @@ function collect(root) {
         case "object" :
           if (!seen.has(schema)) {
             seen.add(schema);
-            schema.items.forEach(item => walk(item.schema, path + `.` + item.location));
+            Object.entries(schema.properties).forEach(param => walk(param[1], path + `.` + param[0]));
             seen.delete(schema);
             return;
           } else {
             return;
           }
-        case "union" :
+        case "anyOf" :
           let anyOf = schema.anyOf;
           let isEnum = anyOf.every(member => {
             switch (member.type) {

package/tests/plugin/PluginLifecycleCorpusTest.res

@@ -36,12 +36,13 @@ describe("The stored plugin-lifecycle payload corpus", () => {
 
   entries->Array.forEach(entry =>
     testSync(`still decodes: ${entry.name}`, () => {
-      // Sury's own exception carries the field path, which is the whole value of
+      // Sury's own error carries the field path, which is the whole value of
       // this suite's failure message — report it verbatim rather than "it threw".
+      // sury 11 throws a plain JS `SuryError` with no ReScript exception
+      // constructor to match on, so the message comes off the JS exception.
       let outcome = switch decodeStored(entry) {
       | _ => "decodes"
-      | exception S.Error(err) => err.message
-      | exception JsExn(e) => `threw: ${JsExn.message(e)->Option.getOr("no message")}`
+      | exception JsExn(e) => JsExn.message(e)->Option.getOr("threw: no message")
       | exception _ => "threw a non-JS exception"
       }
       expect(outcome)->toBe("decodes")

package/tests/plugin/PluginLifecycleCorpusTest.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
@@ -22,11 +21,9 @@ globalThis.describe("The stored plugin-lifecycle payload corpus", () => {
       try {
         decodeStored(entry);
         outcome = "decodes";
-      } catch (raw_err) {
-        let err = Primitive_exceptions.internalToException(raw_err);
-        outcome = err.RE_EXN_ID === S.$$Error ? err._1.message : (
-            err.RE_EXN_ID === "JsExn" ? `threw: ` + Stdlib_Option.getOr(Stdlib_JsExn.message(err._1), "no message") : "threw a non-JS exception"
-          );
+      } catch (raw_e) {
+        let e = Primitive_exceptions.internalToException(raw_e);
+        outcome = e.RE_EXN_ID === "JsExn" ? Stdlib_Option.getOr(Stdlib_JsExn.message(e._1), "threw: no message") : "threw a non-JS exception";
       }
       globalThis.expect(outcome).toBe("decodes");
     });

package/tests/plugin/PluginSpecExperiment.res

@@ -1,4 +1,3 @@
-S.enableJson()
 
 @schema
 type record = {