effect 4.0.0-beta.51 → 4.0.0-beta.53

package/src/unstable/httpapi/HttpApiEndpoint.ts

@@ -16,7 +16,6 @@ import * as HttpRouter from "../http/HttpRouter.ts"
 import type { HttpServerRequest } from "../http/HttpServerRequest.ts"
 import type { HttpServerResponse } from "../http/HttpServerResponse.ts"
 import type * as Multipart from "../http/Multipart.ts"
-import { BadRequestFromSchemaError, type BadRequestNoContent } from "./HttpApiError.ts"
 import type * as HttpApiGroup from "./HttpApiGroup.ts"
 import type * as HttpApiMiddleware from "./HttpApiMiddleware.ts"
 import * as HttpApiSchema from "./HttpApiSchema.ts"
@@ -54,7 +53,7 @@ export interface HttpApiEndpoint<
   out Payload extends Schema.Top = never,
   out Headers extends Schema.Top = never,
   out Success extends Schema.Top = typeof HttpApiSchema.NoContent,
-  out Error extends Schema.Top = typeof BadRequestNoContent,
+  out Error extends Schema.Top = never,
   in out Middleware = never,
   out MiddlewareR = never
 > extends Pipeable {
@@ -172,7 +171,7 @@ export function getSuccessSchemas(endpoint: AnyWithProps): [Schema.Top, ...Array
 }
 
 /** @internal */
-export function getErrorSchemas(endpoint: AnyWithProps): [Schema.Top, ...Array<Schema.Top>] {
+export function getErrorSchemas(endpoint: AnyWithProps): Array<Schema.Top> {
   const schemas = new Set<Schema.Top>(endpoint.error)
   for (const middleware of endpoint.middlewares) {
     const key = middleware as any as HttpApiMiddleware.AnyService
@@ -180,7 +179,7 @@ export function getErrorSchemas(endpoint: AnyWithProps): [Schema.Top, ...Array<S
       schemas.add(schema)
     }
   }
-  return Arr.append(Array.from(schemas), BadRequestFromSchemaError)
+  return Array.from(schemas)
 }
 
 /**
@@ -951,7 +950,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
       : StringTree<ExtractSchemaOrArray<Payload>>,
     StringTree<Headers extends Schema.Struct.Fields ? Schema.Struct<Headers> : Headers>,
     Json<Success extends ReadonlyArray<Schema.Top> ? Success[number] : Success>,
-    Json<(Error extends ReadonlyArray<Schema.Top> ? Error[number] : Error) | typeof BadRequestNoContent>
+    Json<Error extends ReadonlyArray<Schema.Top> ? Error[number] : Error>
   >
   <
     const Name extends string,
@@ -983,7 +982,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
     ExtractSchemaOrArray<Payload>,
     ExtractSchemaOrArray<Headers>,
     Success extends ReadonlyArray<Schema.Top> ? Success[number] : Success,
-    (Error extends ReadonlyArray<Schema.Top> ? Error[number] : Error) | typeof BadRequestNoContent
+    Error extends ReadonlyArray<Schema.Top> ? Error[number] : Error
   >
 } =>
 <
@@ -1018,7 +1017,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
     : Payload,
   Headers extends Schema.Struct.Fields ? Schema.Struct<Headers> : Headers,
   Success extends ReadonlyArray<Schema.Top> ? Success[number] : Success,
-  (Error extends ReadonlyArray<Schema.Top> ? Error[number] : Error) | typeof BadRequestNoContent
+  Error extends ReadonlyArray<Schema.Top> ? Error[number] : Error
 > => {
   const disableCodecs = options?.disableCodecs ?? false
   const transformStringTree = disableCodecs ? identity : Schema.toCodecStringTree

package/src/unstable/httpapi/HttpApiError.ts

@@ -1,11 +1,11 @@
 /**
  * @since 4.0.0
  */
+import * as Data from "../../Data.ts"
 import * as Effect from "../../Effect.ts"
 import * as ErrorReporter from "../../ErrorReporter.ts"
-import { identity } from "../../Function.ts"
+import { hasProperty } from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
-import * as Transformation from "../../SchemaTransformation.ts"
 import * as HttpServerRespondable from "../http/HttpServerRespondable.ts"
 import * as HttpServerResponse from "../http/HttpServerResponse.ts"
 import * as HttpApiSchema from "./HttpApiSchema.ts"
@@ -48,26 +48,6 @@ export const BadRequestNoContent = BadRequest.pipe(HttpApiSchema.asNoContent({
   decode: () => new BadRequest({})
 }))
 
-/**
- * @category Built-in errors
- * @since 4.0.0
- */
-export const BadRequestFromSchemaError = BadRequest.pipe(
-  Schema.decodeTo(
-    Schema.Union([Schema.declare(Schema.isSchemaError), BadRequest]),
-    Transformation.transform({
-      encode: (_) => BadRequest.singleton,
-      decode: identity
-    })
-  ),
-  HttpApiSchema.asNoContent({
-    decode: () => new BadRequest({})
-  })
-).annotate({
-  httpApiStatus: 400,
-  description: "BadRequest"
-})
-
 /**
  * @category Built-in errors
  * @since 4.0.0
@@ -332,3 +312,44 @@ export class ServiceUnavailable
 export const ServiceUnavailableNoContent = ServiceUnavailable.pipe(HttpApiSchema.asNoContent({
   decode: () => new ServiceUnavailable({})
 }))
+
+/**
+ * @category Parsing errors
+ * @since 4.0.0
+ */
+export type HttpApiSchemaErrorTypeId = "~effect/httpapi/HttpApiError/HttpApiSchemaError"
+
+/**
+ * @category Parsing errors
+ * @since 4.0.0
+ */
+export const HttpApiSchemaErrorTypeId: HttpApiSchemaErrorTypeId = "~effect/httpapi/HttpApiError/HttpApiSchemaError"
+
+/**
+ * @category Parsing errors
+ * @since 4.0.0
+ */
+export class HttpApiSchemaError extends Data.TaggedClass("HttpApiSchemaError")<{
+  readonly kind: "Params" | "Headers" | "Query" | "Body" | "Payload"
+  readonly cause: Schema.SchemaError
+}> {
+  readonly [HttpApiSchemaErrorTypeId]: HttpApiSchemaErrorTypeId = HttpApiSchemaErrorTypeId
+
+  static is(u: unknown): u is HttpApiSchemaError {
+    return hasProperty(u, HttpApiSchemaErrorTypeId)
+  }
+
+  static wrap<A, R>(
+    kind: HttpApiSchemaError["kind"],
+    effect: Effect.Effect<A, Schema.SchemaError, R>
+  ): Effect.Effect<A, HttpApiSchemaError, R> {
+    return Effect.mapError(effect, (error) => new HttpApiSchemaError({ kind, cause: error }))
+  }
+
+  readonly name = "HttpApiSchemaError"
+  readonly message = this.kind;
+
+  [HttpServerRespondable.symbol]() {
+    return Effect.succeed(badRequestResponse)
+  }
+}

package/src/unstable/httpapi/HttpApiMiddleware.ts

@@ -5,7 +5,7 @@ import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Layer from "../../Layer.ts"
 import { hasProperty } from "../../Predicate.ts"
-import * as Schema from "../../Schema.ts"
+import type * as Schema from "../../Schema.ts"
 import { Scope } from "../../Scope.ts"
 import type { unhandled } from "../../Types.ts"
 import type * as HttpClientError from "../http/HttpClientError.ts"
@@ -14,6 +14,7 @@ import type * as HttpClientResponse from "../http/HttpClientResponse.ts"
 import type * as HttpRouter from "../http/HttpRouter.ts"
 import type { HttpServerResponse } from "../http/HttpServerResponse.ts"
 import type * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
+import { HttpApiSchemaError } from "./HttpApiError.ts"
 import type * as HttpApiGroup from "./HttpApiGroup.ts"
 import type * as HttpApiSecurity from "./HttpApiSecurity.ts"
 
@@ -333,11 +334,11 @@ function getError(error: ErrorConstraint | undefined): ReadonlySet<Schema.Top> {
 export const layerSchemaErrorTransform = <Id, E extends ErrorConstraint, Requires>(
   service: Context.Service<Id, HttpApiMiddleware<never, E, Requires>>,
   transform: (
-    error: Schema.SchemaError,
+    error: HttpApiSchemaError,
     context: { readonly endpoint: HttpApiEndpoint.AnyWithProps; readonly group: HttpApiGroup.AnyWithProps }
   ) => Effect.Effect<
     HttpServerResponse,
-    ErrorSchemaFromConstraint<E>["Type"] | Schema.SchemaError,
+    ErrorSchemaFromConstraint<E>["Type"] | HttpApiSchemaError,
     Requires | HttpRouter.Provided
   >
 ): Layer.Layer<Id> =>
@@ -348,9 +349,9 @@ export const layerSchemaErrorTransform = <Id, E extends ErrorConstraint, Require
         httpEffect,
         (e): Effect.Effect<
           HttpServerResponse,
-          unhandled | Schema.SchemaError | ErrorSchemaFromConstraint<E>["Type"],
+          unhandled | HttpApiSchemaError | ErrorSchemaFromConstraint<E>["Type"],
           Requires | HttpRouter.Provided
-        > => Schema.isSchemaError(e) ? transform(e, options) : Effect.fail(e)
+        > => HttpApiSchemaError.is(e) ? transform(e, options) : Effect.fail(e)
       )
   )
 

package/src/unstable/httpapi/OpenApi.ts

@@ -524,7 +524,7 @@ type ResponseBodies = Map<
 >
 
 function extractResponseBodies(
-  schemas: readonly [Schema.Top, ...Array<Schema.Top>],
+  schemas: Array<Schema.Top>,
   getStatus: (ast: AST.AST) => number,
   getDescription: (ast: AST.AST) => string | undefined
 ): ResponseBodies {

package/src/unstable/reactivity/AtomHttpApi.ts

@@ -16,6 +16,7 @@ import type * as HttpApi from "../httpapi/HttpApi.ts"
 import * as HttpApiClient from "../httpapi/HttpApiClient.ts"
 import * as HttpApiEndpoint from "../httpapi/HttpApiEndpoint.ts"
 import type * as HttpApiGroup from "../httpapi/HttpApiGroup.ts"
+import type * as HttpApiMiddleware from "../httpapi/HttpApiMiddleware.ts"
 import * as AsyncResult from "./AsyncResult.ts"
 import * as Atom from "./Atom.ts"
 import * as Reactivity from "./Reactivity.ts"
@@ -57,7 +58,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
       infer _Headers,
       infer _Success,
       infer _Error,
-      infer _R,
+      infer _Middleware,
       infer _RE
     >
   ] ? Atom.AtomResultFn<
@@ -67,7 +68,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
         }
       >,
       ResponseByMode<_Success["Type"], ResponseMode>,
-      _Error["Type"]
+      ErrorByMode<_Error, _Middleware, ResponseMode>
     >
     : never
 
@@ -119,13 +120,13 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
       infer _Headers,
       infer _Success,
       infer _Error,
-      infer _R,
+      infer _Middleware,
       infer _RE
     >
   ] ? Atom.Atom<
       AsyncResult.AsyncResult<
         ResponseByMode<_Success["Type"], ResponseMode>,
-        _Error["Type"]
+        ErrorByMode<_Error, _Middleware, ResponseMode>
       >
     >
     : never
@@ -316,3 +317,12 @@ type ResponseByMode<Success, ResponseMode extends HttpApiEndpoint.ClientResponse
   ["decoded-and-response"] ? [Success, HttpClientResponse]
   : [ResponseMode] extends ["response-only"] ? HttpClientResponse
   : Success
+
+type ErrorByMode<
+  Error extends Schema.Top,
+  Middleware,
+  ResponseMode extends HttpApiEndpoint.ClientResponseMode
+> =
+  | HttpApiMiddleware.Error<Middleware>
+  | HttpApiMiddleware.ClientError<Middleware>
+  | ([ResponseMode] extends ["response-only"] ? never : Error["Type"])

package/src/unstable/sql/Statement.ts

@@ -4,12 +4,10 @@
 import { Clock } from "../../Clock.ts"
 import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
+import * as Effectable from "../../Effectable.ts"
 import type * as Fiber from "../../Fiber.ts"
 import { constUndefined } from "../../Function.ts"
-import type { Inspectable } from "../../Inspectable.ts"
-import * as core from "../../internal/core.ts"
 import * as internalEffect from "../../internal/effect.ts"
-import type { Pipeable } from "../../Pipeable.ts"
 import { hasProperty } from "../../Predicate.ts"
 import { TracerTimingEnabled } from "../../References.ts"
 import * as Stream from "../../Stream.ts"
@@ -49,7 +47,7 @@ export type Dialect = "sqlite" | "pg" | "mysql" | "mssql" | "clickhouse"
  * @category model
  * @since 4.0.0
  */
-export interface Statement<A> extends Fragment, Effect.Effect<ReadonlyArray<A>, SqlError>, Pipeable, Inspectable {
+export interface Statement<A> extends Fragment, Effect.Effect<ReadonlyArray<A>, SqlError> {
   readonly raw: Effect.Effect<unknown, SqlError>
   readonly withoutTransform: Effect.Effect<ReadonlyArray<A>, SqlError>
   readonly stream: Stream.Stream<A, SqlError>
@@ -1128,8 +1126,23 @@ const StatementProto: Omit<
   StatementImpl<any>,
   "segments" | "acquirer" | "compiler" | "spanAttributes" | "transformRows"
 > = {
-  ...core.EffectProto,
-  [core.identifier as any]: "Statement",
+  ...Effectable.Prototype<StatementImpl<any>>({
+    label: "Statement",
+    evaluate(fiber) {
+      const span = internalEffect.makeSpanUnsafe(fiber, "sql.execute", { kind: "client" })
+      const clock = fiber.getRef(Clock)
+      const timingEnabled = fiber.getRef(TracerTimingEnabled)
+      return Effect.onExit(
+        this.withConnectionSpan(
+          "execute",
+          (connection, sql, params) => connection.execute(sql, params, this.transformRows),
+          false,
+          span
+        ),
+        (exit) => internalEffect.endSpan(span, exit, clock, timingEnabled)
+      )
+    }
+  }),
   [FragmentTypeId]: FragmentTypeId,
   withConnection<XA, E>(
     this: StatementImpl<any>,
@@ -1229,23 +1242,6 @@ const StatementProto: Omit<
   ) {
     return this.compiler.compile(this, withoutTransform ?? false)
   },
-  [core.evaluate as any](
-    this: StatementImpl<any>,
-    fiber: Fiber.Fiber<any, any>
-  ): Effect.Effect<ReadonlyArray<any>, SqlError> {
-    const span = internalEffect.makeSpanUnsafe(fiber, "sql.execute", { kind: "client" })
-    const clock = fiber.getRef(Clock)
-    const timingEnabled = fiber.getRef(TracerTimingEnabled)
-    return Effect.onExit(
-      this.withConnectionSpan(
-        "execute",
-        (connection, sql, params) => connection.execute(sql, params, this.transformRows),
-        false,
-        span
-      ),
-      (exit) => internalEffect.endSpan(span, exit, clock, timingEnabled)
-    )
-  },
   toJSON(this: StatementImpl<any>) {
     const [sql, params] = this.compile()
     return {

package/src/unstable/workflow/Activity.ts

@@ -5,8 +5,8 @@ import type { NonEmptyReadonlyArray } from "../../Array.ts"
 import * as Cause from "../../Cause.ts"
 import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
+import * as Effectable from "../../Effectable.ts"
 import { dual } from "../../Function.ts"
-import { PipeInspectableProto, YieldableProto } from "../../internal/core.ts"
 import * as Schedule from "../../Schedule.ts"
 import * as Schema from "../../Schema.ts"
 import type { Scope } from "../../Scope.ts"
@@ -27,8 +27,7 @@ export interface Activity<
   Error extends Schema.Top = Schema.Never,
   R = never
 > extends
-  Effect.Yieldable<
-    Activity<Success, Error, R>,
+  Effect.Effect<
     Success["Type"],
     Error["Type"],
     Success["DecodingServices"] | Error["DecodingServices"] | R | WorkflowEngine | WorkflowInstance
@@ -123,8 +122,12 @@ export const make = <
     options.interruptRetryPolicy
   )(options.execute)
   const self: Activity<Success, Error, Exclude<R, WorkflowInstance | WorkflowEngine>> = {
-    ...PipeInspectableProto,
-    ...YieldableProto,
+    ...Effectable.Prototype<Activity<Success, Error, R>>({
+      label: "Activity",
+      evaluate(_) {
+        return execute
+      }
+    }),
     [TypeId]: TypeId,
     name: options.name,
     successSchema,
@@ -147,10 +150,7 @@ export const make = <
     executeEncoded: Effect.matchEffect(executeWithoutInterrupt, {
       onFailure: (error) => Effect.flatMap(Effect.orDie(Schema.encodeEffect(errorSchemaJson)(error)), Effect.fail),
       onSuccess: (value) => Effect.orDie(Schema.encodeEffect(successSchemaJson)(value))
-    }),
-    asEffect() {
-      return execute
-    }
+    })
   } as any
   execute = makeExecute(self)
   return self

package/dist/internal/schema/to-codec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=to-codec.d.ts.map

package/dist/internal/schema/to-codec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"to-codec.d.ts","sourceRoot":"","sources":["../../../src/internal/schema/to-codec.ts"],"names":[],"mappings":""}

package/dist/internal/schema/to-codec.js

@@ -1,126 +0,0 @@
-import { memoize } from "../../Function.js";
-import * as Predicate from "../../Predicate.js";
-import * as AST from "../../SchemaAST.js";
-import * as InternalSchema from "./schema.js";
-/** @internal */
-export const toCodecJson = /*#__PURE__*/AST.toCodec(ast => {
-  const out = toCodecJsonBase(ast);
-  if (out !== ast && AST.isOptional(ast)) {
-    return AST.optionalKeyLastLink(out);
-  }
-  return out;
-});
-function toCodecJsonBase(ast) {
-  switch (ast._tag) {
-    case "Declaration":
-      {
-        const getLink = ast.annotations?.toCodecJson ?? ast.annotations?.toCodec;
-        if (Predicate.isFunction(getLink)) {
-          const tps = AST.isDeclaration(ast) ? ast.typeParameters.map(tp => InternalSchema.make(AST.toEncoded(tp))) : [];
-          const link = getLink(tps);
-          const to = toCodecJson(link.to);
-          return AST.replaceEncoding(ast, to === link.to ? [link] : [new AST.Link(to, link.transformation)]);
-        }
-        return AST.replaceEncoding(ast, [AST.unknownToNull]);
-      }
-    case "Unknown":
-    case "ObjectKeyword":
-      return AST.replaceEncoding(ast, [AST.unknownToJson]);
-    case "Undefined":
-    case "Void":
-    case "Literal":
-    case "Number":
-      return ast.toCodecJson();
-    case "UniqueSymbol":
-    case "Symbol":
-    case "BigInt":
-      return ast.toCodecStringTree();
-    case "Objects":
-      {
-        if (ast.propertySignatures.some(ps => typeof ps.name !== "string")) {
-          throw new globalThis.Error("Objects property names must be strings", {
-            cause: ast
-          });
-        }
-        return ast.recur(toCodecJson);
-      }
-    case "Union":
-      {
-        const sortedTypes = jsonReorder(ast.types);
-        if (sortedTypes !== ast.types) {
-          return new AST.Union(sortedTypes, ast.mode, ast.annotations, ast.checks, ast.encoding, ast.context).recur(toCodecJson);
-        }
-        return ast.recur(toCodecJson);
-      }
-    case "Arrays":
-    case "Suspend":
-      return ast.recur(toCodecJson);
-  }
-  // `Schema.Any` is used as an escape hatch
-  return ast;
-}
-/** @internal */
-export const jsonReorder = /*#__PURE__*/makeReorder(getJsonPriority);
-function getJsonPriority(ast) {
-  switch (ast._tag) {
-    case "BigInt":
-    case "Symbol":
-    case "UniqueSymbol":
-      return 0;
-    default:
-      return 1;
-  }
-}
-/** @internal */
-export function makeReorder(getPriority) {
-  return types => {
-    // Create a map of original indices for O(1) lookup
-    const indexMap = new Map();
-    for (let i = 0; i < types.length; i++) {
-      indexMap.set(AST.toEncoded(types[i]), i);
-    }
-    // Create a sorted copy of the types array
-    const sortedTypes = [...types].sort((a, b) => {
-      a = AST.toEncoded(a);
-      b = AST.toEncoded(b);
-      const pa = getPriority(a);
-      const pb = getPriority(b);
-      if (pa !== pb) return pa - pb;
-      // If priorities are equal, maintain original order (stable sort)
-      return indexMap.get(a) - indexMap.get(b);
-    });
-    // Check if order changed by comparing arrays
-    const orderChanged = sortedTypes.some((ast, index) => ast !== types[index]);
-    if (!orderChanged) return types;
-    return sortedTypes;
-  };
-}
-/** @internal */
-export const toCodecIso = /*#__PURE__*/memoize(ast => {
-  const out = toCodecIsoBase(ast);
-  if (out !== ast && AST.isOptional(ast)) {
-    return AST.optionalKeyLastLink(out);
-  }
-  return out;
-});
-function toCodecIsoBase(ast) {
-  switch (ast._tag) {
-    case "Declaration":
-      {
-        const getLink = ast.annotations?.toCodecIso ?? ast.annotations?.toCodec;
-        if (Predicate.isFunction(getLink)) {
-          const link = getLink(ast.typeParameters.map(tp => InternalSchema.make(tp)));
-          const to = toCodecIso(link.to);
-          return AST.replaceEncoding(ast, to === link.to ? [link] : [new AST.Link(to, link.transformation)]);
-        }
-        return ast;
-      }
-    case "Arrays":
-    case "Objects":
-    case "Union":
-    case "Suspend":
-      return ast.recur(toCodecIso);
-  }
-  return ast;
-}
-//# sourceMappingURL=to-codec.js.map

package/dist/internal/schema/to-codec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"to-codec.js","names":["memoize","Predicate","AST","InternalSchema","toCodecJson","toCodec","ast","out","toCodecJsonBase","isOptional","optionalKeyLastLink","_tag","getLink","annotations","isFunction","tps","isDeclaration","typeParameters","map","tp","make","toEncoded","link","to","replaceEncoding","Link","transformation","unknownToNull","unknownToJson","toCodecStringTree","propertySignatures","some","ps","name","globalThis","Error","cause","recur","sortedTypes","jsonReorder","types","Union","mode","checks","encoding","context","makeReorder","getJsonPriority","getPriority","indexMap","Map","i","length","set","sort","a","b","pa","pb","get","orderChanged","index","toCodecIso","toCodecIsoBase"],"sources":["../../../src/internal/schema/to-codec.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/src/internal/schema/to-codec.ts

@@ -1,138 +0,0 @@
-import { memoize } from "../../Function.ts"
-import * as Predicate from "../../Predicate.ts"
-import * as AST from "../../SchemaAST.ts"
-import * as InternalSchema from "./schema.ts"
-
-/** @internal */
-export const toCodecJson = AST.toCodec((ast) => {
-  const out = toCodecJsonBase(ast)
-  if (out !== ast && AST.isOptional(ast)) {
-    return AST.optionalKeyLastLink(out)
-  }
-  return out
-})
-
-function toCodecJsonBase(ast: AST.AST): AST.AST {
-  switch (ast._tag) {
-    case "Declaration": {
-      const getLink = ast.annotations?.toCodecJson ?? ast.annotations?.toCodec
-      if (Predicate.isFunction(getLink)) {
-        const tps = AST.isDeclaration(ast)
-          ? ast.typeParameters.map((tp) => InternalSchema.make(AST.toEncoded(tp)))
-          : []
-        const link = getLink(tps)
-        const to = toCodecJson(link.to)
-        return AST.replaceEncoding(ast, to === link.to ? [link] : [new AST.Link(to, link.transformation)])
-      }
-      return AST.replaceEncoding(ast, [AST.unknownToNull])
-    }
-    case "Unknown":
-    case "ObjectKeyword":
-      return AST.replaceEncoding(ast, [AST.unknownToJson])
-    case "Undefined":
-    case "Void":
-    case "Literal":
-    case "Number":
-      return ast.toCodecJson()
-    case "UniqueSymbol":
-    case "Symbol":
-    case "BigInt":
-      return ast.toCodecStringTree()
-    case "Objects": {
-      if (ast.propertySignatures.some((ps) => typeof ps.name !== "string")) {
-        throw new globalThis.Error("Objects property names must be strings", { cause: ast })
-      }
-      return ast.recur(toCodecJson)
-    }
-    case "Union": {
-      const sortedTypes = jsonReorder(ast.types)
-      if (sortedTypes !== ast.types) {
-        return new AST.Union(
-          sortedTypes,
-          ast.mode,
-          ast.annotations,
-          ast.checks,
-          ast.encoding,
-          ast.context
-        ).recur(toCodecJson)
-      }
-      return ast.recur(toCodecJson)
-    }
-    case "Arrays":
-    case "Suspend":
-      return ast.recur(toCodecJson)
-  }
-  // `Schema.Any` is used as an escape hatch
-  return ast
-}
-
-/** @internal */
-export const jsonReorder = makeReorder(getJsonPriority)
-
-function getJsonPriority(ast: AST.AST): number {
-  switch (ast._tag) {
-    case "BigInt":
-    case "Symbol":
-    case "UniqueSymbol":
-      return 0
-    default:
-      return 1
-  }
-}
-
-/** @internal */
-export function makeReorder(getPriority: (ast: AST.AST) => number) {
-  return (types: ReadonlyArray<AST.AST>): ReadonlyArray<AST.AST> => {
-    // Create a map of original indices for O(1) lookup
-    const indexMap = new Map<AST.AST, number>()
-    for (let i = 0; i < types.length; i++) {
-      indexMap.set(AST.toEncoded(types[i]), i)
-    }
-
-    // Create a sorted copy of the types array
-    const sortedTypes = [...types].sort((a, b) => {
-      a = AST.toEncoded(a)
-      b = AST.toEncoded(b)
-      const pa = getPriority(a)
-      const pb = getPriority(b)
-      if (pa !== pb) return pa - pb
-      // If priorities are equal, maintain original order (stable sort)
-      return indexMap.get(a)! - indexMap.get(b)!
-    })
-
-    // Check if order changed by comparing arrays
-    const orderChanged = sortedTypes.some((ast, index) => ast !== types[index])
-
-    if (!orderChanged) return types
-    return sortedTypes
-  }
-}
-
-/** @internal */
-export const toCodecIso = memoize((ast: AST.AST): AST.AST => {
-  const out = toCodecIsoBase(ast)
-  if (out !== ast && AST.isOptional(ast)) {
-    return AST.optionalKeyLastLink(out)
-  }
-  return out
-})
-
-function toCodecIsoBase(ast: AST.AST): AST.AST {
-  switch (ast._tag) {
-    case "Declaration": {
-      const getLink = ast.annotations?.toCodecIso ?? ast.annotations?.toCodec
-      if (Predicate.isFunction(getLink)) {
-        const link = getLink(ast.typeParameters.map((tp) => InternalSchema.make(tp)))
-        const to = toCodecIso(link.to)
-        return AST.replaceEncoding(ast, to === link.to ? [link] : [new AST.Link(to, link.transformation)])
-      }
-      return ast
-    }
-    case "Arrays":
-    case "Objects":
-    case "Union":
-    case "Suspend":
-      return ast.recur(toCodecIso)
-  }
-  return ast
-}