effect 3.14.12 → 3.14.13

package/dist/esm/internal/version.js

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

package/package.json

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

package/src/JSONSchema.ts

@@ -2,8 +2,10 @@
  * @since 3.10.0
  */
 
+import * as Arr from "./Array.js"
 import * as errors_ from "./internal/schema/errors.js"
 import * as Option from "./Option.js"
+import * as ParseResult from "./ParseResult.js"
 import * as Predicate from "./Predicate.js"
 import * as Record from "./Record.js"
 import type * as Schema from "./Schema.js"
@@ -355,13 +357,23 @@ const constEmpty: JsonSchema7 = {
 
 const $schema = "http://json-schema.org/draft-07/schema#"
 
-const getJsonSchemaAnnotations = (annotated: AST.Annotated): JsonSchemaAnnotations =>
-  Record.getSomes({
+const getJsonSchemaAnnotations = (ast: AST.AST, annotated?: AST.Annotated): JsonSchemaAnnotations => {
+  annotated ??= ast
+  const out: JsonSchemaAnnotations = Record.getSomes({
     description: AST.getDescriptionAnnotation(annotated),
     title: AST.getTitleAnnotation(annotated),
-    examples: AST.getExamplesAnnotation(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
+    }
+  }
+  return out
+}
 
 const removeDefaultJsonSchemaAnnotations = (
   jsonSchemaAnnotations: JsonSchemaAnnotations,
@@ -627,11 +639,11 @@ const go = (
     case "TupleType": {
       const elements = ast.elements.map((e, i) => ({
         ...go(e.type, $defs, true, path.concat(i), options),
-        ...getJsonSchemaAnnotations(e)
+        ...getJsonSchemaAnnotations(e.type, e)
       }))
       const rest = ast.rest.map((annotatedAST) => ({
         ...go(annotatedAST.type, $defs, true, path, options),
-        ...getJsonSchemaAnnotations(annotatedAST)
+        ...getJsonSchemaAnnotations(annotatedAST.type, annotatedAST)
       }))
       const output: JsonSchema7Array = { type: "array" }
       // ---------------------------------------------
@@ -720,9 +732,10 @@ const go = (
         const name = ps.name
         if (Predicate.isString(name)) {
           const pruned = pruneUndefined(ps.type)
+          const type = pruned ?? ps.type
           output.properties[name] = {
-            ...go(pruned ?? ps.type, $defs, true, path.concat(ps.name), options),
-            ...getJsonSchemaAnnotations(ps)
+            ...go(type, $defs, true, path.concat(ps.name), options),
+            ...getJsonSchemaAnnotations(type, ps)
           }
           // ---------------------------------------------
           // handle optional property signatures

package/src/ParseResult.ts

@@ -481,7 +481,8 @@ const getSync = (ast: AST.AST, isDecoding: boolean, options?: AST.ParseOptions)
     Either.getOrThrowWith(parser(input, overrideOptions), parseError)
 }
 
-const getOption = (ast: AST.AST, isDecoding: boolean, options?: AST.ParseOptions) => {
+/** @internal */
+export const getOption = (ast: AST.AST, isDecoding: boolean, options?: AST.ParseOptions) => {
   const parser = getEither(ast, isDecoding, options)
   return (input: unknown, overrideOptions?: AST.ParseOptions): Option.Option<any> =>
     Option.getRight(parser(input, overrideOptions))

package/src/Schema.ts

@@ -1837,12 +1837,7 @@ const mergeSignatureAnnotations = (
     }
     case "PropertySignatureTransformation": {
       return new PropertySignatureTransformation(
-        new FromPropertySignature(
-          ast.from.type,
-          ast.from.isOptional,
-          ast.from.isReadonly,
-          ast.from.annotations
-        ),
+        ast.from,
         new ToPropertySignature(ast.to.type, ast.to.isOptional, ast.to.isReadonly, {
           ...ast.to.annotations,
           ...annotations
@@ -9759,6 +9754,8 @@ const CauseInterruptEncoded = Struct({
   fiberId: FiberIdEncoded
 })
 
+let causeEncodedId = 0
+
 const causeEncoded = <E extends Schema.All, D extends Schema.All>(
   error: E,
   defect: D
@@ -9789,7 +9786,10 @@ const causeEncoded = <E extends Schema.All, D extends Schema.All>(
       left: suspended,
       right: suspended
     })
-  ).annotations({ title: `CauseEncoded<${format(error)}>` })
+  ).annotations({
+    title: `CauseEncoded<${format(error)}>`,
+    [AST.JSONIdentifierAnnotationId]: `CauseEncoded${causeEncodedId++}`
+  })
   return out
 }
 

package/src/internal/version.ts

@@ -1,4 +1,4 @@
-let moduleVersion = "3.14.12"
+let moduleVersion = "3.14.13"
 
 export const getCurrentVersion = () => moduleVersion