effect 4.0.0-beta.73 → 4.0.0-beta.75

package/src/TxSubscriptionRef.ts

@@ -123,8 +123,8 @@ const TxSubscriptionRefProto: Omit<TxSubscriptionRef<any>, typeof TypeId | "ref"
  *
  * **When to use**
  *
- * Use to create transactional state that also publishes every committed update
- * to subscribers.
+ * Use to create a `TxSubscriptionRef` that publishes every committed update to
+ * subscribers.
  *
  * **Example** (Creating a transactional subscription reference)
  *
@@ -163,8 +163,8 @@ export const make = <A>(value: A): Effect.Effect<TxSubscriptionRef<A>> =>
  *
  * **When to use**
  *
- * Use to read the current transactional value without subscribing to future
- * changes.
+ * Use to read the current `TxSubscriptionRef` value without subscribing to
+ * future changes.
  *
  * **Example** (Reading the current value)
  *
@@ -195,8 +195,8 @@ export const get = <A>(self: TxSubscriptionRef<A>): Effect.Effect<A> => TxRef.ge
  *
  * **When to use**
  *
- * Use to compute a separate return value and next state in one transactional
- * update.
+ * Use to compute a separate return value and next `TxSubscriptionRef` state in
+ * one transactional update.
  *
  * **Example** (Modifying and returning a value)
  *
@@ -228,8 +228,8 @@ export const modify: {
    *
    * **When to use**
    *
-   * Use to compute a separate return value and next state in one transactional
-   * update.
+   * Use to compute a separate return value and next `TxSubscriptionRef` state in
+   * one transactional update.
    *
    * **Example** (Modifying and returning a value)
    *
@@ -261,8 +261,8 @@ export const modify: {
    *
    * **When to use**
    *
-   * Use to compute a separate return value and next state in one transactional
-   * update.
+   * Use to compute a separate return value and next `TxSubscriptionRef` state in
+   * one transactional update.
    *
    * **Example** (Modifying and returning a value)
    *
@@ -307,7 +307,8 @@ export const modify: {
  *
  * **When to use**
  *
- * Use to replace the current value with a known value and publish it.
+ * Use to replace the current `TxSubscriptionRef` value with a known value and
+ * publish it.
  *
  * **Example** (Setting a new value)
  *
@@ -333,7 +334,8 @@ export const set: {
    *
    * **When to use**
    *
-   * Use to replace the current value with a known value and publish it.
+   * Use to replace the current `TxSubscriptionRef` value with a known value and
+   * publish it.
    *
    * **Example** (Setting a new value)
    *
@@ -359,7 +361,8 @@ export const set: {
    *
    * **When to use**
    *
-   * Use to replace the current value with a known value and publish it.
+   * Use to replace the current `TxSubscriptionRef` value with a known value and
+   * publish it.
    *
    * **Example** (Setting a new value)
    *
@@ -391,7 +394,8 @@ export const set: {
  *
  * **When to use**
  *
- * Use to derive the next value from the current value and publish it.
+ * Use to derive the next `TxSubscriptionRef` value from the current value and
+ * publish it.
  *
  * **Example** (Updating a value)
  *
@@ -418,7 +422,8 @@ export const update: {
    *
    * **When to use**
    *
-   * Use to derive the next value from the current value and publish it.
+   * Use to derive the next `TxSubscriptionRef` value from the current value and
+   * publish it.
    *
    * **Example** (Updating a value)
    *
@@ -445,7 +450,8 @@ export const update: {
    *
    * **When to use**
    *
-   * Use to derive the next value from the current value and publish it.
+   * Use to derive the next `TxSubscriptionRef` value from the current value and
+   * publish it.
    *
    * **Example** (Updating a value)
    *
@@ -478,7 +484,8 @@ export const update: {
  *
  * **When to use**
  *
- * Use to replace the value while returning the previous value.
+ * Use to replace a `TxSubscriptionRef` value while returning the previous value
+ * and publishing the update to subscribers.
  *
  * **Example** (Getting and setting atomically)
  *
@@ -506,7 +513,8 @@ export const getAndSet: {
    *
    * **When to use**
    *
-   * Use to replace the value while returning the previous value.
+   * Use to replace a `TxSubscriptionRef` value while returning the previous value
+   * and publishing the update to subscribers.
    *
    * **Example** (Getting and setting atomically)
    *
@@ -534,7 +542,8 @@ export const getAndSet: {
    *
    * **When to use**
    *
-   * Use to replace the value while returning the previous value.
+   * Use to replace a `TxSubscriptionRef` value while returning the previous value
+   * and publishing the update to subscribers.
    *
    * **Example** (Getting and setting atomically)
    *
@@ -567,7 +576,8 @@ export const getAndSet: {
  *
  * **When to use**
  *
- * Use to derive and publish a new value while returning the previous value.
+ * Use to derive and publish a new `TxSubscriptionRef` value while returning the
+ * previous value.
  *
  * **Example** (Getting and updating atomically)
  *
@@ -595,7 +605,8 @@ export const getAndUpdate: {
    *
    * **When to use**
    *
-   * Use to derive and publish a new value while returning the previous value.
+   * Use to derive and publish a new `TxSubscriptionRef` value while returning the
+   * previous value.
    *
    * **Example** (Getting and updating atomically)
    *
@@ -623,7 +634,8 @@ export const getAndUpdate: {
    *
    * **When to use**
    *
-   * Use to derive and publish a new value while returning the previous value.
+   * Use to derive and publish a new `TxSubscriptionRef` value while returning the
+   * previous value.
    *
    * **Example** (Getting and updating atomically)
    *
@@ -657,7 +669,8 @@ export const getAndUpdate: {
  *
  * **When to use**
  *
- * Use to derive and publish a new value while returning that new value.
+ * Use to derive and publish a new `TxSubscriptionRef` value while returning
+ * that new value.
  *
  * **Example** (Updating and reading atomically)
  *
@@ -684,7 +697,8 @@ export const updateAndGet: {
    *
    * **When to use**
    *
-   * Use to derive and publish a new value while returning that new value.
+   * Use to derive and publish a new `TxSubscriptionRef` value while returning
+   * that new value.
    *
    * **Example** (Updating and reading atomically)
    *
@@ -711,7 +725,8 @@ export const updateAndGet: {
    *
    * **When to use**
    *
-   * Use to derive and publish a new value while returning that new value.
+   * Use to derive and publish a new `TxSubscriptionRef` value while returning
+   * that new value.
    *
    * **Example** (Updating and reading atomically)
    *
@@ -751,7 +766,8 @@ export const updateAndGet: {
  *
  * **When to use**
  *
- * Use to subscribe to committed changes through a scoped transactional queue.
+ * Use to subscribe to `TxSubscriptionRef` committed changes through a scoped
+ * transactional queue.
  *
  * **Example** (Subscribing to changes)
  *
@@ -801,7 +817,7 @@ export const changes = <A>(
  *
  * **When to use**
  *
- * Use to consume committed changes as a `Stream`.
+ * Use to consume `TxSubscriptionRef` committed changes as a `Stream`.
  *
  * **Example** (Streaming changes)
  *

package/src/Types.ts

@@ -43,8 +43,6 @@
  *
  * - {@link TupleOf} with a non-literal `number` (e.g. `TupleOf<number, string>`)
  *   degrades to `Array<string>`.
- * - {@link MergeRecord} is an alias for {@link MergeLeft}; prefer
- *   {@link MergeLeft} or {@link MergeRight} for clarity.
  * - {@link NoInfer} uses the `[A][A extends any ? 0 : never]` trick, not the
  *   built-in `NoInfer` from TypeScript 5.4+.
  * - {@link DeepMutable} recurses into `Map`, `Set`, arrays, and objects but
@@ -168,7 +166,8 @@ export type Tags<E> = E extends { readonly _tag: string } ? E["_tag"] : never
  *
  * **When to use**
  *
- * Use to narrow a union by removing a specific variant.
+ * Use to remove tagged-union members whose `_tag` matches a specific value in
+ * type-level code.
  *
  * **Details**
  *
@@ -201,7 +200,8 @@ export type ExcludeTag<E, K extends string> = Exclude<E, { readonly _tag: K }>
  *
  * **When to use**
  *
- * Use to narrow a union down to a single variant.
+ * Use to select tagged-union members whose `_tag` matches a specific value in
+ * type-level code.
  *
  * **Details**
  *
@@ -358,7 +358,8 @@ export type EqualsWith<A, B, Y, N> = (<T>() => T extends A ? 1 : 2) extends (<T>
  *
  * **When to use**
  *
- * Use to conditionally branch based on the presence of keys in a type.
+ * Use to branch type-level logic when at least one key from a candidate key set
+ * exists on an object type.
  *
  * **Details**
  *
@@ -406,7 +407,6 @@ export type Has<A, Key extends string> = (Key extends infer K ? K extends keyof
  * ```
  *
  * @see {@link MergeRight}
- * @see {@link MergeRecord}
  * @see {@link Simplify}
  *
  * @category models
@@ -451,35 +451,6 @@ export type MergeRight<Target, Source> = Simplify<
   }
 >
 
-/**
- * Alias for {@link MergeLeft}. Merges two object types where keys from
- * `Source` take precedence on conflict.
- *
- * **When to use**
- *
- * Use when prefer {@link MergeLeft} or {@link MergeRight} for clarity about which
- * side wins.
- *
- * **Example** (Merging records)
- *
- * ```ts
- * import type { Types } from "effect"
- *
- * type Result = Types.MergeRecord<
- *   { a: number; b: number },
- *   { a: string; c: boolean }
- * >
- * // { a: number; b: number; c: boolean }
- * ```
- *
- * @see {@link MergeLeft}
- * @see {@link MergeRight}
- *
- * @category models
- * @since 2.0.0
- */
-export type MergeRecord<Source, Target> = MergeLeft<Source, Target>
-
 /**
  * Describes the concurrency level for Effect operations that run multiple
  * effects.
@@ -963,8 +934,8 @@ export type IsUnion<T> = [T] extends [UnionToIntersection<T>] ? false : true
  *
  * **When to use**
  *
- * Use with the nested error pattern where errors wrap sub-errors in a `reason`
- * field.
+ * Use when an error type stores nested sub-errors in a `reason` field and you
+ * need that field's full union type as a standalone type.
  *
  * **Details**
  *
@@ -1033,7 +1004,8 @@ export type ReasonTags<E> = E extends { readonly reason: { readonly _tag: string
  *
  * **When to use**
  *
- * Use to extract only the matching reason variant from a nested error type.
+ * Use when you need the nested reason variant type itself, selected by `_tag`,
+ * rather than the enclosing error type.
  *
  * **Details**
  *
@@ -1147,7 +1119,8 @@ export type OmitReason<E, K extends string> = E extends { readonly reason: infer
  *
  * **When to use**
  *
- * Use to remove a handled reason variant from an error's reason union.
+ * Use when you need the remaining nested reason union type after removing
+ * variants handled by `_tag`, rather than the enclosing error type.
  *
  * **Details**
  *

package/src/UndefinedOr.ts

@@ -179,8 +179,8 @@ export const match: {
  *
  * **When to use**
  *
- * Use when fail-fast unwrapping of an `A | undefined` value is appropriate and
- * callers need to provide the thrown error for the undefined case.
+ * Use when you need fail-fast unwrapping of an `A | undefined` value and want
+ * to provide the thrown error for the undefined case.
  *
  * **Details**
  *
@@ -200,8 +200,8 @@ export const getOrThrowWith: {
    *
    * **When to use**
    *
-   * Use when fail-fast unwrapping of an `A | undefined` value is appropriate and
-   * callers need to provide the thrown error for the undefined case.
+   * Use when you need fail-fast unwrapping of an `A | undefined` value and want
+   * to provide the thrown error for the undefined case.
    *
    * **Details**
    *
@@ -221,8 +221,8 @@ export const getOrThrowWith: {
    *
    * **When to use**
    *
-   * Use when fail-fast unwrapping of an `A | undefined` value is appropriate and
-   * callers need to provide the thrown error for the undefined case.
+   * Use when you need fail-fast unwrapping of an `A | undefined` value and want
+   * to provide the thrown error for the undefined case.
    *
    * **Details**
    *
@@ -249,7 +249,7 @@ export const getOrThrowWith: {
  *
  * **When to use**
  *
- * Use when a value should already be defined at this point and throwing a
+ * Use when you need to unwrap a value that should already be defined and a
  * generic missing-value `Error` is acceptable.
  *
  * **Details**
@@ -301,16 +301,17 @@ export const liftThrowable = <A extends ReadonlyArray<unknown>, B>(
  *
  * **When to use**
  *
- * Use to take the first available value like a fallback chain, combining values
- * only when both operands are present.
+ * Use when you need to reduce values that may be `undefined`, keeping the
+ * first defined value as a fallback and combining only when both operands are
+ * defined.
  *
  * **Details**
  *
- * - `undefined` + `undefined` -> `undefined`
- * - `a` + `undefined` -> `a` (first value wins)
- * - `undefined` + `b` -> `b` (second value wins)
- * - `a` + `b` -> `combiner.combine(a, b)`
- * - Initial value is `undefined`
+ * Combining `undefined` with `undefined` returns `undefined`. Combining a
+ * defined value with `undefined` keeps the defined value, so the first defined
+ * value wins when only one side is present. When both values are defined, they
+ * are combined with `combiner.combine`. The reducer's initial value is
+ * `undefined`.
  *
  * @category constructors
  * @since 4.0.0

package/src/Unify.ts

@@ -79,8 +79,8 @@ export type unifySymbol = typeof unifySymbol
  *
  * **When to use**
  *
- * Use with `unifySymbol` to expose the source type that unification should read
- * from a protocol-enabled data type.
+ * Use when you need a type-level protocol key that exposes the source type
+ * read by `Unify` from a protocol-enabled data type.
  *
  * **Details**
  *
@@ -289,7 +289,7 @@ export type Unify<A> = Values<
  *
  * @see {@link Unify} for the type-level normalization applied by this helper
  *
- * @category utils
+ * @category utility types
  * @since 2.0.0
  */
 export const unify: {
@@ -334,7 +334,7 @@ export const unify: {
    *
    * @see {@link Unify} for the type-level normalization applied by this helper
    *
-   * @category utils
+   * @category utility types
    * @since 2.0.0
    */
   <
@@ -388,7 +388,7 @@ export const unify: {
    *
    * @see {@link Unify} for the type-level normalization applied by this helper
    *
-   * @category utils
+   * @category utility types
    * @since 2.0.0
    */
   <
@@ -441,7 +441,7 @@ export const unify: {
    *
    * @see {@link Unify} for the type-level normalization applied by this helper
    *
-   * @category utils
+   * @category utility types
    * @since 2.0.0
    */
   <
@@ -491,7 +491,7 @@ export const unify: {
    *
    * @see {@link Unify} for the type-level normalization applied by this helper
    *
-   * @category utils
+   * @category utility types
    * @since 2.0.0
    */
   <
@@ -540,7 +540,7 @@ export const unify: {
    *
    * @see {@link Unify} for the type-level normalization applied by this helper
    *
-   * @category utils
+   * @category utility types
    * @since 2.0.0
    */
   <
@@ -588,7 +588,7 @@ export const unify: {
    *
    * @see {@link Unify} for the type-level normalization applied by this helper
    *
-   * @category utils
+   * @category utility types
    * @since 2.0.0
    */
   <T>(x: T): Unify<T>

package/src/internal/schema/annotations.ts

@@ -1,15 +1,15 @@
 import { memoize } from "../../Function.ts"
 import type * as Schema from "../../Schema.ts"
-import type * as AST from "../../SchemaAST.ts"
+import type * as SchemaAST from "../../SchemaAST.ts"
 
 /** @internal */
-export function resolve(ast: AST.AST): Schema.Annotations.Annotations | undefined {
+export function resolve(ast: SchemaAST.AST): Schema.Annotations.Annotations | undefined {
   return ast.checks ? ast.checks[ast.checks.length - 1].annotations : ast.annotations
 }
 
 /** @internal */
 export function resolveAt<A>(key: string) {
-  return (ast: AST.AST): A | undefined => resolve(ast)?.[key] as A | undefined
+  return (ast: SchemaAST.AST): A | undefined => resolve(ast)?.[key] as A | undefined
 }
 
 /** @internal */
@@ -25,7 +25,7 @@ export const resolveDescription = resolveAt<string>("description")
 export const resolveBrands = resolveAt<ReadonlyArray<string>>("brands")
 
 /** @internal */
-export const getExpected = memoize((ast: AST.AST): string => {
+export const getExpected = memoize((ast: SchemaAST.AST): string => {
   const identifier = resolveIdentifier(ast)
   if (typeof identifier === "string") return identifier
   return ast.getExpected(getExpected)

package/src/internal/schema/arbitrary.ts

@@ -6,17 +6,17 @@ import * as Number from "../../Number.ts"
 import * as Option from "../../Option.ts"
 import * as Predicate from "../../Predicate.ts"
 import type * as Schema from "../../Schema.ts"
-import * as AST from "../../SchemaAST.ts"
+import * as SchemaAST from "../../SchemaAST.ts"
 import * as Struct from "../../Struct.ts"
 import type * as FastCheck from "../../testing/FastCheck.ts"
 import * as UndefinedOr from "../../UndefinedOr.ts"
 import { errorWithPath } from "../errors.ts"
 import * as InternalAnnotations from "./annotations.ts"
 
-const arbitraryMemoMap = new WeakMap<AST.AST, LazyArbitraryWithContext<any>>()
+const arbitraryMemoMap = new WeakMap<SchemaAST.AST, LazyArbitraryWithContext<any>>()
 
-function applyChecks(ast: AST.AST, filters: Array<AST.Filter<any>>, arbitrary: FastCheck.Arbitrary<any>) {
-  return filters.map((filter) => (a: any) => filter.run(a, ast, AST.defaultParseOptions) === undefined).reduce(
+function applyChecks(ast: SchemaAST.AST, filters: Array<SchemaAST.Filter<any>>, arbitrary: FastCheck.Arbitrary<any>) {
+  return filters.map((filter) => (a: any) => filter.run(a, ast, SchemaAST.defaultParseOptions) === undefined).reduce(
     (acc, filter) => acc.filter(filter),
     arbitrary
   )
@@ -99,7 +99,7 @@ function isConstraintKey(key: string): key is keyof Schema.Annotations.ToArbitra
 
 /** @internal */
 export function constraintContext(
-  filters: Array<AST.Filter<any>>
+  filters: Array<SchemaAST.Filter<any>>
 ): (ctx: Schema.Annotations.ToArbitrary.Context) => Schema.Annotations.ToArbitrary.Context {
   const annotations = filters.map((filter) => filter.annotations?.toArbitraryConstraint).filter(
     Predicate.isNotUndefined
@@ -140,7 +140,7 @@ interface LazyArbitraryWithContext<T> {
 }
 
 /** @internal */
-export function getFilters(checks: AST.Checks | undefined): Array<AST.Filter<any>> {
+export function getFilters(checks: SchemaAST.Checks | undefined): Array<SchemaAST.Filter<any>> {
   if (checks) {
     return checks.flatMap((check) => {
       switch (check._tag) {
@@ -155,11 +155,11 @@ export function getFilters(checks: AST.Checks | undefined): Array<AST.Filter<any
 }
 
 /** @internal */
-export const memoized = memoize((ast: AST.AST): LazyArbitraryWithContext<any> => {
+export const memoized = memoize((ast: SchemaAST.AST): LazyArbitraryWithContext<any> => {
   return recur(ast, [])
 })
 
-function recur(ast: AST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWithContext<any> {
+function recur(ast: SchemaAST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWithContext<any> {
   // ---------------------------------------------
   // handle Override annotation
   // ---------------------------------------------
@@ -167,7 +167,7 @@ function recur(ast: AST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWit
     | Schema.Annotations.ToArbitrary.Declaration<any, ReadonlyArray<Schema.Top>>
     | undefined
   if (annotation) {
-    const typeParameters = AST.isDeclaration(ast) ? ast.typeParameters.map((tp) => recur(tp, path)) : []
+    const typeParameters = SchemaAST.isDeclaration(ast) ? ast.typeParameters.map((tp) => recur(tp, path)) : []
     const filters = getFilters(ast.checks)
     const f = constraintContext(filters)
     return (fc, ctx) =>
@@ -180,13 +180,13 @@ function recur(ast: AST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWit
   if (ast.checks) {
     const filters = getFilters(ast.checks)
     const f = constraintContext(filters)
-    const lawc = recur(AST.replaceChecks(ast, undefined), path)
+    const lawc = recur(SchemaAST.replaceChecks(ast, undefined), path)
     return (fc, ctx) => applyChecks(ast, filters, lawc(fc, f(ctx)))
   }
   return base(ast, path)
 }
 
-function base(ast: AST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWithContext<any> {
+function base(ast: SchemaAST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWithContext<any> {
   switch (ast._tag) {
     case "Never":
     case "Declaration":
@@ -229,9 +229,9 @@ function base(ast: AST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWith
     case "ObjectKeyword":
       return (fc) => fc.oneof(fc.object(), fc.array(fc.anything()))
     case "Enum":
-      return recur(AST.enumsToLiterals(ast), path)
+      return recur(SchemaAST.enumsToLiterals(ast), path)
     case "TemplateLiteral":
-      return (fc) => fc.stringMatching(AST.getTemplateLiteralRegExp(ast))
+      return (fc) => fc.stringMatching(SchemaAST.getTemplateLiteralRegExp(ast))
     case "Arrays":
       return (fc, ctx) => {
         const reset = resetContext(ctx)
@@ -240,7 +240,7 @@ function base(ast: AST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWith
         // ---------------------------------------------
         const elements: Array<FastCheck.Arbitrary<Option.Option<any>>> = ast.elements.map((e, i) => {
           const out = recur(e, [...path, i])(fc, reset)
-          if (!AST.isOptional(e)) {
+          if (!SchemaAST.isOptional(e)) {
             return out.map(Option.some)
           }
           return out.chain((a) => fc.boolean().map((b) => b ? Option.some(a) : Option.none()))
@@ -285,7 +285,7 @@ function base(ast: AST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWith
         const requiredKeys: Array<PropertyKey> = []
         for (const ps of ast.propertySignatures) {
           const name = ps.name
-          if (!AST.isOptional(ps.type)) {
+          if (!SchemaAST.isOptional(ps.type)) {
             requiredKeys.push(name)
           }
           pss[name] = recur(ps.type, [...path, name])(fc, reset)
@@ -315,7 +315,7 @@ function base(ast: AST.AST, path: ReadonlyArray<PropertyKey>): LazyArbitraryWith
 
       if (memo) return memo
 
-      const get = AST.memoizeThunk(() => recur(ast.thunk(), path))
+      const get = SchemaAST.memoizeThunk(() => recur(ast.thunk(), path))
       const out: LazyArbitraryWithContext<any> = (fc, ctx) =>
         fc.constant(null).chain(() => get()(fc, { ...ctx, isSuspend: true }))
 

package/src/internal/schema/equivalence.ts

@@ -3,17 +3,17 @@ import * as Equivalence from "../../Equivalence.ts"
 import { memoize } from "../../Function.ts"
 import * as Predicate from "../../Predicate.ts"
 import type * as Schema from "../../Schema.ts"
-import * as AST from "../../SchemaAST.ts"
-import * as Parser from "../../SchemaParser.ts"
+import * as SchemaAST from "../../SchemaAST.ts"
+import * as SchemaParser from "../../SchemaParser.ts"
 import { errorWithPath } from "../errors.ts"
 import * as InternalAnnotations from "./annotations.ts"
 
 /** @internal */
-export const toEquivalence = memoize((ast: AST.AST): Equivalence.Equivalence<any> => {
+export const toEquivalence = memoize((ast: SchemaAST.AST): Equivalence.Equivalence<any> => {
   return recur(ast, [])
 })
 
-function recur(ast: AST.AST, path: ReadonlyArray<PropertyKey>): Equivalence.Equivalence<any> {
+function recur(ast: SchemaAST.AST, path: ReadonlyArray<PropertyKey>): Equivalence.Equivalence<any> {
   // ---------------------------------------------
   // handle annotations
   // ---------------------------------------------
@@ -21,7 +21,7 @@ function recur(ast: AST.AST, path: ReadonlyArray<PropertyKey>): Equivalence.Equi
     | Schema.Annotations.ToEquivalence.Declaration<any, ReadonlyArray<any>>
     | undefined
   if (annotation) {
-    return annotation(AST.isDeclaration(ast) ? ast.typeParameters.map((tp) => recur(tp, path)) : [])
+    return annotation(SchemaAST.isDeclaration(ast) ? ast.typeParameters.map((tp) => recur(tp, path)) : [])
   }
   switch (ast._tag) {
     case "Never":
@@ -105,7 +105,7 @@ function recur(ast: AST.AST, path: ReadonlyArray<PropertyKey>): Equivalence.Equi
           const name = ps.name
           const aHas = Object.hasOwn(a, name)
           const bHas = Object.hasOwn(b, name)
-          if (AST.isOptional(ps.type)) {
+          if (SchemaAST.isOptional(ps.type)) {
             if (aHas !== bHas) {
               return false
             }
@@ -119,8 +119,8 @@ function recur(ast: AST.AST, path: ReadonlyArray<PropertyKey>): Equivalence.Equi
         // ---------------------------------------------
         for (let i = 0; i < indexSignatures.length; i++) {
           const is = ast.indexSignatures[i]
-          const aKeys = AST.getIndexSignatureKeys(a, is.parameter)
-          const bKeys = AST.getIndexSignatureKeys(b, is.parameter)
+          const aKeys = SchemaAST.getIndexSignatureKeys(a, is.parameter)
+          const bKeys = SchemaAST.getIndexSignatureKeys(b, is.parameter)
 
           if (aKeys.length !== bKeys.length) return false
 
@@ -136,8 +136,8 @@ function recur(ast: AST.AST, path: ReadonlyArray<PropertyKey>): Equivalence.Equi
     }
     case "Union":
       return Equivalence.make((a, b) => {
-        const candidates = AST.getCandidates(a, ast.types)
-        const types = candidates.map(Parser._is)
+        const candidates = SchemaAST.getCandidates(a, ast.types)
+        const types = candidates.map(SchemaParser._is)
         for (let i = 0; i < candidates.length; i++) {
           const is = types[i]
           if (is(a) && is(b)) {
@@ -147,7 +147,7 @@ function recur(ast: AST.AST, path: ReadonlyArray<PropertyKey>): Equivalence.Equi
         return false
       })
     case "Suspend": {
-      const get = AST.memoizeThunk(() => recur(ast.thunk(), path))
+      const get = SchemaAST.memoizeThunk(() => recur(ast.thunk(), path))
       return Equivalence.make((a, b) => get()(a, b))
     }
   }