@reventlessdev/reventless-core 3.0.0-alpha.268 → 3.0.0-alpha.269

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 3.0.0-alpha.269 (2026-09-21)
+
+### Bug Fixes
+
+* **deps:** update rescript to 12.3.1 ([ea1ce37](https://github.com/ReventlessDev/reventless-core/commit/ea1ce377297640f6d0d360e6c84c778d59ecbcc5))
+* **deps:** update sury to 11.0.0 ([8715b22](https://github.com/ReventlessDev/reventless-core/commit/8715b22b33856c46ba57518aad151065c123a995))
+
+
 # 3.0.0-alpha.268 (2026-09-21)
 
 ### Bug Fixes

package/README.md

@@ -59,7 +59,7 @@ Then register it as a ReScript dependency in `rescript.json`:
 }
 ```
 
-Requires ReScript `^12.3.0` (peer dependency).
+Requires ReScript `^12.3.1` (peer dependency).
 
 ## Links
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-core",
-  "version": "3.0.0-alpha.268",
+  "version": "3.0.0-alpha.269",
   "description": "Core package for Reventless framework",
   "license": "Apache-2.0",
   "jest": {
@@ -26,27 +26,27 @@
     }
   },
   "dependencies": {
-    "sury": "11.0.0-rc.2",
+    "sury": "11.0.0",
     "uuid": "^13.0.0",
-    "@reventlessdev/rescript-effect": "0.1.0-alpha.33",
-    "@reventlessdev/rescript-hash-object": "1.2.0-alpha.14",
-    "@reventlessdev/rescript-fast-csv": "2.0.0-alpha.12",
-    "@reventlessdev/rescript-jest": "1.0.0-alpha.10",
-    "@reventlessdev/rescript-node": "2.0.0-alpha.12",
-    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.21",
-    "@reventlessdev/rescript-ssh2": "2.0.0-alpha.12",
-    "@reventlessdev/rescript-uuid": "2.0.0-alpha.0",
-    "@reventlessdev/reventless-interop": "3.0.0-alpha.37",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.168",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.140"
+    "@reventlessdev/rescript-effect": "0.1.0-alpha.34",
+    "@reventlessdev/rescript-hash-object": "1.2.0-alpha.15",
+    "@reventlessdev/rescript-fast-csv": "2.0.0-alpha.13",
+    "@reventlessdev/rescript-jest": "1.0.0-alpha.11",
+    "@reventlessdev/rescript-node": "2.0.0-alpha.13",
+    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.22",
+    "@reventlessdev/rescript-ssh2": "2.0.0-alpha.13",
+    "@reventlessdev/rescript-uuid": "2.0.0-alpha.1",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.169",
+    "@reventlessdev/reventless-interop": "3.0.0-alpha.38",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.141"
   },
   "devDependencies": {
-    "rescript": "12.3.0",
-    "sury-ppx": "11.0.0-rc.2",
+    "rescript": "12.3.1",
+    "sury-ppx": "11.0.0",
     "@reventlessdev/reventless-ppx": "1.0.0-alpha.81"
   },
   "peerDependencies": {
-    "rescript": "12.3.0"
+    "rescript": "^12.3.1"
   },
   "gitHead": "ddea51534dc210635d7b11968089627b3b697ce2",
   "publishConfig": {

package/src/components/AutomationSlice/AutomationSlice_Callback.res.mjs

@@ -28,8 +28,8 @@ let todoRowSchema = Sury.$schema(s => ({
   createdAt: s.m(Sury.string),
   processedAt: s.m(Sury.$option(Sury.string)),
   completedAt: s.m(Sury.$option(Sury.string)),
-  retryCount: s.m(Sury.int),
-  maxRetries: s.m(Sury.$option(Sury.int))
+  retryCount: s.m(Sury.int32),
+  maxRetries: s.m(Sury.$option(Sury.int32))
 }));
 
 function todoRowSchemaFor(itemSchema) {
@@ -39,8 +39,8 @@ function todoRowSchemaFor(itemSchema) {
     createdAt: s.m(Sury.string),
     processedAt: s.m(Sury.$option(Sury.string)),
     completedAt: s.m(Sury.$option(Sury.string)),
-    retryCount: s.m(Sury.int),
-    maxRetries: s.m(Sury.$option(Sury.int))
+    retryCount: s.m(Sury.int32),
+    maxRetries: s.m(Sury.$option(Sury.int32))
   }));
 }
 

package/src/components/CommandGenerator/CommandGenerator_Callback.res.mjs

@@ -59,103 +59,101 @@ function dropNullArguments(obj) {
   });
 }
 
-function makeGenerateCommand(publishJsons, publishJsonsAndWait, serviceName, commandSchema, componentKind, $staropt$star, partitionTag) {
-  return payload => {
-    let stripIdFromParams = $staropt$star !== undefined ? $staropt$star : true;
-    return Effect.flatMap(Effect.tap(Effect.sync(() => {
-      let msgId = Message$ReventlessCore.uuid();
-      let meta_time = Message$ReventlessCore.nowAsISOString();
-      let meta_ip = Stdlib_Option.getOr(payload.meta.ip.shift(), "");
-      let meta_user = payload.meta.user;
-      let meta = {
-        service: serviceName,
-        time: meta_time,
-        ip: meta_ip,
-        user: meta_user,
-        msgId: msgId,
-        correlationId: msgId
-      };
-      let obj = Stdlib_Option.flatMap(JSON.stringify(payload.arguments), jsonString => Stdlib_JSON.Decode.object(JSON.parse(jsonString)));
-      let params = obj !== undefined ? (stripIdFromParams ? Stdlib_Dict.$$delete(obj, "id") : undefined, dropNullArguments(obj), stampOwnerFields(obj, commandSchema, payload.command, payload.identity, serviceName), Object.entries(obj)) : Stdlib_JsError.throwWithMessage("Couldn't decode:" + Stdlib_Option.getOr(JSON.stringify(payload.arguments), "<payload.arguments>"));
-      let commandStr = payload.command;
-      let match = params.length;
-      let commandJson = match !== 0 ? Object.fromEntries([[
-            "TAG",
-            commandStr
-          ]].concat(params)) : commandStr;
-      let suppliedId = payload.arguments.id;
-      let id;
-      id = componentKind === "Aggregate" || !(suppliedId == null) ? suppliedId : Stdlib_Option.mapOr(partitionTag, "", pt => DcbTag$Reventless.partitionValueOfTags(DcbTag$Reventless.extractTagsFromJson(commandSchema, commandJson), pt));
-      return [
-        meta,
-        commandJson,
-        id
-      ];
-    }), param => {
-      let commandJson = param[1];
-      return EffectLogger$ReventlessCore.logInfo(`CommandGenerator(` + serviceName + `)`, commandJson, `generated command: ` + LogFormat$ReventlessCore.cmdLabelOfJson(commandJson));
-    }), param => {
-      let id = param[2];
-      let commandJson = param[1];
-      let meta = param[0];
-      let val;
-      try {
-        val = Message$ReventlessCore.decode(commandJson, commandSchema);
-      } catch (raw_err) {
-        let err = Primitive_exceptions.internalToException(raw_err);
-        let hook = Plugin_ResolverError$ReventlessCore.onResolverErrorHook.contents;
-        if (hook !== undefined) {
-          hook({
-            pluginName: "",
-            componentName: serviceName,
-            attemptedCommandType: Message$ReventlessCore.variantNameOfJson(commandJson),
-            timestamp: Message$ReventlessCore.nowAsISOString()
-          });
-        }
-        let message = Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message);
-        let reason = message !== undefined ? message : Stdlib_Option.getOr(JSON.stringify(err), "unknown error");
-        return Plugin_ResolverError$ReventlessCore.throwCallerFault(`Error: Couldn't decode ` + JSON.stringify(commandJson) + `: ` + reason);
+function makeGenerateCommand(publishJsons, publishJsonsAndWait, serviceName, commandSchema, componentKind, stripIdFromParamsOpt, partitionTag) {
+  let stripIdFromParams = stripIdFromParamsOpt !== undefined ? stripIdFromParamsOpt : true;
+  return payload => Effect.flatMap(Effect.tap(Effect.sync(() => {
+    let msgId = Message$ReventlessCore.uuid();
+    let meta_time = Message$ReventlessCore.nowAsISOString();
+    let meta_ip = Stdlib_Option.getOr(payload.meta.ip.shift(), "");
+    let meta_user = payload.meta.user;
+    let meta = {
+      service: serviceName,
+      time: meta_time,
+      ip: meta_ip,
+      user: meta_user,
+      msgId: msgId,
+      correlationId: msgId
+    };
+    let obj = Stdlib_Option.flatMap(JSON.stringify(payload.arguments), jsonString => Stdlib_JSON.Decode.object(JSON.parse(jsonString)));
+    let params = obj !== undefined ? (stripIdFromParams ? Stdlib_Dict.$$delete(obj, "id") : undefined, dropNullArguments(obj), stampOwnerFields(obj, commandSchema, payload.command, payload.identity, serviceName), Object.entries(obj)) : Stdlib_JsError.throwWithMessage("Couldn't decode:" + Stdlib_Option.getOr(JSON.stringify(payload.arguments), "<payload.arguments>"));
+    let commandStr = payload.command;
+    let match = params.length;
+    let commandJson = match !== 0 ? Object.fromEntries([[
+          "TAG",
+          commandStr
+        ]].concat(params)) : commandStr;
+    let suppliedId = payload.arguments.id;
+    let id;
+    id = componentKind === "Aggregate" || !(suppliedId == null) ? suppliedId : Stdlib_Option.mapOr(partitionTag, "", pt => DcbTag$Reventless.partitionValueOfTags(DcbTag$Reventless.extractTagsFromJson(commandSchema, commandJson), pt));
+    return [
+      meta,
+      commandJson,
+      id
+    ];
+  }), param => {
+    let commandJson = param[1];
+    return EffectLogger$ReventlessCore.logInfo(`CommandGenerator(` + serviceName + `)`, commandJson, `generated command: ` + LogFormat$ReventlessCore.cmdLabelOfJson(commandJson));
+  }), param => {
+    let id = param[2];
+    let commandJson = param[1];
+    let meta = param[0];
+    let val;
+    try {
+      val = Message$ReventlessCore.decode(commandJson, commandSchema);
+    } catch (raw_err) {
+      let err = Primitive_exceptions.internalToException(raw_err);
+      let hook = Plugin_ResolverError$ReventlessCore.onResolverErrorHook.contents;
+      if (hook !== undefined) {
+        hook({
+          pluginName: "",
+          componentName: serviceName,
+          attemptedCommandType: Message$ReventlessCore.variantNameOfJson(commandJson),
+          timestamp: Message$ReventlessCore.nowAsISOString()
+        });
       }
-      let interceptor = commandInterceptorHook.contents;
-      let interceptEffect = interceptor !== undefined ? Effect.promise(() => interceptor(payload.identity, serviceName, componentKind, payload.command, payload.arguments)) : Effect.succeed("Allow");
-      return Effect.flatMap(interceptEffect, interceptResult => {
-        if (typeof interceptResult !== "object") {
-          if (publishJsonsAndWait !== undefined) {
-            return Effect.map(Effect.promise(() => publishJsonsAndWait([{
-                id: id,
-                meta: meta,
-                commandJson: commandJson
-              }])), outcomes => {
-              let payload = outcomes[0];
-              switch (payload.TAG) {
-                case "Accepted" :
-                  if (!Stdlib_Option.isNone(payload.entityId)) {
-                    return payload;
-                  }
-                  let newrecord = {...payload};
-                  newrecord.entityId = id;
-                  return newrecord;
-                case "Rejected" :
-                case "Pending" :
+      let message = Stdlib_Option.flatMap(Stdlib_JsExn.fromException(err), Stdlib_JsExn.message);
+      let reason = message !== undefined ? message : Stdlib_Option.getOr(JSON.stringify(err), "unknown error");
+      return Plugin_ResolverError$ReventlessCore.throwCallerFault(`Error: Couldn't decode ` + JSON.stringify(commandJson) + `: ` + reason);
+    }
+    let interceptor = commandInterceptorHook.contents;
+    let interceptEffect = interceptor !== undefined ? Effect.promise(() => interceptor(payload.identity, serviceName, componentKind, payload.command, payload.arguments)) : Effect.succeed("Allow");
+    return Effect.flatMap(interceptEffect, interceptResult => {
+      if (typeof interceptResult !== "object") {
+        if (publishJsonsAndWait !== undefined) {
+          return Effect.map(Effect.promise(() => publishJsonsAndWait([{
+              id: id,
+              meta: meta,
+              commandJson: commandJson
+            }])), outcomes => {
+            let payload = outcomes[0];
+            switch (payload.TAG) {
+              case "Accepted" :
+                if (!Stdlib_Option.isNone(payload.entityId)) {
                   return payload;
-              }
-            });
-          } else {
-            return Effect.map(Effect.promise(() => publishJsons([{
-                id: id,
-                meta: meta,
-                commandJson: commandJson
-              }])), () => ({
-              TAG: "Pending",
-              msgId: meta.msgId
-            }));
-          }
+                }
+                let newrecord = {...payload};
+                newrecord.entityId = id;
+                return newrecord;
+              case "Rejected" :
+              case "Pending" :
+                return payload;
+            }
+          });
         } else {
-          return Stdlib_JsError.throwWithMessage(interceptResult._0);
+          return Effect.map(Effect.promise(() => publishJsons([{
+              id: id,
+              meta: meta,
+              commandJson: commandJson
+            }])), () => ({
+            TAG: "Pending",
+            msgId: meta.msgId
+          }));
         }
-      });
+      } else {
+        return Stdlib_JsError.throwWithMessage(interceptResult._0);
+      }
     });
-  };
+  });
 }
 
 function Make(Spec) {

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

@@ -12,7 +12,7 @@ import * as ComponentType$ReventlessCore from "../../ComponentType.res.mjs";
 
 let countsStateSchema = Sury.$schema(s => ({
   id: s.m(Sury.string),
-  count: s.m(Sury.int)
+  count: s.m(Sury.int32)
 }));
 
 function groupByCounterId(references) {

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

@@ -9,7 +9,7 @@ import * as EffectLogger$ReventlessCore from "../../util/EffectLogger.res.mjs";
 
 let referencesStateSchema = Sury.$schema(s => ({
   id: s.m(Sury.string),
-  inc: s.m(Sury.int)
+  inc: s.m(Sury.int32)
 }));
 
 function groupCountItemsByCounterId(countItems) {

package/src/components/EventCollector/EventCollector_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 Effect from "@reventlessdev/rescript-effect/src/Effect.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stream from "effect/Stream";
@@ -9,7 +9,7 @@ import * as ComponentType$ReventlessCore from "../../ComponentType.res.mjs";
 import * as EventCollector$ReventlessCore from "./EventCollector.res.mjs";
 
 function makeStreamHandler(eventCollector, schema, jsonEventsHandler) {
-  let jsonHandler = stream => jsonEventsHandler(Stream.mapEffect(stream, json => Effect.trySync(_exn => "decode error", () => S.parseOrThrow(json, schema))));
+  let jsonHandler = stream => jsonEventsHandler(Stream.mapEffect(stream, json => Effect.trySync(_exn => "decode error", () => Sury.parseOrThrow(json, schema))));
   let channel = eventCollector.channel;
   return channel.handleChannelEvent(jsonHandler);
 }
@@ -61,4 +61,4 @@ export {
   makeStreamHandler,
   Make,
 }
-/* S Not a pure module */
+/* sury Not a pure module */

package/src/components/InboundTranslationSlice/InboundTranslationSlice_Callback.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
 import * as Sury from "sury";
 import * as Uuid from "uuid";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
@@ -20,7 +19,7 @@ let auditRowSchema = Sury.$schema(s => ({
   input: s.m(Sury.string),
   status: s.m(auditStatusSchema),
   targetIds: s.m(Sury.$option(Sury.array(Sury.string))),
-  commandCount: s.m(Sury.$option(Sury.int)),
+  commandCount: s.m(Sury.$option(Sury.int32)),
   error: s.m(Sury.$option(Sury.string)),
   receivedAt: s.m(Sury.string)
 }));
@@ -75,7 +74,7 @@ function Make(Spec) {
       try {
         input = {
           TAG: "Ok",
-          _0: S.parseOrThrow(inputJson, Spec.externalInputSchema)
+          _0: Sury.parseOrThrow(inputJson, Spec.externalInputSchema)
         };
       } catch (raw_exn) {
         let exn = Primitive_exceptions.internalToException(raw_exn);

package/src/components/OutboundTranslationSlice/OutboundTranslationSlice_Callback.res.mjs

@@ -25,8 +25,8 @@ let todoRowSchema = Sury.$schema(s => ({
   createdAt: s.m(Sury.string),
   processedAt: s.m(Sury.$option(Sury.string)),
   completedAt: s.m(Sury.$option(Sury.string)),
-  retryCount: s.m(Sury.int),
-  maxRetries: s.m(Sury.$option(Sury.int)),
+  retryCount: s.m(Sury.int32),
+  maxRetries: s.m(Sury.$option(Sury.int32)),
   lastError: s.m(Sury.$option(Sury.string))
 }));
 
@@ -37,8 +37,8 @@ function todoRowSchemaFor(itemSchema) {
     createdAt: s.m(Sury.string),
     processedAt: s.m(Sury.$option(Sury.string)),
     completedAt: s.m(Sury.$option(Sury.string)),
-    retryCount: s.m(Sury.int),
-    maxRetries: s.m(Sury.$option(Sury.int)),
+    retryCount: s.m(Sury.int32),
+    maxRetries: s.m(Sury.$option(Sury.int32)),
     lastError: s.m(Sury.$option(Sury.string))
   }));
 }

package/src/plugin/component/Plugin_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 Output$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Output.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
@@ -461,7 +461,7 @@ function Make(Spec) {
           let extensionPointsOutputs = match$1[0];
           let coreSetup;
           if (interstackAdminExtensionPoints !== undefined) {
-            let pluginExtensionPointUnwrapped = S.parseOrThrow(StackReference$Pulumi.get(interstackAdminExtensionPoints, PluginExtensionPointSpec$ReventlessInfra.name), ExtensionPoint$ReventlessInterop.resolvedOutputsSchema);
+            let pluginExtensionPointUnwrapped = Sury.parseOrThrow(StackReference$Pulumi.get(interstackAdminExtensionPoints, PluginExtensionPointSpec$ReventlessInfra.name), ExtensionPoint$ReventlessInterop.resolvedOutputsSchema);
             let pluginExtensionPointCommandTopicRemoteChannel = PluginExtensionPointRemoteChannel.make(pluginExtensionPointUnwrapped.commandTopic.resources.map(Adapter$ReventlessCore.fromInteropResolved));
             coreSetup = [
               pluginExtensionPointUnwrapped,
@@ -671,4 +671,4 @@ export {
   PluginExtensionPointSpec,
   Make,
 }
-/* S Not a pure module */
+/* sury Not a pure module */

package/src/plugin/component/Plugin_Helpers.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_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
@@ -79,7 +79,7 @@ function getRemoteStorageResources(pluginName, queryDbName) {
         return [];
       }
       try {
-        let readModel = S.parseOrThrow(rawReadModel, ReadModel$ReventlessInterop.resolvedOutputsSchema);
+        let readModel = Sury.parseOrThrow(rawReadModel, ReadModel$ReventlessInterop.resolvedOutputsSchema);
         return Adapter$ReventlessCore.fromInteropResources(readModel.queryDb.resources);
       } catch (raw_exn) {
         let exn = Primitive_exceptions.internalToException(raw_exn);

package/src/plugin/lifecycle/PluginBehavior.res.mjs

@@ -20,7 +20,7 @@ let knownVersionSchema = Sury.$schema(s => ({
 
 let stateSchema = Sury.$schema(s => ({
   current: s.m(Sury.$option(Plugin$Reventless.versionSchema)),
-  known: s.m(Sury.dict(knownVersionSchema))
+  known: s.m(Sury.record(knownVersionSchema))
 }));
 
 let initialState_known = {};

package/src/util/Interstack.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_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
@@ -25,7 +25,7 @@ function fromJson(json) {
   try {
     return {
       TAG: "Ok",
-      _0: S.parseOrThrow(json, Task$ReventlessInterop.resolvedOutputsSchema)
+      _0: Sury.parseOrThrow(json, Task$ReventlessInterop.resolvedOutputsSchema)
     };
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
@@ -54,7 +54,7 @@ function fromJson$1(json) {
   try {
     return {
       TAG: "Ok",
-      _0: S.parseOrThrow(json, EventMapper$ReventlessInterop.resolvedOutputsSchema)
+      _0: Sury.parseOrThrow(json, EventMapper$ReventlessInterop.resolvedOutputsSchema)
     };
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
@@ -88,7 +88,7 @@ function fromJson$2(json) {
   try {
     return {
       TAG: "Ok",
-      _0: S.parseOrThrow(json, ExtensionPoint$ReventlessInterop.resolvedOutputsSchema)
+      _0: Sury.parseOrThrow(json, ExtensionPoint$ReventlessInterop.resolvedOutputsSchema)
     };
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);

package/tests/aggregate/AggregateCacheTest.res.mjs

@@ -25,7 +25,7 @@ let eventSchema = Sury.union([
   })),
   Sury.$schema(s => ({
     TAG: "CheckpointTaken",
-    count: s.m(Sury.int)
+    count: s.m(Sury.int32)
   }))
 ]);
 

package/tests/api/BrandedMarkerCompositionTest.res.mjs

@@ -1,6 +1,5 @@
 // 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 Owner$Reventless from "@reventlessdev/reventless-spec/src/components/Owner.res.mjs";
@@ -28,7 +27,7 @@ globalThis.describe("a field marker on a branded semantic:", () => {
           return false;
         }
         try {
-          S.parseOrThrow(raw, schema);
+          Sury.parseOrThrow(raw, schema);
           return true;
         } catch (exn) {
           return false;
@@ -54,7 +53,7 @@ globalThis.describe("a field marker on a branded semantic:", () => {
           return false;
         }
         try {
-          S.parseOrThrow(raw, schema);
+          Sury.parseOrThrow(raw, schema);
           return true;
         } catch (exn) {
           return false;

package/tests/api/GeolocationSemanticTest.res.mjs

@@ -1,6 +1,5 @@
 // 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 Semantic$Reventless from "@reventlessdev/reventless-spec/src/semantic/Semantic.res.mjs";
@@ -89,7 +88,7 @@ globalThis.describe("a row in the pre-union shape does not decode", () => {
   globalThis.test("the three-field shape is refused against the union schema", () => {
     let decodes;
     try {
-      S.parseOrThrow(oldShapedRow, stateSchema);
+      Sury.parseOrThrow(oldShapedRow, stateSchema);
       decodes = true;
     } catch (exn) {
       decodes = false;

package/tests/api/GraphQL_FragmentGeneratorTest.res.mjs

@@ -234,7 +234,7 @@ globalThis.describe("deriveServerCapability — inferred keys reach the SDL surf
   globalThis.test("an inferred key yields an eq filter and a sort field", () => {
     let schema = Sury.$schema(s => ({
       orderId: s.m(Sury.string),
-      total: s.m(Sury.float)
+      total: s.m(Sury.number)
     }));
     let c = GraphQL_FragmentGenerator$ReventlessCore.deriveServerCapability("Orders", schema);
     globalThis.expect(c.filterFields.map(f => f.name)).toEqual(["orderId"]);
@@ -387,7 +387,7 @@ let schema = Sury.$schema(s => ({
   shippingMethod: s.m(shippingMethodSchema),
   total: s.m(Money$Reventless.schema),
   tip: s.m(Sury.$option(Money$Reventless.schema)),
-  itemCount: s.m(Sury.int)
+  itemCount: s.m(Sury.int32)
 }));
 
 let PlaceOrder = {

package/tests/api/SuryToJsonSchemaTest.res

@@ -1012,10 +1012,10 @@ describe("SuryToJsonSchema:", () => {
     )
   })
 
-  // Parity sanity-check: deriveObjectSchema and the legacy S.toJSONSchema must
+  // Parity sanity-check: deriveObjectSchema and the legacy S.toInputJSONSchemaOrThrow must
   // agree on `properties` keyset and `required` array for unannotated objects,
   // so swapping the encoder at Plugin_Structure.res:261/280 doesn't drop fields.
-  describe("parity with S.toJSONSchema for unannotated objects:", () => {
+  describe("parity with S.toInputJSONSchemaOrThrow for unannotated objects:", () => {
     let getKeys = (schema: JSON.t): array<string> =>
       switch getProperty(schema, "properties")->Option.flatMap(JSON.Decode.object) {
       | Some(obj) => obj->Dict.keysToArray
@@ -1031,7 +1031,7 @@ describe("SuryToJsonSchema:", () => {
     let sortStrings = (xs: array<string>): array<string> => xs->Array.toSorted(String.compare)
 
     testSync(
-      "properties keyset matches between deriveObjectSchema and S.toJSONSchema",
+      "properties keyset matches between deriveObjectSchema and S.toInputJSONSchemaOrThrow",
       () => {
         let schema = S.schema(
           s =>
@@ -1042,13 +1042,13 @@ describe("SuryToJsonSchema:", () => {
             },
         )->S.castToUnknown
         let derived = SuryToJsonSchema.deriveObjectSchema(schema)
-        let native = (schema->S.toJSONSchema->Obj.magic: JSON.t)
+        let native = (schema->S.toInputJSONSchemaOrThrow->Obj.magic: JSON.t)
         expect(derived->getKeys->sortStrings)->toEqual(native->getKeys->sortStrings)
       },
     )
 
     testSync(
-      "required array matches between deriveObjectSchema and S.toJSONSchema",
+      "required array matches between deriveObjectSchema and S.toInputJSONSchemaOrThrow",
       () => {
         let schema = S.schema(
           s =>
@@ -1058,13 +1058,13 @@ describe("SuryToJsonSchema:", () => {
             },
         )->S.castToUnknown
         let derived = SuryToJsonSchema.deriveObjectSchema(schema)
-        let native = (schema->S.toJSONSchema->Obj.magic: JSON.t)
+        let native = (schema->S.toInputJSONSchemaOrThrow->Obj.magic: JSON.t)
         expect(derived->getRequired->sortStrings)->toEqual(native->getRequired->sortStrings)
       },
     )
 
     testSync(
-      "S.toJSONSchema does NOT emit x-reventless-* keys even when metadata is set",
+      "S.toInputJSONSchemaOrThrow does NOT emit x-reventless-* keys even when metadata is set",
       () => {
         let withSpec = (schema, spec) =>
           schema->S.Metadata.set(~id=Reventless.StateAnnotations.stateAnnotationsId, spec)
@@ -1076,7 +1076,7 @@ describe("SuryToJsonSchema:", () => {
             },
         )->S.castToUnknown
         let schema' = schema->withSpec({...emptySpec, ids: ["entityId"]})
-        let native = (schema'->S.toJSONSchema->Obj.magic: JSON.t)
+        let native = (schema'->S.toInputJSONSchemaOrThrow->Obj.magic: JSON.t)
         let entityIdSchema = getPropertyOf(native, "entityId")
         expect(entityIdSchema->Option.flatMap(s => getProperty(s, "x-reventless-id")))->toBe(None)
       },

package/tests/api/SuryToJsonSchemaTest.res.mjs

@@ -471,7 +471,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("emits x-reventless-semantic on the field listed in semantic", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
-        total: s.m(Sury.float)
+        total: s.m(Sury.number)
       }));
       let newrecord = {...emptySpec};
       newrecord.semantic = [[
@@ -494,7 +494,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("emits x-reventless-metric {aggregate,label} on the field listed in metric", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
-        total: s.m(Sury.float)
+        total: s.m(Sury.number)
       }));
       let newrecord = {...emptySpec};
       newrecord.metric = [[
@@ -518,7 +518,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("omits the metric label when empty (UI derives one from the field name)", () => {
       let schema = Sury.$schema(s => ({
-        total: s.m(Sury.float)
+        total: s.m(Sury.number)
       }));
       let newrecord = {...emptySpec};
       newrecord.metric = [[
@@ -543,7 +543,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("emits x-reventless-retired {label,showWhenFalse} on the retired field", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       let newrecord = {...emptySpec};
       newrecord.retired = {
@@ -612,7 +612,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("omits both value and values entirely on the boolean form", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       let newrecord = {...emptySpec};
       newrecord.retired = {
@@ -637,7 +637,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("carries namedWhenRetired only when the record opted in", () => {
       let build = named => {
         let schema = Sury.$schema(s => ({
-          archived: s.m(Sury.bool)
+          archived: s.m(Sury.boolean)
         }));
         let newrecord = {...emptySpec};
         newrecord.retired = {
@@ -660,7 +660,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("omits the retired label when empty but always states showWhenFalse", () => {
       let schema = Sury.$schema(s => ({
-        deactivated: s.m(Sury.bool)
+        deactivated: s.m(Sury.boolean)
       }));
       let newrecord = {...emptySpec};
       newrecord.retired = {
@@ -684,7 +684,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("emits nothing for a schema with no retired annotation", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, emptySpec));
       globalThis.expect(Stdlib_Option.flatMap(getPropertyOf(json, "archived"), s => getProperty(s, "x-reventless-retired"))).toBe(undefined);
@@ -801,7 +801,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
   });
-  globalThis.describe("parity with S.toJSONSchema for unannotated objects:", () => {
+  globalThis.describe("parity with S.toInputJSONSchemaOrThrow for unannotated objects:", () => {
     let getKeys = schema => {
       let obj = Stdlib_Option.flatMap(getProperty(schema, "properties"), Stdlib_JSON.Decode.object);
       if (obj !== undefined) {
@@ -819,26 +819,26 @@ globalThis.describe("SuryToJsonSchema:", () => {
       }
     };
     let sortStrings = xs => xs.toSorted(Primitive_string.compare);
-    globalThis.test("properties keyset matches between deriveObjectSchema and S.toJSONSchema", () => {
+    globalThis.test("properties keyset matches between deriveObjectSchema and S.toInputJSONSchemaOrThrow", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
         name: s.m(Sury.string),
-        count: s.m(Sury.int)
+        count: s.m(Sury.int32)
       }));
       let derived = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, schema);
-      let native = Sury.toJSONSchema(schema);
+      let native = Sury.toInputJSONSchemaOrThrow(schema);
       globalThis.expect(sortStrings(getKeys(derived))).toEqual(sortStrings(getKeys(native)));
     });
-    globalThis.test("required array matches between deriveObjectSchema and S.toJSONSchema", () => {
+    globalThis.test("required array matches between deriveObjectSchema and S.toInputJSONSchemaOrThrow", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
         name: s.m(Sury.string)
       }));
       let derived = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, schema);
-      let native = Sury.toJSONSchema(schema);
+      let native = Sury.toInputJSONSchemaOrThrow(schema);
       globalThis.expect(sortStrings(getRequired(derived))).toEqual(sortStrings(getRequired(native)));
     });
-    globalThis.test("S.toJSONSchema does NOT emit x-reventless-* keys even when metadata is set", () => {
+    globalThis.test("S.toInputJSONSchemaOrThrow does NOT emit x-reventless-* keys even when metadata is set", () => {
       let schema = Sury.$schema(s => ({
         entityId: s.m(Sury.string),
         name: s.m(Sury.string)
@@ -847,7 +847,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
       newrecord.ids = ["entityId"];
       let spec = newrecord;
       let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
-      let native = Sury.toJSONSchema(schema$p);
+      let native = Sury.toInputJSONSchemaOrThrow(schema$p);
       let entityIdSchema = getPropertyOf(native, "entityId");
       globalThis.expect(Stdlib_Option.flatMap(entityIdSchema, s => getProperty(s, "x-reventless-id"))).toBe(undefined);
     });
@@ -932,15 +932,15 @@ globalThis.describe("SuryToJsonSchema:", () => {
       globalThis.expect(Stdlib_Option.isSome(Stdlib_Option.flatMap(getPropertyOf(json, "imageUrl"), s => getProperty(s, "oneOf")))).toBe(true);
     });
     globalThis.test("a type-carried semantic beats an annotation naming the same field", () => {
+      let schema = Sury.$schema(s => ({
+        imageUrl: s.m(StorageRef$Reventless.forStore(undefined, "productImages"))
+      }));
       let newrecord = {...emptySpec};
       newrecord.semantic = [[
           "imageUrl",
           "image"
         ]];
       let spec = newrecord;
-      let schema = Sury.$schema(s => ({
-        imageUrl: s.m(StorageRef$Reventless.forStore(undefined, "productImages"))
-      }));
       let schema$1 = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, schema$1);
       globalThis.expect(semanticOf(json, "imageUrl")).toEqual("storageRef");
@@ -1022,7 +1022,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
   globalThis.describe("Money changes the field's shape, and says so:", () => {
     let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$schema(s => ({
       price: s.m(Money$Reventless.schema),
-      quantity: s.m(Sury.float)
+      quantity: s.m(Sury.number)
     })));
     let keyOf = (name, key) => Stdlib_Option.flatMap(getPropertyOf(json, name), s => getProperty(s, key));
     globalThis.test("the field is an object, not a number", () => {
@@ -1112,7 +1112,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
   globalThis.describe("GeoPoint is an object carrying the geoPoint marker:", () => {
     let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$schema(s => ({
       location: s.m(GeoPoint$Reventless.schema),
-      lat: s.m(Sury.float)
+      lat: s.m(Sury.number)
     })));
     let keyOf = (name, key) => Stdlib_Option.flatMap(getPropertyOf(json, name), s => getProperty(s, key));
     globalThis.test("the field is an object, not a pair of numbers", () => {
@@ -1167,9 +1167,9 @@ globalThis.describe("SuryToJsonSchema:", () => {
   globalThis.describe("a field declaring a default:", () => {
     let defaultOf = (json, field) => Stdlib_Option.flatMap(getPropertyOf(json, field), s => getProperty(s, "default"));
     let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$schema(s => ({
-      quantity: s.m(FieldDefault$Reventless.int(Sury.int, 1)),
+      quantity: s.m(FieldDefault$Reventless.int(Sury.int32, 1)),
       shippingMethod: s.m(FieldDefault$Reventless.string(Sury.string, "Standard")),
-      plain: s.m(Sury.int)
+      plain: s.m(Sury.int32)
     })));
     globalThis.test("carries it as `default`", () => {
       globalThis.expect(defaultOf(json, "quantity")).toEqual(1);
@@ -1186,7 +1186,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("and reaches a field of a nested record", () => {
       let lineItem = Sury.$schema(s => ({
         productId: s.m(Sury.string),
-        quantity: s.m(FieldDefault$Reventless.int(Sury.int, 1))
+        quantity: s.m(FieldDefault$Reventless.int(Sury.int32, 1))
       }));
       let nested = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$schema(s => ({
         lineItems: s.m(Sury.array(lineItem))

package/tests/dcb/DcbFixtures.res.mjs

@@ -38,7 +38,7 @@ let eventSchema$1 = Sury.union([
   Sury.$schema(s => ({
     TAG: "PlainEvent",
     name: s.m(Sury.string),
-    value: s.m(Sury.int)
+    value: s.m(Sury.int32)
   })),
   Sury.literal("EmptyEvent")
 ]);
@@ -325,7 +325,7 @@ function makeMockStorage() {
 
 let plainRecordSchema = Sury.$schema(s => ({
   name: s.m(Sury.string),
-  value: s.m(Sury.int)
+  value: s.m(Sury.int32)
 }));
 
 let multiTagRecordSchema = Sury.$schema(s => ({
@@ -350,7 +350,7 @@ let mixedEventSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "EventB",
     id: s.m(DcbTag$Reventless.string),
-    count: s.m(Sury.int)
+    count: s.m(Sury.int32)
   })),
   Sury.$schema(s => ({
     TAG: "EventC",
@@ -373,7 +373,7 @@ let complexEventSchema = Sury.union([
     TAG: "OrderPlaced",
     orderId: s.m(DcbTag$Reventless.string),
     userId: s.m(DcbTag$Reventless.string),
-    amount: s.m(Sury.float)
+    amount: s.m(Sury.number)
   })),
   Sury.$schema(s => ({
     TAG: "OrderShipped",
@@ -383,7 +383,7 @@ let complexEventSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "PaymentProcessed",
     paymentId: s.m(DcbTag$Reventless.string),
-    amount: s.m(Sury.float)
+    amount: s.m(Sury.number)
   }))
 ]);
 
@@ -463,7 +463,7 @@ let compositeMultiVariantSchema = Sury.union([
     TAG: "VariantB",
     env: s.m(DcbTag$Reventless.compositePartitionMember(0, undefined)),
     name: s.m(DcbTag$Reventless.compositePartitionMember(1, undefined)),
-    count: s.m(Sury.int)
+    count: s.m(Sury.int32)
   }))
 ]);
 

package/tests/dcb/DcbValidationTest.res.mjs

@@ -43,7 +43,7 @@ let producedAMismatchTagsSchema = Sury.$schema(s => ({
 let producedAMismatchTypeSchema = Sury.$schema(s => ({
   TAG: "ItemCreated",
   itemId: s.m(DcbTag$Reventless.string),
-  name: s.m(Sury.float)
+  name: s.m(Sury.number)
 }));
 
 let consumedFullSchema = Sury.union([
@@ -77,13 +77,13 @@ let consumedDanglingSchema = Sury.$schema(s => ({
 let consumedBadFieldSchema = Sury.$schema(s => ({
   TAG: "ItemCreated",
   itemId: s.m(Sury.string),
-  rating: s.m(Sury.float)
+  rating: s.m(Sury.number)
 }));
 
 let consumedBadTypeSchema = Sury.$schema(s => ({
   TAG: "ItemCreated",
   itemId: s.m(Sury.string),
-  name: s.m(Sury.float)
+  name: s.m(Sury.number)
 }));
 
 let recordDemandCommandSchema = Sury.$schema(s => ({

package/tests/eventmapper/EventMapperFixtures.res.mjs

@@ -14,11 +14,11 @@ let eventSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "ItemCreated",
     name: s.m(Sury.string),
-    price: s.m(Sury.float)
+    price: s.m(Sury.number)
   })),
   Sury.$schema(s => ({
     TAG: "ItemPriceUpdated",
-    newPrice: s.m(Sury.float)
+    newPrice: s.m(Sury.number)
   })),
   Sury.literal("ItemRemoved")
 ]);
@@ -36,7 +36,7 @@ let name$1 = "ItemCatalog";
 
 let stateSchema = Sury.$schema(s => ({
   name: s.m(Sury.string),
-  price: s.m(Sury.float)
+  price: s.m(Sury.number)
 }));
 
 let config = ReadModel$Reventless.config(undefined, undefined, undefined);
@@ -128,7 +128,7 @@ let eventSchema$1 = Sury.union([
   Sury.$schema(s => ({
     TAG: "OrderPlaced",
     orderId: s.m(Sury.string),
-    amount: s.m(Sury.float)
+    amount: s.m(Sury.number)
   })),
   Sury.$schema(s => ({
     TAG: "OrderShipped",
@@ -151,7 +151,7 @@ let commandSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "ProcessOrder",
     orderId: s.m(Sury.string),
-    amount: s.m(Sury.float)
+    amount: s.m(Sury.number)
   })),
   Sury.$schema(s => ({
     TAG: "ShipOrder",

package/tests/plugin/PluginSpecExperiment.res

@@ -7,5 +7,5 @@ type record = {
 @schema
 type variant = | @s.meta({description: "QQQ"}) Q(int) | @s.meta({description: "XXX"}) X | Y
 
-Console.log2("Record:", recordSchema->S.toJSONSchema->JSON.stringifyAny(~space=2))
-Console.log2("Variant:", variantSchema->S.toJSONSchema->JSON.stringifyAny(~space=2))
+Console.log2("Record:", recordSchema->S.toInputJSONSchemaOrThrow->JSON.stringifyAny(~space=2))
+Console.log2("Variant:", variantSchema->S.toInputJSONSchemaOrThrow->JSON.stringifyAny(~space=2))

package/tests/plugin/PluginSpecExperiment.res.mjs

@@ -12,15 +12,15 @@ let recordSchema = Sury.$schema(s => ({
 let variantSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "Q",
-    _0: s.m(Sury.int)
+    _0: s.m(Sury.int32)
   })),
   Sury.literal("X"),
   Sury.literal("Y")
 ]);
 
-console.log("Record:", JSON.stringify(Sury.toJSONSchema(recordSchema), undefined, 2));
+console.log("Record:", JSON.stringify(Sury.toInputJSONSchemaOrThrow(recordSchema), undefined, 2));
 
-console.log("Variant:", JSON.stringify(Sury.toJSONSchema(variantSchema), undefined, 2));
+console.log("Variant:", JSON.stringify(Sury.toInputJSONSchemaOrThrow(variantSchema), undefined, 2));
 
 export {
   recordSchema,

package/tests/plugin/PluginStructureTest.res

@@ -1740,7 +1740,7 @@ describe("Plugin_Structure.make — Phase 2 graph fields", () => {
 
   // Phase 4: queryableDef.schema must carry x-reventless-* extension keys for
   // annotated state types. Plugin_Structure now uses SuryToJsonSchema.deriveObjectSchema
-  // (annotation-aware) instead of S.toJSONSchema (metadata-blind).
+  // (annotation-aware) instead of S.toInputJSONSchemaOrThrow (metadata-blind).
   describe("queryableDef.schema propagates x-reventless-* annotations", () => {
     let parseSchema = (svs: Reventless.Plugin.queryableDef): JSON.t => svs.schema->JSON.parseOrThrow
 

package/tests/plugin/PluginStructureTest.res.mjs

@@ -1417,20 +1417,20 @@ globalThis.describe("Plugin_Structure.make — Phase 2 graph fields", () => {
     });
     globalThis.test("publishes no states on the boolean form", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       globalThis.expect(Plugin_Structure$ReventlessCore.retiredValuesFromStateSchema(withRetired(schema, "archived"))).toEqual(undefined);
     });
     globalThis.test("names the annotated field", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       globalThis.expect(Plugin_Structure$ReventlessCore.retiredFieldFromStateSchema(withRetired(schema, "archived"))).toEqual("archived");
     });
     globalThis.test("declines a conventionally-named boolean nobody annotated", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool),
-        deactivated: s.m(Sury.bool)
+        archived: s.m(Sury.boolean),
+        deactivated: s.m(Sury.boolean)
       }));
       globalThis.expect(Plugin_Structure$ReventlessCore.retiredFieldFromStateSchema(schema)).toEqual(undefined);
     });
@@ -1530,7 +1530,7 @@ globalThis.describe("Plugin_Structure.make — Phase 2 graph fields", () => {
     });
     globalThis.test("the boolean form is not a skip", () => {
       let schema = withRetiredStates(Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       })), "archived", undefined, undefined);
       globalThis.expect(Plugin_Structure$ReventlessCore.checkRetiredValue("Products", schema)).toEqual("NotDeclared");
     });

package/tests/plugin/SchemaWalkerTest.res.mjs

@@ -7,8 +7,8 @@ import * as SchemaWalker$ReventlessCore from "../../src/plugin/component/SchemaW
 
 let simpleRecordSchema = Sury.$schema(s => ({
   label: s.m(Sury.string),
-  count: s.m(Sury.int),
-  rating: s.m(Sury.$option(Sury.float))
+  count: s.m(Sury.int32),
+  rating: s.m(Sury.$option(Sury.number))
 }));
 
 let simpleVariantSchema = Sury.union([

package/tests/plugin/StateChange/PsReserveStock.res.mjs

@@ -15,7 +15,7 @@ function evolve(_state, _event) {
 
 let lineItemSchema = Sury.$schema(s => ({
   productId: s.m(Reference$Reventless.to_(undefined, undefined, "AvailableProducts")),
-  quantity: s.m(Sury.int)
+  quantity: s.m(Sury.int32)
 }));
 
 let commandSchema = Sury.$schema(s => ({

package/tests/plugin/StateView/PsAnnotatedView.res

@@ -1,6 +1,6 @@
 // Phase 4 fixture: state-view slice with structural annotations.
 // Used to verify Plugin_Structure.make ships x-reventless-* extension
-// properties through queryableDef.schema after swapping S.toJSONSchema
+// properties through queryableDef.schema after swapping S.toInputJSONSchemaOrThrow
 // for SuryToJsonSchema.deriveObjectSchema.
 
 @@reventless.spec("AnnotatedView")

package/tests/plugin/StateView/PsAnnotatedView.res.mjs

@@ -13,9 +13,9 @@ let consumedEventSchema = Sury.$schema(s => ({
   ownerId: s.m(DcbTag$Reventless.string),
   version: s.m(Sury.string),
   name: s.m(Sury.string),
-  total: s.m(Sury.float),
+  total: s.m(Sury.number),
   contact: s.m(Sensitive$Reventless.string),
-  quantity: s.m(FieldDefault$Reventless.int(Sury.int, 1))
+  quantity: s.m(FieldDefault$Reventless.int(Sury.int32, 1))
 }));
 
 let stateSchema = Sury.$schema(s => ({
@@ -23,9 +23,9 @@ let stateSchema = Sury.$schema(s => ({
   version: s.m(Sury.string),
   ownerId: s.m(Sury.string),
   name: s.m(Sury.string),
-  total: s.m(Sury.float),
+  total: s.m(Sury.number),
   contact: s.m(Sensitive$Reventless.string),
-  quantity: s.m(FieldDefault$Reventless.int(Sury.int, 1))
+  quantity: s.m(FieldDefault$Reventless.int(Sury.int32, 1))
 }));
 
 function project(param) {

package/tests/querydb/QueryDbFixtures.res.mjs

@@ -10,7 +10,7 @@ let moduleUrl = import.meta.url;
 
 let stateSchema = Sury.$schema(s => ({
   name: s.m(Sury.string),
-  count: s.m(Sury.int)
+  count: s.m(Sury.int32)
 }));
 
 let config = ReadModel$Reventless.config(undefined, undefined, undefined);

package/tests/util/CommandPublisherTest.res.mjs

@@ -8,7 +8,7 @@ let published = {
 };
 
 let commandSchema = Sury.$schema(s => ({
-  value: s.m(Sury.int)
+  value: s.m(Sury.int32)
 }));
 
 function commandAuthorization(param) {