effect 4.0.0-beta.25 → 4.0.0-beta.27

package/src/LayerMap.ts

@@ -27,7 +27,7 @@ const TypeId = "~effect/LayerMap"
  * // Create a LayerMap that provides different database configurations
  * const createDatabaseLayerMap = LayerMap.make((env: string) =>
  *   Layer.succeed(DatabaseService)({
- *     query: (sql) => Effect.succeed(`${env}: ${sql}`)
+ *     query: Effect.fn("DatabaseService.query")((sql) => Effect.succeed(`${env}: ${sql}`))
  *   })
  * )
  *
@@ -91,7 +91,7 @@ export interface LayerMap<in out K, in out I, in out E = never> {
  *   const layerMap = yield* LayerMap.make(
  *     (env: string) =>
  *       Layer.succeed(DatabaseService)({
- *         query: (sql) => Effect.succeed(`${env}: ${sql}`)
+ *         query: Effect.fn("DatabaseService.query")((sql) => Effect.succeed(`${env}: ${sql}`))
  *       }),
  *     { idleTimeToLive: "5 seconds" }
  *   )
@@ -171,10 +171,10 @@ export const make: <
  * // Create predefined layers
  * const layers = {
  *   development: Layer.succeed(DevDatabase)({
- *     query: (sql) => Effect.succeed(`DEV: ${sql}`)
+ *     query: Effect.fn("DevDatabase.query")((sql) => Effect.succeed(`DEV: ${sql}`))
  *   }),
  *   production: Layer.succeed(ProdDatabase)({
- *     query: (sql) => Effect.succeed(`PROD: ${sql}`)
+ *     query: Effect.fn("ProdDatabase.query")((sql) => Effect.succeed(`PROD: ${sql}`))
  *   })
  * } as const
  *

package/src/ManagedRuntime.ts

@@ -141,7 +141,7 @@ export interface ManagedRuntime<in R, out ER> {
  *   readonly notify: (message: string) => Effect.Effect<void>
  * }>()("Notifications") {
  *   static readonly layer = Layer.succeed(this)({
- *     notify: (message) => Console.log(message)
+ *     notify: Effect.fn("Notifications.notify")((message) => Console.log(message))
  *   })
  * }
  *

package/src/Metric.ts

@@ -4801,7 +4801,7 @@ export const FiberRuntimeMetricsImpl: FiberRuntimeMetricsService = {
  *     Effect.gen(function*() {
  *       yield* Effect.sleep(`${50 + id * 10} millis`)
  *       if (id % 7 === 0) {
- *         yield* Effect.fail(new AppError({ operation: `fetch-user-${id}` }))
+ *         return yield* new AppError({ operation: `fetch-user-${id}` })
  *       }
  *       return { id, name: `User ${id}`, email: `user${id}@example.com` }
  *     })
@@ -4940,9 +4940,7 @@ export const disableRuntimeMetricsLayer = Layer.succeed(FiberRuntimeMetrics)(und
  *         yield* Effect.sleep(`${100 + i * 50} millis`)
  *         if (i % 4 === 0) {
  *           // Simulate some failures
- *           yield* Effect.fail(
- *             new RuntimeMetricsError({ operation: `task-${i}` })
- *           )
+ *           return yield* new RuntimeMetricsError({ operation: `task-${i}` })
  *         }
  *         return `Task ${i} completed`
  *       }).pipe(

package/src/Runtime.ts

@@ -117,7 +117,9 @@ export const defaultTeardown: Teardown = <E, A>(
   exit: Exit.Exit<E, A>,
   onExit: (code: number) => void
 ) => {
-  onExit(Exit.isFailure(exit) ? Cause.hasInterruptsOnly(exit.cause) ? 130 : 1 : 0)
+  if (Exit.isSuccess(exit)) return onExit(0)
+  if (Cause.hasInterruptsOnly(exit.cause)) return onExit(130)
+  return onExit(getErrorExitCode(Cause.squash(exit.cause)))
 }
 
 /**
@@ -206,10 +208,9 @@ export const makeRunMain = (
       ? Effect.runFork(effect)
       : Effect.runFork(
         Effect.tapCause(effect, (cause) => {
-          if (Cause.hasInterruptsOnly(cause)) {
-            return Effect.void
-          }
-          return Effect.logError(cause)
+          if (Cause.hasInterruptsOnly(cause)) return Effect.void
+          const isReported = getErrorReported(Cause.squash(cause))
+          return isReported ? Effect.logError(cause) : Effect.void
         })
       )
     try {
@@ -221,3 +222,92 @@ export const makeRunMain = (
     const teardown = options?.teardown ?? defaultTeardown
     return f({ fiber, teardown })
   })
+
+declare global {
+  interface Error {
+    readonly [errorExitCode]?: number
+    readonly [errorReported]?: boolean
+  }
+}
+
+/**
+ * @category Exit code management
+ * @since 4.0.0
+ */
+export type errorExitCode = "~effect/Runtime/errorExitCode"
+
+/**
+ * Allows associating an exit code with an error for determining the process
+ * exit code on failure.
+ *
+ * ```ts
+ * import { Data, Effect, Runtime } from "effect"
+ * import { NodeRuntime } from "@effect/platform-node"
+ *
+ * class MyError extends Data.TaggedError("MyError") {
+ *   readonly [Runtime.errorExitCode] = 42
+ * }
+ *
+ * // If the program fails with MyError, the process will exit with code 42
+ * NodeRuntime.runMain(Effect.fail(new MyError()))
+ * ```
+ *
+ * @category Exit code management
+ * @since 4.0.0
+ */
+export const errorExitCode: errorExitCode = "~effect/Runtime/errorExitCode"
+
+/**
+ * @category Exit code management
+ * @since 4.0.0
+ */
+export const getErrorExitCode = (u: unknown): number => {
+  if (typeof u === "object" && u !== null && errorExitCode in u) {
+    const code = u[errorExitCode]
+    if (typeof code === "number") {
+      return code
+    }
+  }
+  return 1
+}
+
+/**
+ * @category Error reporting management
+ * @since 4.0.0
+ */
+export type errorReported = "~effect/Runtime/errorReported"
+
+/**
+ * Allows an error to opt-out of error reporting.
+ *
+ * ```ts
+ * import { Data, Effect, Runtime } from "effect"
+ * import { NodeRuntime } from "@effect/platform-node"
+ *
+ * class MyError extends Data.TaggedError("MyError") {
+ *   readonly [Runtime.errorReported] = true
+ * }
+ *
+ * // If the program fails with MyError, the process will exit with code 1 but
+ * // no error will be logged.
+ * NodeRuntime.runMain(Effect.fail(new MyError()))
+ * ```
+ *
+ * @category Error reporting management
+ * @since 4.0.0
+ */
+export const errorReported: errorReported = "~effect/Runtime/errorReported"
+
+/**
+ * @category Error reporting management
+ * @since 4.0.0
+ */
+export const getErrorReported = (u: unknown): boolean => {
+  if (typeof u === "object" && u !== null && errorReported in u) {
+    const isReported = u[errorReported]
+    if (typeof isReported === "boolean") {
+      return isReported
+    }
+  }
+  return true
+}

package/src/Schedule.ts

@@ -72,7 +72,7 @@ const randomNext: Effect<number> = random.Random.useSync((random) => random.next
  * const program = Effect.gen(function*() {
  *   // Using retry schedule
  *   const result1 = yield* Effect.retry(
- *     Effect.fail("temporary error"),
+ *     Effect.suspend(() => Math.random() > 0.5 ? Effect.fail("temporary error") : Effect.succeed("Success")),
  *     retrySchedule
  *   )
  *
@@ -200,7 +200,7 @@ export const CurrentMetadata = ServiceMap.Reference<Metadata>("effect/Schedule/C
  *     Effect.gen(function*() {
  *       attempt++
  *       if (attempt < 3) {
- *         yield* Effect.fail(`Attempt ${attempt} failed`)
+ *         return yield* Effect.fail(`Attempt ${attempt} failed`)
  *       }
  *       return `Success on attempt ${attempt}`
  *     }),
@@ -619,7 +619,7 @@ export const toStepWithSleep = <Output, Input, Error, Env>(
  *     Effect.gen(function*() {
  *       attempt++
  *       if (attempt < 5) {
- *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+ *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
  *       }
  *       return `Success on attempt ${attempt}`
  *     }),
@@ -736,7 +736,7 @@ export const addDelay: {
    *     Effect.gen(function*() {
    *       attempt++
    *       if (attempt < 5) {
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *       return `Success on attempt ${attempt}`
    *     }),
@@ -855,7 +855,7 @@ export const addDelay: {
    *     Effect.gen(function*() {
    *       attempt++
    *       if (attempt < 5) {
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *       return `Success on attempt ${attempt}`
    *     }),
@@ -909,7 +909,7 @@ export const addDelay: {
  *       attempt++
  *       yield* Console.log(`Attempt ${attempt}`)
  *       if (attempt < 6) {
- *         yield* Effect.fail(new Error(`Failure ${attempt}`))
+ *         return yield* Effect.fail(new Error(`Failure ${attempt}`))
  *       }
  *       return `Success on attempt ${attempt}`
  *     }),
@@ -948,7 +948,7 @@ export const andThen: {
    *       attempt++
    *       yield* Console.log(`Attempt ${attempt}`)
    *       if (attempt < 6) {
-   *         yield* Effect.fail(new Error(`Failure ${attempt}`))
+   *         return yield* Effect.fail(new Error(`Failure ${attempt}`))
    *       }
    *       return `Success on attempt ${attempt}`
    *     }),
@@ -989,7 +989,7 @@ export const andThen: {
    *       attempt++
    *       yield* Console.log(`Attempt ${attempt}`)
    *       if (attempt < 6) {
-   *         yield* Effect.fail(new Error(`Failure ${attempt}`))
+   *         return yield* Effect.fail(new Error(`Failure ${attempt}`))
    *       }
    *       return `Success on attempt ${attempt}`
    *     }),
@@ -1397,7 +1397,7 @@ export const andThenResult: {
  *       yield* Console.log(`Retry attempt ${attempt}`)
  *
  *       if (attempt < 3) {
- *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+ *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
  *       }
  *
  *       return `Success on attempt ${attempt}`
@@ -1465,7 +1465,7 @@ export const both: {
    *       yield* Console.log(`Retry attempt ${attempt}`)
    *
    *       if (attempt < 3) {
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *
    *       return `Success on attempt ${attempt}`
@@ -1535,7 +1535,7 @@ export const both: {
    *       yield* Console.log(`Retry attempt ${attempt}`)
    *
    *       if (attempt < 3) {
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *
    *       return `Success on attempt ${attempt}`
@@ -1966,7 +1966,7 @@ export const bothWith: {
  *       yield* Console.log(`Attempt ${attempt}`)
  *
  *       if (attempt < 7) { // Needs both phases to succeed
- *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+ *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
  *       }
  *
  *       return `Success on attempt ${attempt}`
@@ -2029,7 +2029,7 @@ export const compose: {
    *       yield* Console.log(`Attempt ${attempt}`)
    *
    *       if (attempt < 7) { // Needs both phases to succeed
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *
    *       return `Success on attempt ${attempt}`
@@ -2094,7 +2094,7 @@ export const compose: {
    *       yield* Console.log(`Attempt ${attempt}`)
    *
    *       if (attempt < 7) { // Needs both phases to succeed
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *
    *       return `Success on attempt ${attempt}`
@@ -2642,7 +2642,7 @@ export const collectWhile: {
  *       yield* Console.log("Complex scheduled task...")
  *       // Simulate occasional failures
  *       if (Math.random() < 0.3) {
- *         yield* Effect.fail(new Error("Scheduled task failed"))
+ *         return yield* Effect.fail(new Error("Scheduled task failed"))
  *       }
  *       return "success"
  *     }),
@@ -2766,7 +2766,7 @@ export const cron: {
    *       yield* Console.log("Complex scheduled task...")
    *       // Simulate occasional failures
    *       if (Math.random() < 0.3) {
-   *         yield* Effect.fail(new Error("Scheduled task failed"))
+   *         return yield* Effect.fail(new Error("Scheduled task failed"))
    *       }
    *       return "success"
    *     }),
@@ -2890,7 +2890,7 @@ export const cron: {
    *       yield* Console.log("Complex scheduled task...")
    *       // Simulate occasional failures
    *       if (Math.random() < 0.3) {
-   *         yield* Effect.fail(new Error("Scheduled task failed"))
+   *         return yield* Effect.fail(new Error("Scheduled task failed"))
    *       }
    *       return "success"
    *     }),
@@ -3098,7 +3098,7 @@ export const duration = (durationInput: Duration.Input): Schedule<Duration.Durat
  *       yield* Console.log(`Retry attempt ${attempt}`)
  *
  *       if (Math.random() < 0.8) { // 80% failure rate
- *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+ *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
  *       }
  *
  *       return `Success on attempt ${attempt}`
@@ -3172,7 +3172,7 @@ export const during = (duration: Duration.Input): Schedule<Duration.Duration> =>
  *       yield* Console.log(`Retry attempt ${attempt}`)
  *
  *       if (attempt < 6) {
- *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+ *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
  *       }
  *
  *       return `Success on attempt ${attempt}`
@@ -3242,7 +3242,7 @@ export const either: {
    *       yield* Console.log(`Retry attempt ${attempt}`)
    *
    *       if (attempt < 6) {
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *
    *       return `Success on attempt ${attempt}`
@@ -3314,7 +3314,7 @@ export const either: {
    *       yield* Console.log(`Retry attempt ${attempt}`)
    *
    *       if (attempt < 6) {
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *
    *       return `Success on attempt ${attempt}`
@@ -3841,7 +3841,7 @@ export const elapsed: Schedule<Duration.Duration> = fromStepWithMetadata(
  *       attempt++
  *       if (attempt < 4) {
  *         yield* Console.log(`Attempt ${attempt} failed, retrying...`)
- *         yield* Effect.fail(new Error(`Failure ${attempt}`))
+ *         return yield* Effect.fail(new Error(`Failure ${attempt}`))
  *       }
  *       return `Success on attempt ${attempt}`
  *     }),
@@ -3891,7 +3891,7 @@ export const exponential = (
  *       yield* Console.log(`Attempt ${attempt}`)
  *
  *       if (attempt < 5) {
- *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+ *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
  *       }
  *
  *       return `Success on attempt ${attempt}`
@@ -4436,7 +4436,7 @@ export const passthrough = <Output, Input, Error, Env>(
  *       yield* Console.log(`Attempt ${attempt}`)
  *
  *       if (attempt < 4) {
- *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+ *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
  *       }
  *
  *       return `Success on attempt ${attempt}`
@@ -4923,7 +4923,7 @@ export const spaced = (duration: Duration.Input): Schedule<number> => {
  *     Effect.gen(function*() {
  *       attempt++
  *       if (attempt < 4) {
- *         yield* Effect.fail(new Error(`Network timeout on attempt ${attempt}`))
+ *         return yield* Effect.fail(new Error(`Network timeout on attempt ${attempt}`))
  *       }
  *       return `Success on attempt ${attempt}`
  *     }),
@@ -4994,7 +4994,7 @@ export const spaced = (duration: Duration.Input): Schedule<number> => {
  *       const errorType = isCritical
  *         ? "critical database failure"
  *         : "temporary network issue"
- *       yield* Effect.fail(new Error(errorType))
+ *       return yield* Effect.fail(new Error(errorType))
  *     }),
  *     alertingSchedule
  *   ).pipe(
@@ -5046,7 +5046,7 @@ export const tapInput: {
    *     Effect.gen(function*() {
    *       attempt++
    *       if (attempt < 4) {
-   *         yield* Effect.fail(new Error(`Network timeout on attempt ${attempt}`))
+   *         return yield* Effect.fail(new Error(`Network timeout on attempt ${attempt}`))
    *       }
    *       return `Success on attempt ${attempt}`
    *     }),
@@ -5117,7 +5117,7 @@ export const tapInput: {
    *       const errorType = isCritical
    *         ? "critical database failure"
    *         : "temporary network issue"
-   *       yield* Effect.fail(new Error(errorType))
+   *       return yield* Effect.fail(new Error(errorType))
    *     }),
    *     alertingSchedule
    *   ).pipe(
@@ -5171,7 +5171,7 @@ export const tapInput: {
    *     Effect.gen(function*() {
    *       attempt++
    *       if (attempt < 4) {
-   *         yield* Effect.fail(new Error(`Network timeout on attempt ${attempt}`))
+   *         return yield* Effect.fail(new Error(`Network timeout on attempt ${attempt}`))
    *       }
    *       return `Success on attempt ${attempt}`
    *     }),
@@ -5242,7 +5242,7 @@ export const tapInput: {
    *       const errorType = isCritical
    *         ? "critical database failure"
    *         : "temporary network issue"
-   *       yield* Effect.fail(new Error(errorType))
+   *       return yield* Effect.fail(new Error(errorType))
    *     }),
    *     alertingSchedule
    *   ).pipe(
@@ -5304,7 +5304,7 @@ export const tapInput: {
  *     Effect.gen(function*() {
  *       attempt++
  *       if (attempt < 4) {
- *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+ *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
  *       }
  *       return `Success on attempt ${attempt}`
  *     }),
@@ -5388,7 +5388,7 @@ export const tapOutput: {
    *     Effect.gen(function*() {
    *       attempt++
    *       if (attempt < 4) {
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *       return `Success on attempt ${attempt}`
    *     }),
@@ -5474,7 +5474,7 @@ export const tapOutput: {
    *     Effect.gen(function*() {
    *       attempt++
    *       if (attempt < 4) {
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *       return `Success on attempt ${attempt}`
    *     }),
@@ -5588,7 +5588,7 @@ export const tapOutput: {
  *       yield* Console.log(`Attempt ${attempt}`)
  *
  *       if (attempt < 5) { // Will fail more than 3 times
- *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+ *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
  *       }
  *
  *       return `Success on attempt ${attempt}`
@@ -5667,7 +5667,7 @@ export const take: {
    *       yield* Console.log(`Attempt ${attempt}`)
    *
    *       if (attempt < 5) { // Will fail more than 3 times
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *
    *       return `Success on attempt ${attempt}`
@@ -5748,7 +5748,7 @@ export const take: {
    *       yield* Console.log(`Attempt ${attempt}`)
    *
    *       if (attempt < 5) { // Will fail more than 3 times
-   *         yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
+   *         return yield* Effect.fail(new Error(`Attempt ${attempt} failed`))
    *       }
    *
    *       return `Success on attempt ${attempt}`

package/src/Schema.ts

@@ -8667,11 +8667,11 @@ export function toJsonSchemaDocument(schema: Top, options?: ToJsonSchemaOptions)
 }
 
 // -----------------------------------------------------------------------------
-// Serializer
+// Canonical Codecs
 // -----------------------------------------------------------------------------
 
 /**
- * @category Serializer
+ * @category Canonical Codecs
  * @since 4.0.0
  */
 export function toCodecJson<T, E, RD, RE>(schema: Codec<T, E, RD, RE>): Codec<T, unknown, RD, RE> {
@@ -8679,7 +8679,7 @@ export function toCodecJson<T, E, RD, RE>(schema: Codec<T, E, RD, RE>): Codec<T,
 }
 
 /**
- * @category Serializer
+ * @category Canonical Codecs
  * @since 4.0.0
  */
 export function toCodecIso<S extends Top>(schema: S): Codec<S["Type"], S["Iso"]> {
@@ -8687,13 +8687,13 @@ export function toCodecIso<S extends Top>(schema: S): Codec<S["Type"], S["Iso"]>
 }
 
 /**
- * @category Serializer
+ * @category Canonical Codecs
  * @since 4.0.0
  */
 export type StringTree = Tree<string | undefined>
 
 /**
- * The StringTree serializer converts **every leaf value to a string**, while
+ * The StringTree canonical codec converts **every leaf value to a string**, while
  * preserving the original structure.
  *
  * Declarations are converted to `undefined` (unless they have a
@@ -8707,7 +8707,7 @@ export type StringTree = Tree<string | undefined>
  *
  *    Defaults to `false`.
  *
- * @category Serializer
+ * @category Canonical Codecs
  * @since 4.0.0
  */
 export function toCodecStringTree<T, E, RD, RE>(schema: Codec<T, E, RD, RE>): Codec<T, StringTree, RD, RE>
@@ -8740,7 +8740,7 @@ type XmlEncoderOptions = {
 }
 
 /**
- * @category Serializer
+ * @category Canonical Codecs
  * @since 4.0.0
  */
 export function toEncoderXml<T, E, RD, RE>(
@@ -8860,8 +8860,6 @@ function serializerTree(
   onMissingAnnotation: (ast: AST.AST) => AST.AST
 ): AST.AST {
   switch (ast._tag) {
-    case "Unknown":
-    case "ObjectKeyword":
     case "Declaration": {
       const getLink = ast.annotations?.toCodecJson ?? ast.annotations?.toCodec
       if (Predicate.isFunction(getLink)) {
@@ -8878,6 +8876,9 @@ function serializerTree(
       return AST.replaceEncoding(ast, [nullToString])
     case "Boolean":
       return AST.replaceEncoding(ast, [booleanToString])
+    case "Unknown":
+    case "ObjectKeyword":
+      return AST.replaceEncoding(ast, [AST.unknownToStringTree])
     case "Enum":
     case "Number":
     case "Literal":
@@ -9104,13 +9105,13 @@ export function toDifferJsonPatch<T, E>(schema: Codec<T, E>): Differ<T, JsonPatc
  * @category Tree
  * @since 4.0.0
  */
-export type Tree<Node> = Node | TreeObject<Node> | ReadonlyArray<Tree<Node>>
+export type Tree<Node> = Node | TreeRecord<Node> | ReadonlyArray<Tree<Node>>
 
 /**
  * @category Tree
  * @since 4.0.0
  */
-export interface TreeObject<A> {
+export interface TreeRecord<A> {
   readonly [x: string]: Tree<A>
 }
 
@@ -9133,51 +9134,12 @@ export function Tree<S extends Top>(node: S) {
   return Tree
 }
 
-/**
- * @category Tree
- * @since 4.0.0
- */
-export type MutableTree<A> = A | MutableTreeRecord<A> | Array<MutableTree<A>>
-
-/**
- * @category Tree
- * @since 4.0.0
- */
-export interface MutableTreeRecord<A> {
-  [x: string]: MutableTree<A>
-}
-
-/**
- * @category Tree
- * @since 4.0.0
- */
-export function MutableTree<S extends Top>(node: S) {
-  const MutableTree$ref = suspend((): Codec<
-    MutableTree<S["Type"]>,
-    MutableTree<S["Encoded"]>,
-    S["DecodingServices"],
-    S["EncodingServices"]
-  > => MutableTree)
-  const MutableTree = Union([
-    node,
-    mutable(Array(MutableTree$ref)),
-    Record(String, mutableKey(MutableTree$ref))
-  ])
-  return MutableTree
-}
-
 /**
  * @category JSON
  * @since 4.0.0
  */
 export type Json = null | number | boolean | string | JsonArray | JsonObject
 
-/**
- * @category JSON
- * @since 4.0.0
- */
-export const Json: Codec<Json> = Tree(Union([Null, Number, Boolean, String]))
-
 /**
  * @category JSON
  * @since 4.0.0
@@ -9196,13 +9158,13 @@ export interface JsonObject {
  * @category JSON
  * @since 4.0.0
  */
-export type MutableJson = null | number | boolean | string | MutableJsonArray | MutableJsonObject
+export const Json: Codec<Json> = make(AST.Json)
 
 /**
  * @category JSON
  * @since 4.0.0
  */
-export const MutableJson: Codec<MutableJson> = MutableTree(Union([Null, Number, Boolean, String]))
+export type MutableJson = null | number | boolean | string | MutableJsonArray | MutableJsonObject
 
 /**
  * @category JSON
@@ -9218,6 +9180,12 @@ export interface MutableJsonObject {
   [x: string]: MutableJson
 }
 
+/**
+ * @category JSON
+ * @since 4.0.0
+ */
+export const MutableJson: Codec<MutableJson> = make(AST.MutableJson)
+
 // -----------------------------------------------------------------------------
 // Annotations
 // -----------------------------------------------------------------------------