effect 4.0.0-beta.85 → 4.0.0-beta.86

package/src/unstable/httpapi/HttpApiEndpoint.ts

@@ -60,7 +60,7 @@ type SuccessType<S> = S extends HttpApiSchema.StreamSse<
   infer _Value
 > ? Stream.Stream<_Value, _Error["Type"], never>
   : S extends HttpApiSchema.StreamUint8Array ? Stream.Stream<Uint8Array, unknown, never>
-  : S extends Schema.Top ? S["Type"]
+  : S extends Schema.Constraint ? S["Type"]
   : never
 
 type SuccessEncodingServices<S> = S extends HttpApiSchema.StreamSse<
@@ -69,7 +69,7 @@ type SuccessEncodingServices<S> = S extends HttpApiSchema.StreamSse<
   infer _Value
 > ? _Events["EncodingServices"] | _Error["EncodingServices"]
   : S extends HttpApiSchema.StreamUint8Array ? never
-  : S extends Schema.Top ? S["EncodingServices"]
+  : S extends Schema.Constraint ? S["EncodingServices"]
   : never
 
 type SuccessDecodingServices<S> = S extends HttpApiSchema.StreamSse<
@@ -78,10 +78,10 @@ type SuccessDecodingServices<S> = S extends HttpApiSchema.StreamSse<
   infer _Value
 > ? _Events["DecodingServices"] | _Error["DecodingServices"]
   : S extends HttpApiSchema.StreamUint8Array ? never
-  : S extends Schema.Top ? S["DecodingServices"]
+  : S extends Schema.Constraint ? S["DecodingServices"]
   : never
 
-type ExtractSuccessOrArray<S extends SuccessConstraint> = S extends ReadonlyArray<Schema.Top> ? S[number] : S
+type ExtractSuccessOrArray<S extends SuccessConstraint> = S extends ReadonlyArray<Schema.Constraint> ? S[number] : S
 
 type ExtractBufferedSuccess<S extends SuccessConstraint> = Exclude<
   Extract<ExtractSuccessOrArray<S>, Schema.Top>,
@@ -262,8 +262,18 @@ export interface Any extends Pipeable {
  * @category models
  * @since 4.0.0
  */
-export interface AnyWithProps
-  extends HttpApiEndpoint<string, HttpMethod, string, Schema.Top, Schema.Top, Schema.Top, Schema.Top, any, any>
+export interface AnyWithProps extends
+  HttpApiEndpoint<
+    string,
+    HttpMethod,
+    string,
+    Schema.Top,
+    Schema.Top,
+    Schema.Top,
+    Schema.Top,
+    any,
+    any
+  >
 {}
 
 /**
@@ -578,10 +588,10 @@ export type RequestRaw<Endpoint extends Any> = Endpoint extends HttpApiEndpoint<
  * @since 4.0.0
  */
 export type ClientRequest<
-  Params extends Schema.Top,
-  Query extends Schema.Top,
-  Payload extends Schema.Top,
-  Headers extends Schema.Top,
+  Params extends Schema.Constraint,
+  Query extends Schema.Constraint,
+  Payload extends Schema.Constraint,
+  Headers extends Schema.Constraint,
   ResponseMode extends ClientResponseMode
 > = (
   & ([Params["Type"]] extends [never] ? {} : { readonly params: Params["Type"] })
@@ -1027,8 +1037,8 @@ function makeProto<
  * @since 4.0.0
  */
 export type ParamsConstraint =
-  | Record<string, Schema.Encoder<string | undefined, unknown>>
-  | Schema.Encoder<Record<string, string | undefined>, unknown>
+  | Record<string, Schema.Codec<unknown, string | undefined, unknown, unknown>>
+  | Schema.Codec<unknown, Record<string, string | undefined>, unknown, unknown>
 
 /**
  * Constraint for header schemas: each header must encode to `string | undefined`,
@@ -1038,8 +1048,8 @@ export type ParamsConstraint =
  * @since 4.0.0
  */
 export type HeadersConstraint =
-  | Record<string, Schema.Encoder<string | undefined, unknown>>
-  | Schema.Encoder<Record<string, string | undefined>, unknown>
+  | Record<string, Schema.Codec<unknown, string | undefined, unknown, unknown>>
+  | Schema.Codec<unknown, Record<string, string | undefined>, unknown, unknown>
 
 /**
  * Constraint for query schemas: each field must encode to `string`, an array of
@@ -1049,8 +1059,8 @@ export type HeadersConstraint =
  * @since 4.0.0
  */
 export type QueryConstraint =
-  | Record<string, Schema.Encoder<string | ReadonlyArray<string> | undefined, unknown>>
-  | Schema.Encoder<Record<string, string | ReadonlyArray<string> | undefined>, unknown>
+  | Record<string, Schema.Codec<unknown, string | ReadonlyArray<string> | undefined, unknown, unknown>>
+  | Schema.Codec<unknown, string | ReadonlyArray<string> | undefined, unknown, unknown>
 
 /**
  * Payload schema depends on the HTTP method:
@@ -1065,7 +1075,7 @@ export type QueryConstraint =
  */
 export type PayloadConstraint<Method extends HttpMethod> = Method extends HttpMethod.NoBody ? Record<
     string,
-    Schema.Encoder<string | ReadonlyArray<string> | undefined, unknown>
+    Schema.Codec<unknown, string | ReadonlyArray<string> | undefined, unknown, unknown>
   > :
   Schema.Top | ReadonlyArray<Schema.Top>
 
@@ -1101,7 +1111,7 @@ export type ErrorConstraint = Schema.Top | ReadonlyArray<Schema.Top>
 
 type ErrorNoStream<S extends ErrorConstraint> = [
   Extract<
-    S extends ReadonlyArray<Schema.Top> ? S[number] : S,
+    S extends ReadonlyArray<Schema.Constraint> ? S[number] : S,
     HttpApiSchema.StreamSchema
   >
 ] extends [never] ? S : never
@@ -1147,7 +1157,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
       : StringTree<ExtractSchemaOrArray<Payload>>,
     StringTree<Headers extends Schema.Struct.Fields ? Schema.Struct<Headers> : Headers>,
     JsonSuccessOrArray<Success>,
-    Json<Error extends ReadonlyArray<Schema.Top> ? Error[number] : Error>
+    Json<Error extends ReadonlyArray<Schema.Constraint> ? Error[number] : Error>
   >
   <
     const Name extends string,
@@ -1179,7 +1189,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
     ExtractSchemaOrArray<Payload>,
     ExtractSchemaOrArray<Headers>,
     ExtractSuccessOrArray<Success>,
-    Error extends ReadonlyArray<Schema.Top> ? Error[number] : Error
+    Error extends ReadonlyArray<Schema.Constraint> ? Error[number] : Error
   >
 } =>
 <
@@ -1210,11 +1220,11 @@ export const make = <Method extends HttpMethod>(method: Method): {
   Params extends Schema.Struct.Fields ? Schema.Struct<Params> : Params,
   Query extends Schema.Struct.Fields ? Schema.Struct<Query> : Query,
   Payload extends Schema.Struct.Fields ? Schema.Struct<Payload>
-    : Payload extends ReadonlyArray<Schema.Top> ? Payload[number]
+    : Payload extends ReadonlyArray<Schema.Constraint> ? Payload[number]
     : Payload,
   Headers extends Schema.Struct.Fields ? Schema.Struct<Headers> : Headers,
   ExtractSuccessOrArray<Success>,
-  Error extends ReadonlyArray<Schema.Top> ? Error[number] : Error
+  Error extends ReadonlyArray<Schema.Constraint> ? Error[number] : Error
 > => {
   const disableCodecs = options?.disableCodecs ?? false
   const transformStringTree = disableCodecs ? identity : Schema.toCodecStringTree
@@ -1233,10 +1243,10 @@ export const make = <Method extends HttpMethod>(method: Method): {
   })
 }
 
-type ExtractSchemaOrArray<S extends Schema.Struct.Fields | Schema.Top | ReadonlyArray<Schema.Top>> = S extends
-  Schema.Struct.Fields ? Schema.Struct<S>
-  : S extends ReadonlyArray<Schema.Top> ? S[number]
-  : S
+type ExtractSchemaOrArray<S extends Schema.Struct.Fields | Schema.Constraint | ReadonlyArray<Schema.Constraint>> =
+  S extends Schema.Struct.Fields ? Schema.Struct<S>
+    : S extends ReadonlyArray<Schema.Constraint> ? S[number]
+    : S
 
 /**
  * A schema codec that decodes and encodes the schema's value type through JSON
@@ -1245,7 +1255,7 @@ type ExtractSchemaOrArray<S extends Schema.Struct.Fields | Schema.Top | Readonly
  * @category Codecs
  * @since 4.0.0
  */
-export interface Json<S extends Schema.Top>
+export interface Json<S extends Schema.Constraint>
   extends Schema.Codec<S["Type"], Schema.Json, S["DecodingServices"], S["EncodingServices"]>
 {}
 
@@ -1256,7 +1266,7 @@ export interface Json<S extends Schema.Top>
  * @category Codecs
  * @since 4.0.0
  */
-export interface StringTree<S extends Schema.Top> extends
+export interface StringTree<S extends Schema.Constraint> extends
   Schema.Codec<
     S["Type"],
     Schema.StringTree,
@@ -1267,7 +1277,7 @@ export interface StringTree<S extends Schema.Top> extends
 
 function ensureStruct(
   params: Schema.Struct.Fields | Schema.Top | undefined,
-  transform: typeof Schema.toCodecJson | typeof Schema.toCodecStringTree
+  transform: (schema: Schema.Top) => Schema.Top
 ): Schema.Top | undefined {
   if (params === undefined) return undefined
   if (Schema.isSchema(params)) return transform(params)
@@ -1275,12 +1285,14 @@ function ensureStruct(
 }
 
 function getPayload(
-  payload: Schema.Top | ReadonlyArray<Schema.Top> | Schema.Struct.Fields | undefined,
+  payload: Schema.Constraint | ReadonlyArray<Schema.Constraint> | Schema.Struct.Fields | undefined,
   method: HttpMethod,
   disableCodecs: boolean
 ): PayloadMap {
-  const result: Map<string, { encoding: HttpApiSchema.PayloadEncoding; schemas: [Schema.Top, ...Array<Schema.Top>] }> =
-    new Map()
+  const result: Map<
+    string,
+    { encoding: HttpApiSchema.PayloadEncoding; schemas: [Schema.Top, ...Array<Schema.Top>] }
+  > = new Map()
   if (payload === undefined) return result
   const schemas: Array<Schema.Top> = Array.isArray(payload)
     ? payload
@@ -1338,7 +1350,7 @@ function getErrorResponse(
   return new Set(disableCodecs ? schemas : schemas.map(transformResponse))
 }
 
-function validateSuccessResponse(schemas: ReadonlyArray<Schema.Top>, method: HttpMethod) {
+function validateSuccessResponse(schemas: ReadonlyArray<Schema.Constraint>, method: HttpMethod) {
   const statuses = new Map<number, {
     readonly stream?: HttpApiSchema.StreamSchema | undefined
     bufferedContentTypes: Set<string>

package/src/unstable/httpapi/HttpApiMiddleware.ts

@@ -45,8 +45,8 @@ export const isSecurity = (u: AnyService): u is AnyServiceSecurity => hasPropert
 
 type ErrorConstraint = Schema.Top | ReadonlyArray<Schema.Top>
 
-type ErrorSchemaFromConstraint<E> = E extends ReadonlyArray<Schema.Top> ? E[number]
-  : E extends Schema.Top ? E
+type ErrorSchemaFromConstraint<E> = E extends ReadonlyArray<Schema.Constraint> ? E[number]
+  : E extends Schema.Constraint ? E
   : never
 
 /**

package/src/unstable/httpapi/HttpApiSchema.ts

@@ -233,7 +233,7 @@ export const Accepted: Accepted = Empty(202)
  * @category schemas
  * @since 4.0.0
  */
-export interface asNoContent<S extends Schema.Top> extends Schema.decodeTo<Schema.toType<S>, Schema.Void> {}
+export interface asNoContent<S extends Schema.Constraint> extends Schema.decodeTo<Schema.toType<S>, Schema.Void> {}
 
 /**
  * Marks a schema as a no-content response while preserving a decoded client value.
@@ -249,7 +249,7 @@ export interface asNoContent<S extends Schema.Top> extends Schema.decodeTo<Schem
  * @category encoding
  * @since 4.0.0
  */
-export function asNoContent<S extends Schema.Top>(options: {
+export function asNoContent<S extends Schema.Constraint>(options: {
   readonly decode: LazyArg<S["Type"]>
 }) {
   return (self: S): asNoContent<S> => {
@@ -292,19 +292,22 @@ export type StreamSseMode = "events" | "data"
  */
 export interface StreamSse<
   Events extends Sse.EventCodec,
-  Error extends Schema.Top,
+  Error extends Schema.Constraint,
   Value = Events["Type"]
 > extends
-  Schema.Bottom<
-    Stream.Stream<Value, Error["Type"], never>,
-    Stream.Stream<Value, Error["Type"], never>,
-    Events["DecodingServices"] | Error["DecodingServices"],
-    Events["EncodingServices"] | Error["EncodingServices"],
+  Schema.BottomLazy<
     SchemaAST.Declaration,
     StreamSse<Events, Error, Value>
   >
 {
+  readonly "Type": Stream.Stream<Value, Error["Type"], never>
+  readonly "Encoded": Stream.Stream<Value, Error["Type"], never>
+  readonly "DecodingServices": Events["DecodingServices"] | Error["DecodingServices"]
+  readonly "EncodingServices": Events["EncodingServices"] | Error["EncodingServices"]
   readonly "Rebuild": StreamSse<Events, Error, Value>
+  readonly "~type.make.in": Stream.Stream<Value, Error["Type"], never>
+  readonly "~type.make": Stream.Stream<Value, Error["Type"], never>
+  readonly "Iso": Stream.Stream<Value, Error["Type"], never>
   readonly [StreamSchemaTypeId]: typeof StreamSchemaTypeId
   readonly _tag: "StreamSse"
   readonly mode: "sse"
@@ -321,7 +324,7 @@ export interface StreamSse<
  * @category models
  * @since 4.0.0
  */
-export interface SseEventFromData<Data extends Schema.Top> extends
+export interface SseEventFromData<Data extends Schema.Constraint> extends
   Schema.Codec<
     {
       readonly id: string | undefined
@@ -375,20 +378,6 @@ export interface StreamUint8Array extends
  */
 export type StreamSchema = StreamSse<Sse.EventCodec, Schema.Top, unknown> | StreamUint8Array
 
-/** @internal */
-export type StreamMetadata =
-  | {
-    readonly mode: "sse"
-    readonly sseMode: StreamSseMode
-    readonly contentType: string
-    readonly events: Sse.EventCodec
-    readonly error: Schema.Top
-  }
-  | {
-    readonly mode: "uint8array"
-    readonly contentType: string
-  }
-
 const streamSchema = Schema.declare(Stream.isStream)
 
 /**
@@ -404,7 +393,7 @@ export const StreamSse: {
    * @category constructors
    * @since 4.0.0
    */
-  <Events extends Sse.EventCodec, Error extends Schema.Top = Schema.Never>(
+  <Events extends Sse.EventCodec, Error extends Schema.Constraint = Schema.Never>(
     options: {
       readonly contentType?: string | undefined
       readonly events: Events
@@ -417,7 +406,7 @@ export const StreamSse: {
    * @category constructors
    * @since 4.0.0
    */
-  <Data extends Schema.Top, Error extends Schema.Top = Schema.Never>(
+  <Data extends Schema.Constraint, Error extends Schema.Constraint = Schema.Never>(
     options: {
       readonly contentType?: string | undefined
       readonly data: Data
@@ -427,8 +416,8 @@ export const StreamSse: {
 } = (options: {
   readonly contentType?: string | undefined
   readonly events?: Sse.EventCodec | undefined
-  readonly data?: Schema.Top | undefined
-  readonly error?: Schema.Top | undefined
+  readonly data?: Schema.Constraint | undefined
+  readonly error?: Schema.Constraint | undefined
 }): StreamSse<Sse.EventCodec, Schema.Top, unknown> => {
   const events = options.events ?? (options.data === undefined ? undefined : Schema.Struct({
     id: Schema.UndefinedOr(Schema.String),
@@ -477,22 +466,6 @@ export const isStreamSse = (u: unknown): u is StreamSse<Sse.EventCodec, Schema.T
 export const isStreamUint8Array = (u: unknown): u is StreamUint8Array =>
   isStreamSchema(u) && u._tag === "StreamUint8Array"
 
-/** @internal */
-export function getStreamMetadata(self: StreamSchema): StreamMetadata {
-  return self._tag === "StreamSse" ?
-    {
-      mode: self.mode,
-      sseMode: self.sseMode,
-      contentType: self.contentType,
-      events: self.events,
-      error: self.error
-    } :
-    {
-      mode: self.mode,
-      contentType: self.contentType
-    }
-}
-
 function defaultStreamContentType(mode: StreamMode): string {
   switch (mode) {
     case "sse":

package/src/unstable/httpapi/OpenApi.ts

@@ -454,7 +454,7 @@ export function fromApi<Id extends string, Groups extends HttpApiGroup.Any>(
         }
       }
 
-      function processParameters(schema: Schema.Top | undefined, i: OpenAPISpecParameter["in"]) {
+      function processParameters(schema: Schema.Constraint | undefined, i: OpenAPISpecParameter["in"]) {
         if (schema) {
           const ast = SchemaAST.getLastEncoding(schema.ast)
           if (SchemaAST.isObjects(ast)) {
@@ -636,7 +636,7 @@ function extractSuccessResponseBodies(endpoint: HttpApiEndpoint.AnyWithProps): R
 }
 
 function extractResponseBodies(
-  schemas: Array<Schema.Top>,
+  schemas: Array<Schema.Constraint>,
   getStatus: (ast: SchemaAST.AST) => number,
   getDescription: (ast: SchemaAST.AST) => string | undefined
 ): ResponseBodies {
@@ -650,7 +650,7 @@ function extractResponseBodies(
 
   return map
 
-  function process(schema: Schema.Top) {
+  function process(schema: Schema.Constraint) {
     if (HttpApiSchema.isStreamSchema(schema)) {
       addStreamContent(schema)
       return
@@ -679,7 +679,7 @@ function extractResponseBodies(
     }
   }
 
-  function addContent(schema: Schema.Top, status: number, encoding: HttpApiSchema.Encoding) {
+  function addContent(schema: Schema.Constraint, status: number, encoding: HttpApiSchema.Encoding) {
     const description = getDescription(schema.ast)
     const statusMap = map.get(status)
     const { _tag, contentType } = encoding
@@ -738,7 +738,7 @@ type Content = Map<
   HttpApiSchema.Encoding["_tag"],
   Map<
     string, // contentType
-    Set<Schema.Top>
+    Set<Schema.Constraint>
   >
 >
 

package/src/unstable/observability/internal/otlpProtobuf.ts

@@ -138,33 +138,6 @@ export const encodeResource = (resource: Resource): Uint8Array =>
       : new Uint8Array(0)
   )
 
-// Trace types (opentelemetry.proto.trace.v1)
-
-/**
- * Status code enum
- *
- * @internal
- */
-export const StatusCode = {
-  Unset: 0,
-  Ok: 1,
-  Error: 2
-} as const
-
-/**
- * SpanKind enum
- *
- * @internal
- */
-export const SpanKind = {
-  Unspecified: 0,
-  Internal: 1,
-  Server: 2,
-  Client: 3,
-  Producer: 4,
-  Consumer: 5
-} as const
-
 /**
  * Encodes a Status message.
  *
@@ -376,19 +349,6 @@ export const encodeResourceSpans = (resourceSpans: ResourceSpan): Uint8Array =>
 export const encodeTracesData = (tracesData: TraceData): Uint8Array =>
   Proto.repeatedField(1, tracesData.resourceSpans, encodeResourceSpans)
 
-// Metrics types (opentelemetry.proto.metrics.v1)
-
-/**
- * AggregationTemporality enum
- *
- * @internal
- */
-export const AggregationTemporality = {
-  Unspecified: 0,
-  Delta: 1,
-  Cumulative: 2
-} as const
-
 /**
  * Encodes a NumberDataPoint message.
  *
@@ -631,41 +591,6 @@ export const encodeMetricsData = (metricsData: {
   readonly resourceMetrics: ReadonlyArray<Parameters<typeof encodeResourceMetrics>[0]>
 }): Uint8Array => Proto.repeatedField(1, metricsData.resourceMetrics, encodeResourceMetrics)
 
-// Logs types (opentelemetry.proto.logs.v1)
-
-/**
- * SeverityNumber enum
- *
- * @internal
- */
-export const SeverityNumber = {
-  Unspecified: 0,
-  Trace: 1,
-  Trace2: 2,
-  Trace3: 3,
-  Trace4: 4,
-  Debug: 5,
-  Debug2: 6,
-  Debug3: 7,
-  Debug4: 8,
-  Info: 9,
-  Info2: 10,
-  Info3: 11,
-  Info4: 12,
-  Warn: 13,
-  Warn2: 14,
-  Warn3: 15,
-  Warn4: 16,
-  Error: 17,
-  Error2: 18,
-  Error3: 19,
-  Error4: 20,
-  Fatal: 21,
-  Fatal2: 22,
-  Fatal3: 23,
-  Fatal4: 24
-} as const
-
 /**
  * Encodes a LogRecord message.
  *

package/src/unstable/observability/internal/protobuf.ts

@@ -37,17 +37,6 @@ export const encodeVarint = (value: number | bigint): Uint8Array => {
   return new Uint8Array(bytes)
 }
 
-/**
- * Encodes a signed varint using ZigZag encoding
- *
- * @internal
- */
-export const encodeSint = (value: number | bigint): Uint8Array => {
-  const n = typeof value === "bigint" ? value : BigInt(value)
-  const zigzag = (n << BigInt(1)) ^ (n >> BigInt(63))
-  return encodeVarint(zigzag)
-}
-
 /**
  * Encodes a 64-bit fixed value (little-endian)
  *
@@ -133,17 +122,6 @@ export const varintField = (fieldNumber: number, value: number | bigint): Uint8A
     encodeVarint(value)
   )
 
-/**
- * Encodes a sint field (ZigZag encoded)
- *
- * @internal
- */
-export const sintField = (fieldNumber: number, value: number | bigint): Uint8Array =>
-  concat(
-    encodeVarint(encodeTag(fieldNumber, WireType.Varint)),
-    encodeSint(value)
-  )
-
 /**
  * Encodes a bool field
  *
@@ -231,26 +209,6 @@ export const repeatedField = <T>(
   encode: (value: T) => Uint8Array
 ): Uint8Array => concat(...values.map((v) => messageField(fieldNumber, encode(v))))
 
-/**
- * Encodes repeated varint fields (not packed)
- *
- * @internal
- */
-export const repeatedVarintField = (
-  fieldNumber: number,
-  values: ReadonlyArray<number | bigint>
-): Uint8Array => concat(...values.map((v) => varintField(fieldNumber, v)))
-
-/**
- * Helper to conditionally encode an optional field
- *
- * @internal
- */
-export const optionalField = <T>(
-  value: T | undefined,
-  encode: (v: T) => Uint8Array
-): Uint8Array => value !== undefined ? encode(value) : new Uint8Array(0)
-
 /**
  * Helper to conditionally encode a string field if non-empty
  *

package/src/unstable/persistence/KeyValueStore.ts

@@ -695,7 +695,7 @@ const SchemaStoreTypeId = "~effect/persistence/KeyValueStore/SchemaStore" as con
  * @category SchemaStore
  * @since 4.0.0
  */
-export interface SchemaStore<S extends Schema.Top> {
+export interface SchemaStore<S extends Schema.Constraint> {
   readonly [SchemaStoreTypeId]: typeof SchemaStoreTypeId
   /**
    * Returns the value of the specified key if it exists.
@@ -756,7 +756,7 @@ export interface SchemaStore<S extends Schema.Top> {
  * @category SchemaStore
  * @since 4.0.0
  */
-export const toSchemaStore = <S extends Schema.Top>(self: KeyValueStore, schema: S): SchemaStore<S> => {
+export const toSchemaStore = <S extends Schema.Constraint>(self: KeyValueStore, schema: S): SchemaStore<S> => {
   const serializer = Schema.toCodecJson(schema)
   const jsonSchema = Schema.fromJsonString(serializer)
   const decode = Schema.decodeEffect(jsonSchema)

package/src/unstable/persistence/Persistable.ts

@@ -37,7 +37,7 @@ export const symbol = "~effect/persistence/Persistable" as const
  * @category models
  * @since 4.0.0
  */
-export interface Persistable<A extends Schema.Top, E extends Schema.Top> extends PrimaryKey.PrimaryKey {
+export interface Persistable<A extends Schema.Constraint, E extends Schema.Constraint> extends PrimaryKey.PrimaryKey {
   readonly [symbol]: {
     readonly success: A
     readonly error: E
@@ -50,7 +50,7 @@ export interface Persistable<A extends Schema.Top, E extends Schema.Top> extends
  * @category models
  * @since 4.0.0
  */
-export type Any = Persistable<Schema.Top, Schema.Top>
+export type Any = Persistable<Schema.Constraint, Schema.Constraint>
 
 /**
  * Extracts the success schema from a persistable request.
@@ -147,8 +147,8 @@ export const Class = <
 >() =>
 <
   const Tag extends string,
-  A extends Schema.Top = Schema.Void,
-  E extends Schema.Top = Schema.Never
+  A extends Schema.Constraint = Schema.Void,
+  E extends Schema.Constraint = Schema.Never
 >(tag: Tag, options: {
   readonly primaryKey: (payload: Config["payload"]) => string
   readonly success?: A | undefined
@@ -205,7 +205,7 @@ export const Class = <
  * @category accessors
  * @since 4.0.0
  */
-export const exitSchema = <A extends Schema.Top, E extends Schema.Top>(
+export const exitSchema = <A extends Schema.Constraint, E extends Schema.Constraint>(
   self: Persistable<A, E>
 ): Schema.Exit<A, E, Schema.Defect> => {
   let schema = exitSchemaCache.get(self)
@@ -224,7 +224,7 @@ const exitSchemaCache = new WeakMap<Persistable<any, any>, Schema.Exit<any, any,
  * @category serialization
  * @since 4.0.0
  */
-export const serializeExit = <A extends Schema.Top, E extends Schema.Top>(
+export const serializeExit = <A extends Schema.Constraint, E extends Schema.Constraint>(
   self: Persistable<A, E>,
   exit: Exit.Exit<A["Type"], E["Type"]>
 ): Effect.Effect<unknown, Schema.SchemaError, A["EncodingServices"] | E["EncodingServices"]> => {
@@ -239,7 +239,7 @@ export const serializeExit = <A extends Schema.Top, E extends Schema.Top>(
  * @category serialization
  * @since 4.0.0
  */
-export const deserializeExit = <A extends Schema.Top, E extends Schema.Top>(
+export const deserializeExit = <A extends Schema.Constraint, E extends Schema.Constraint>(
   self: Persistable<A, E>,
   encoded: unknown
 ): Effect.Effect<

package/src/unstable/persistence/PersistedQueue.ts

@@ -104,7 +104,7 @@ export interface PersistedQueue<in out A, out R = never> {
 export class PersistedQueueFactory extends Context.Service<
   PersistedQueueFactory,
   {
-    readonly make: <S extends Schema.Top>(options: {
+    readonly make: <S extends Schema.Constraint>(options: {
       readonly name: string
       readonly schema: S
     }) => Effect.Effect<PersistedQueue<S["Type"], S["EncodingServices"] | S["DecodingServices"]>>
@@ -118,7 +118,7 @@ export class PersistedQueueFactory extends Context.Service<
  * @category accessors
  * @since 4.0.0
  */
-export const make = <S extends Schema.Top>(options: {
+export const make = <S extends Schema.Constraint>(options: {
   readonly name: string
   readonly schema: S
 }): Effect.Effect<
@@ -143,7 +143,7 @@ export const makeFactory = Effect.gen(function*() {
   const store = yield* PersistedQueueStore
 
   return PersistedQueueFactory.of({
-    make<S extends Schema.Top>(options: {
+    make<S extends Schema.Constraint>(options: {
       readonly name: string
       readonly schema: S
     }) {