@reventlessdev/reventless-spec 3.0.0-alpha.116 → 3.0.0-alpha.118

package/src/components/DcbTag.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 Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
@@ -8,69 +8,70 @@ import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
 import * as Primitive_string from "@rescript/runtime/lib/es6/Primitive_string.js";
+import * as Util_Sury$Reventless from "../util/Util_Sury.res.mjs";
 import * as DcbScopeInference$Reventless from "./DcbScopeInference.res.mjs";
 
-let tagSchema = S.schema(s => ({
-  key: s.m(S.string),
-  value: s.m(S.string)
+let tagSchema = Sury.$schema(s => ({
+  key: s.m(Sury.string),
+  value: s.m(Sury.string)
 }));
 
-let partitionTagSchema = S.schema(s => ({
-  key: s.m(S.string)
+let partitionTagSchema = Sury.$schema(s => ({
+  key: s.m(Sury.string)
 }));
 
-let dcbTagId = S.Metadata.Id.make("dcb", "tag");
+let dcbTagId = Sury.$Metadata_Id_make("dcb", "tag");
 
-let dcbPartitionTagId = S.Metadata.Id.make("dcb", "partitionTag");
+let dcbPartitionTagId = Sury.$Metadata_Id_make("dcb", "partitionTag");
 
-let dcbCrossPartitionId = S.Metadata.Id.make("dcb", "crossPartition");
+let dcbCrossPartitionId = Sury.$Metadata_Id_make("dcb", "crossPartition");
 
-let dcbCompositePartitionMemberId = S.Metadata.Id.make("dcb", "compositePartitionMember");
+let dcbCompositePartitionMemberId = Sury.$Metadata_Id_make("dcb", "compositePartitionMember");
 
-let dcbTagKeyOverrideId = S.Metadata.Id.make("dcb", "tagKeyOverride");
+let dcbTagKeyOverrideId = Sury.$Metadata_Id_make("dcb", "tagKeyOverride");
 
-let string = S.Metadata.set(S.string, dcbTagId, true);
+let string = Sury.$Metadata_set(Sury.string, dcbTagId, true);
 
 function stringForKey(key) {
-  return S.Metadata.set(S.Metadata.set(S.string, dcbTagId, true), dcbTagKeyOverrideId, key);
+  return Sury.$Metadata_set(Sury.$Metadata_set(Sury.string, dcbTagId, true), dcbTagKeyOverrideId, key);
 }
 
-let int = S.Metadata.set(S.int, dcbTagId, true);
+let int = Sury.$Metadata_set(Sury.int, dcbTagId, true);
 
-let partition = S.Metadata.set(S.Metadata.set(S.string, dcbTagId, true), dcbPartitionTagId, true);
+let partition = Sury.$Metadata_set(Sury.$Metadata_set(Sury.string, dcbTagId, true), dcbPartitionTagId, true);
 
-let crossPartition = S.Metadata.set(S.Metadata.set(S.string, dcbTagId, true), dcbCrossPartitionId, true);
+let crossPartition = Sury.$Metadata_set(Sury.$Metadata_set(Sury.string, dcbTagId, true), dcbCrossPartitionId, true);
 
 function compositePartitionMember(position, sepOpt) {
   let sep = sepOpt !== undefined ? sepOpt : "/";
-  return S.Metadata.set(S.Metadata.set(S.string, dcbTagId, true), dcbCompositePartitionMemberId, {
+  return Sury.$Metadata_set(Sury.$Metadata_set(Sury.string, dcbTagId, true), dcbCompositePartitionMemberId, {
     position: position,
     sep: sep
   });
 }
 
 function isCompositePartitionMember(fieldSchema) {
-  return Stdlib_Option.isSome(S.Metadata.get(fieldSchema, dcbCompositePartitionMemberId));
+  return Stdlib_Option.isSome(Sury.$Metadata_get(fieldSchema, dcbCompositePartitionMemberId));
 }
 
-let compositePartitionSpecSchema = S.schema(s => ({
-  keys: s.m(S.array(S.string)),
-  seps: s.m(S.array(S.string))
+let compositePartitionSpecSchema = Sury.$schema(s => ({
+  keys: s.m(Sury.array(Sury.string)),
+  seps: s.m(Sury.array(Sury.string))
 }));
 
-let derivedPartitionTagSchema = S.union([
-  S.schema(s => ({
+let derivedPartitionTagSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "Simple",
     _0: s.m(partitionTagSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "Composite",
     _0: s.m(compositePartitionSpecSchema)
   }))
 ]);
 
 function isTagged(fieldSchema) {
-  return Stdlib_Option.isSome(S.Metadata.get(fieldSchema, dcbTagId));
+  return Stdlib_Option.isSome(Sury.$Metadata_get(fieldSchema, dcbTagId));
 }
 
 function isTaggedArray(fieldSchema) {
@@ -81,16 +82,16 @@ function isTaggedArray(fieldSchema) {
   if (itemSchema === "strip" || itemSchema === "strict") {
     return false;
   } else {
-    return isTagged(itemSchema);
+    return Stdlib_Option.isSome(Sury.$Metadata_get(itemSchema, dcbTagId));
   }
 }
 
 function isPartitionTag(fieldSchema) {
-  return Stdlib_Option.isSome(S.Metadata.get(fieldSchema, dcbPartitionTagId));
+  return Stdlib_Option.isSome(Sury.$Metadata_get(fieldSchema, dcbPartitionTagId));
 }
 
 function isCrossPartitionTag(fieldSchema) {
-  return Stdlib_Option.isSome(S.Metadata.get(fieldSchema, dcbCrossPartitionId));
+  return Stdlib_Option.isSome(Sury.$Metadata_get(fieldSchema, dcbCrossPartitionId));
 }
 
 function isCrossPartitionTaggedArray(fieldSchema) {
@@ -101,12 +102,12 @@ function isCrossPartitionTaggedArray(fieldSchema) {
   if (itemSchema === "strip" || itemSchema === "strict") {
     return false;
   } else {
-    return isCrossPartitionTag(itemSchema);
+    return Stdlib_Option.isSome(Sury.$Metadata_get(itemSchema, dcbCrossPartitionId));
   }
 }
 
 function resolveTagKey(fieldName, fieldSchema) {
-  return Stdlib_Option.getOr(S.Metadata.get(fieldSchema, dcbTagKeyOverrideId), fieldName);
+  return Stdlib_Option.getOr(Sury.$Metadata_get(fieldSchema, dcbTagKeyOverrideId), fieldName);
 }
 
 function resolveArrayTagKey(fieldName, fieldSchema) {
@@ -117,7 +118,7 @@ function resolveArrayTagKey(fieldName, fieldSchema) {
   if (itemSchema === "strip" || itemSchema === "strict") {
     return fieldName;
   } else {
-    return Stdlib_Option.getOr(S.Metadata.get(itemSchema, dcbTagKeyOverrideId), fieldName);
+    return Stdlib_Option.getOr(Sury.$Metadata_get(itemSchema, dcbTagKeyOverrideId), fieldName);
   }
 }
 
@@ -142,7 +143,7 @@ function extractTagsFromProperties(properties, jsonDict) {
   return Stdlib_Array.filterMap(Object.entries(properties), param => {
     let fieldSchema = param[1];
     let fieldName = param[0];
-    if (isTagged(fieldSchema)) {
+    if (Stdlib_Option.isSome(Sury.$Metadata_get(fieldSchema, dcbTagId))) {
       return Stdlib_Option.map(jsonDict[fieldName], jsonValue => ({
         key: resolveTagKey(fieldName, fieldSchema),
         value: jsonValueToString(jsonValue)
@@ -151,15 +152,14 @@ function extractTagsFromProperties(properties, jsonDict) {
   });
 }
 
-function variantTagName(items) {
-  return Stdlib_Option.flatMap(items.find(item => item.location === "TAG"), item => {
-    let match = item.schema;
-    if (match.type !== "string") {
+function variantTagName(properties) {
+  return Stdlib_Option.flatMap(properties["TAG"], schema => {
+    if (schema.type !== "string") {
       return;
     }
-    let $$const = match.const;
-    if ($$const !== undefined) {
-      return $$const;
+    let name = schema.const;
+    if (name !== undefined) {
+      return name;
     }
   });
 }
@@ -173,7 +173,7 @@ function extractTagsFromJson(schema, json) {
       } else {
         return [];
       }
-    case "union" :
+    case "anyOf" :
       let jsonDict$1 = Stdlib_JSON.Decode.object(json);
       if (jsonDict$1 === undefined) {
         return [];
@@ -186,12 +186,13 @@ function extractTagsFromJson(schema, json) {
       return Stdlib_Array.reduce(schema.anyOf, [], (acc, variantSchema) => {
         if (acc.length !== 0) {
           return acc;
-        } else if (variantSchema.type === "object") {
-          if (Primitive_object.equal(variantTagName(variantSchema.items), jsonTag)) {
-            return extractTagsFromProperties(variantSchema.properties, jsonDict$1);
-          } else {
-            return [];
-          }
+        }
+        if (variantSchema.type !== "object") {
+          return [];
+        }
+        let properties = variantSchema.properties;
+        if (Primitive_object.equal(variantTagName(properties), jsonTag)) {
+          return extractTagsFromProperties(properties, jsonDict$1);
         } else {
           return [];
         }
@@ -202,17 +203,17 @@ function extractTagsFromJson(schema, json) {
 }
 
 function extractTags(schema, value) {
-  return extractTagsFromJson(schema, S.reverseConvertToJsonOrThrow(value, schema));
+  return extractTagsFromJson(schema, Util_Sury$Reventless.toJson(value, schema));
 }
 
 function extractVariantNames(schema) {
   switch (schema.type) {
     case "object" :
-      return Stdlib_Option.mapOr(variantTagName(schema.items), [], t => [t]);
-    case "union" :
+      return Stdlib_Option.mapOr(variantTagName(schema.properties), [], t => [t]);
+    case "anyOf" :
       return Stdlib_Array.filterMap(schema.anyOf, variantSchema => {
         if (variantSchema.type === "object") {
-          return variantTagName(variantSchema.items);
+          return variantTagName(variantSchema.properties);
         }
       });
     default:
@@ -230,8 +231,8 @@ function extractAllVariantNames(schema) {
         return [];
       }
     case "object" :
-      return Stdlib_Option.mapOr(variantTagName(schema.items), [], t => [t]);
-    case "union" :
+      return Stdlib_Option.mapOr(variantTagName(schema.properties), [], t => [t]);
+    case "anyOf" :
       return Stdlib_Array.filterMap(schema.anyOf, variantSchema => {
         switch (variantSchema.type) {
           case "string" :
@@ -242,7 +243,7 @@ function extractAllVariantNames(schema) {
               return;
             }
           case "object" :
-            return variantTagName(variantSchema.items);
+            return variantTagName(variantSchema.properties);
           default:
             return;
         }
@@ -259,11 +260,11 @@ function isVariantPayloadBearing(schema, name) {
   }
   switch (schema.type) {
     case "object" :
-      return Stdlib_Option.mapOr(variantTagName(schema.items), false, t => t === name);
-    case "union" :
+      return Stdlib_Option.mapOr(variantTagName(schema.properties), false, t => t === name);
+    case "anyOf" :
       return schema.anyOf.some(variantSchema => {
         if (variantSchema.type === "object") {
-          return Stdlib_Option.mapOr(variantTagName(variantSchema.items), false, t => t === name);
+          return Stdlib_Option.mapOr(variantTagName(variantSchema.properties), false, t => t === name);
         } else {
           return false;
         }
@@ -277,7 +278,7 @@ function extractTagsFromPropertiesExpanded(properties, jsonDict) {
   return Object.entries(properties).flatMap(param => {
     let fieldSchema = param[1];
     let fieldName = param[0];
-    if (isTagged(fieldSchema)) {
+    if (Stdlib_Option.isSome(Sury.$Metadata_get(fieldSchema, dcbTagId))) {
       let jsonValue = jsonDict[fieldName];
       if (jsonValue !== undefined) {
         return [{
@@ -315,7 +316,7 @@ function extractTagsFromJsonExpanded(schema, json) {
       } else {
         return [];
       }
-    case "union" :
+    case "anyOf" :
       let jsonDict$1 = Stdlib_JSON.Decode.object(json);
       if (jsonDict$1 === undefined) {
         return [];
@@ -328,12 +329,13 @@ function extractTagsFromJsonExpanded(schema, json) {
       return Stdlib_Array.reduce(schema.anyOf, [], (acc, variantSchema) => {
         if (acc.length !== 0) {
           return acc;
-        } else if (variantSchema.type === "object") {
-          if (Primitive_object.equal(variantTagName(variantSchema.items), jsonTag)) {
-            return extractTagsFromPropertiesExpanded(variantSchema.properties, jsonDict$1);
-          } else {
-            return [];
-          }
+        }
+        if (variantSchema.type !== "object") {
+          return [];
+        }
+        let properties = variantSchema.properties;
+        if (Primitive_object.equal(variantTagName(properties), jsonTag)) {
+          return extractTagsFromPropertiesExpanded(properties, jsonDict$1);
         } else {
           return [];
         }
@@ -344,14 +346,14 @@ function extractTagsFromJsonExpanded(schema, json) {
 }
 
 function extractTagsExpanded(schema, value) {
-  return extractTagsFromJsonExpanded(schema, S.reverseConvertToJsonOrThrow(value, schema));
+  return extractTagsFromJsonExpanded(schema, Util_Sury$Reventless.toJson(value, schema));
 }
 
 function hasTaggedArrayFields(schema) {
   switch (schema.type) {
     case "object" :
       return Object.entries(schema.properties).some(param => isTaggedArray(param[1]));
-    case "union" :
+    case "anyOf" :
       return schema.anyOf.some(variantSchema => {
         if (variantSchema.type === "object") {
           return Object.entries(variantSchema.properties).some(param => isTaggedArray(param[1]));
@@ -368,7 +370,7 @@ function tagKeysOfProperties(properties) {
   return Stdlib_Array.filterMap(Object.entries(properties), param => {
     let fieldSchema = param[1];
     let fieldName = param[0];
-    if (isTagged(fieldSchema)) {
+    if (Stdlib_Option.isSome(Sury.$Metadata_get(fieldSchema, dcbTagId))) {
       return resolveTagKey(fieldName, fieldSchema);
     } else if (isTaggedArray(fieldSchema)) {
       return resolveArrayTagKey(fieldName, fieldSchema);
@@ -385,7 +387,7 @@ function extractTagKeysByEventType(schema) {
       return;
     }
     let properties = variantSchema.properties;
-    Stdlib_Option.forEach(variantTagName(variantSchema.items), eventType => {
+    Stdlib_Option.forEach(variantTagName(properties), eventType => {
       result[eventType] = tagKeysOfProperties(properties);
     });
   };
@@ -393,7 +395,7 @@ function extractTagKeysByEventType(schema) {
     case "object" :
       addVariant(schema);
       break;
-    case "union" :
+    case "anyOf" :
       schema.anyOf.forEach(addVariant);
       break;
   }
@@ -462,15 +464,15 @@ function extractTaggedFields(schema) {
   switch (schema.type) {
     case "object" :
       return Stdlib_Array.filterMap(Object.entries(schema.properties), param => {
-        if (isTagged(param[1])) {
+        if (Stdlib_Option.isSome(Sury.$Metadata_get(param[1], dcbTagId))) {
           return param[0];
         }
       }).toSorted(Primitive_string.compare);
-    case "union" :
+    case "anyOf" :
       let allFields = schema.anyOf.flatMap(variantSchema => {
         if (variantSchema.type === "object") {
           return Stdlib_Array.filterMap(Object.entries(variantSchema.properties), param => {
-            if (isTagged(param[1])) {
+            if (Stdlib_Option.isSome(Sury.$Metadata_get(param[1], dcbTagId))) {
               return param[0];
             }
           });
@@ -492,7 +494,7 @@ function crossPartitionKeysOfProperties(properties) {
   return Stdlib_Array.filterMap(Object.entries(properties), param => {
     let fieldSchema = param[1];
     let fieldName = param[0];
-    if (isTagged(fieldSchema) && isCrossPartitionTag(fieldSchema)) {
+    if (Stdlib_Option.isSome(Sury.$Metadata_get(fieldSchema, dcbTagId)) && Stdlib_Option.isSome(Sury.$Metadata_get(fieldSchema, dcbCrossPartitionId))) {
       return resolveTagKey(fieldName, fieldSchema);
     } else if (isCrossPartitionTaggedArray(fieldSchema)) {
       return resolveArrayTagKey(fieldName, fieldSchema);
@@ -508,7 +510,7 @@ function extractCrossPartitionTagKeys(schema) {
     case "object" :
       keys = crossPartitionKeysOfProperties(schema.properties);
       break;
-    case "union" :
+    case "anyOf" :
       keys = schema.anyOf.flatMap(variantSchema => {
         if (variantSchema.type === "object") {
           return crossPartitionKeysOfProperties(variantSchema.properties);
@@ -557,7 +559,7 @@ function eventShapesOfSchema(schema) {
         }
       case "object" :
         let properties = variantSchema.properties;
-        return Stdlib_Option.map(variantTagName(variantSchema.items), eventType => ({
+        return Stdlib_Option.map(variantTagName(properties), eventType => ({
           eventType: eventType,
           idFields: idFieldsOfProperties(properties)
         }));
@@ -568,7 +570,7 @@ function eventShapesOfSchema(schema) {
   switch (schema.type) {
     case "object" :
       return Stdlib_Option.mapOr(ofVariant(schema), [], s => [s]);
-    case "union" :
+    case "anyOf" :
       return Stdlib_Array.filterMap(schema.anyOf, ofVariant);
     default:
       return [];
@@ -579,15 +581,15 @@ function extractPartitionTagFields(schema) {
   switch (schema.type) {
     case "object" :
       return Stdlib_Array.filterMap(Object.entries(schema.properties), param => {
-        if (isPartitionTag(param[1])) {
+        if (Stdlib_Option.isSome(Sury.$Metadata_get(param[1], dcbPartitionTagId))) {
           return param[0];
         }
       });
-    case "union" :
+    case "anyOf" :
       let allFields = schema.anyOf.flatMap(variantSchema => {
         if (variantSchema.type === "object") {
           return Stdlib_Array.filterMap(Object.entries(variantSchema.properties), param => {
-            if (isPartitionTag(param[1])) {
+            if (Stdlib_Option.isSome(Sury.$Metadata_get(param[1], dcbPartitionTagId))) {
               return param[0];
             }
           });
@@ -641,14 +643,14 @@ function deriveEffectiveScope(slices) {
 function hasMultiTagVariant(schema) {
   switch (schema.type) {
     case "object" :
-      let tagCount = Object.entries(schema.properties).filter(param => isTagged(param[1])).length;
+      let tagCount = Object.entries(schema.properties).filter(param => Stdlib_Option.isSome(Sury.$Metadata_get(param[1], dcbTagId))).length;
       return tagCount > 1;
-    case "union" :
+    case "anyOf" :
       return schema.anyOf.some(variantSchema => {
         if (variantSchema.type !== "object") {
           return false;
         }
-        let tagCount = Object.entries(variantSchema.properties).filter(param => isTagged(param[1])).length;
+        let tagCount = Object.entries(variantSchema.properties).filter(param => Stdlib_Option.isSome(Sury.$Metadata_get(param[1], dcbTagId))).length;
         return tagCount > 1;
       });
     default:
@@ -661,12 +663,13 @@ function findMultiTagVariantNames(schema) {
     if (variantSchema.type !== "object") {
       return;
     }
-    let tagCount = Object.entries(variantSchema.properties).filter(param => isTagged(param[1])).length;
+    let properties = variantSchema.properties;
+    let tagCount = Object.entries(properties).filter(param => Stdlib_Option.isSome(Sury.$Metadata_get(param[1], dcbTagId))).length;
     if (tagCount > 1) {
-      return Stdlib_Option.getOr(variantTagName(variantSchema.items), "(unknown)");
+      return Stdlib_Option.getOr(variantTagName(properties), "(unknown)");
     }
   };
-  if (schema.type === "union") {
+  if (schema.type === "anyOf") {
     return Stdlib_Array.filterMap(schema.anyOf, variantName);
   }
   let name = variantName(schema);
@@ -679,7 +682,7 @@ function findMultiTagVariantNames(schema) {
 
 function extractCompositePartitionFieldsFromProperties(properties) {
   return Stdlib_Array.filterMap(Object.entries(properties), param => {
-    let meta = S.Metadata.get(param[1], dcbCompositePartitionMemberId);
+    let meta = Sury.$Metadata_get(param[1], dcbCompositePartitionMemberId);
     if (meta !== undefined) {
       return {
         name: param[0],
@@ -703,7 +706,7 @@ function extractCompositePartitionFields(schema) {
   switch (schema.type) {
     case "object" :
       return collect(schema.properties);
-    case "union" :
+    case "anyOf" :
       return schema.anyOf.flatMap(variantSchema => {
         if (variantSchema.type === "object") {
           return collect(variantSchema.properties);

package/src/components/DcbValidation.res

@@ -12,8 +12,8 @@ type variantInfo = {
 // Extract variant info (TAG name, fields, tagged fields) from a single variant schema
 let extractVariantInfo = (variantSchema: S.t<unknown>): option<variantInfo> =>
   switch variantSchema {
-  | Object({items, properties}) =>
-    DcbTag.variantTagName(items)->Option.map(tagName => {
+  | Object({properties}) =>
+    DcbTag.variantTagName(properties)->Option.map(tagName => {
       let taggedFields =
         properties
         ->Dict.toArray
@@ -42,7 +42,7 @@ let extractVariantInfo = (variantSchema: S.t<unknown>): option<variantInfo> =>
 // Extract all variant infos from a schema (handles Union and single variants)
 let extractAllVariants = (schema: S.t<unknown>): array<variantInfo> =>
   switch schema {
-  | Union({anyOf}) => anyOf->Array.filterMap(extractVariantInfo)
+  | AnyOf({anyOf}) => anyOf->Array.filterMap(extractVariantInfo)
   | _ =>
     switch extractVariantInfo(schema) {
     | Some(info) => [info]
@@ -66,7 +66,7 @@ let rec schemasAreCompatible = (a: S.t<unknown>, b: S.t<unknown>): bool =>
   | (Array({additionalItems: Schema(aItem)}), Array({additionalItems: Schema(bItem)})) =>
     schemasAreCompatible(aItem, bItem)
   | (Object({properties: aProps}), Object({properties: bProps})) => propsCompatible(aProps, bProps)
-  | (Union(_), Union(_)) =>
+  | (AnyOf(_), AnyOf(_)) =>
     // Same set of variant tags, and each shared variant's payload compatible.
     let av = extractAllVariants(a)
     let bv = extractAllVariants(b)
@@ -104,7 +104,7 @@ let schemaTypeName = (schema: S.t<unknown>): string =>
   | BigInt(_) => "bigint"
   | Array(_) => "array"
   | Object(_) => "object"
-  | Union(_) => "union"
+  | AnyOf(_) => "union"
   | Never(_) => "never"
   | Unknown(_) => "unknown"
   | Ref(_) => "ref"
@@ -126,7 +126,7 @@ let schemaTypeName = (schema: S.t<unknown>): string =>
 // since that is all there is to say about it.
 let describeSchema = (schema: S.t<unknown>): string =>
   switch schema {
-  | Union({anyOf}) =>
+  | AnyOf({anyOf}) =>
     let tags = extractAllVariants(schema)->Array.map(v => v.tagName)
     let members = tags->Array.length > 0 ? tags : anyOf->Array.map(schemaTypeName)
     `union[${members->Array.join(" | ")}]`

package/src/components/DcbValidation.res.mjs

@@ -21,7 +21,7 @@ function extractVariantInfo(variantSchema) {
       }
     case "object" :
       let properties = variantSchema.properties;
-      return Stdlib_Option.map(DcbTag$Reventless.variantTagName(variantSchema.items), tagName => {
+      return Stdlib_Option.map(DcbTag$Reventless.variantTagName(properties), tagName => {
         let taggedFields = Stdlib_Array.filterMap(Object.entries(properties), param => {
           if (DcbTag$Reventless.isTagged(param[1])) {
             return param[0];
@@ -39,7 +39,7 @@ function extractVariantInfo(variantSchema) {
 }
 
 function extractAllVariants(schema) {
-  if (schema.type === "union") {
+  if (schema.type === "anyOf") {
     return Stdlib_Array.filterMap(schema.anyOf, extractVariantInfo);
   }
   let info = extractVariantInfo(schema);
@@ -88,8 +88,8 @@ function schemasAreCompatible(_a, _b) {
         } else {
           return false;
         }
-      case "union" :
-        if (b.type !== "union") {
+      case "anyOf" :
+        if (b.type !== "anyOf") {
           return false;
         }
         let av = extractAllVariants(a);
@@ -149,7 +149,7 @@ function schemaTypeName(schema) {
       return "array";
     case "object" :
       return "object";
-    case "union" :
+    case "anyOf" :
       return "union";
     case "ref" :
       return "ref";
@@ -169,7 +169,7 @@ function describeSchema(schema) {
       }
     case "object" :
       return `object{` + Object.keys(schema.properties).toSorted(Primitive_string.compare).join(", ") + `}`;
-    case "union" :
+    case "anyOf" :
       let tags = extractAllVariants(schema).map(v => v.tagName);
       let members = tags.length !== 0 ? tags : schema.anyOf.map(schemaTypeName);
       return `union[` + members.join(" | ") + `]`;

package/src/components/DisplayName.res.mjs

@@ -1,12 +1,12 @@
 // 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";
 
-let displayNameId = S.Metadata.Id.make("reventless", "displayName");
+let displayNameId = Sury.$Metadata_Id_make("reventless", "displayName");
 
 function getSpec(schema) {
-  return S.Metadata.get(schema, displayNameId);
+  return Sury.$Metadata_get(schema, displayNameId);
 }
 
 function computeLabel(spec, state) {

package/src/components/Owner.res

@@ -119,7 +119,7 @@ let variantFieldNames = (schema: S.t<unknown>, ~variant: string): array<string>
     | _ => false
     }
   switch schema {
-  | Union({anyOf}) =>
+  | AnyOf({anyOf}) =>
     anyOf
     ->Array.find(v =>
       switch v {

package/src/components/Owner.res.mjs

@@ -1,22 +1,22 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Semantic$Reventless from "../semantic/Semantic.res.mjs";
 
-let ownerId = S.Metadata.Id.make("reventless", "owner");
+let ownerId = Sury.$Metadata_Id_make("reventless", "owner");
 
 function mark(schema) {
-  return S.Metadata.set(schema, ownerId, true);
+  return Sury.$Metadata_set(schema, ownerId, true);
 }
 
-let string = mark(S.string);
+let string = Sury.$Metadata_set(Sury.string, ownerId, true);
 
-let optionString = S.option(string);
+let optionString = Sury.$option(string);
 
 function isOwner(schema) {
-  return Stdlib_Option.getOr(S.Metadata.get(schema, ownerId), false);
+  return Stdlib_Option.getOr(Sury.$Metadata_get(schema, ownerId), false);
 }
 
 function isFieldOwner(schema) {
@@ -71,7 +71,7 @@ function variantFieldNames(schema, variant) {
       } else {
         return [];
       }
-    case "union" :
+    case "anyOf" :
       return Stdlib_Option.mapOr(schema.anyOf.find(v => {
         if (v.type === "object") {
           return isVariant(v.properties);