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

package/src/admin/Platform_Admin_Structure.res.mjs

@@ -1,107 +1,13 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
-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";
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
-import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
 import * as Api_Naming$ReventlessCore from "../components/Api/Api_Naming.res.mjs";
 import * as PluginSpec$ReventlessCore from "../plugin/lifecycle/PluginSpec.res.mjs";
 import * as Plugin_Structure$ReventlessCore from "../plugin/component/Plugin_Structure.res.mjs";
-import * as SuryToJsonSchema$ReventlessCore from "../components/Api/SuryToJsonSchema.res.mjs";
-import * as PluginBaseFragment$ReventlessCore from "../plugin/api/PluginBaseFragment.res.mjs";
 import * as PluginsReadModelSpec$ReventlessCore from "../plugin/lifecycle/PluginsReadModelSpec.res.mjs";
 
 let pluginId = "Platform";
 
-function encodeSchema(schema) {
-  return JSON.stringify(SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema));
-}
-
-function encodeSchemaExcluding(schema, excludeFields) {
-  let derived = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
-  let obj = Stdlib_JSON.Decode.object(derived);
-  if (obj === undefined) {
-    return JSON.stringify(derived);
-  }
-  let props = Stdlib_Option.flatMap(obj["properties"], Stdlib_JSON.Decode.object);
-  if (props === undefined) {
-    return JSON.stringify(derived);
-  }
-  excludeFields.forEach(f => Stdlib_Dict.$$delete(props, f));
-  obj["properties"] = props;
-  let req = Stdlib_Option.flatMap(obj["required"], Stdlib_JSON.Decode.array);
-  if (req !== undefined) {
-    let filtered = Stdlib_Array.filterMap(req, Stdlib_JSON.Decode.string).filter(name => !excludeFields.includes(name)).map(prim => prim);
-    obj["required"] = filtered;
-  }
-  return JSON.stringify(obj);
-}
-
-let idArgsSchema = S.schema(s => ({
-  id: s.m(DcbTag$Reventless.string)
-}));
-
-let activateCommand_schema = encodeSchema(idArgsSchema);
-
-let activateCommand_aggregateIdField = "id";
-
-let activateCommand_mutationField = Api_Naming$ReventlessCore.adminField("Plugin_Activate");
-
-let activateCommand_references = [];
-
-let activateCommand_allowedStates = ["Inactive"];
-
-let activateCommand_apiExposed = true;
-
-let activateCommand = {
-  name: "Activate",
-  schema: activateCommand_schema,
-  level: "Instance",
-  aggregateIdField: activateCommand_aggregateIdField,
-  mutationField: activateCommand_mutationField,
-  references: activateCommand_references,
-  allowedStates: activateCommand_allowedStates,
-  targetState: undefined,
-  apiExposed: activateCommand_apiExposed,
-  requiredAccess: undefined,
-  ownerField: undefined
-};
-
-let deactivateCommand_schema = encodeSchema(idArgsSchema);
-
-let deactivateCommand_aggregateIdField = "id";
-
-let deactivateCommand_mutationField = Api_Naming$ReventlessCore.adminField("Plugin_Deactivate");
-
-let deactivateCommand_references = [];
-
-let deactivateCommand_allowedStates = [
-  "Connected",
-  "Disconnected"
-];
-
-let deactivateCommand_apiExposed = true;
-
-let deactivateCommand = {
-  name: "Deactivate",
-  schema: deactivateCommand_schema,
-  level: "Instance",
-  aggregateIdField: deactivateCommand_aggregateIdField,
-  mutationField: deactivateCommand_mutationField,
-  references: deactivateCommand_references,
-  allowedStates: deactivateCommand_allowedStates,
-  targetState: undefined,
-  apiExposed: deactivateCommand_apiExposed,
-  requiredAccess: undefined,
-  ownerField: undefined
-};
-
-let pluginAggregate_commands = [
-  activateCommand,
-  deactivateCommand
-];
+let pluginCommands = Plugin_Structure$ReventlessCore.extractCommandDefs(true, variantName => Api_Naming$ReventlessCore.adminField(PluginSpec$ReventlessCore.name + "_" + variantName), PluginSpec$ReventlessCore.commandAuthorization, PluginSpec$ReventlessCore.commandSchema);
 
 let pluginAggregate_producedEventTypes = [];
 
@@ -115,7 +21,7 @@ let pluginAggregate_errors = Plugin_Structure$ReventlessCore.extractErrorDefs(Pl
 
 let pluginAggregate = {
   name: "Plugin",
-  commands: pluginAggregate_commands,
+  commands: pluginCommands,
   producedEventTypes: pluginAggregate_producedEventTypes,
   consumedEventTypes: pluginAggregate_consumedEventTypes,
   linkedViews: pluginAggregate_linkedViews,
@@ -125,43 +31,7 @@ let pluginAggregate = {
   chapter: undefined
 };
 
-let pluginReadModel_queryField = Api_Naming$ReventlessCore.adminField("Plugins");
-
-let pluginReadModel_schema = encodeSchemaExcluding(PluginsReadModelSpec$ReventlessCore.stateSchema, PluginBaseFragment$ReventlessCore.pluginUIOnlyExcludeFields);
-
-let pluginReadModel_consumedEventTypes = [];
-
-let pluginReadModel_linkedWriteSide = ["Plugin"];
-
-let pluginReadModel_searchableFields = ["name"];
-
-let pluginReadModel_labelFieldSource = "convention";
-
-let pluginReadModel_lifecycleField = "status";
-
-let pluginReadModel_singleQueryField = Api_Naming$ReventlessCore.adminField("Plugin");
-
-let pluginReadModel = {
-  name: "Plugins",
-  queryField: pluginReadModel_queryField,
-  schema: pluginReadModel_schema,
-  consumedEventTypes: pluginReadModel_consumedEventTypes,
-  linkedWriteSide: pluginReadModel_linkedWriteSide,
-  labelField: "name",
-  searchableFields: pluginReadModel_searchableFields,
-  labelFieldSource: pluginReadModel_labelFieldSource,
-  lifecycleField: pluginReadModel_lifecycleField,
-  ownerField: undefined,
-  retiredField: undefined,
-  retiredValues: undefined,
-  namedWhenRetired: undefined,
-  visibility: undefined,
-  chapter: undefined,
-  singleQueryField: pluginReadModel_singleQueryField,
-  idField: undefined,
-  idFieldSource: undefined,
-  requiredAccess: undefined
-};
+let pluginReadModel = Plugin_Structure$ReventlessCore.queryableDefFromSpec(pluginId, PluginsReadModelSpec$ReventlessCore.name, PluginsReadModelSpec$ReventlessCore.stateSchema, PluginsReadModelSpec$ReventlessCore.authorization, undefined, undefined, ["Plugin"], undefined);
 
 let structure_readModels = [pluginReadModel];
 
@@ -195,16 +65,15 @@ let structure = {
 
 let pluginName = pluginId;
 
+let commandSchema = PluginSpec$ReventlessCore.commandSchema;
+
 export {
   pluginId,
   pluginName,
-  encodeSchema,
-  encodeSchemaExcluding,
-  idArgsSchema,
-  activateCommand,
-  deactivateCommand,
+  commandSchema,
+  pluginCommands,
   pluginAggregate,
   pluginReadModel,
   structure,
 }
-/* idArgsSchema Not a pure module */
+/* pluginCommands Not a pure module */

package/src/admin/UiFragmentRegistry/StateChangeSlice/UiFragmentRegistry.res.mjs

@@ -1,40 +1,40 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
 import * as Plugin$Reventless from "@reventlessdev/reventless-spec/src/components/Plugin.res.mjs";
 import * as Api$ReventlessInfra from "@reventlessdev/reventless-infra/src/components/Api.res.mjs";
 
-let commandSchema = S.union([
-  S.schema(s => ({
+let commandSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "RegisterUiFragment",
     pluginId: s.m(DcbTag$Reventless.string),
     manifest: s.m(Plugin$Reventless.uiFragmentManifestSchema),
-    at: s.m(S.string)
+    at: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "DeregisterUiFragment",
     pluginId: s.m(DcbTag$Reventless.string)
   }))
 ]);
 
-let errorSchema = S.literal("RegistryError");
+let errorSchema = Sury.literal("RegistryError");
 
-let eventSchema = S.union([
-  S.schema(s => ({
+let eventSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "UiFragmentRegistered",
     pluginId: s.m(DcbTag$Reventless.string),
     manifest: s.m(Plugin$Reventless.uiFragmentManifestSchema),
-    at: s.m(S.string)
+    at: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "UiFragmentUpdated",
     pluginId: s.m(DcbTag$Reventless.string),
     previousManifest: s.m(Plugin$Reventless.uiFragmentManifestSchema),
     newManifest: s.m(Plugin$Reventless.uiFragmentManifestSchema),
-    at: s.m(S.string)
+    at: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "UiFragmentDeregistered",
     pluginId: s.m(DcbTag$Reventless.string)
   }))

package/src/admin/UiFragmentRegistry/StateViewSlice/UiFragments.res.mjs

@@ -1,34 +1,34 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
 import * as Plugin$Reventless from "@reventlessdev/reventless-spec/src/components/Plugin.res.mjs";
 import * as ReadModel$Reventless from "@reventlessdev/reventless-spec/src/components/ReadModel.res.mjs";
 
-let stateSchema = S.schema(s => ({
-  pluginId: s.m(S.string),
-  remoteEntryUrl: s.m(S.string),
-  panels: s.m(S.array(Plugin$Reventless.panelManifestEntrySchema)),
-  pages: s.m(S.array(Plugin$Reventless.pageManifestEntrySchema)),
-  registeredAt: s.m(S.string),
-  updatedAt: s.m(S.string)
+let stateSchema = Sury.$schema(s => ({
+  pluginId: s.m(Sury.string),
+  remoteEntryUrl: s.m(Sury.string),
+  panels: s.m(Sury.array(Plugin$Reventless.panelManifestEntrySchema)),
+  pages: s.m(Sury.array(Plugin$Reventless.pageManifestEntrySchema)),
+  registeredAt: s.m(Sury.string),
+  updatedAt: s.m(Sury.string)
 }));
 
-let consumedEventSchema = S.union([
-  S.schema(s => ({
+let consumedEventSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "UiFragmentRegistered",
     pluginId: s.m(DcbTag$Reventless.string),
     manifest: s.m(Plugin$Reventless.uiFragmentManifestSchema),
-    at: s.m(S.string)
+    at: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "UiFragmentUpdated",
     pluginId: s.m(DcbTag$Reventless.string),
     previousManifest: s.m(Plugin$Reventless.uiFragmentManifestSchema),
     newManifest: s.m(Plugin$Reventless.uiFragmentManifestSchema),
-    at: s.m(S.string)
+    at: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "UiFragmentDeregistered",
     pluginId: s.m(DcbTag$Reventless.string)
   }))

package/src/components/Aggregate/Aggregate_Callback.res

@@ -153,7 +153,7 @@ module Make = (
   let encodeState = (state: Behavior.state): option<JSON.t> =>
     switch snapshotConfig {
     | Some({stateSchema}) =>
-      switch state->S.reverseConvertToJsonOrThrow(stateSchema) {
+      switch state->Reventless.Util_Sury.toJson(stateSchema) {
       | json => Some(json)
       | exception _ => None
       }
@@ -163,7 +163,7 @@ module Make = (
   let decodeState = (json: JSON.t): option<Behavior.state> =>
     switch snapshotConfig {
     | Some({stateSchema}) =>
-      switch json->S.parseJsonOrThrow(stateSchema) {
+      switch json->Reventless.Util_Sury.fromJson(stateSchema) {
       | state => Some(state)
       | exception _ => None
       }

package/src/components/Aggregate/Aggregate_Callback.res.mjs

@@ -1,6 +1,5 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
 import HashObject from "hash-object";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
@@ -11,6 +10,7 @@ import * as Stream from "effect/Stream";
 import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as Lru$ReventlessCore from "../../util/Lru.res.mjs";
+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 LogFormat$ReventlessCore from "../../util/LogFormat.res.mjs";
 import * as EffectLogger$ReventlessCore from "../../util/EffectLogger.res.mjs";
@@ -87,7 +87,7 @@ function Make(Spec) {
       }
       let json;
       try {
-        json = S.reverseConvertToJsonOrThrow(state, snapshotConfig.stateSchema);
+        json = Util_Sury$Reventless.toJson(state, snapshotConfig.stateSchema);
       } catch (exn) {
         return;
       }
@@ -99,7 +99,7 @@ function Make(Spec) {
       }
       let state;
       try {
-        state = S.parseJsonOrThrow(json, snapshotConfig.stateSchema);
+        state = Util_Sury$Reventless.fromJson(json, snapshotConfig.stateSchema);
       } catch (exn) {
         return;
       }
@@ -356,4 +356,4 @@ function Make(Spec) {
 export {
   Make,
 }
-/* S Not a pure module */
+/* hash-object Not a pure module */

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

@@ -1,10 +1,10 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Api$ReventlessInfra from "@reventlessdev/reventless-infra/src/components/Api.res.mjs";
 
 function getAllowedStates(commandSchema, variantName) {
-  let entries = S.Metadata.get(commandSchema, Api$ReventlessInfra.allowedStatesId);
+  let entries = Sury.$Metadata_get(commandSchema, Api$ReventlessInfra.allowedStatesId);
   if (entries !== undefined) {
     return entries[variantName];
   }
@@ -13,4 +13,4 @@ function getAllowedStates(commandSchema, variantName) {
 export {
   getAllowedStates,
 }
-/* S Not a pure module */
+/* sury Not a pure module */

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

@@ -1,19 +1,19 @@
 // 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 Api$ReventlessInfra from "@reventlessdev/reventless-infra/src/components/Api.res.mjs";
 
 function isNoApi(commandSchema) {
-  return Stdlib_Option.getOr(S.Metadata.get(commandSchema, Api$ReventlessInfra.noApiId), false);
+  return Stdlib_Option.getOr(Sury.$Metadata_get(commandSchema, Api$ReventlessInfra.noApiId), false);
 }
 
 function getExcludedVariants(commandSchema) {
-  return S.Metadata.get(commandSchema, Api$ReventlessInfra.noApiVariantsId);
+  return Sury.$Metadata_get(commandSchema, Api$ReventlessInfra.noApiVariantsId);
 }
 
 function filterNoApiVariants(fieldNames, commandSchema) {
-  let excluded = S.Metadata.get(commandSchema, Api$ReventlessInfra.noApiVariantsId);
+  let excluded = Sury.$Metadata_get(commandSchema, Api$ReventlessInfra.noApiVariantsId);
   if (excluded !== undefined) {
     return fieldNames.filter(name => !excluded.has(name));
   } else {
@@ -26,4 +26,4 @@ export {
   getExcludedVariants,
   filterNoApiVariants,
 }
-/* S Not a pure module */
+/* sury Not a pure module */

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

@@ -1,10 +1,10 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Api$ReventlessInfra from "@reventlessdev/reventless-infra/src/components/Api.res.mjs";
 
 function getTargetState(commandSchema, variantName) {
-  let entries = S.Metadata.get(commandSchema, Api$ReventlessInfra.targetStateId);
+  let entries = Sury.$Metadata_get(commandSchema, Api$ReventlessInfra.targetStateId);
   if (entries !== undefined) {
     return entries[variantName];
   }
@@ -13,4 +13,4 @@ function getTargetState(commandSchema, variantName) {
 export {
   getTargetState,
 }
-/* S Not a pure module */
+/* sury Not a pure module */

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]);