effect-app 4.0.0-beta.33 → 4.0.0-beta.331

package/src/Schema/phoneNumber.ts

@@ -2,10 +2,9 @@ import type { Refinement } from "effect-app/Function"
 import { isValidPhone } from "effect-app/validation"
 import * as S from "effect/Schema"
 import type { Simplify } from "effect/Types"
-import { withDefaultMake } from "./ext.js"
-import { Numbers } from "./FastCheck.js"
-import type { B } from "./schema.js"
-import type { NonEmptyStringBrand } from "./strings.js"
+import { withDefaultMake } from "./ext.ts"
+import type { B } from "./schema.ts"
+import type { NonEmptyStringBrand } from "./strings.ts"
 
 export interface PhoneNumberBrand extends Simplify<B.Brand<"PhoneNumber"> & NonEmptyStringBrand> {}
 export type PhoneNumber = string & PhoneNumberBrand
@@ -13,14 +12,19 @@ export type PhoneNumber = string & PhoneNumberBrand
 export const PhoneNumber = S
   .String
   .pipe(
-    S.refine(isValidPhone as Refinement<string, PhoneNumber>, {
-      identifier: "PhoneNumber",
+    S.annotate({
       title: "PhoneNumber",
       description: "a phone number with at least 7 digits",
-      jsonSchema: { format: "phone" }
+      format: "phone"
     }),
-    S.annotate({
-      toArbitrary: () => (fc) => Numbers(7, 10)(fc).map((_) => _ as PhoneNumber)
+    S.refine(isValidPhone as Refinement<string, PhoneNumber>, {
+      identifier: "PhoneNumber",
+      description: "a phone number with at least 7 digits",
+      jsonSchema: { format: "phone" },
+      // Native Arbitrary cannot invert `isValidPhone`; steer sampling to digit-only numbers (>= 7 digits).
+      arbitraryConstraint: {
+        patterns: [{ source: "^\\+?[1-9][0-9]{6,11}$", flags: "" }]
+      }
     }),
     withDefaultMake
   )

package/src/Schema/schema.ts

@@ -1,5 +1,5 @@
 import * as B from "effect/Brand"
-import * as AST from "effect/SchemaAST"
 import * as P from "effect/SchemaParser"
+import * as AST from "../SchemaAST.ts"
 
 export { AST, B, P }

package/src/Schema/strings.ts

@@ -1,17 +1,20 @@
 import type * as B from "effect/Brand"
 import * as S from "effect/Schema"
 import type { Simplify } from "effect/Types"
-import { fromBrand, nominal } from "./brand.js"
-import { withDefaultMake } from "./ext.js"
+import type * as SchemaAST from "../SchemaAST.ts"
+import { type BrandedSchema, fromBrand, nominal } from "./brand.ts"
+import { withDefaultMake } from "./ext.ts"
 
 export type NonEmptyStringBrand = B.Brand<"NonEmptyString">
 export type NonEmptyString = string & NonEmptyStringBrand
-export const NonEmptyString = S
+export interface NonEmptyStringSchema extends BrandedSchema<S.NonEmptyString, NonEmptyString> {
+  (i: string, options?: SchemaAST.ParseOptions): NonEmptyString
+}
+export const NonEmptyString: NonEmptyStringSchema = S
   .NonEmptyString
   .pipe(
-    fromBrand(nominal<NonEmptyString>(), {
+    fromBrand<NonEmptyString>(nominal<NonEmptyString>(), {
       identifier: "NonEmptyString",
-      title: "NonEmptyString",
       jsonSchema: {}
     }),
     withDefaultMake
@@ -19,13 +22,15 @@ export const NonEmptyString = S
 
 export interface NonEmptyString64kBrand extends Simplify<B.Brand<"NonEmptyString64k"> & NonEmptyStringBrand> {}
 export type NonEmptyString64k = string & NonEmptyString64kBrand
-export const NonEmptyString64k = S
+export interface NonEmptyString64kSchema extends BrandedSchema<S.NonEmptyString, NonEmptyString64k> {
+  (i: string, options?: SchemaAST.ParseOptions): NonEmptyString64k
+}
+export const NonEmptyString64k: NonEmptyString64kSchema = S
   .NonEmptyString
   .pipe(
     S.check(S.isMaxLength(64 * 1024)),
-    fromBrand(nominal<NonEmptyString64k>(), {
+    fromBrand<NonEmptyString64k>(nominal<NonEmptyString64k>(), {
       identifier: "NonEmptyString64k",
-      title: "NonEmptyString64k",
       jsonSchema: {}
     }),
     withDefaultMake
@@ -33,13 +38,15 @@ export const NonEmptyString64k = S
 
 export interface NonEmptyString2kBrand extends Simplify<B.Brand<"NonEmptyString2k"> & NonEmptyString64kBrand> {}
 export type NonEmptyString2k = string & NonEmptyString2kBrand
-export const NonEmptyString2k = S
+export interface NonEmptyString2kSchema extends BrandedSchema<S.NonEmptyString, NonEmptyString2k> {
+  (i: string, options?: SchemaAST.ParseOptions): NonEmptyString2k
+}
+export const NonEmptyString2k: NonEmptyString2kSchema = S
   .NonEmptyString
   .pipe(
     S.check(S.isMaxLength(2 * 1024)),
-    fromBrand(nominal<NonEmptyString2k>(), {
+    fromBrand<NonEmptyString2k>(nominal<NonEmptyString2k>(), {
       identifier: "NonEmptyString2k",
-      title: "NonEmptyString2k",
       jsonSchema: {}
     }),
     withDefaultMake
@@ -47,13 +54,15 @@ export const NonEmptyString2k = S
 
 export interface NonEmptyString255Brand extends Simplify<B.Brand<"NonEmptyString255"> & NonEmptyString2kBrand> {}
 export type NonEmptyString255 = string & NonEmptyString255Brand
-export const NonEmptyString255 = S
+export interface NonEmptyString255Schema extends BrandedSchema<S.NonEmptyString, NonEmptyString255> {
+  (i: string, options?: SchemaAST.ParseOptions): NonEmptyString255
+}
+export const NonEmptyString255: NonEmptyString255Schema = S
   .NonEmptyString
   .pipe(
     S.check(S.isMaxLength(255)),
-    fromBrand(nominal<NonEmptyString255>(), {
+    fromBrand<NonEmptyString255>(nominal<NonEmptyString255>(), {
       identifier: "NonEmptyString255",
-      title: "NonEmptyString255",
       jsonSchema: {}
     }),
     withDefaultMake

package/src/Schema.ts

@@ -1,36 +1,348 @@
-import { SchemaAST, type Tracer } from "effect"
 import * as S from "effect/Schema"
-import type { NonEmptyReadonlyArray } from "./Array.js"
-import { fakerArb } from "./faker.js"
-import { Email as EmailT, type Email as EmailType } from "./Schema/email.js"
-import { withDefaultMake } from "./Schema/ext.js"
-import { PhoneNumber as PhoneNumberT, type PhoneNumber as PhoneNumberType } from "./Schema/phoneNumber.js"
-import { extendM } from "./utils.js"
+import { type Simplify } from "effect/Struct"
+import type * as Tracer from "effect/Tracer"
+import type { RequiredKeys } from "effect/Types"
+import type { Arbitrary as FastCheckArbitrary } from "fast-check"
+import type { NonEmptyReadonlyArray } from "./Array.ts"
+import { Email as EmailT, type Email as EmailType } from "./Schema/email.ts"
+import { concurrencyUnbounded, withDefaultMake, withDefaultParseOptions } from "./Schema/ext.ts"
+import type { FC } from "./Schema/FastCheck.ts"
+import { PhoneNumber as PhoneNumberT, type PhoneNumber as PhoneNumberType } from "./Schema/phoneNumber.ts"
+import { type AST } from "./Schema/schema.ts"
+import * as SchemaAST from "./SchemaAST.ts"
+import { copy, extendM, type StructuralCopyOrigin } from "./utils.ts"
+
+// ---------------------------------------------------------------------------
+// Default helpers — re-exported from effect/Schema
+//
+// The five helpers below are surfaced explicitly so the (important) policy
+// around them lives next to the export. See also the file-level note in
+// `./Schema/ext.ts` and the documented wrappers in
+// `./Schema/ext.ts`, `./Schema/numbers.ts`, `./Schema/moreStrings.ts`,
+// and `./ids.ts`.
+//
+// **Construction-only**: `withConstructorDefault` fills the field when it
+// is omitted from `.make(...)` input. It is NOT applied during decode, so
+// it CANNOT be used to just-in-time migrate database fields. A stored
+// record missing the field will still fail to decode.
+//
+// **`withDecodingDefault*` is discouraged**: a missing field in persisted
+// data is just as likely to be data corruption as it is an old-shape
+// document; silently substituting a default hides the problem and can
+// poison downstream aggregates. Prefer an explicit, preferably versioned
+// migration of database data over shoving missing fields under the rug.
+// ---------------------------------------------------------------------------
+
+/**
+ * Attach a default value used **only** when constructing a value (e.g. via
+ * `.make(...)` or struct constructors) and the field is omitted from input.
+ *
+ * **Not applied during decode.** Decoding a payload that is missing the
+ * field will still raise a parse error. Do **not** rely on this to migrate
+ * database fields just-in-time — see the section header above.
+ *
+ * @see {@link withDecodingDefault} / {@link withDecodingDefaultType} —
+ *   decode-time variants (discouraged for persisted data; use explicit,
+ *   versioned migrations instead).
+ */
+export { withConstructorDefault } from "effect/Schema"
+
+/**
+ * Attach a default value used during decode when the field's `Encoded` value
+ * is missing **or** `undefined`. The default is specified as an `Encoded`
+ * value and threaded through the schema's decode step.
+ *
+ * **Discouraged for persisted data.** A missing field in a stored record is
+ * just as likely to be data corruption as it is an old-shape document;
+ * silently substituting a default hides the problem. Prefer an explicit,
+ * preferably versioned migration of database data — see the section header
+ * above.
+ *
+ * @see {@link withDecodingDefaultKey} — key-absent-only variant
+ * @see {@link withDecodingDefaultType} — `Type`-side variant
+ * @see {@link withConstructorDefault} — for `.make(...)`-time defaults
+ */
+export { withDecodingDefault } from "effect/Schema"
+
+/**
+ * Attach a default value used during decode when the field **key is absent**
+ * (note: not when present and `undefined`). The default is an `Encoded`
+ * value.
+ *
+ * **Discouraged for persisted data** — same reasoning as
+ * {@link withDecodingDefault}. Use explicit, preferably versioned migrations
+ * over decode-time fallbacks.
+ *
+ * @see {@link withDecodingDefault} — value-absent-or-undefined variant
+ * @see {@link withDecodingDefaultTypeKey} — `Type`-side variant
+ * @see {@link withConstructorDefault} — for `.make(...)`-time defaults
+ */
+export { withDecodingDefaultKey } from "effect/Schema"
+
+/**
+ * Attach a default value used during decode when the field is missing **or**
+ * `undefined`. The default is specified as a `Type` value (i.e. on the
+ * decoded side).
+ *
+ * **Discouraged for persisted data** — same reasoning as
+ * {@link withDecodingDefault}. Use explicit, preferably versioned migrations
+ * over decode-time fallbacks.
+ *
+ * @see {@link withDecodingDefault} — `Encoded`-side variant
+ * @see {@link withDecodingDefaultTypeKey} — key-absent-only variant
+ * @see {@link withConstructorDefault} — for `.make(...)`-time defaults
+ */
+export { withDecodingDefaultType } from "effect/Schema"
+
+/**
+ * Attach a default value used during decode when the field **key is absent**
+ * (note: not when present and `undefined`). The default is a `Type` value.
+ *
+ * **Discouraged for persisted data** — same reasoning as
+ * {@link withDecodingDefault}. Use explicit, preferably versioned migrations
+ * over decode-time fallbacks.
+ *
+ * @see {@link withDecodingDefaultKey} — `Encoded`-side variant
+ * @see {@link withDecodingDefaultType} — value-absent-or-undefined variant
+ * @see {@link withConstructorDefault} — for `.make(...)`-time defaults
+ */
+export { withDecodingDefaultTypeKey } from "effect/Schema"
 
 export * from "effect/Schema"
-// v4: TaggedError renamed to TaggedErrorClass
-export { TaggedErrorClass as TaggedError } from "effect/Schema"
 
-export * from "./Schema/Class.js"
-export { Class, TaggedClass } from "./Schema/Class.js"
+export * from "./Schema/Class.ts"
+export { Class, ErrorClass, Opaque, OpaqueErrorFacadeClass, OpaqueFacade, OpaqueShape, OpaqueType, TaggedClass, TaggedErrorClass } from "./Schema/Class.ts"
 
-export { fromBrand, nominal } from "./Schema/brand.js"
-export { Array, Boolean, Date, Finite, Literal, Map, NullOr, Number, ReadonlyMap, ReadonlySet } from "./Schema/ext.js"
-export { Int, NonNegativeInt } from "./Schema/numbers.js"
+export { fromBrand, nominal } from "./Schema/brand.ts"
+export { Array, Boolean, Date, DateFromString, DateValid, Finite, Literals, NullOr, Number, ReadonlyMap, ReadonlySet } from "./Schema/ext.ts"
+export { Int, NonNegativeInt } from "./Schema/numbers.ts"
 
-export * from "./Schema/email.js"
-export * from "./Schema/ext.js"
-export * from "./Schema/moreStrings.js"
-export * from "./Schema/numbers.js"
-export * from "./Schema/phoneNumber.js"
-export * from "./Schema/schema.js"
-export * from "./Schema/strings.js"
-export { NonEmptyString } from "./Schema/strings.js"
+export * from "./Schema/email.ts"
+export * from "./Schema/ext.ts"
+export * from "./Schema/moreStrings.ts"
+export * from "./Schema/numbers.ts"
+export * from "./Schema/phoneNumber.ts"
+export * from "./Schema/schema.ts"
+export * from "./Schema/SpecialJsonSchema.ts"
+export * from "./Schema/SpecialOpenApi.ts"
+export * from "./Schema/strings.ts"
+export { NonEmptyString } from "./Schema/strings.ts"
 
 export * as SchemaIssue from "effect/SchemaIssue"
-export * as SchemaParser from "effect/SchemaParser"
 
-export { Void as Void_ } from "effect/Schema"
+/** Fast-check generator factory previously exported as `Schema.Arbitrary`. */
+export type Arbitrary<T> = (fc: FC) => FastCheckArbitrary<T>
+
+export const decodeEffectConcurrently: typeof S.decodeEffect = withDefaultParseOptions(S.decodeEffect)
+export const decodeUnknownEffectConcurrently: typeof S.decodeUnknownEffect = withDefaultParseOptions(
+  S.decodeUnknownEffect
+)
+export * as SchemaParser from "./Schema/SchemaParser.ts"
+
+/**
+ * Schema for a TypeScript `void` return value — the canonical `Void` used
+ * across the app, including RPC success schemas. Accepts **any present value**
+ * at runtime and discards it to `undefined`, while keeping the decoded/encoded
+ * type as `void`. Use `S.Undefined` when the input must be exactly `undefined`.
+ */
+export interface Void extends S.Void {}
+export const Void: Void = S.Void
+
+// ---------------------------------------------------------------------------
+// Struct / NonEmptyArray / Record
+// ---------------------------------------------------------------------------
+
+export function Struct<const Fields extends S.Struct.Fields>(
+  fields: Fields
+): Struct<Fields> {
+  const result = S.Struct(fields).annotate(concurrencyUnbounded)
+  const allowVoidMake = (schema: any): any => {
+    // Normalize omitted input to an empty object so optional/default-only structs can be constructed with make().
+    const origMake: any = schema.make
+    const origMakeOption: any = schema.makeOption
+    const origMakeEffect: any = schema.makeEffect
+    schema.make = function(this: any, input: any, options?: any) {
+      return origMake.call(this, input === undefined ? {} : input, options)
+    }
+    schema.makeOption = function(this: any, input: any, options?: any) {
+      return origMakeOption.call(this, input === undefined ? {} : input, options)
+    }
+    schema.makeEffect = function(this: any, input: any, options?: any) {
+      return origMakeEffect.call(this, input === undefined ? {} : input, options)
+    }
+    return schema
+  }
+  // eslint-disable-next-line @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-assignment
+  const origMapFields: any = result.mapFields
+  // eslint-disable-next-line @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-assignment
+  const origAnnotate: any = result.annotate
+  // eslint-disable-next-line @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-assignment
+  const origAnnotateKey: any = result.annotateKey
+
+  const preserveCopyAndMethods = (schema: any): any => {
+    schema.copy = copy
+    schema.mapFields = function(this: any, f: any, options?: any) {
+      return (result as any).mapFields.call(this, f, options)
+    }
+    schema.annotate = function(this: any, annotations?: any) {
+      return (result as any).annotate.call(this, annotations)
+    }
+    schema.annotateKey = function(this: any, annotations?: any) {
+      return (result as any).annotateKey.call(this, annotations)
+    }
+    return allowVoidMake(schema)
+  }
+  ;(result as any).mapFields = function(this: any, f: any, options?: any) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    const mapped = origMapFields.call(this, f, options).annotate(concurrencyUnbounded)
+    return preserveCopyAndMethods(mapped)
+  }
+  ;(result as any).annotate = function(this: any, annotations?: any) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    const annotated = origAnnotate.call(this, annotations)
+    return preserveCopyAndMethods(annotated)
+  }
+  ;(result as any).annotateKey = function(this: any, annotations?: any) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    const annotated = origAnnotateKey.call(this, annotations)
+    return preserveCopyAndMethods(annotated)
+  }
+  ;(result as any).copy = copy
+  allowVoidMake(result)
+  return result as Struct<Fields>
+}
+
+export interface Struct<Fields extends S.Struct.Fields> extends
+  S.Bottom<
+    Struct.Type<Fields>,
+    Struct.Encoded<Fields>,
+    Struct.DecodingServices<Fields>,
+    Struct.EncodingServices<Fields>,
+    AST.Objects,
+    // Rebuild is what's returned from annotate etc
+    Struct<Fields>,
+    Struct.MakeIn<Fields>,
+    Struct.Iso<Fields>
+  >
+{
+  /**
+   * The field definitions of this struct. Spread them into a new struct to
+   * reuse fields across schemas.
+   *
+   * **Example** (Reusing fields across structs)
+   *
+   * ```ts
+   * import * as Schema from "effect/Schema"
+   *
+   * const Timestamped = Schema.Struct({
+   *   createdAt: Schema.Date,
+   *   updatedAt: Schema.Date
+   * })
+   *
+   * const User = Schema.Struct({
+   *   ...Timestamped.fields,
+   *   name: Schema.String,
+   *   email: Schema.String
+   * })
+   * ```
+   */
+  readonly fields: Fields
+  /**
+   * Returns a new struct with the fields modified by the provided function.
+   *
+   * **Options**
+   *
+   * - `unsafePreserveChecks` - if `true`, keep any `.check(...)` constraints
+   *   that were attached to the original union. Defaults to `false`.
+   *
+   *   **Warning**: This is an unsafe operation. Since `mapFields`
+   *   transformations change the schema type, the original refinement functions
+   *   may no longer be valid or safe to apply to the transformed schema. Only
+   *   use this option if you have verified that your refinements remain correct
+   *   after the transformation.
+   */
+  mapFields<To extends Struct.Fields>(
+    f: (fields: Fields) => To,
+    options?: {
+      readonly unsafePreserveChecks?: boolean | undefined
+    } | undefined
+  ): Struct<Simplify<Readonly<To>>>
+
+  // added copy
+  readonly copy: StructuralCopyOrigin<Struct.Type<Fields>>
+}
+
+export declare namespace Struct {
+  export type Fields = S.Struct.Fields
+  export type Type<F extends S.Struct.Fields> = S.Struct.Type<F>
+  export type Encoded<F extends S.Struct.Fields> = S.Struct.Encoded<F>
+  export type DecodingServices<F extends S.Struct.Fields> = S.Struct.DecodingServices<F>
+  export type EncodingServices<F extends S.Struct.Fields> = S.Struct.EncodingServices<F>
+  // changed; all optional allows void
+  export type MakeIn<F extends S.Struct.Fields> = RequiredKeys<S.Struct.MakeIn<F>> extends never
+    ? void | S.Struct.MakeIn<F>
+    : S.Struct.MakeIn<F>
+  export type Iso<F extends S.Struct.Fields> = S.Struct.Iso<F>
+}
+
+export type StructNestedEncodedError<T> = {
+  readonly _tag: "StructNestedEncodedError"
+  readonly message: "Expected a Struct schema or a schema with from.Encoded"
+  readonly schema: T
+}
+
+export type StructNestedEncoded<T> = T extends { fields: infer Fields extends S.Struct.Fields } ? Struct.Encoded<Fields>
+  : T extends { readonly from: { readonly Encoded: infer Encoded } } ? Encoded
+  : StructNestedEncodedError<T>
+
+export function NonEmptyArray<Value extends S.Top>(value: Value): S.NonEmptyArray<Value> {
+  return S.NonEmptyArray(value).annotate(concurrencyUnbounded)
+}
+
+export function TaggedStruct<const Tag extends SchemaAST.LiteralValue, const Fields extends S.Struct.Fields>(
+  value: Tag,
+  fields: Fields
+): TaggedStruct<Tag, Fields> {
+  return Struct({ _tag: S.tag(value), ...fields }) as any
+}
+export interface TaggedStruct<Tag extends SchemaAST.LiteralValue, Fields extends S.Struct.Fields>
+  extends Struct<{ readonly _tag: S.tag<Tag> } & Fields>
+{}
+export declare namespace TaggedStruct {
+  export type Fields = S.Struct.Fields
+  export type Type<Tag extends SchemaAST.LiteralValue, F extends S.Struct.Fields> = S.Struct.Type<
+    { readonly _tag: S.tag<Tag> } & F
+  >
+  export type Encoded<Tag extends SchemaAST.LiteralValue, F extends S.Struct.Fields> = S.Struct.Encoded<
+    { readonly _tag: S.tag<Tag> } & F
+  >
+  export type DecodingServices<Tag extends SchemaAST.LiteralValue, F extends S.Struct.Fields> =
+    S.Struct.DecodingServices<
+      { readonly _tag: S.tag<Tag> } & F
+    >
+  export type EncodingServices<Tag extends SchemaAST.LiteralValue, F extends S.Struct.Fields> =
+    S.Struct.EncodingServices<
+      { readonly _tag: S.tag<Tag> } & F
+    >
+  export type MakeIn<Tag extends SchemaAST.LiteralValue, F extends S.Struct.Fields> = S.Struct.MakeIn<
+    { readonly _tag: S.tag<Tag> } & F
+  >
+  export type Iso<Tag extends SchemaAST.LiteralValue, F extends S.Struct.Fields> = S.Struct.Iso<
+    { readonly _tag: S.tag<Tag> } & F
+  >
+}
+
+export function Record<Key extends S.Record.Key, Value extends S.Top>(
+  key: Key,
+  value: Value
+): S.$Record<Key, Value> {
+  return S.Record(key, value).annotate(concurrencyUnbounded)
+}
+export declare namespace Record {
+  export type Key = S.Record.Key
+  export type Type<K extends S.Record.Key, V extends S.Top> = S.Record.Type<K, V>
+  export type Encoded<K extends S.Record.Key, V extends S.Top> = S.Record.Encoded<K, V>
+}
 
 export const SpanId = Symbol()
 export type SpanId = typeof SpanId
@@ -39,29 +351,11 @@ export interface WithOptionalSpan {
   [SpanId]?: Tracer.Span
 }
 
-const makeEmail = S.decodeSync(EmailT as any) as (value: string) => EmailType
-const makePhoneNumber = S.decodeSync(PhoneNumberT as any) as (value: string) => PhoneNumberType
-
-export const Email = EmailT
-  .pipe(
-    S.annotate({
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      toArbitrary: () => (fc) => fakerArb((faker) => faker.internet.exampleEmail)(fc).map(makeEmail)
-    }),
-    withDefaultMake
-  )
+export const Email = EmailT.pipe(withDefaultMake)
 
 export type Email = EmailType
 
-export const PhoneNumber = PhoneNumberT
-  .pipe(
-    S.annotate({
-      toArbitrary: () => (fc) =>
-        // eslint-disable-next-line @typescript-eslint/unbound-method
-        fakerArb((faker) => faker.phone.number)(fc).map(makePhoneNumber)
-    }),
-    withDefaultMake
-  )
+export const PhoneNumber = PhoneNumberT.pipe(withDefaultMake)
 
 export type PhoneNumber = PhoneNumberType
 
@@ -125,13 +419,76 @@ type TaggedUnionTags<Members extends TaggedUnionMembers> = S.Literals<
   }
 >
 
+type TaggedPropertyKeys<A, Members extends TaggedUnionMembers> = {
+  [K in keyof A & string]: A[K] extends Members[number]["Type"] ? K : never
+}[keyof A & string]
+
+type PropertyGuardsFor<
+  Members extends TaggedUnionMembers,
+  K extends string,
+  A
+> =
+  & {
+    readonly [M in Members[number] as `is${M["Type"]["_tag"]}`]: (
+      target: A
+    ) => target is A & { readonly [P in K]: M["Type"] }
+  }
+  & {
+    readonly isAnyOf: <const Tags extends ReadonlyArray<Members[number]["Type"]["_tag"]>>(
+      tags: Tags
+    ) => (
+      target: A
+    ) => target is A & { readonly [P in K]: Extract<Members[number]["Type"], { readonly _tag: Tags[number] }> }
+  }
+
+type PropertyGuards<
+  Members extends TaggedUnionMembers,
+  K extends string
+> =
+  & {
+    readonly [M in Members[number] as `is${M["Type"]["_tag"]}`]: <
+      T extends { readonly [P in K]: Members[number]["Type"] }
+    >(target: T) => target is T & { readonly [P in K]: M["Type"] }
+  }
+  & {
+    readonly isAnyOf: <const Tags extends ReadonlyArray<Members[number]["Type"]["_tag"]>>(
+      tags: Tags
+    ) => <T extends { readonly [P in K]: Members[number]["Type"] }>(
+      target: T
+    ) => target is T & { readonly [P in K]: Extract<Members[number]["Type"], { readonly _tag: Tags[number] }> }
+  }
+
 type TaggedUnionWithTags<Members extends TaggedUnionMembers> = S.toTaggedUnion<"_tag", Members> & {
   readonly tags: TaggedUnionTags<Members>
+  readonly generateGuards: <K extends string>(property: K) => PropertyGuards<Members, K>
+  readonly generateGuardsFor: <A>() => <K extends TaggedPropertyKeys<A, Members>>(
+    property: K
+  ) => PropertyGuardsFor<Members, K, A>
 }
 
 const extendTaggedUnionWithTags = <Members extends TaggedUnionMembers>(
   schema: S.Union<Members>
-): TaggedUnionWithTags<Members> => extendM(schema.pipe(S.toTaggedUnion("_tag")), () => ({ tags: tags(schema.members) }))
+): TaggedUnionWithTags<Members> =>
+  extendM(schema.pipe(S.toTaggedUnion("_tag")), (tagged) => {
+    const makeGuards = (property: string) => {
+      const result: any = {}
+      const guards: Record<string, (u: unknown) => boolean> = tagged.guards
+      for (const tag of Object.keys(guards)) {
+        const guard = guards[tag]!
+        result[`is${tag}`] = (target: any) => guard(target[property])
+      }
+      result.isAnyOf = (memberTags: Array<string>) => {
+        const check = tagged.isAnyOf(memberTags)
+        return (target: any) => check(target[property])
+      }
+      return result
+    }
+    return {
+      tags: tags(schema.members),
+      generateGuards: makeGuards,
+      generateGuardsFor: () => makeGuards
+    }
+  })
 
 export const ExtendTaggedUnion = <Members extends TaggedUnionMembers>(
   schema: S.Union<Members>
@@ -139,4 +496,4 @@ export const ExtendTaggedUnion = <Members extends TaggedUnionMembers>(
 
 export const TaggedUnion = <
   Members extends TaggedUnionMembers
->(...a: Members): TaggedUnionWithTags<Members> => extendTaggedUnionWithTags(S.Union(a))
+>(members: Members): TaggedUnionWithTags<Members> => extendTaggedUnionWithTags(S.Union(members))

package/src/SchemaAST.ts

@@ -0,0 +1 @@
+export * from "effect/SchemaAST"

package/src/Set.ts

@@ -1,8 +1,12 @@
 // ets_tracing: off
 
-import { Array, type Equivalence, Option, type Order, type Result } from "effect"
+import * as Array from "effect/Array"
+import type * as Equivalence from "effect/Equivalence"
+import * as Option from "effect/Option"
+import type * as Order from "effect/Order"
 import { not } from "effect/Predicate"
-import { identity, pipe, type Predicate, type Refinement, tuple } from "./Function.js"
+import type * as Result from "effect/Result"
+import { identity, pipe, type Predicate, type Refinement, tuple } from "./Function.ts"
 
 export function find_<A, B extends A>(
   as: ReadonlySet<A>,