effect 3.17.9 → 3.17.10

package/dist/cjs/JSONSchema.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.make = exports.fromAST = void 0;
 var Arr = _interopRequireWildcard(require("./Array.js"));
 var errors_ = _interopRequireWildcard(require("./internal/schema/errors.js"));
+var schemaId_ = _interopRequireWildcard(require("./internal/schema/schemaId.js"));
 var Option = _interopRequireWildcard(require("./Option.js"));
 var ParseResult = _interopRequireWildcard(require("./ParseResult.js"));
 var Predicate = _interopRequireWildcard(require("./Predicate.js"));
@@ -73,38 +74,38 @@ const fromAST = (ast, options) => {
   const definitionPath = options.definitionPath ?? "#/$defs/";
   const getRef = id => definitionPath + id;
   const target = options.target ?? "jsonSchema7";
-  const handleIdentifier = options.topLevelReferenceStrategy !== "skip";
+  const handleIdentifier = options.topLevelReferenceStrategy !== "skip" ? "handle-identifier" : "ignore-identifier";
   const additionalPropertiesStrategy = options.additionalPropertiesStrategy ?? "strict";
   return go(ast, options.definitions, handleIdentifier, [], {
     getRef,
     target,
     additionalPropertiesStrategy
-  });
+  }, "handle-annotation", "handle-errors");
 };
 exports.fromAST = fromAST;
 const constNever = {
-  "$id": "/schemas/never",
-  "not": {}
+  $id: "/schemas/never",
+  not: {}
 };
 const constAny = {
-  "$id": "/schemas/any"
+  $id: "/schemas/any"
 };
 const constUnknown = {
-  "$id": "/schemas/unknown"
+  $id: "/schemas/unknown"
 };
 const constVoid = {
-  "$id": "/schemas/void"
+  $id: "/schemas/void"
 };
-const constAnyObject = {
-  "$id": "/schemas/object",
+const constObject = {
+  $id: "/schemas/object",
   "anyOf": [{
     "type": "object"
   }, {
     "type": "array"
   }]
 };
-const constEmpty = {
-  "$id": "/schemas/%7B%7D",
+const constEmptyStruct = {
+  $id: "/schemas/%7B%7D",
   "anyOf": [{
     "type": "object"
   }, {
@@ -112,79 +113,93 @@ const constEmpty = {
   }]
 };
 const $schema = "http://json-schema.org/draft-07/schema#";
-const getJsonSchemaAnnotations = (ast, annotated) => {
-  annotated ??= ast;
-  const out = Record.getSomes({
-    description: AST.getDescriptionAnnotation(annotated),
-    title: AST.getTitleAnnotation(annotated),
-    default: AST.getDefaultAnnotation(annotated)
-  });
-  const oexamples = AST.getExamplesAnnotation(annotated);
-  if (Option.isSome(oexamples) && oexamples.value.length > 0) {
-    const getOption = ParseResult.getOption(ast, false);
-    const examples = Arr.filterMap(oexamples.value, e => getOption(e));
-    if (examples.length > 0) {
-      out.examples = examples;
+function getRawDescription(annotated) {
+  if (annotated !== undefined) return Option.getOrUndefined(AST.getDescriptionAnnotation(annotated));
+}
+function getRawTitle(annotated) {
+  if (annotated !== undefined) return Option.getOrUndefined(AST.getTitleAnnotation(annotated));
+}
+function getRawDefault(annotated) {
+  if (annotated !== undefined) return AST.getDefaultAnnotation(annotated);
+  return Option.none();
+}
+function getRawExamples(annotated) {
+  if (annotated !== undefined) return Option.getOrUndefined(AST.getExamplesAnnotation(annotated));
+}
+function encodeExamples(ast, examples) {
+  const getOption = ParseResult.getOption(ast, false);
+  const out = Arr.filterMap(examples, e => getOption(e));
+  return out.length > 0 ? out : undefined;
+}
+function filterBuiltIn(ast, annotation, key) {
+  if (annotation !== undefined) {
+    switch (ast._tag) {
+      case "StringKeyword":
+        return annotation !== AST.stringKeyword.annotations[key] ? annotation : undefined;
+      case "NumberKeyword":
+        return annotation !== AST.numberKeyword.annotations[key] ? annotation : undefined;
+      case "BooleanKeyword":
+        return annotation !== AST.booleanKeyword.annotations[key] ? annotation : undefined;
     }
   }
-  return out;
-};
-const removeDefaultJsonSchemaAnnotations = (jsonSchemaAnnotations, ast) => {
-  if (jsonSchemaAnnotations["title"] === ast.annotations[AST.TitleAnnotationId]) {
-    delete jsonSchemaAnnotations["title"];
+  return annotation;
+}
+function pruneJsonSchemaAnnotations(ast, description, title, def, examples) {
+  const out = {};
+  if (description !== undefined) out.description = description;
+  if (title !== undefined) out.title = title;
+  if (Option.isSome(def)) out.default = def.value;
+  if (examples !== undefined) {
+    const encodedExamples = encodeExamples(ast, examples);
+    if (encodedExamples !== undefined) {
+      out.examples = encodedExamples;
+    }
   }
-  if (jsonSchemaAnnotations["description"] === ast.annotations[AST.DescriptionAnnotationId]) {
-    delete jsonSchemaAnnotations["description"];
+  if (Object.keys(out).length === 0) {
+    return undefined;
   }
-  return jsonSchemaAnnotations;
-};
-const getASTJsonSchemaAnnotations = ast => {
-  const jsonSchemaAnnotations = getJsonSchemaAnnotations(ast);
-  switch (ast._tag) {
-    case "StringKeyword":
-      return removeDefaultJsonSchemaAnnotations(jsonSchemaAnnotations, AST.stringKeyword);
-    case "NumberKeyword":
-      return removeDefaultJsonSchemaAnnotations(jsonSchemaAnnotations, AST.numberKeyword);
-    case "BooleanKeyword":
-      return removeDefaultJsonSchemaAnnotations(jsonSchemaAnnotations, AST.booleanKeyword);
-    default:
-      return jsonSchemaAnnotations;
+  return out;
+}
+function getContextJsonSchemaAnnotations(ast, annotated) {
+  return pruneJsonSchemaAnnotations(ast, getRawDescription(annotated), getRawTitle(annotated), getRawDefault(annotated), getRawExamples(annotated));
+}
+function getJsonSchemaAnnotations(ast) {
+  return pruneJsonSchemaAnnotations(ast, filterBuiltIn(ast, getRawDescription(ast), AST.DescriptionAnnotationId), filterBuiltIn(ast, getRawTitle(ast), AST.TitleAnnotationId), getRawDefault(ast), getRawExamples(ast));
+}
+function mergeJsonSchemaAnnotations(jsonSchema, jsonSchemaAnnotations) {
+  if (jsonSchemaAnnotations) {
+    if ("$ref" in jsonSchema) {
+      return {
+        allOf: [jsonSchema],
+        ...jsonSchemaAnnotations
+      };
+    }
+    return {
+      ...jsonSchema,
+      ...jsonSchemaAnnotations
+    };
   }
-};
+  return jsonSchema;
+}
 const pruneUndefined = ast => {
   if (Option.isNone(AST.getJSONSchemaAnnotation(ast))) {
     return AST.pruneUndefined(ast, pruneUndefined, ast => pruneUndefined(ast.from));
   }
 };
 const isParseJsonTransformation = ast => ast.annotations[AST.SchemaIdAnnotationId] === AST.ParseJsonSchemaId;
-const isOverrideAnnotation = jsonSchema => {
-  return "type" in jsonSchema || "oneOf" in jsonSchema || "anyOf" in jsonSchema || "const" in jsonSchema || "enum" in jsonSchema || "$ref" in jsonSchema;
-};
-// Returns true if the schema is an enum with no other properties other than the
-// optional "type". This is used to merge enums together.
-const isMergeableEnum = jsonSchema => {
-  const len = Object.keys(jsonSchema).length;
-  return "enum" in jsonSchema && (len === 1 || "type" in jsonSchema && len === 2);
-};
-// Some validators do not support enums without a type keyword. This function
-// adds a type keyword to the schema if it is missing and the enum values are
-// homogeneous.
-const addEnumType = jsonSchema => {
-  if ("enum" in jsonSchema && !("type" in jsonSchema)) {
-    const type = jsonSchema.enum.every(Predicate.isString) ? "string" : jsonSchema.enum.every(Predicate.isNumber) ? "number" : jsonSchema.enum.every(Predicate.isBoolean) ? "boolean" : undefined;
-    if (type !== undefined) {
-      return {
-        type,
-        ...jsonSchema
-      };
+const isOverrideAnnotation = (ast, jsonSchema) => {
+  if (AST.isRefinement(ast)) {
+    const schemaId = ast.annotations[AST.SchemaIdAnnotationId];
+    if (schemaId === schemaId_.IntSchemaId) {
+      return "type" in jsonSchema && jsonSchema.type !== "integer";
     }
   }
-  return jsonSchema;
+  return "type" in jsonSchema || "oneOf" in jsonSchema || "anyOf" in jsonSchema || "$ref" in jsonSchema;
 };
-const mergeRefinements = (from, jsonSchema, annotations) => {
+const mergeRefinements = (from, jsonSchema, ast) => {
   const out = {
     ...from,
-    ...annotations,
+    ...getJsonSchemaAnnotations(ast),
     ...jsonSchema
   };
   out.allOf ??= [];
@@ -220,25 +235,6 @@ function isContentSchemaSupported(options) {
       return true;
   }
 }
-function isNullTypeKeywordSupported(options) {
-  switch (options.target) {
-    case "jsonSchema7":
-    case "jsonSchema2019-09":
-      return true;
-    case "openApi3.1":
-      return false;
-  }
-}
-// https://swagger.io/docs/specification/v3_0/data-models/data-types/#null
-function isNullableKeywordSupported(options) {
-  switch (options.target) {
-    case "jsonSchema7":
-    case "jsonSchema2019-09":
-      return false;
-    case "openApi3.1":
-      return true;
-  }
-}
 function getAdditionalProperties(options) {
   switch (options.additionalPropertiesStrategy) {
     case "allow":
@@ -247,166 +243,177 @@ function getAdditionalProperties(options) {
       return false;
   }
 }
-const isNeverJSONSchema = jsonSchema => "$id" in jsonSchema && jsonSchema.$id === "/schemas/never";
-const isAnyJSONSchema = jsonSchema => "$id" in jsonSchema && jsonSchema.$id === "/schemas/any";
-const isUnknownJSONSchema = jsonSchema => "$id" in jsonSchema && jsonSchema.$id === "/schemas/unknown";
-const isVoidJSONSchema = jsonSchema => "$id" in jsonSchema && jsonSchema.$id === "/schemas/void";
-const shrink = members => {
-  let i = members.findIndex(isAnyJSONSchema);
-  if (i !== -1) {
-    members = [members[i]];
+function addASTAnnotations(jsonSchema, ast) {
+  return addAnnotations(jsonSchema, getJsonSchemaAnnotations(ast));
+}
+function addAnnotations(jsonSchema, annotations) {
+  if (annotations === undefined || Object.keys(annotations).length === 0) {
+    return jsonSchema;
   }
-  i = members.findIndex(isUnknownJSONSchema);
-  if (i !== -1) {
-    members = [members[i]];
+  if ("$ref" in jsonSchema) {
+    return {
+      allOf: [jsonSchema],
+      ...annotations
+    };
   }
-  i = members.findIndex(isVoidJSONSchema);
-  if (i !== -1) {
-    members = [members[i]];
+  return {
+    ...jsonSchema,
+    ...annotations
+  };
+}
+function getIdentifierAnnotation(ast) {
+  const identifier = Option.getOrUndefined(AST.getJSONIdentifier(ast));
+  if (identifier === undefined) {
+    if (AST.isSuspend(ast)) {
+      return getIdentifierAnnotation(ast.f());
+    }
+    if (AST.isTransformation(ast) && AST.isTypeLiteral(ast.from) && AST.isDeclaration(ast.to)) {
+      const to = ast.to;
+      const surrogate = AST.getSurrogateAnnotation(to);
+      if (Option.isSome(surrogate)) {
+        return getIdentifierAnnotation(to);
+      }
+    }
   }
-  return members;
-};
-const go = (ast, $defs, handleIdentifier, path, options) => {
-  if (handleIdentifier) {
-    const identifier = AST.getJSONIdentifier(ast);
-    if (Option.isSome(identifier)) {
-      const id = identifier.value;
+  return identifier;
+}
+function go(ast, $defs, identifier, path, options, annotation, errors) {
+  if (identifier === "handle-identifier") {
+    const id = getIdentifierAnnotation(ast);
+    if (id !== undefined) {
       const escapedId = id.replace(/~/ig, "~0").replace(/\//ig, "~1");
       const out = {
         $ref: options.getRef(escapedId)
       };
       if (!Record.has($defs, id)) {
         $defs[id] = out;
-        $defs[id] = go(ast, $defs, false, path, options);
+        $defs[id] = go(ast, $defs, "ignore-identifier", path, options, "handle-annotation", errors);
       }
       return out;
     }
   }
-  const hook = AST.getJSONSchemaAnnotation(ast);
-  if (Option.isSome(hook)) {
-    const handler = hook.value;
-    if (AST.isRefinement(ast)) {
-      const t = AST.getTransformationFrom(ast);
-      if (t === undefined) {
-        return mergeRefinements(go(ast.from, $defs, handleIdentifier, path, options), handler, getJsonSchemaAnnotations(ast));
-      } else if (!isOverrideAnnotation(handler)) {
-        return go(t, $defs, handleIdentifier, path, options);
+  if (annotation === "handle-annotation") {
+    const hook = AST.getJSONSchemaAnnotation(ast);
+    if (Option.isSome(hook)) {
+      const handler = hook.value;
+      if (isOverrideAnnotation(ast, handler)) {
+        switch (ast._tag) {
+          case "Declaration":
+            return addASTAnnotations(handler, ast);
+          default:
+            return handler;
+        }
+      } else {
+        switch (ast._tag) {
+          case "Refinement":
+            {
+              const t = AST.getTransformationFrom(ast);
+              if (t === undefined) {
+                return mergeRefinements(go(ast.from, $defs, identifier, path, options, "handle-annotation", errors), handler, ast);
+              } else {
+                return go(t, $defs, identifier, path, options, "handle-annotation", errors);
+              }
+            }
+          default:
+            return {
+              ...go(ast, $defs, identifier, path, options, "ignore-annotation", errors),
+              ...handler
+            };
+        }
       }
     }
-    if (AST.isDeclaration(ast)) {
-      return {
-        ...handler,
-        ...getJsonSchemaAnnotations(ast)
-      };
-    }
-    return handler;
   }
   const surrogate = AST.getSurrogateAnnotation(ast);
   if (Option.isSome(surrogate)) {
-    return go(surrogate.value, $defs, handleIdentifier, path, options);
+    return go(surrogate.value, $defs, identifier, path, options, "handle-annotation", errors);
   }
   switch (ast._tag) {
+    // Unsupported
     case "Declaration":
-      throw new Error(errors_.getJSONSchemaMissingAnnotationErrorMessage(path, ast));
+    case "UndefinedKeyword":
+    case "BigIntKeyword":
+    case "UniqueSymbol":
+    case "SymbolKeyword":
+      {
+        if (errors === "ignore-errors") return addASTAnnotations(constAny, ast);
+        throw new Error(errors_.getJSONSchemaMissingAnnotationErrorMessage(path, ast));
+      }
+    case "Suspend":
+      {
+        if (identifier === "handle-identifier") {
+          if (errors === "ignore-errors") return addASTAnnotations(constAny, ast);
+          throw new Error(errors_.getJSONSchemaMissingIdentifierAnnotationErrorMessage(path, ast));
+        }
+        return go(ast.f(), $defs, "ignore-identifier", path, options, "handle-annotation", errors);
+      }
+    // Primitives
+    case "NeverKeyword":
+      return addASTAnnotations(constNever, ast);
+    case "VoidKeyword":
+      return addASTAnnotations(constVoid, ast);
+    case "UnknownKeyword":
+      return addASTAnnotations(constUnknown, ast);
+    case "AnyKeyword":
+      return addASTAnnotations(constAny, ast);
+    case "ObjectKeyword":
+      return addASTAnnotations(constObject, ast);
+    case "StringKeyword":
+      return addASTAnnotations({
+        type: "string"
+      }, ast);
+    case "NumberKeyword":
+      return addASTAnnotations({
+        type: "number"
+      }, ast);
+    case "BooleanKeyword":
+      return addASTAnnotations({
+        type: "boolean"
+      }, ast);
     case "Literal":
       {
         const literal = ast.literal;
         if (literal === null) {
-          if (isNullTypeKeywordSupported(options)) {
-            // https://json-schema.org/draft-07/draft-handrews-json-schema-validation-00.pdf
-            // Section 6.1.1
-            return {
-              type: "null",
-              ...getJsonSchemaAnnotations(ast)
-            };
-          } else {
-            // OpenAPI 3.1 does not support the "null" type keyword
-            // https://swagger.io/docs/specification/v3_0/data-models/data-types/#null
-            return {
-              // @ts-expect-error
-              enum: [null],
-              ...getJsonSchemaAnnotations(ast)
-            };
-          }
+          return addASTAnnotations({
+            type: "null"
+          }, ast);
         } else if (Predicate.isString(literal)) {
-          return {
+          return addASTAnnotations({
             type: "string",
-            enum: [literal],
-            ...getJsonSchemaAnnotations(ast)
-          };
+            enum: [literal]
+          }, ast);
         } else if (Predicate.isNumber(literal)) {
-          return {
+          return addASTAnnotations({
             type: "number",
-            enum: [literal],
-            ...getJsonSchemaAnnotations(ast)
-          };
+            enum: [literal]
+          }, ast);
         } else if (Predicate.isBoolean(literal)) {
-          return {
+          return addASTAnnotations({
             type: "boolean",
-            enum: [literal],
-            ...getJsonSchemaAnnotations(ast)
-          };
+            enum: [literal]
+          }, ast);
         }
+        if (errors === "ignore-errors") return addASTAnnotations(constAny, ast);
         throw new Error(errors_.getJSONSchemaMissingAnnotationErrorMessage(path, ast));
       }
-    case "UniqueSymbol":
-      throw new Error(errors_.getJSONSchemaMissingAnnotationErrorMessage(path, ast));
-    case "UndefinedKeyword":
-      throw new Error(errors_.getJSONSchemaMissingAnnotationErrorMessage(path, ast));
-    case "VoidKeyword":
-      return {
-        ...constVoid,
-        ...getJsonSchemaAnnotations(ast)
-      };
-    case "NeverKeyword":
-      return {
-        ...constNever,
-        ...getJsonSchemaAnnotations(ast)
-      };
-    case "UnknownKeyword":
-      return {
-        ...constUnknown,
-        ...getJsonSchemaAnnotations(ast)
-      };
-    case "AnyKeyword":
-      return {
-        ...constAny,
-        ...getJsonSchemaAnnotations(ast)
-      };
-    case "ObjectKeyword":
-      return {
-        ...constAnyObject,
-        ...getJsonSchemaAnnotations(ast)
-      };
-    case "StringKeyword":
-      return {
-        type: "string",
-        ...getASTJsonSchemaAnnotations(ast)
-      };
-    case "NumberKeyword":
-      return {
-        type: "number",
-        ...getASTJsonSchemaAnnotations(ast)
-      };
-    case "BooleanKeyword":
-      return {
-        type: "boolean",
-        ...getASTJsonSchemaAnnotations(ast)
-      };
-    case "BigIntKeyword":
-      throw new Error(errors_.getJSONSchemaMissingAnnotationErrorMessage(path, ast));
-    case "SymbolKeyword":
-      throw new Error(errors_.getJSONSchemaMissingAnnotationErrorMessage(path, ast));
+    case "Enums":
+      {
+        const anyOf = ast.enums.map(e => {
+          const type = Predicate.isNumber(e[1]) ? "number" : "string";
+          return {
+            type,
+            title: e[0],
+            enum: [e[1]]
+          };
+        });
+        return anyOf.length >= 1 ? addASTAnnotations({
+          $comment: "/schemas/enums",
+          anyOf
+        }, ast) : addASTAnnotations(constNever, ast);
+      }
     case "TupleType":
       {
-        const elements = ast.elements.map((e, i) => ({
-          ...go(e.type, $defs, true, path.concat(i), options),
-          ...getJsonSchemaAnnotations(e.type, e)
-        }));
-        const rest = ast.rest.map(annotatedAST => ({
-          ...go(annotatedAST.type, $defs, true, path, options),
-          ...getJsonSchemaAnnotations(annotatedAST.type, annotatedAST)
-        }));
+        const elements = ast.elements.map((e, i) => mergeJsonSchemaAnnotations(go(e.type, $defs, "handle-identifier", path.concat(i), options, "handle-annotation", errors), getContextJsonSchemaAnnotations(e.type, e)));
+        const rest = ast.rest.map(type => mergeJsonSchemaAnnotations(go(type.type, $defs, "handle-identifier", path, options, "handle-annotation", errors), getContextJsonSchemaAnnotations(type.type, type)));
         const output = {
           type: "array"
         };
@@ -434,6 +441,7 @@ const go = (ast, $defs, handleIdentifier, path, options) => {
           // handle post rest elements
           // ---------------------------------------------
           if (restLength > 1) {
+            if (errors === "ignore-errors") return addASTAnnotations(constAny, ast);
             throw new Error(errors_.getJSONSchemaUnsupportedPostRestElementsErrorMessage(path));
           }
         } else {
@@ -443,18 +451,12 @@ const go = (ast, $defs, handleIdentifier, path, options) => {
             output.maxItems = 0;
           }
         }
-        return {
-          ...output,
-          ...getJsonSchemaAnnotations(ast)
-        };
+        return addASTAnnotations(output, ast);
       }
     case "TypeLiteral":
       {
         if (ast.propertySignatures.length === 0 && ast.indexSignatures.length === 0) {
-          return {
-            ...constEmpty,
-            ...getJsonSchemaAnnotations(ast)
-          };
+          return addASTAnnotations(constEmptyStruct, ast);
         }
         const output = {
           type: "object",
@@ -470,12 +472,12 @@ const go = (ast, $defs, handleIdentifier, path, options) => {
           switch (parameter._tag) {
             case "StringKeyword":
               {
-                output.additionalProperties = go(pruned, $defs, true, path, options);
+                output.additionalProperties = go(pruned, $defs, "handle-identifier", path, options, "handle-annotation", errors);
                 break;
               }
             case "TemplateLiteral":
               {
-                patternProperties = go(pruned, $defs, true, path, options);
+                patternProperties = go(pruned, $defs, "handle-identifier", path, options, "handle-annotation", errors);
                 propertyNames = {
                   type: "string",
                   pattern: AST.getTemplateLiteralRegExp(parameter).source
@@ -484,15 +486,15 @@ const go = (ast, $defs, handleIdentifier, path, options) => {
               }
             case "Refinement":
               {
-                patternProperties = go(pruned, $defs, true, path, options);
-                propertyNames = go(parameter, $defs, true, path, options);
+                patternProperties = go(pruned, $defs, "handle-identifier", path, options, "handle-annotation", errors);
+                propertyNames = go(parameter, $defs, "handle-identifier", path, options, "handle-annotation", errors);
                 break;
               }
             case "SymbolKeyword":
               {
                 const indexSignaturePath = path.concat("[symbol]");
-                output.additionalProperties = go(pruned, $defs, true, indexSignaturePath, options);
-                propertyNames = go(parameter, $defs, true, indexSignaturePath, options);
+                output.additionalProperties = go(pruned, $defs, "handle-identifier", indexSignaturePath, options, "handle-annotation", errors);
+                propertyNames = go(parameter, $defs, "handle-identifier", indexSignaturePath, options, "handle-annotation", errors);
                 break;
               }
           }
@@ -506,10 +508,7 @@ const go = (ast, $defs, handleIdentifier, path, options) => {
           if (Predicate.isString(name)) {
             const pruned = pruneUndefined(ps.type);
             const type = pruned ?? ps.type;
-            output.properties[name] = {
-              ...go(type, $defs, true, path.concat(ps.name), options),
-              ...getJsonSchemaAnnotations(type, ps)
-            };
+            output.properties[name] = mergeJsonSchemaAnnotations(go(type, $defs, "handle-identifier", path.concat(ps.name), options, "handle-annotation", errors), getContextJsonSchemaAnnotations(type, ps));
             // ---------------------------------------------
             // handle optional property signatures
             // ---------------------------------------------
@@ -517,6 +516,7 @@ const go = (ast, $defs, handleIdentifier, path, options) => {
               output.required.push(name);
             }
           } else {
+            if (errors === "ignore-errors") return addASTAnnotations(constAny, ast);
             throw new Error(errors_.getJSONSchemaUnsupportedKeyErrorMessage(name, path));
           }
         }
@@ -532,129 +532,34 @@ const go = (ast, $defs, handleIdentifier, path, options) => {
         if (propertyNames !== undefined) {
           output.propertyNames = propertyNames;
         }
-        return {
-          ...output,
-          ...getJsonSchemaAnnotations(ast)
-        };
+        return addASTAnnotations(output, ast);
       }
     case "Union":
       {
-        const members = [];
-        for (const type of ast.types) {
-          const jsonSchema = go(type, $defs, true, path, options);
-          if (!isNeverJSONSchema(jsonSchema)) {
-            const last = members[members.length - 1];
-            if (isMergeableEnum(jsonSchema) && last !== undefined && isMergeableEnum(last)) {
-              members[members.length - 1] = {
-                enum: last.enum.concat(jsonSchema.enum)
-              };
-            } else {
-              members.push(jsonSchema);
-            }
-          }
+        const members = ast.types.map(t => go(t, $defs, "handle-identifier", path, options, "handle-annotation", errors));
+        const anyOf = compactUnion(members);
+        switch (anyOf.length) {
+          case 0:
+            return constNever;
+          case 1:
+            return addASTAnnotations(anyOf[0], ast);
+          default:
+            return addASTAnnotations({
+              anyOf
+            }, ast);
         }
-        const anyOf = shrink(members);
-        const finalize = anyOf => {
-          switch (anyOf.length) {
-            case 0:
-              return {
-                ...constNever,
-                ...getJsonSchemaAnnotations(ast)
-              };
-            case 1:
-              {
-                return {
-                  ...addEnumType(anyOf[0]),
-                  ...getJsonSchemaAnnotations(ast)
-                };
-              }
-            default:
-              return {
-                anyOf: anyOf.map(addEnumType),
-                ...getJsonSchemaAnnotations(ast)
-              };
-          }
-        };
-        if (isNullableKeywordSupported(options)) {
-          let nullable = false;
-          const nonNullables = [];
-          for (const s of anyOf) {
-            if ("nullable" in s) {
-              nullable = true;
-              const nn = {
-                ...s
-              };
-              delete nn.nullable;
-              nonNullables.push(nn);
-            } else if (isMergeableEnum(s)) {
-              const nnes = s.enum.filter(e => e !== null);
-              if (nnes.length < s.enum.length) {
-                nullable = true;
-                if (nnes.length === 0) {
-                  continue;
-                }
-                const nn = {
-                  ...s
-                };
-                nn.enum = nnes;
-                nonNullables.push(nn);
-              }
-            } else {
-              nonNullables.push(s);
-            }
-          }
-          if (nullable) {
-            const out = finalize(nonNullables);
-            if (!isAnyJSONSchema(out) && !isUnknownJSONSchema(out)) {
-              // @ts-expect-error
-              out.nullable = nullable;
-            }
-            return out;
-          }
-        }
-        return finalize(anyOf);
-      }
-    case "Enums":
-      {
-        const anyOf = ast.enums.map(e => addEnumType({
-          title: e[0],
-          enum: [e[1]]
-        }));
-        return anyOf.length >= 1 ? {
-          $comment: "/schemas/enums",
-          anyOf,
-          ...getJsonSchemaAnnotations(ast)
-        } : {
-          ...constNever,
-          ...getJsonSchemaAnnotations(ast)
-        };
       }
     case "Refinement":
-      {
-        // The jsonSchema annotation is required only if the refinement does not have a transformation
-        if (AST.getTransformationFrom(ast) === undefined) {
-          throw new Error(errors_.getJSONSchemaMissingAnnotationErrorMessage(path, ast));
-        }
-        return go(ast.from, $defs, handleIdentifier, path, options);
-      }
+      return go(ast.from, $defs, identifier, path, options, "handle-annotation", errors);
     case "TemplateLiteral":
       {
         const regex = AST.getTemplateLiteralRegExp(ast);
-        return {
+        return addASTAnnotations({
           type: "string",
           title: String(ast),
           description: "a template literal",
-          pattern: regex.source,
-          ...getJsonSchemaAnnotations(ast)
-        };
-      }
-    case "Suspend":
-      {
-        const identifier = Option.orElse(AST.getJSONIdentifier(ast), () => AST.getJSONIdentifier(ast.f()));
-        if (Option.isNone(identifier)) {
-          throw new Error(errors_.getJSONSchemaMissingIdentifierAnnotationErrorMessage(path, ast));
-        }
-        return go(ast.f(), $defs, handleIdentifier, path, options);
+          pattern: regex.source
+        }, ast);
       }
     case "Transformation":
       {
@@ -664,35 +569,73 @@ const go = (ast, $defs, handleIdentifier, path, options) => {
             "contentMediaType": "application/json"
           };
           if (isContentSchemaSupported(options)) {
-            out["contentSchema"] = go(ast.to, $defs, handleIdentifier, path, options);
+            out["contentSchema"] = go(ast.to, $defs, identifier, path, options, "handle-annotation", errors);
           }
           return out;
         }
-        let next = ast.from;
-        if (AST.isTypeLiteralTransformation(ast.transformation)) {
-          // Annotations from the transformation are applied unless there are user-defined annotations on the form side,
-          // ensuring that the user's intended annotations are included in the generated schema.
-          const identifier = AST.getIdentifierAnnotation(ast);
-          if (Option.isSome(identifier) && Option.isNone(AST.getIdentifierAnnotation(next))) {
-            next = AST.annotations(next, {
-              [AST.IdentifierAnnotationId]: identifier.value
-            });
-          }
-          const title = AST.getTitleAnnotation(ast);
-          if (Option.isSome(title) && Option.isNone(AST.getTitleAnnotation(next))) {
-            next = AST.annotations(next, {
-              [AST.TitleAnnotationId]: title.value
-            });
-          }
-          const description = AST.getDescriptionAnnotation(ast);
-          if (Option.isSome(description) && Option.isNone(AST.getDescriptionAnnotation(next))) {
-            next = AST.annotations(next, {
-              [AST.DescriptionAnnotationId]: description.value
-            });
+        const from = go(ast.from, $defs, identifier, path, options, "handle-annotation", errors);
+        if (ast.transformation._tag === "TypeLiteralTransformation" && isJsonSchema7Object(from)) {
+          const to = go(ast.to, {}, "ignore-identifier", path, options, "handle-annotation", "ignore-errors");
+          if (isJsonSchema7Object(to)) {
+            for (const t of ast.transformation.propertySignatureTransformations) {
+              const toKey = t.to;
+              const fromKey = t.from;
+              if (Predicate.isString(toKey) && Predicate.isString(fromKey)) {
+                const toProperty = to.properties[toKey];
+                if (Predicate.isRecord(toProperty)) {
+                  const fromProperty = from.properties[fromKey];
+                  if (Predicate.isRecord(fromProperty)) {
+                    const annotations = {};
+                    if (Predicate.isString(toProperty.title)) annotations.title = toProperty.title;
+                    if (Predicate.isString(toProperty.description)) annotations.description = toProperty.description;
+                    if (Array.isArray(toProperty.examples)) annotations.examples = toProperty.examples;
+                    if (Object.hasOwn(toProperty, "default")) annotations.default = toProperty.default;
+                    from.properties[fromKey] = addAnnotations(fromProperty, annotations);
+                  }
+                }
+              }
+            }
           }
         }
-        return go(next, $defs, handleIdentifier, path, options);
+        return addASTAnnotations(from, ast);
       }
   }
-};
+}
+function isJsonSchema7Object(jsonSchema) {
+  return Predicate.isRecord(jsonSchema) && jsonSchema.type === "object" && Predicate.isRecord(jsonSchema.properties);
+}
+function isNeverWithoutCustomAnnotations(jsonSchema) {
+  return jsonSchema === constNever || Predicate.hasProperty(jsonSchema, "$id") && jsonSchema.$id === constNever.$id && Object.keys(jsonSchema).length === 3 && jsonSchema.title === AST.neverKeyword.annotations[AST.TitleAnnotationId];
+}
+function isAny(jsonSchema) {
+  return "$id" in jsonSchema && jsonSchema.$id === constAny.$id;
+}
+function isUnknown(jsonSchema) {
+  return "$id" in jsonSchema && jsonSchema.$id === constUnknown.$id;
+}
+function isVoid(jsonSchema) {
+  return "$id" in jsonSchema && jsonSchema.$id === constVoid.$id;
+}
+function isCompactableLiteral(jsonSchema) {
+  return Predicate.hasProperty(jsonSchema, "enum") && "type" in jsonSchema && Object.keys(jsonSchema).length === 2;
+}
+function compactUnion(members) {
+  const out = [];
+  for (const m of members) {
+    if (isNeverWithoutCustomAnnotations(m)) continue;
+    if (isAny(m) || isUnknown(m) || isVoid(m)) return [m];
+    if (isCompactableLiteral(m) && out.length > 0) {
+      const last = out[out.length - 1];
+      if (isCompactableLiteral(last) && last.type === m.type) {
+        out[out.length - 1] = {
+          type: last.type,
+          enum: [...last.enum, ...m.enum]
+        };
+        continue;
+      }
+    }
+    out.push(m);
+  }
+  return out;
+}
 //# sourceMappingURL=JSONSchema.js.map