effect 3.11.6 → 3.11.8

package/dist/esm/internal/schema/{filters.js → schemaId.js}

@@ -1,4 +1,6 @@
 /** @internal */
+export const DateFromSelfSchemaId = /*#__PURE__*/Symbol.for("effect/SchemaId/DateFromSelf");
+/** @internal */
 export const GreaterThanSchemaId = /*#__PURE__*/Symbol.for("effect/SchemaId/GreaterThan");
 /** @internal */
 export const GreaterThanOrEqualToSchemaId = /*#__PURE__*/Symbol.for("effect/SchemaId/GreaterThanOrEqualTo");
@@ -38,4 +40,4 @@ export const MinItemsSchemaId = /*#__PURE__*/Symbol.for("effect/SchemaId/MinItem
 export const MaxItemsSchemaId = /*#__PURE__*/Symbol.for("effect/SchemaId/MaxItems");
 /** @internal */
 export const ItemsCountSchemaId = /*#__PURE__*/Symbol.for("effect/SchemaId/ItemsCount");
-//# sourceMappingURL=filters.js.map
+//# sourceMappingURL=schemaId.js.map

package/dist/esm/internal/schema/schemaId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schemaId.js","names":["DateFromSelfSchemaId","Symbol","for","GreaterThanSchemaId","GreaterThanOrEqualToSchemaId","LessThanSchemaId","LessThanOrEqualToSchemaId","IntSchemaId","NonNaNSchemaId","FiniteSchemaId","JsonNumberSchemaId","BetweenSchemaId","GreaterThanBigintSchemaId","GreaterThanOrEqualToBigIntSchemaId","LessThanBigIntSchemaId","LessThanOrEqualToBigIntSchemaId","BetweenBigintSchemaId","MinLengthSchemaId","MaxLengthSchemaId","LengthSchemaId","MinItemsSchemaId","MaxItemsSchemaId","ItemsCountSchemaId"],"sources":["../../../../src/internal/schema/schemaId.ts"],"sourcesContent":[null],"mappings":"AAEA;AACA,OAAO,MAAMA,oBAAoB,gBAAgCC,MAAM,CAACC,GAAG,CACzE,8BAA8B,CACA;AAEhC;AACA,OAAO,MAAMC,mBAAmB,gBAA+BF,MAAM,CAACC,GAAG,CACvE,6BAA6B,CACA;AAE/B;AACA,OAAO,MAAME,4BAA4B,gBAAwCH,MAAM,CAACC,GAAG,CACzF,sCAAsC,CACA;AAExC;AACA,OAAO,MAAMG,gBAAgB,gBAA4BJ,MAAM,CAACC,GAAG,CACjE,0BAA0B,CACA;AAE5B;AACA,OAAO,MAAMI,yBAAyB,gBAAqCL,MAAM,CAACC,GAAG,CACnF,mCAAmC,CACA;AAErC;AACA,OAAO,MAAMK,WAAW,gBAAuBN,MAAM,CAACC,GAAG,CACvD,qBAAqB,CACA;AAEvB;AACA,OAAO,MAAMM,cAAc,gBAA0BP,MAAM,CAACC,GAAG,CAC7D,wBAAwB,CACA;AAE1B;AACA,OAAO,MAAMO,cAAc,gBAA0BR,MAAM,CAACC,GAAG,CAC7D,wBAAwB,CACA;AAE1B;AACA,OAAO,MAAMQ,kBAAkB,gBAA8BT,MAAM,CAACC,GAAG,CACrE,4BAA4B,CACA;AAE9B;AACA,OAAO,MAAMS,eAAe,gBAA2BV,MAAM,CAACC,GAAG,CAC/D,yBAAyB,CACA;AAE3B;AACA,OAAO,MAAMU,yBAAyB,gBAAqCX,MAAM,CAACC,GAAG,CACnF,mCAAmC,CACA;AAErC;AACA,OAAO,MAAMW,kCAAkC,gBAA8CZ,MAAM,CAACC,GAAG,CACrG,4CAA4C,CACA;AAE9C;AACA,OAAO,MAAMY,sBAAsB,gBAAkCb,MAAM,CAACC,GAAG,CAC7E,gCAAgC,CACA;AAElC;AACA,OAAO,MAAMa,+BAA+B,gBAA2Cd,MAAM,CAACC,GAAG,CAC/F,yCAAyC,CACA;AAE3C;AACA,OAAO,MAAMc,qBAAqB,gBAAiCf,MAAM,CAACC,GAAG,CAC3E,+BAA+B,CACA;AAEjC;AACA,OAAO,MAAMe,iBAAiB,gBAA6BhB,MAAM,CAACC,GAAG,CACnE,2BAA2B,CACA;AAE7B;AACA,OAAO,MAAMgB,iBAAiB,gBAA6BjB,MAAM,CAACC,GAAG,CACnE,2BAA2B,CACA;AAE7B;AACA,OAAO,MAAMiB,cAAc,gBAA0BlB,MAAM,CAACC,GAAG,CAC7D,wBAAwB,CACA;AAE1B;AACA,OAAO,MAAMkB,gBAAgB,gBAA4BnB,MAAM,CAACC,GAAG,CACjE,0BAA0B,CACA;AAE5B;AACA,OAAO,MAAMmB,gBAAgB,gBAA4BpB,MAAM,CAACC,GAAG,CACjE,0BAA0B,CACA;AAE5B;AACA,OAAO,MAAMoB,kBAAkB,gBAA8BrB,MAAM,CAACC,GAAG,CACrE,4BAA4B,CACA","ignoreList":[]}

package/dist/esm/internal/version.js

@@ -1,4 +1,4 @@
-let moduleVersion = "3.11.6";
+let moduleVersion = "3.11.8";
 export const getCurrentVersion = () => moduleVersion;
 export const setCurrentVersion = version => {
   moduleVersion = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect",
-  "version": "3.11.6",
+  "version": "3.11.8",
   "description": "The missing standard library for TypeScript, for writing production-grade software.",
   "license": "MIT",
   "repository": {

package/src/Arbitrary.ts

@@ -5,7 +5,7 @@
 import * as Arr from "./Array.js"
 import * as FastCheck from "./FastCheck.js"
 import * as errors_ from "./internal/schema/errors.js"
-import * as filters_ from "./internal/schema/filters.js"
+import * as schemaId_ from "./internal/schema/schemaId.js"
 import * as util_ from "./internal/schema/util.js"
 import * as Option from "./Option.js"
 import * as Predicate from "./Predicate.js"
@@ -28,7 +28,7 @@ export interface LazyArbitrary<A> {
 export interface ArbitraryGenerationContext {
   readonly maxDepth: number
   readonly depthIdentifier?: string
-  readonly constraints?: StringConstraints | NumberConstraints | BigIntConstraints | ArrayConstraints
+  readonly constraints?: StringConstraints | NumberConstraints | BigIntConstraints | DateConstraints | ArrayConstraints
 }
 
 /**
@@ -110,6 +110,8 @@ class Deferred {
       }
       case "BigIntConstraints":
         return (fc) => fc.bigInt(config.constraints)
+      case "DateConstraints":
+        return (fc) => fc.date(config.constraints)
       case "ArrayConstraints":
         return goTupleType(config.ast, ctx, path, config.constraints)
     }
@@ -232,6 +234,32 @@ export const makeArrayConstraints = (options: {
   return out
 }
 
+interface DateConstraints {
+  readonly _tag: "DateConstraints"
+  readonly constraints: FastCheck.DateConstraints
+}
+
+/** @internal */
+export const makeDateConstraints = (options: {
+  readonly min?: Date | undefined
+  readonly max?: Date | undefined
+  readonly noInvalidDate?: boolean | undefined
+}): DateConstraints => {
+  const out: Types.Mutable<DateConstraints> = {
+    _tag: "DateConstraints",
+    constraints: {
+      noInvalidDate: options.noInvalidDate ?? false
+    }
+  }
+  if (Predicate.isDate(options.min)) {
+    out.constraints.min = options.min
+  }
+  if (Predicate.isDate(options.max)) {
+    out.constraints.max = options.max
+  }
+  return out
+}
+
 interface ArrayConfig extends ArrayConstraints {
   readonly ast: AST.TupleType
 }
@@ -246,7 +274,7 @@ const makeArrayConfig = (options: {
   }
 }
 
-type Config = StringConstraints | NumberConstraints | BigIntConstraints | ArrayConfig
+type Config = StringConstraints | NumberConstraints | BigIntConstraints | DateConstraints | ArrayConfig
 
 const go = (
   ast: AST.AST,
@@ -268,6 +296,9 @@ const go = (
         return hook.value(ctx)
     }
   }
+  if (AST.isDeclaration(ast)) {
+    throw new Error(errors_.getArbitraryMissingAnnotationErrorMessage(path, ast))
+  }
   const op = toOp(ast, ctx, path)
   switch (op._tag) {
     case "Succeed":
@@ -288,8 +319,14 @@ export const toOp = (
   path: ReadonlyArray<PropertyKey>
 ): Op => {
   switch (ast._tag) {
-    case "Declaration":
-      throw new Error(errors_.getArbitraryMissingAnnotationErrorMessage(path, ast))
+    case "Declaration": {
+      const TypeAnnotationId: any = ast.annotations[AST.SchemaIdAnnotationId]
+      switch (TypeAnnotationId) {
+        case schemaId_.DateFromSelfSchemaId:
+          return new Deferred(makeDateConstraints(ast.annotations[TypeAnnotationId] as any))
+      }
+      return new Succeed(go(ast, ctx, path))
+    }
     case "Literal":
       return new Succeed((fc) => fc.constant(ast.literal))
     case "UniqueSymbol":
@@ -479,7 +516,7 @@ const goTupleType = (
   }
 }
 
-type Constraints = StringConstraints | NumberConstraints | BigIntConstraints | ArrayConstraints
+type Constraints = StringConstraints | NumberConstraints | BigIntConstraints | DateConstraints | ArrayConstraints
 
 const getConstraints = (_tag: Constraints["_tag"], ast: AST.Refinement): Constraints | undefined => {
   const TypeAnnotationId: any = ast.annotations[AST.SchemaIdAnnotationId]
@@ -490,7 +527,7 @@ const getConstraints = (_tag: Constraints["_tag"], ast: AST.Refinement): Constra
       return makeStringConstraints(jsonSchema)
     case "NumberConstraints": {
       switch (TypeAnnotationId) {
-        case filters_.NonNaNSchemaId:
+        case schemaId_.NonNaNSchemaId:
           return makeNumberConstraints({ noNaN: true })
         default:
           return makeNumberConstraints({
@@ -506,6 +543,8 @@ const getConstraints = (_tag: Constraints["_tag"], ast: AST.Refinement): Constra
     }
     case "BigIntConstraints":
       return makeBigIntConstraints(ast.annotations[TypeAnnotationId] as any)
+    case "DateConstraints":
+      return makeDateConstraints(ast.annotations[TypeAnnotationId] as any)
     case "ArrayConstraints":
       return makeArrayConstraints({
         minLength: jsonSchema.minItems,
@@ -514,21 +553,23 @@ const getConstraints = (_tag: Constraints["_tag"], ast: AST.Refinement): Constra
   }
 }
 
+function getMax(n1: Date | undefined, n2: Date | undefined): Date | undefined
 function getMax(n1: bigint | undefined, n2: bigint | undefined): bigint | undefined
 function getMax(n1: number | undefined, n2: number | undefined): number | undefined
 function getMax(
-  n1: bigint | number | undefined,
-  n2: bigint | number | undefined
-): bigint | number | undefined {
+  n1: bigint | number | Date | undefined,
+  n2: bigint | number | Date | undefined
+): bigint | number | Date | undefined {
   return n1 === undefined ? n2 : n2 === undefined ? n1 : n1 <= n2 ? n2 : n1
 }
 
+function getMin(n1: Date | undefined, n2: Date | undefined): Date | undefined
 function getMin(n1: bigint | undefined, n2: bigint | undefined): bigint | undefined
 function getMin(n1: number | undefined, n2: number | undefined): number | undefined
 function getMin(
-  n1: bigint | number | undefined,
-  n2: bigint | number | undefined
-): bigint | number | undefined {
+  n1: bigint | number | Date | undefined,
+  n2: bigint | number | Date | undefined
+): bigint | number | Date | undefined {
   return n1 === undefined ? n2 : n2 === undefined ? n1 : n1 <= n2 ? n1 : n2
 }
 
@@ -572,6 +613,16 @@ const merge = (c1: Config, c2: Constraints | undefined): Config => {
         }
         break
       }
+      case "DateConstraints": {
+        if (c2._tag === "DateConstraints") {
+          return makeDateConstraints({
+            min: getMax(c1.constraints.min, c2.constraints.min),
+            max: getMin(c1.constraints.max, c2.constraints.max),
+            noInvalidDate: getOr(c1.constraints.noInvalidDate, c2.constraints.noInvalidDate)
+          })
+        }
+        break
+      }
       case "ArrayConstraints": {
         if (c2._tag === "ArrayConstraints") {
           return makeArrayConfig({

package/src/JSONSchema.ts

@@ -85,6 +85,14 @@ export interface JsonSchema7Ref extends JsonSchemaAnnotations {
   $ref: string
 }
 
+/**
+ * @category model
+ * @since 3.11.7
+ */
+export interface JsonSchema7Null extends JsonSchemaAnnotations {
+  type: "null"
+}
+
 /**
  * @category model
  * @since 3.10.0
@@ -163,7 +171,8 @@ export interface JsonSchema7Array extends JsonSchemaAnnotations {
  * @since 3.10.0
  */
 export interface JsonSchema7Enum extends JsonSchemaAnnotations {
-  enum: Array<AST.LiteralValue>
+  type?: "string" | "number" | "boolean"
+  enum: Array<string | number | boolean>
 }
 
 /**
@@ -173,6 +182,7 @@ export interface JsonSchema7Enum extends JsonSchemaAnnotations {
 export interface JsonSchema7Enums extends JsonSchemaAnnotations {
   $comment: "/schemas/enums"
   anyOf: Array<{
+    type: "string" | "number"
     title: string
     enum: [string | number]
   }>
@@ -211,6 +221,7 @@ export type JsonSchema7 =
   | JsonSchema7object
   | JsonSchema7empty
   | JsonSchema7Ref
+  | JsonSchema7Null
   | JsonSchema7String
   | JsonSchema7Number
   | JsonSchema7Integer
@@ -240,11 +251,17 @@ export const make = <A, I, R>(schema: Schema.Schema<A, I, R>): JsonSchema7Root =
     // Special case top level `parseJson` transformations
     ? schema.ast.to
     : schema.ast
-  const out: JsonSchema7Root = fromAST(ast, {
+  const jsonSchema = fromAST(ast, {
     definitions
   })
-  out.$schema = $schema
-  if (!Record.isEmptyRecord(definitions)) {
+  const out: JsonSchema7Root = {
+    $schema,
+    $defs: {},
+    ...jsonSchema
+  }
+  if (Record.isEmptyRecord(definitions)) {
+    delete out.$defs
+  } else {
     out.$defs = definitions
   }
   return out
@@ -405,10 +422,31 @@ const isOverrideAnnotation = (jsonSchema: JsonSchema7): boolean => {
     ("enum" in jsonSchema) || ("$ref" in jsonSchema)
 }
 
-// Returns true if the schema is an enum with no other properties.
-// This is used to merge enums together.
-const isEnumOnly = (schema: JsonSchema7): schema is JsonSchema7Enum =>
-  "enum" in schema && Object.keys(schema).length === 1
+// 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: JsonSchema7): jsonSchema is JsonSchema7Enum => {
+  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: JsonSchema7): JsonSchema7 => {
+  if ("enum" in jsonSchema && !("type" in jsonSchema)) {
+    const type: "string" | "number" | "boolean" | undefined = 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 }
+    }
+  }
+  return jsonSchema
+}
 
 const mergeRefinements = (from: any, jsonSchema: any, annotations: any): any => {
   const out: any = { ...from, ...annotations, ...jsonSchema }
@@ -438,15 +476,54 @@ const mergeRefinements = (from: any, jsonSchema: any, annotations: any): any =>
   return out
 }
 
+type Options = {
+  readonly getRef: (id: string) => string
+  readonly target: Target
+}
+
+type Path = ReadonlyArray<PropertyKey>
+
+const isContentSchemaSupported = (options: Options) => options.target !== "jsonSchema7"
+
+const isNullTypeKeywordSupported = (options: Options) => options.target !== "openApi3.1"
+
+// https://swagger.io/docs/specification/v3_0/data-models/data-types/#null
+const isNullableKeywordSupported = (options: Options) => options.target === "openApi3.1"
+
+const isNeverJSONSchema = (jsonSchema: JsonSchema7): jsonSchema is JsonSchema7Never =>
+  "$id" in jsonSchema && jsonSchema.$id === "/schemas/never"
+
+const isAnyJSONSchema = (jsonSchema: JsonSchema7): jsonSchema is JsonSchema7Any =>
+  "$id" in jsonSchema && jsonSchema.$id === "/schemas/any"
+
+const isUnknownJSONSchema = (jsonSchema: JsonSchema7): jsonSchema is JsonSchema7Unknown =>
+  "$id" in jsonSchema && jsonSchema.$id === "/schemas/unknown"
+
+const isVoidJSONSchema = (jsonSchema: JsonSchema7): jsonSchema is JsonSchema7Void =>
+  "$id" in jsonSchema && jsonSchema.$id === "/schemas/void"
+
+const shrink = (members: Array<JsonSchema7>): Array<JsonSchema7> => {
+  let i = members.findIndex(isAnyJSONSchema)
+  if (i !== -1) {
+    members = [members[i]]
+  }
+  i = members.findIndex(isUnknownJSONSchema)
+  if (i !== -1) {
+    members = [members[i]]
+  }
+  i = members.findIndex(isVoidJSONSchema)
+  if (i !== -1) {
+    members = [members[i]]
+  }
+  return members
+}
+
 const go = (
   ast: AST.AST,
   $defs: Record<string, JsonSchema7>,
   handleIdentifier: boolean,
-  path: ReadonlyArray<PropertyKey>,
-  options: {
-    readonly getRef: (id: string) => string
-    readonly target: Target
-  }
+  path: Path,
+  options: Options
 ): JsonSchema7 => {
   if (handleIdentifier) {
     const identifier = AST.getJSONIdentifier(ast)
@@ -487,9 +564,25 @@ const go = (
     case "Literal": {
       const literal = ast.literal
       if (literal === null) {
-        return { enum: [null], ...getJsonSchemaAnnotations(ast) }
-      } else if (Predicate.isString(literal) || Predicate.isNumber(literal) || Predicate.isBoolean(literal)) {
-        return { enum: [literal], ...getJsonSchemaAnnotations(ast) }
+        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)
+          }
+        }
+      } else if (Predicate.isString(literal)) {
+        return { type: "string", enum: [literal], ...getJsonSchemaAnnotations(ast) }
+      } else if (Predicate.isNumber(literal)) {
+        return { type: "number", enum: [literal], ...getJsonSchemaAnnotations(ast) }
+      } else if (Predicate.isBoolean(literal)) {
+        return { type: "boolean", enum: [literal], ...getJsonSchemaAnnotations(ast) }
       }
       throw new Error(errors_.getJSONSchemaMissingAnnotationErrorMessage(path, ast))
     }
@@ -636,38 +729,90 @@ const go = (
       return { ...output, ...getJsonSchemaAnnotations(ast) }
     }
     case "Union": {
-      const anyOf: Array<JsonSchema7> = []
+      const members: Array<JsonSchema7> = []
       for (const type of ast.types) {
-        const schema = go(type, $defs, true, path, options)
-        if ("enum" in schema) {
-          if (Object.keys(schema).length > 1) {
-            anyOf.push(schema)
+        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 {
-            const last = anyOf[anyOf.length - 1]
-            if (last !== undefined && isEnumOnly(last)) {
-              for (const e of schema.enum) {
-                last.enum.push(e)
-              }
-            } else {
-              anyOf.push(schema)
+            members.push(jsonSchema)
+          }
+        }
+      }
+
+      const anyOf = shrink(members)
+
+      const finalize = (anyOf: Array<JsonSchema7>) => {
+        switch (anyOf.length) {
+          case 0:
+            return {
+              ...constNever,
+              ...getJsonSchemaAnnotations(ast)
+            }
+          case 1: {
+            return {
+              ...addEnumType(anyOf[0]),
+              ...getJsonSchemaAnnotations(ast)
             }
           }
-        } else {
-          anyOf.push(schema)
+          default:
+            return {
+              anyOf: anyOf.map(addEnumType),
+              ...getJsonSchemaAnnotations(ast)
+            }
         }
       }
-      if (anyOf.length === 1 && isEnumOnly(anyOf[0])) {
-        return { enum: anyOf[0].enum, ...getJsonSchemaAnnotations(ast) }
-      } else {
-        return { anyOf, ...getJsonSchemaAnnotations(ast) }
+
+      if (isNullableKeywordSupported(options)) {
+        let nullable = false
+        const nonNullables: Array<JsonSchema7> = []
+        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": {
-      return {
-        $comment: "/schemas/enums",
-        anyOf: ast.enums.map((e) => ({ title: e[0], enum: [e[1]] })),
-        ...getJsonSchemaAnnotations(ast)
-      }
+      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
@@ -699,7 +844,7 @@ const go = (
           "type": "string",
           "contentMediaType": "application/json"
         }
-        if (options.target !== "jsonSchema7") {
+        if (isContentSchemaSupported(options)) {
           out["contentSchema"] = go(ast.to, $defs, handleIdentifier, path, options)
         }
         return out