@reventlessdev/reventless-core 3.0.0-alpha.239 → 3.0.0-alpha.241

package/src/components/Api/GraphQL_FragmentGenerator.res

@@ -132,6 +132,21 @@ let deriveObjectTypeWithNested = (
 ): array<string> =>
   switch SchemaType.fromSuryObject(~typeName, schema) {
   | Some(fields) =>
+    // `@internal` joins the caller's exclusions rather than replacing them. The
+    // caller's list is a decision made where the query entry is assembled; this
+    // one is a declaration on the field itself, and the schema is the better
+    // place for it — a hand-written list has to be kept in step with the record
+    // by whoever next edits it, which is the drift that made a hand-maintained
+    // `pluginExcludeFields` necessary in the first place.
+    //
+    // This is the single point for the SDL: every generated object type is
+    // derived here, so a field declared internal is absent from all of them
+    // without any entry having to say so.
+    let declaredInternal =
+      Reventless.StateAnnotations.getSpec(schema)
+      ->Option.flatMap(spec => spec.internal)
+      ->Option.getOr([])
+    let excludeFields = Array.concat(excludeFields, declaredInternal)
     let filteredFields = if excludeFields->Array.length > 0 {
       let d = Dict.make()
       fields
@@ -641,7 +656,7 @@ let generate = (
     // schema shape — see `mutationSchemaEntry.injectIdArg`.
     let injectIdArg = entry.injectIdArg->Option.getOr(true)
     switch schema {
-    | Union({anyOf}) =>
+    | AnyOf({anyOf}) =>
       // Map each fieldName to its variant in anyOf by matching the constructor
       // name. Position-based pairing (anyOf index ↔ fieldNames index) breaks
       // when `@noApi` filters out some variants but the schema still carries
@@ -650,17 +665,8 @@ let generate = (
       // index 1, leaking a stale `_0: Platform_Plugin_Deactivate_0` arg.
       let variantNames = anyOf->Array.map(v =>
         switch v {
-        | Object({items}) =>
-          items
-          ->Array.find(item => item.location == "TAG")
-          ->Option.flatMap(item =>
-            switch item.schema {
-            | String({const}) => Some(const)
-            | _ => None
-            }
-          )
-          ->Option.getOr("")
-        | String({const}) => const
+        | Object({properties}) => SchemaWalker.tagConstOf(properties)->Option.getOr("")
+        | String({const: ?Some(const)}) => const
         | _ => ""
         }
       )

package/src/components/Api/GraphQL_FragmentGenerator.res.mjs

@@ -5,6 +5,7 @@ import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_String from "@rescript/runtime/lib/es6/Stdlib_String.js";
 import * as Api_Naming$ReventlessCore from "./Api_Naming.res.mjs";
 import * as SchemaType$ReventlessCore from "./SchemaType.res.mjs";
+import * as SchemaWalker$ReventlessCore from "../../plugin/component/SchemaWalker.res.mjs";
 import * as StateAnnotations$Reventless from "@reventlessdev/reventless-spec/src/components/StateAnnotations.res.mjs";
 import * as GraphQL_Stitcher$ReventlessCore from "./GraphQL_Stitcher.res.mjs";
 
@@ -116,12 +117,14 @@ function deriveObjectTypeWithNested(typeName, excludeFieldsOpt, includeIdParamOp
   if (fields === undefined) {
     return [];
   }
+  let declaredInternal = Stdlib_Option.getOr(Stdlib_Option.flatMap(StateAnnotations$Reventless.getSpec(schema), spec => spec.internal), []);
+  let excludeFields$1 = excludeFields.concat(declaredInternal);
   let filteredFields;
-  if (excludeFields.length !== 0) {
+  if (excludeFields$1.length !== 0) {
     let d = {};
     Object.entries(fields).forEach(param => {
       let k = param[0];
-      if (!excludeFields.some(ex => ex === k)) {
+      if (!excludeFields$1.some(ex => ex === k)) {
         d[k] = param[1];
         return;
       }
@@ -444,7 +447,7 @@ function generate(mutationEntries, queryEntries) {
         } else {
           return;
         }
-      case "union" :
+      case "anyOf" :
         let anyOf = schema.anyOf;
         let variantNames = anyOf.map(v => {
           switch (v.type) {
@@ -456,16 +459,7 @@ function generate(mutationEntries, queryEntries) {
                 return "";
               }
             case "object" :
-              return Stdlib_Option.getOr(Stdlib_Option.flatMap(v.items.find(item => item.location === "TAG"), item => {
-                let match = item.schema;
-                if (match.type !== "string") {
-                  return;
-                }
-                let $$const = match.const;
-                if ($$const !== undefined) {
-                  return $$const;
-                }
-              }), "");
+              return Stdlib_Option.getOr(SchemaWalker$ReventlessCore.tagConstOf(v.properties), "");
             default:
               return "";
           }

package/src/components/Api/GraphQL_SchemaInspector.res

@@ -29,7 +29,7 @@ let inspectMutationFields = (~fieldPrefix: string, commandSchema: S.t<'a>): arra
   let collectedTypes: array<string> = []
   let seenTypes = Set.make()
   switch schema {
-  | Union({anyOf}) =>
+  | AnyOf({anyOf}) =>
     let constructorNames = Reventless.DcbTag.extractAllVariantNames(commandSchema)
     anyOf->Array.forEachWithIndex((variantSchema, i) => {
       let fieldName = switch constructorNames->Array.get(i) {

package/src/components/Api/GraphQL_SchemaInspector.res.mjs

@@ -27,7 +27,7 @@ function inspectMutationFields(fieldPrefix, commandSchema) {
         fields.push(field);
       });
       break;
-    case "union" :
+    case "anyOf" :
       let constructorNames = DcbTag$Reventless.extractAllVariantNames(commandSchema);
       commandSchema.anyOf.forEach((variantSchema, i) => {
         let name = constructorNames[i];

package/src/components/Api/MCP_SchemaGenerator.res

@@ -52,7 +52,7 @@ let generateTools = (
     let entryDescription = entry.description->Option.getOr("")
 
     switch schema {
-    | Union({anyOf}) =>
+    | AnyOf({anyOf}) =>
       // Aggregate commands: each variant is a separate tool.
       // Inject an "id" property (aggregate instance ID) since aggregate
       // commands target a specific instance.

package/src/components/Api/MCP_SchemaGenerator.res.mjs

@@ -33,7 +33,7 @@ function generateTools(pluginName, mutationEntries) {
           inputSchema: inputSchema
         });
         return;
-      case "union" :
+      case "anyOf" :
         schema.anyOf.forEach((variantSchema, i) => {
           let fieldName = Stdlib_Option.getOr(entry.fieldNames[i], "");
           if (fieldName.length <= 0) {

package/src/components/Api/SchemaType.res

@@ -99,15 +99,11 @@ and shapeOf = (~parentName: string, ~fieldName: string, schema: S.t<unknown>): s
     | BigInt(_) => ScalarBigInt
     | Array({items, additionalItems}) =>
       let itemType = switch items->Array.get(0) {
-      | Some({schema: itemSchema}) =>
-        fromSury(
-          ~parentName,
-          ~fieldName,
-          itemSchema->(Obj.magic: S.t<unknown> => S.t<unknown>),
-        )
+      | Some(itemSchema) => fromSury(~parentName, ~fieldName, itemSchema)
       | None =>
-        // sury stores the item schema in additionalItems (not items) for S.array().
-        // additionalItems is @unboxed: Strip="strip", Strict="strict", Schema(t) = the schema object.
+        // For a homogeneous S.array() sury stores the element schema in
+        // additionalItems (items holds fixed tuple positions). additionalItems is
+        // @unboxed: Strip="strip" | Strict="strict" | Schema(t) = the schema object.
         switch additionalItems {
         | Schema(s) => fromSury(~parentName, ~fieldName, s)
         | _ => ScalarString
@@ -135,7 +131,7 @@ and shapeOf = (~parentName: string, ~fieldName: string, schema: S.t<unknown>): s
       } else {
         ObjectRef(nestedName, fields)
       }
-    | Union({anyOf}) =>
+    | AnyOf({anyOf}) =>
       let nonNullVariants = anyOf->Array.filter(v =>
         switch v {
         | Null(_) | Undefined(_) => false
@@ -196,7 +192,7 @@ let optionalFieldNames = (schema: S.t<unknown>): array<string> =>
     ->Dict.toArray
     ->Array.filterMap(((propName, propSchema)) =>
       switch propSchema {
-      | Union({anyOf}) =>
+      | AnyOf({anyOf}) =>
         anyOf->Array.some(v =>
           switch v {
           | Null(_) | Undefined(_) => true

package/src/components/Api/SchemaType.res.mjs

@@ -92,8 +92,8 @@ function shapeOf(parentName, fieldName, schema) {
       };
     case "array" :
       let additionalItems = schema.additionalItems;
-      let match = schema.items[0];
-      let itemType = match !== undefined ? fromSury(parentName, fieldName, match.schema) : (
+      let itemSchema = schema.items[0];
+      let itemType = itemSchema !== undefined ? fromSury(parentName, fieldName, itemSchema) : (
           additionalItems === "strip" || additionalItems === "strict" ? "ScalarString" : fromSury(parentName, fieldName, additionalItems)
         );
       let itemType$1 = (isIdsFieldName(fieldName) || isIdFieldName(fieldName)) && itemType === "ScalarString" ? "EntityId" : itemType;
@@ -120,7 +120,7 @@ function shapeOf(parentName, fieldName, schema) {
           _1: fields
         };
       }
-    case "union" :
+    case "anyOf" :
       let anyOf = schema.anyOf;
       let nonNullVariants = anyOf.filter(v => {
         switch (v.type) {
@@ -173,7 +173,7 @@ function optionalFieldNames(schema) {
   if (schema.type === "object") {
     return Stdlib_Array.filterMap(Object.entries(schema.properties), param => {
       let propSchema = param[1];
-      if (propSchema.type === "union" && propSchema.anyOf.some(v => {
+      if (propSchema.type === "anyOf" && propSchema.anyOf.some(v => {
           switch (v.type) {
             case "null" :
             case "undefined" :

package/src/components/Api/StorageRefFields.res

@@ -78,7 +78,7 @@ to qualify a store the annotation left unqualified.
 */
 let fromEventSchema = (~plugin: string, eventSchema: S.t<unknown>): array<eventRefFields> =>
   switch eventSchema {
-  | Union({anyOf}) => anyOf->Array.filterMap(v => fromVariant(~plugin, v))
+  | AnyOf({anyOf}) => anyOf->Array.filterMap(v => fromVariant(~plugin, v))
   | other => fromVariant(~plugin, other)->Option.mapOr([], e => [e])
   }
 

package/src/components/Api/StorageRefFields.res.mjs

@@ -44,7 +44,7 @@ function fromVariant(plugin, variant) {
 }
 
 function fromEventSchema(plugin, eventSchema) {
-  if (eventSchema.type === "union") {
+  if (eventSchema.type === "anyOf") {
     return Stdlib_Array.filterMap(eventSchema.anyOf, v => fromVariant(plugin, v));
   } else {
     return Stdlib_Option.mapOr(fromVariant(plugin, eventSchema), [], e => [e]);

package/src/components/Api/SuryToJsonSchema.res

@@ -263,8 +263,19 @@ and objectRefToJsonSchema = (
 ): JSON.t => {
   let props = Dict.make()
   let required: array<string> = []
+  // `@internal` fields are dropped rather than annotated. A marker would be the
+  // right answer for a field that is on the surface and merely unwanted (that is
+  // `@hidden`); this one is not on the surface at all, so there is nothing for a
+  // consumer to describe and an entry here would advertise a field the SDL does
+  // not declare — which is precisely the mismatch that made read-model queries
+  // reference fields the server rejects.
+  //
+  // This is the single point for every JSON-Schema consumer: `queryableDef.schema`,
+  // the MCP generator and the manifest all derive through this walk.
+  let internal = annotations->Option.flatMap(spec => spec.internal)->Option.getOr([])
   fields
   ->Dict.toArray
+  ->Array.filter(((fieldName, _)) => !(internal->Array.includes(fieldName)))
   ->Array.forEach(((fieldName, fieldType)) => {
     let baseSchema = fromSchemaType(fieldType)
     let withAnnotations = switch annotations {

package/src/components/Api/SuryToJsonSchema.res.mjs

@@ -281,7 +281,8 @@ function objectRefToJsonSchema(annotations, optionalOpt, ownersOpt, fields) {
   let owners = ownersOpt !== undefined ? ownersOpt : [];
   let props = {};
   let required = [];
-  Object.entries(fields).forEach(param => {
+  let internal = Stdlib_Option.getOr(Stdlib_Option.flatMap(annotations, spec => spec.internal), []);
+  Object.entries(fields).filter(param => !internal.includes(param[0])).forEach(param => {
     let fieldType = param[1];
     let fieldName = param[0];
     let baseSchema = fromSchemaType(fieldType);

package/src/components/AutomationSlice/AutomationSlice_Callback.res

@@ -1,4 +1,3 @@
-S.enableJson()
 // AutomationSlice callback — implements the TODO list pattern with mixed-source
 // dispatch (Plan 04).
 //
@@ -143,7 +142,7 @@ module Make = (
           | Some(_) => () // Already exists — skip
           | None =>
             let row: todoRow = {
-              item: item->S.reverseConvertToJsonOrThrow(Spec.todoItemSchema),
+              item: item->Reventless.Util_Sury.toJson(Spec.todoItemSchema),
               status: Pending,
               createdAt: now(),
               retryCount: 0,
@@ -198,7 +197,7 @@ module Make = (
     let commands = []
 
     pending->Array.forEach(((id, row)) => {
-      let item = try row.item->S.parseJsonOrThrow(Spec.todoItemSchema)->Some catch {
+      let item = try row.item->Reventless.Util_Sury.fromJson(Spec.todoItemSchema)->Some catch {
       | exn =>
         let errMsg =
           exn->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr("unknown")
@@ -214,7 +213,7 @@ module Make = (
         | Some((targetId, command)) =>
           todoItems->Dict.set(id, {...row, status: Processing, processedAt: now()})
           let commandJson = try command
-          ->S.reverseConvertToJsonOrThrow(Spec.commandSchema)
+          ->Reventless.Util_Sury.toJson(Spec.commandSchema)
           ->Some catch {
           | exn =>
             let errMsg =

package/src/components/AutomationSlice/AutomationSlice_Callback.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_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -9,35 +9,34 @@ 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 DcbDecode$Reventless from "@reventlessdev/reventless-spec/src/components/DcbDecode.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 Message$ReventlessCore from "../../Message.res.mjs";
 import * as EffectLogger$ReventlessCore from "../../util/EffectLogger.res.mjs";
 
-S.enableJson();
-
-let todoStatusSchema = S.union([
-  S.literal("Pending"),
-  S.literal("Processing"),
-  S.literal("Completed"),
-  S.literal("Failed")
+let todoStatusSchema = Sury.union([
+  Sury.literal("Pending"),
+  Sury.literal("Processing"),
+  Sury.literal("Completed"),
+  Sury.literal("Failed")
 ]);
 
-let todoRowSchema = S.schema(s => ({
-  item: s.m(S.json),
+let todoRowSchema = Sury.$schema(s => ({
+  item: s.m(Sury.json),
   status: s.m(todoStatusSchema),
-  createdAt: s.m(S.string),
-  processedAt: s.m(S.option(S.string)),
-  completedAt: s.m(S.option(S.string)),
-  retryCount: s.m(S.int)
+  createdAt: s.m(Sury.string),
+  processedAt: s.m(Sury.$option(Sury.string)),
+  completedAt: s.m(Sury.$option(Sury.string)),
+  retryCount: s.m(Sury.int)
 }));
 
 function todoRowSchemaFor(itemSchema) {
-  return S.schema(s => ({
+  return Sury.$schema(s => ({
     item: s.m(itemSchema),
     status: s.m(todoStatusSchema),
-    createdAt: s.m(S.string),
-    processedAt: s.m(S.option(S.string)),
-    completedAt: s.m(S.option(S.string)),
-    retryCount: s.m(S.int)
+    createdAt: s.m(Sury.string),
+    processedAt: s.m(Sury.$option(Sury.string)),
+    completedAt: s.m(Sury.$option(Sury.string)),
+    retryCount: s.m(Sury.int)
   }));
 }
 
@@ -60,7 +59,7 @@ function Make(Spec) {
           if (match !== undefined) {
             return;
           }
-          let row_item = S.reverseConvertToJsonOrThrow(param[1], Spec.todoItemSchema);
+          let row_item = Util_Sury$Reventless.toJson(param[1], Spec.todoItemSchema);
           let row_createdAt = new Date().toISOString();
           let row = {
             item: row_item,
@@ -115,7 +114,7 @@ function Make(Spec) {
         let id = param[0];
         let item;
         try {
-          item = Primitive_option.some(S.parseJsonOrThrow(row.item, Spec.todoItemSchema));
+          item = Primitive_option.some(Util_Sury$Reventless.fromJson(row.item, Spec.todoItemSchema));
         } catch (raw_exn) {
           let exn = Primitive_exceptions.internalToException(raw_exn);
           let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(exn), Stdlib_JsExn.message), "unknown");
@@ -134,7 +133,7 @@ function Make(Spec) {
           todoItems[id] = newrecord;
           let commandJson;
           try {
-            commandJson = S.reverseConvertToJsonOrThrow(match[1], Spec.commandSchema);
+            commandJson = Util_Sury$Reventless.toJson(match[1], Spec.commandSchema);
           } catch (raw_exn) {
             let exn = Primitive_exceptions.internalToException(raw_exn);
             let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(exn), Stdlib_JsExn.message), "unknown");
@@ -198,4 +197,4 @@ export {
   todoRowSchemaFor,
   Make,
 }
-/*  Not a pure module */
+/* todoStatusSchema Not a pure module */

package/src/components/CommandTopic/CommandTopic_Callback.res

@@ -18,8 +18,7 @@ module Make = (Spec: ReventlessInfra.CommandTopic.T, Ops: Ops with module Spec =
         | command' => Some({ReventlessInfra.CommandTopic.reference, command: command'})
         | exception err =>
           let commandStr = json->JSON.stringify
-          let errMsg =
-            err->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr("unknown")
+          let errMsg = err->Reventless.Util_Sury.exnMessage
           EffectLogger.logError(
             ~comp,
             `decode failed: ${commandStr} err=${errMsg}`,

package/src/components/CommandTopic/CommandTopic_Callback.res.mjs

@@ -1,10 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-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 Effect from "effect/Effect";
 import * as Stream from "effect/Stream";
 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 Message$ReventlessCore from "../../Message.res.mjs";
 import * as EffectLogger$ReventlessCore from "../../util/EffectLogger.res.mjs";
 
@@ -21,7 +20,7 @@ function Make(Spec) {
         } catch (raw_err) {
           let err = Primitive_exceptions.internalToException(raw_err);
           let commandStr = JSON.stringify(json);
-          let errMsg = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message), "unknown");
+          let errMsg = Util_Sury$Reventless.exnMessage(err, undefined);
           Effect.runSync(EffectLogger$ReventlessCore.logError(comp, undefined, `decode failed: ` + commandStr + ` err=` + errMsg));
           return;
         }
@@ -46,4 +45,4 @@ function Make(Spec) {
 export {
   Make,
 }
-/* Stdlib_JsExn Not a pure module */
+/* effect/Effect Not a pure module */

package/src/components/CommandTopic/CommandTopic_Helpers.res

@@ -169,7 +169,7 @@ let encodeCommandJson = (cmdJson: Reventless.Message.commandJson): JSON.t =>
   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),
     ]),
   )

package/src/components/CommandTopic/CommandTopic_Helpers.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 Effect from "effect/Effect";
@@ -8,6 +7,7 @@ import * as Stream from "effect/Stream";
 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 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 EffectLogger$ReventlessCore from "../../util/EffectLogger.res.mjs";
 
 let commandOutcomeHook = {
@@ -127,7 +127,7 @@ function encodeCommandJson(cmdJson) {
     ],
     [
       "meta",
-      S.reverseConvertToJsonOrThrow(cmdJson.meta, Message$Reventless.metaSchema)
+      Util_Sury$Reventless.toJson(cmdJson.meta, Message$Reventless.metaSchema)
     ],
     [
       "command",
@@ -238,4 +238,4 @@ export {
   registerHandler,
   getHandlers,
 }
-/* S Not a pure module */
+/* Stdlib_JsExn Not a pure module */

package/src/components/Counter/Counter.res.mjs

@@ -1,9 +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 ComponentType$ReventlessCore from "../../ComponentType.res.mjs";
 
-let counterEventSchema = S.literal("CountFinished");
+let counterEventSchema = Sury.literal("CountFinished");
 
 let name = ComponentType$ReventlessCore.toName("Counter");
 

package/src/components/Counter/Counter_Callback.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_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Effect from "effect/Effect";
@@ -10,9 +10,9 @@ import * as Message$ReventlessCore from "../../Message.res.mjs";
 import * as EffectLogger$ReventlessCore from "../../util/EffectLogger.res.mjs";
 import * as ComponentType$ReventlessCore from "../../ComponentType.res.mjs";
 
-let countsStateSchema = S.schema(s => ({
-  id: s.m(S.string),
-  count: s.m(S.int)
+let countsStateSchema = Sury.$schema(s => ({
+  id: s.m(Sury.string),
+  count: s.m(Sury.int)
 }));
 
 function groupByCounterId(references) {

package/src/components/Counter/Counter_Operations.res.mjs

@@ -1,15 +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_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Effect from "effect/Effect";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as Counter$ReventlessCore from "./Counter.res.mjs";
 import * as EffectLogger$ReventlessCore from "../../util/EffectLogger.res.mjs";
 
-let referencesStateSchema = S.schema(s => ({
-  id: s.m(S.string),
-  inc: s.m(S.int)
+let referencesStateSchema = Sury.$schema(s => ({
+  id: s.m(Sury.string),
+  inc: s.m(Sury.int)
 }));
 
 function groupCountItemsByCounterId(countItems) {

package/src/components/Dcb/Dcb_Builder.res

@@ -51,7 +51,7 @@ let mergedEventSchema = (schemas: array<S.t<unknown>>) =>
     many
     ->Array.flatMap(schema =>
       switch schema {
-      | S.Union({anyOf}) => anyOf
+      | S.AnyOf({anyOf}) => anyOf
       | other => [other]
       }
     )

package/src/components/Dcb/Dcb_Builder.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_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
@@ -81,8 +81,8 @@ function mergedEventSchema(schemas) {
     return schemas[0];
   }
   let seen = new Set();
-  return S.union(schemas.flatMap(schema => {
-    if (schema.type === "union") {
+  return Sury.union(schemas.flatMap(schema => {
+    if (schema.type === "anyOf") {
       return schema.anyOf;
     } else {
       return [schema];
@@ -242,10 +242,11 @@ function Make(DcbEventLogStorage) {
       let DcbEventLog = DcbEventLog_Builder$ReventlessCore.Make(DcbEventLogStorage)(DcbEventTopicPublisher);
       let dcbEventLog = DcbEventLog.make(name, indexes$1, partitionTag, effectiveCrossPartitionTagKeys, opts);
       Stdlib_Option.forEach(HooksConfig.hooks.onDcbEventLogCreated, hook => hook(dcbEventLog));
+      let commandSchema = Sury.json;
       let DcbCommandTopic = CommandTopic_Builder$ReventlessCore.Make({
         Id: Id$Reventless.$$String,
         name: childName,
-        commandSchema: S.json
+        commandSchema: commandSchema
       })(DcbCommandTopicChannel);
       let dcbCommandTopic = DcbCommandTopic.make(name + `Dcb`, {
         kind: "Plugin",
@@ -254,10 +255,11 @@ function Make(DcbEventLogStorage) {
       Stdlib_Option.forEach(HooksConfig.hooks.onDcbCommandTopicCreated, hook => hook(dcbCommandTopic));
       let publishJsons = Component$ReventlessCore.operations(dcbCommandTopic).apply(ops => ops.publishJsons);
       let name$1 = childName + "Async";
+      let commandSchema$1 = Sury.json;
       let DcbAsyncCommandTopic = CommandTopic_Builder$ReventlessCore.Make({
         Id: Id$Reventless.$$String,
         name: name$1,
-        commandSchema: S.json
+        commandSchema: commandSchema$1
       })(DcbCommandTopicChannelAsync);
       let asyncDcbCommandTopicOpt;
       if (asyncSlices.length !== 0) {
@@ -447,7 +449,7 @@ function Make(DcbEventLogStorage) {
         });
         return [
           byTag$1,
-          make(S.json)
+          make(Sury.json)
         ];
       });
       let dcbHandler = Pulumi.all([

package/src/components/DcbEventLog/DcbEventLog_Builder.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 Pulumi from "@pulumi/pulumi";
 import * as Component$ReventlessCore from "../Component.res.mjs";
@@ -13,6 +13,7 @@ import * as DcbEventLog_Operations$ReventlessCore from "./DcbEventLog_Operations
 
 function Make(Storage) {
   return EventTopicPublisher => {
+    let eventSchema = Sury.json;
     let make = (name, indexesOpt, partitionTag, crossPartitionTagKeysOpt, opts) => {
       let indexes = indexesOpt !== undefined ? indexesOpt : [];
       let crossPartitionTagKeys = crossPartitionTagKeysOpt !== undefined ? crossPartitionTagKeysOpt : [];
@@ -31,7 +32,7 @@ function Make(Storage) {
         let SpecificEventTopic = EventTopic_Builder$ReventlessCore.Make({
           Id: Id$Reventless.$$String,
           name: "DcbEventLog",
-          eventSchema: S.json
+          eventSchema: eventSchema
         })(EventTopicPublisher);
         let eventTopic = SpecificEventTopic.make(extra$1, storage.resources, owner, Util_Pulumi$ReventlessCore.ComponentResourceOptions.ofCustomResourceOptions(opts));
         Component$ReventlessCore.setOperations(extra, Pulumi.all([
@@ -71,4 +72,4 @@ function Make(Storage) {
 export {
   Make,
 }
-/* S Not a pure module */
+/* sury Not a pure module */

package/src/components/EventCollector/EventCollector_Builder.res

@@ -11,7 +11,7 @@ let makeStreamHandler = (
   let jsonHandler: EventCollector.jsonEventsHandler = stream =>
     stream
     ->Stream.mapEffect(json =>
-      Effect.trySync(~catch=_exn => "decode error", () => json->S.parseOrThrow(schema))
+      Effect.trySync(~catch=_exn => "decode error", () => json->S.parseOrThrow(~to=schema))
     )
     ->jsonEventsHandler
 

package/src/components/InboundTranslationSlice/InboundTranslationSlice_Callback.res

@@ -1,4 +1,3 @@
-S.enableJson()
 // InboundTranslationSlice callback — receives external input and translates to commands.
 //
 // Maintains an audit log QueryDb and delegates translation to Translation.translate.
@@ -113,7 +112,7 @@ module Make = (
     let requestId = Uuid.v4()
 
     // Parse the external input
-    let input = try inputJson->S.parseOrThrow(Spec.externalInputSchema)->Ok catch {
+    let input = try inputJson->S.parseOrThrow(~to=Spec.externalInputSchema)->Ok catch {
     | exn =>
       let msg =
         exn