@effect-app/infra 0.133.0-next.3 → 0.133.0-next.30

package/_src/api/express/schema/routing.ts

@@ -0,0 +1,236 @@
+/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { REST } from "@effect-app/schema"
+
+export type Request<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA,
+  PPath extends `/${string}`
+> = REST.ReqRes<unknown, ReqA> & {
+  method: REST.Methods.Rest
+  path: PPath
+  Cookie?: REST.ReqRes<Record<string, string>, CookieA>
+  Path?: REST.ReqRes<Record<string, string>, PathA>
+  Body?: REST.ReqRes<unknown, BodyA>
+  Query?: REST.ReqRes<Record<string, string>, QueryA>
+  Headers?: REST.ReqRes<Record<string, string>, HeaderA>
+  Tag: Tag<M, M>
+}
+
+export interface RouteRequestHandler<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA,
+  ResA,
+  PPath extends `/${string}`
+> {
+  Request: Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, PPath>
+  Response?: REST.ReqRes<unknown, ResA> // | REST.ReqResSchemed<unknown, ResA>
+  ResponseOpenApi?: any
+}
+
+export function asRouteDescriptionAny<R extends RouteDescriptorAny>(i: R) {
+  return i as RouteDescriptorAny
+}
+
+export function arrAsRouteDescriptionAny<R extends RouteDescriptorAny>(
+  arr: ReadonlyArray<R>
+) {
+  return arr.map(asRouteDescriptionAny)
+}
+
+export interface RouteDescriptor<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA,
+  ResA,
+  METHOD extends REST.Methods.Rest = REST.Methods.Rest
+> {
+  _tag: "Schema"
+  path: `/${string}`
+  method: METHOD
+  handler: RouteRequestHandler<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, `/${string}`>
+  info?: {
+    tags: ReadonlyArray<string>
+  }
+}
+
+export type RouteDescriptorAny = RouteDescriptor<
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any
+>
+
+export function makeRouteDescriptor<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA,
+  ResA = void,
+  METHOD extends REST.Methods.Rest = REST.Methods.Rest
+>(
+  path: `/${string}`,
+  method: METHOD,
+  handler: RouteRequestHandler<
+    M,
+    PathA,
+    CookieA,
+    QueryA,
+    BodyA,
+    HeaderA,
+    ReqA,
+    ResA,
+    `/${string}`
+  >
+): RouteDescriptor<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA,
+  ResA,
+  METHOD
+> {
+  return { path, handler, method, _tag: "Schema" }
+}
+
+// export function makeFromSchema<ResA>(
+//   e: RouteDescriptor<any, any, any, any, any, any, ResA, any>
+// ) {
+//   const jsonSchema_ = OpenApi.for
+//   const jsonSchema = <E, A>(r: REST.ReqRes<E, A>) => jsonSchema_(r)
+//   const { Request: Req, Response: Res_, ResponseOpenApi } = e.handler
+//   const r = ResponseOpenApi ?? Res_
+//   const Res = r ? S.extractSchema(r) : S.Void
+//   // TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
+//   // TODO: use the path vs body etc serialisation also in the Client.
+//   const makeReqQuerySchema = Effect(Option.fromNullable(Req.Query)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqHeadersSchema = Effect(Option.fromNullable(Req.Headers)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqCookieSchema = Effect(Option.fromNullable(Req.Cookie)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqPathSchema = Effect(Option.fromNullable(Req.Path)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqBodySchema = Effect(Option.fromNullable(Req.Body)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   // const makeReqSchema = schema(Req)
+
+//   const makeResSchema = jsonSchema_(Res)
+
+//   function makeParameters(inn: ParameterLocation) {
+//     return (a: Option<JSONSchema | SubSchema>) => {
+//       return a
+//         .flatMap((o) => (isObjectSchema(o) ? Option(o) : Option.none))
+//         .map((x) => {
+//           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+//           return Object.keys(x.properties!).map((p) => {
+//             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+//             const schema = x.properties![p]
+//             const required = Boolean(x.required?.includes(p))
+//             return { name: p, in: inn, required, schema }
+//           })
+//         })
+//         .getOrElse(() => [])
+//     }
+//   }
+
+//   return Effect
+//     .all({
+//       req: jsonSchema(Req.Model),
+//       reqQuery: makeReqQuerySchema,
+//       reqHeaders: makeReqHeadersSchema,
+//       reqBody: makeReqBodySchema,
+//       reqPath: makeReqPathSchema,
+//       reqCookie: makeReqCookieSchema,
+//       res: makeResSchema
+//     })
+//     .map((_) => {
+//       // console.log("$$$ REQ", _.req)
+//       const isEmpty = !e.handler.Response || e.handler.Response === S.Void
+//       return {
+//         path: e.path,
+//         method: e.method.toLowerCase(),
+//         tags: e.info?.tags,
+//         description: _.req?.description,
+//         summary: _.req?.summary,
+//         operationId: _.req?.title,
+//         parameters: [
+//           ...makeParameters("path")(_.reqPath),
+//           ...makeParameters("query")(_.reqQuery),
+//           ...makeParameters("header")(_.reqHeaders),
+//           ...makeParameters("cookie")(_.reqCookie)
+//         ],
+//         requestBody: _
+//           .reqBody
+//           .map((schema) => ({
+//             content: { "application/json": { schema } }
+//           }))
+//           .value,
+//         responses: [
+//           isEmpty
+//             ? new Response(204, { description: "Empty" })
+//             : new Response(200, {
+//               description: "OK",
+//               content: { "application/json": { schema: _.res } }
+//             }),
+//           new Response(400, { description: "ValidationError" })
+//         ]
+//           .concat(
+//             e.path.includes(":") && isEmpty
+//               ? [new Response(404, { description: "NotFoundError" })]
+//               : []
+//           )
+//       }
+//     })
+// }
+
+// class Response {
+//   constructor(
+//     public readonly statusCode: number,
+//     public readonly type: any // string | JSONSchema | SubSchema
+//   ) {}
+// }

package/_src/errors.ts

@@ -11,7 +11,11 @@ export class NotFoundError<T extends string = string>
 }
 
 /** @tsplus type ValidationError */
-export class ValidationError extends Data.TaggedError("ValidationError")<{ errors: ReadonlyArray<unknown> }> {}
+export class ValidationError extends Data.TaggedError("ValidationError")<{ errors: ReadonlyArray<unknown> }> {
+  override get message() {
+    return `Validation failed: ${this.errors.map((e) => JSON.stringify(e)).join(", ")}`
+  }
+}
 
 /** @tsplus type NotLoggedInError */
 export class NotLoggedInError extends Data.TaggedError("NotLoggedInError")<{ message?: string | undefined }> {

package/_src/services/QueueMaker/memQueue.ts

@@ -1,6 +1,6 @@
 import { MemQueue } from "@effect-app/infra-adapters/memQueue"
 import { RequestContext } from "@effect-app/infra/RequestContext"
-import type { Schema2 } from "@effect-app/prelude"
+import type { S } from "@effect-app/prelude"
 import { RequestId } from "@effect-app/prelude/ids"
 import { Tracer } from "effect"
 import { RequestContextContainer } from "../RequestContextContainer.js"
@@ -17,8 +17,8 @@ export function makeMemQueue<
 >(
   queueName: string,
   queueDrainName: string,
-  schema: Schema2.Schema<EvtE, Evt>,
-  drainSchema: Schema2.Schema<unknown, DrainEvt>
+  schema: S.Schema<EvtE, Evt>,
+  drainSchema: S.Schema<unknown, DrainEvt>
 ) {
   return Effect.gen(function*($) {
     const mem = yield* $(MemQueue)

package/_src/services/QueueMaker/sbqueue.ts

@@ -9,7 +9,7 @@ import {
 import type {} from "@azure/service-bus"
 import { captureException } from "@effect-app/infra/errorReporter"
 import { RequestContext } from "@effect-app/infra/RequestContext"
-import type { Schema2 } from "@effect-app/prelude"
+import type { S } from "@effect-app/prelude"
 import { RequestId } from "@effect-app/prelude/ids"
 import { struct } from "@effect-app/schema"
 import { Tracer } from "effect"
@@ -27,8 +27,8 @@ export function makeServiceBusQueue<
 >(
   _queueName: string,
   queueDrainName: string,
-  schema: Schema2.Schema<EvtE, Evt>,
-  drainSchema: Schema2.Schema<unknown, DrainEvt>
+  schema: S.Schema<EvtE, Evt>,
+  drainSchema: S.Schema<unknown, DrainEvt>
 ) {
   const wireSchema = struct({
     body: schema,

package/_src/services/RepositoryBase.ts

@@ -9,7 +9,7 @@ import type {} from "effect/Hash"
 import type { Opt } from "@effect-app/core/Option"
 import { makeCodec } from "@effect-app/infra/api/codec"
 import { makeFilters } from "@effect-app/infra/filter"
-import type { Schema2 } from "@effect-app/prelude"
+import type { S } from "@effect-app/prelude"
 import type { InvalidStateError, OptimisticConcurrencyException } from "../errors.js"
 import { ContextMapContainer } from "./Store/ContextMapContainer.js"
 import { QueryBuilder } from "./Store/filterApi/query.js"
@@ -91,7 +91,7 @@ export function makeRepo<
     From extends { id: string }
   >(
     name: ItemType,
-    schema: Schema2.Schema<From, T>,
+    schema: S.Schema<From, T>,
     mapFrom: (pm: Omit<PM, "_etag">) => From,
     mapTo: (e: From, etag: string | undefined) => PM
   ) => {
@@ -301,7 +301,7 @@ export function makeStore<
     E extends { id: string }
   >(
     name: ItemType,
-    schema: Schema2.Schema<E, T>,
+    schema: S.Schema<E, T>,
     mapTo: (e: E, etag: string | undefined) => PM
   ) => {
     const [_dec, encode] = makeCodec(schema)
@@ -411,7 +411,7 @@ export const RepositoryBaseImpl = <Service>() => {
   >() =>
   <ItemType extends string, T extends { id: string }, From extends { id: string }>(
     itemType: ItemType,
-    schema: Schema2.Schema<From, T>,
+    schema: S.Schema<From, T>,
     jitM?: (pm: From) => From
   ): Exact<PM, From & { _etag: string | undefined }> extends true ?
       & (abstract new() => RepositoryBaseC1<T, PM, Evt, ItemType>)
@@ -452,7 +452,7 @@ export const RepositoryDefaultImpl = <Service>() => {
   >() =>
   <ItemType extends string, T extends { id: string }, From extends { id: string }>(
     itemType: ItemType,
-    schema: Schema2.Schema<From, T>,
+    schema: S.Schema<From, T>,
     jitM?: (pm: From) => From
   ): Exact<PM, From & { _etag: string | undefined }> extends true ?
       & (abstract new(

package/_src/services/simpledb/redisdb.ts

@@ -2,7 +2,7 @@
 
 import { flow } from "@effect-app/core/Function"
 import { RedisClient } from "@effect-app/infra-adapters/redis-client"
-import * as S from "@effect-app/prelude/schema"
+import * as S from "@effect-app/schema"
 import type { Lock } from "redlock"
 import type { CachedRecord, DBRecord, Index } from "./shared.js"
 import { ConnectionException, CouldNotAquireDbLockException, getIndexName, getRecordName } from "./shared.js"

package/_src/services/simpledb/shared.ts

@@ -1,4 +1,4 @@
-import * as S from "@effect-app/prelude/schema"
+import * as S from "@effect-app/schema"
 
 export class CouldNotAquireDbLockException
   extends Data.TaggedError("CouldNotAquireDbLockException")<{ type: string; id: string; error: Error; message: string }>

package/_src/test.arbs.ts

@@ -0,0 +1,23 @@
+// Do not import to frontend
+
+import { setFaker } from "@effect-app/prelude/faker"
+import { faker } from "@faker-js/faker"
+
+// const rnd = new Random(rand.congruential32(5))
+
+setFaker(faker)
+
+// /**
+//  * @tsplus getter FastCheck generate
+//  */
+// export function generate<T>(arb: fc.Arbitrary<T>) {
+//   return arb.generate(rnd, undefined)
+// }
+
+// /**
+//  * @tsplus getter ets/Schema/Arbitrary/Gen generate
+//  */
+
+// export function generateFromArbitrary<T>(arb: Arbitrary.Gen<T>) {
+//   return generate(arb(fc))
+// }

package/dist/RequestContext.d.ts

@@ -1,6 +1,6 @@
-import { useClassFeaturesForSchema, TaggedClass, NonEmptyString255, FromClass } from "@effect-app/prelude/schema";
-import { Schema2 } from "@effect-app/prelude";
-declare const RequestContextParent_base: Schema2.Class<{
+import { useClassFeaturesForSchema, TaggedClass, NonEmptyString255, struct, literal, FromClass } from "@effect-app/schema";
+import { S } from "@effect-app/prelude";
+declare const RequestContextParent_base: S.Class<{
     readonly _tag: "RequestContext";
     readonly id: string;
     readonly name: string;
@@ -11,31 +11,49 @@ declare const RequestContextParent_base: Schema2.Class<{
     } | undefined;
 }, {
     readonly _tag: "RequestContext";
-    readonly id: string & Schema2.StringIdBrand;
-    readonly name: string & Schema2.NonEmptyString255Brand;
+    readonly id: S.NonEmptyString255;
+    readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly createdAt: Date;
     readonly userProfile?: {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
     } | undefined;
 }, {
-    readonly name: string & Schema2.NonEmptyString255Brand;
+    readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly userProfile?: {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
     } | undefined;
-    readonly id?: string & Schema2.StringIdBrand;
+    readonly id?: S.NonEmptyString255;
     readonly createdAt?: Date;
-}, RequestContextParent, import("effect/Data").Case>;
+}, RequestContextParent, {
+    id: S.WithDefaults<S.Schema<string, S.NonEmptyString255> & {
+        make: () => S.NonEmptyString255;
+        withDefault: () => S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
+    }> & S.Schema<string, S.NonEmptyString255> & {
+        make: () => S.NonEmptyString255;
+        withDefault: () => S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
+    };
+    name: S.WithDefaults<S.Schema<string, string & S.NonEmptyString255Brand>> & S.Schema<string, string & S.NonEmptyString255Brand>;
+    userProfile: S.PropertySignature<{
+        readonly sub: string;
+    } | undefined, true, {
+        readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
+    } | undefined, true>;
+    locale: S.Schema<"en" | "de", "en" | "de"> & {
+        literals: ["en", "de"];
+    };
+    createdAt: S.Schema<string, Date> & S.ConstructorPropertyDescriptor<string, Date>;
+}, import("effect/Data").Case>;
 export declare class RequestContextParent extends RequestContextParent_base {
 }
-declare const RequestContext_base: Schema2.Class<{
+declare const RequestContext_base: S.Class<{
     readonly _tag: "RequestContext";
     readonly id: string;
-    readonly rootId: string;
     readonly name: string;
     readonly locale: "en" | "de";
     readonly createdAt: string;
+    readonly rootId: string;
     readonly userProfile?: {
         readonly sub: string;
     } | undefined;
@@ -52,28 +70,58 @@ declare const RequestContext_base: Schema2.Class<{
     readonly namespace?: string | undefined;
 }, {
     readonly _tag: "RequestContext";
-    readonly id: Schema2.StringId;
-    readonly rootId: string & Schema2.StringIdBrand;
-    readonly name: string & Schema2.NonEmptyString255Brand;
+    readonly id: S.NonEmptyString255;
+    readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly createdAt: Date;
+    readonly rootId: S.NonEmptyString255;
     readonly userProfile?: {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
     } | undefined;
     readonly parent?: RequestContextParent | undefined;
-    readonly namespace?: (string & Schema2.NonEmptyString255Brand) | undefined;
+    readonly namespace?: (string & S.NonEmptyString255Brand) | undefined;
 }, {
-    readonly name: string & Schema2.NonEmptyString255Brand;
+    readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly userProfile?: {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
     } | undefined;
     readonly parent?: RequestContextParent | undefined;
-    readonly namespace?: (string & Schema2.NonEmptyString255Brand) | undefined;
-    readonly id?: Schema2.StringId;
-    readonly rootId?: string & Schema2.StringIdBrand;
+    readonly namespace?: (string & S.NonEmptyString255Brand) | undefined;
+    readonly id?: S.NonEmptyString255;
     readonly createdAt?: Date;
-}, RequestContext, import("effect/Data").Case>;
+    readonly rootId?: S.NonEmptyString255;
+}, RequestContext, {
+    id: S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
+    rootId: S.WithDefaults<S.Schema<string, S.NonEmptyString255> & {
+        make: () => S.NonEmptyString255;
+        withDefault: () => S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
+    }> & S.Schema<string, S.NonEmptyString255> & {
+        make: () => S.NonEmptyString255;
+        withDefault: () => S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
+    };
+    parent: S.PropertySignature<{
+        readonly _tag: "RequestContext";
+        readonly id: string;
+        readonly name: string;
+        readonly locale: "en" | "de";
+        readonly createdAt: string;
+        readonly userProfile?: {
+            readonly sub: string;
+        } | undefined;
+    } | undefined, true, RequestContextParent | undefined, true>;
+    namespace: S.PropertySignature<string | undefined, true, (string & S.NonEmptyString255Brand) | undefined, true>;
+    name: S.WithDefaults<S.Schema<string, string & S.NonEmptyString255Brand>> & S.Schema<string, string & S.NonEmptyString255Brand>;
+    userProfile: S.PropertySignature<{
+        readonly sub: string;
+    } | undefined, true, {
+        readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
+    } | undefined, true>;
+    locale: S.Schema<"en" | "de", "en" | "de"> & {
+        literals: ["en", "de"];
+    };
+    createdAt: S.Schema<string, Date> & S.ConstructorPropertyDescriptor<string, Date>;
+}, import("effect/Data").Case>;
 /**
  * @tsplus type RequestContext
  * @tsplus companion RequestContext.Ops
@@ -81,14 +129,14 @@ declare const RequestContext_base: Schema2.Class<{
 export declare class RequestContext extends RequestContext_base {
     static inherit(this: void, parent: RequestContext, newSelf: ConstructorParameters<typeof RequestContextParent>[0]): RequestContext;
     static toMonitoring(this: void, self: RequestContext): {
-        parentOperationName?: string & Schema2.NonEmptyString255Brand;
+        parentOperationName?: string & S.NonEmptyString255Brand;
         parentLocale?: "en" | "de";
-        operationName: string & Schema2.NonEmptyString255Brand;
+        operationName: string & S.NonEmptyString255Brand;
         locale: "en" | "de";
     };
 }
 export declare namespace RequestContextParent {
-    const From_base: Schema2.FromClass<{
+    const From_base: S.FromClass<{
         readonly _tag: "RequestContext";
         readonly id: string;
         readonly name: string;
@@ -107,13 +155,13 @@ export declare namespace RequestContextParent {
     export {};
 }
 export declare namespace RequestContext {
-    const From_base_1: Schema2.FromClass<{
+    const From_base_1: S.FromClass<{
         readonly _tag: "RequestContext";
         readonly id: string;
-        readonly rootId: string;
         readonly name: string;
         readonly locale: "en" | "de";
         readonly createdAt: string;
+        readonly rootId: string;
         readonly userProfile?: {
             readonly sub: string;
         } | undefined;

package/dist/RequestContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAU7C,qBACa,oBAAqB,SAAQ,yBAKxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBACa,cAAe,SAAQ,mBAclC;IACA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAUhE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAKD,yBAAiB,oBAAoB,CAAC;;;;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,SAAwC;KAAG;;CACtE;AACD,yBAAiB,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;IAC9B;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,WAAkC;KAAG;;CAChE"}
+{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGvC,qBACa,oBAAqB,SAAQ,yBAQxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBACa,cAAe,SAAQ,mBAclC;IACA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAUhE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAKD,yBAAiB,oBAAoB,CAAC;;;;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,SAAwC;KAAG;;CACtE;AACD,yBAAiB,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;IAC9B;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,WAAkC;KAAG;;CAChE"}

package/dist/RequestContext.js

@@ -5,19 +5,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var RequestContext_1;
-import * as tsplus_module_1 from "@effect-app/prelude/schema";
+import * as tsplus_module_1 from "@effect-app/schema";
 import * as tsplus_module_2 from "@effect/schema/Schema";
-import { Schema2 } from "@effect-app/prelude";
+import * as tsplus_module_3 from "@effect-app/prelude/utils";
+import { S } from "@effect-app/prelude";
 import { RequestId, UserProfileId } from "@effect-app/prelude/ids";
-const fields = {
+let RequestContextParent = class RequestContextParent extends tsplus_module_1.TaggedClass()("RequestContext", {
+    id: RequestId,
     name: tsplus_module_1.NonEmptyString255,
     userProfile: tsplus_module_2.optional(tsplus_module_1.struct({ sub: UserProfileId })),
     locale: tsplus_module_1.literal("en", "de"),
-    createdAt: tsplus_module_2.withDefaultConstructor(Schema2.Date, () => new Date()) // TODO
-};
-let RequestContextParent = class RequestContextParent extends tsplus_module_1.TaggedClass()("RequestContext", {
-    id: RequestId,
-    ...fields
+    createdAt: tsplus_module_2.withDefaultConstructor(S.Date, () => new Date()) // TODO
 }) {
 };
 RequestContextParent = __decorate([
@@ -28,12 +26,12 @@ export { RequestContextParent };
  * @tsplus type RequestContext
  * @tsplus companion RequestContext.Ops
  */
-let RequestContext = RequestContext_1 = class RequestContext extends Schema2.TaggedClass()("RequestContext", {
+let RequestContext = RequestContext_1 = class RequestContext extends S.TaggedClass()("RequestContext", {
+    ...tsplus_module_3.RecordOmitold(tsplus_module_3.object$(RequestContextParent.fields), "id"),
     id: RequestId.withDefault(),
     rootId: RequestId,
     parent: tsplus_module_2.optional(RequestContextParent),
-    namespace: tsplus_module_2.optional(tsplus_module_1.NonEmptyString255),
-    ...fields
+    namespace: tsplus_module_2.optional(tsplus_module_1.NonEmptyString255)
     // ...RequestContextParent.omit("id").extend({
     //   id: RequestId.withDefault(),
     //   rootId: RequestId,
@@ -84,4 +82,4 @@ export { RequestContext };
     }
     RequestContext.From = From;
 })(RequestContext || (RequestContext = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUM3QyxPQUFPLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBRWxFLE1BQU0sTUFBTSxHQUFHO0lBQ2IsSUFBSSxrQkFBRSxpQkFBaUI7SUFDdkIsV0FBVyxFQUFFLHlCQUFBLGdCQUFBLE1BQU0sQ0FBQyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsQ0FBQyxDQUFXO0lBQ3RELE1BQU0sRUFBRSxnQkFBQSxPQUFPLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQztJQUMzQixTQUFTLEVBQUUsdUNBQUEsT0FBTyxDQUFDLElBQUksRUFBaUIsR0FBRyxFQUFFLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU87Q0FDekQsQ0FBQTtBQUdILElBQU0sb0JBQW9CLEdBQTFCLE1BQU0sb0JBQXFCLFNBQVEsZ0JBQUEsV0FBVyxFQUVsRCxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEVBQUUsRUFBRSxTQUFTO0lBQ2IsR0FBRyxNQUFNO0NBQ1YsQ0FBQztDQUFHLENBQUE7QUFMUSxvQkFBb0I7b0JBRGhDLHlCQUF5QjtHQUNiLG9CQUFvQixDQUs1Qjs7QUFFTDs7O0dBR0c7QUFFSSxJQUFNLGNBQWMsc0JBQXBCLE1BQU0sY0FBZSxTQUFRLE9BQU8sQ0FBQyxXQUFXLEVBRXBELENBQUMsZ0JBQWdCLEVBQUU7SUFDcEIsRUFBRSxFQUFFLFNBQVMsQ0FBQyxXQUFXLEVBQUU7SUFDM0IsTUFBTSxFQUFFLFNBQVM7SUFDakIsTUFBTSxFQUFFLHlCQUFBLG9CQUFvQixDQUFXO0lBQ3ZDLFNBQVMsRUFBRSx5Q0FBQSxpQkFBaUIsQ0FBVztJQUN2QyxHQUFHLE1BQU07SUFDVCw4Q0FBOEM7SUFDOUMsaUNBQWlDO0lBQ2pDLHVCQUF1QjtJQUN2Qiw2Q0FBNkM7SUFDN0MsNENBQTRDO0lBQzVDLEtBQUs7Q0FDTixDQUFDO0lBQ0EsTUFBTSxDQUFDLE9BQU8sQ0FFWixNQUFzQixFQUN0QixPQUE4RDtRQUU5RCxPQUFPLElBQUksZ0JBQWMsQ0FBQztZQUN4QixTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVM7WUFDNUIsR0FBRyxPQUFPO1lBQ1YsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1lBQ3JCLE1BQU07U0FDUCxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQVksQ0FBYSxJQUFvQjtRQUNsRCxPQUFPO1lBQ0wsYUFBYSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ3hCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU07Z0JBQ2IsQ0FBQyxDQUFDLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFO2dCQUM3RSxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQTtJQUNILENBQUM7Q0FDRixDQUFBO0FBckNZLGNBQWM7b0JBRDFCLHlCQUF5QjtHQUNiLGNBQWMsQ0FxQzFCOztBQUVELGdDQUFnQztBQUNoQyxFQUFFO0FBQ0Ysb0JBQW9CO0FBQ3BCLFdBQWlCLG9CQUFvQjtJQUNuQzs7O09BR0c7SUFDSCxNQUFhLElBQUssU0FBUSxnQkFBQSxTQUFTLEVBQStCO0tBQUc7SUFBeEQseUJBQUksT0FBb0QsQ0FBQTtBQUN2RSxDQUFDLEVBTmdCLG9CQUFvQixLQUFwQixvQkFBb0IsUUFNcEM7QUFDRCxXQUFpQixjQUFjO0lBQzdCOzs7T0FHRztJQUNILE1BQWEsSUFBSyxTQUFRLGdCQUFBLFNBQVMsRUFBeUI7S0FBRztJQUFsRCxtQkFBSSxPQUE4QyxDQUFBO0FBQ2pFLENBQUMsRUFOZ0IsY0FBYyxLQUFkLGNBQWMsUUFNOUIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDdkMsT0FBTyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUczRCxJQUFNLG9CQUFvQixHQUExQixNQUFNLG9CQUFxQixTQUFRLGdCQUFBLFdBQVcsRUFFbEQsQ0FBQyxnQkFBZ0IsRUFBRTtJQUNwQixFQUFFLEVBQUUsU0FBUztJQUNiLElBQUksa0JBQUUsaUJBQWlCO0lBQ3ZCLFdBQVcsRUFBRSx5QkFBQSxnQkFBQSxNQUFNLENBQUMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLENBQUMsQ0FBVztJQUN0RCxNQUFNLEVBQUUsZ0JBQUEsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7SUFDM0IsU0FBUyxFQUFFLHVDQUFBLENBQUMsQ0FBQyxJQUFJLEVBQWlCLEdBQUcsRUFBRSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxPQUFPO0NBQzVELENBQUM7Q0FBRyxDQUFBO0FBUlEsb0JBQW9CO29CQURoQyx5QkFBeUI7R0FDYixvQkFBb0IsQ0FRNUI7O0FBRUw7OztHQUdHO0FBRUksSUFBTSxjQUFjLHNCQUFwQixNQUFNLGNBQWUsU0FBUSxDQUFDLENBQUMsV0FBVyxFQUU5QyxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEdBQUcsc0RBQUEsb0JBQW9CLENBQUMsTUFBTSxHQUFTLElBQUksQ0FBQztJQUM1QyxFQUFFLEVBQUUsU0FBUyxDQUFDLFdBQVcsRUFBRTtJQUMzQixNQUFNLEVBQUUsU0FBUztJQUNqQixNQUFNLEVBQUUseUJBQUEsb0JBQW9CLENBQVc7SUFDdkMsU0FBUyxFQUFFLHlDQUFBLGlCQUFpQixDQUFXO0lBQ3ZDLDhDQUE4QztJQUM5QyxpQ0FBaUM7SUFDakMsdUJBQXVCO0lBQ3ZCLDZDQUE2QztJQUM3Qyw0Q0FBNEM7SUFDNUMsS0FBSztDQUNOLENBQUM7SUFDQSxNQUFNLENBQUMsT0FBTyxDQUVaLE1BQXNCLEVBQ3RCLE9BQThEO1FBRTlELE9BQU8sSUFBSSxnQkFBYyxDQUFDO1lBQ3hCLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUztZQUM1QixHQUFHLE9BQU87WUFDVixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07WUFDckIsTUFBTTtTQUNQLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFhLElBQW9CO1FBQ2xELE9BQU87WUFDTCxhQUFhLEVBQUUsSUFBSSxDQUFDLElBQUk7WUFDeEIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTTtnQkFDYixDQUFDLENBQUMsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUU7Z0JBQzdFLENBQUMsQ0FBQyxFQUFFLENBQUM7U0FDUixDQUFBO0lBQ0gsQ0FBQztDQUNGLENBQUE7QUFyQ1ksY0FBYztvQkFEMUIseUJBQXlCO0dBQ2IsY0FBYyxDQXFDMUI7O0FBRUQsZ0NBQWdDO0FBQ2hDLEVBQUU7QUFDRixvQkFBb0I7QUFDcEIsV0FBaUIsb0JBQW9CO0lBQ25DOzs7T0FHRztJQUNILE1BQWEsSUFBSyxTQUFRLGdCQUFBLFNBQVMsRUFBK0I7S0FBRztJQUF4RCx5QkFBSSxPQUFvRCxDQUFBO0FBQ3ZFLENBQUMsRUFOZ0Isb0JBQW9CLEtBQXBCLG9CQUFvQixRQU1wQztBQUNELFdBQWlCLGNBQWM7SUFDN0I7OztPQUdHO0lBQ0gsTUFBYSxJQUFLLFNBQVEsZ0JBQUEsU0FBUyxFQUF5QjtLQUFHO0lBQWxELG1CQUFJLE9BQThDLENBQUE7QUFDakUsQ0FBQyxFQU5nQixjQUFjLEtBQWQsY0FBYyxRQU05QiJ9

package/dist/_global.ext.d.ts

@@ -30,26 +30,5 @@ import type {} from "@effect-app/infra/api/setupRequest";
  * @tsplus global
  */
 import {} from "@effect-app/infra/api/reportError";
-import { S } from "@effect-app/schema/schema";
-import type { ParseOptions } from "@effect/schema/AST";
-/**
- * @tsplus fluent effect/schema/Schema withDefault
- * @tsplus location "@effect-app/infra/_global.ext"
- */
-export declare const defaultDate: <From>(s: S.Schema<From, Date>) => S.ConstructorPropertyDescriptor<From, Date>;
-/**
- * @tsplus fluent effect/schema/Schema withDefault
- * @tsplus location "@effect-app/infra/_global.ext"
- */
-export declare const defaultNullable: <From, To>(s: S.Schema<From, To | null>) => S.ConstructorPropertyDescriptor<From, To | null>;
-/**
- * @tsplus fluent effect/schema/Schema withDefault
- * @tsplus location "@effect-app/infra/_global.ext"
- */
-export declare const defaultArray: <From, T>(s: S.Schema<From, ReadonlyArray<T>>) => S.ConstructorPropertyDescriptor<From, readonly T[]>;
-/**
- * @tsplus fluent effect/schema/Schema __call
- * @tsplus location "@effect-app/infra/_global.ext"
- */
-export declare const parseSync: <I, A>(self: S.Schema<I, A>, u: I, options?: ParseOptions | undefined) => A;
+import "@effect-app/infra/test.arbs";
 //# sourceMappingURL=_global.ext.d.ts.map

package/dist/_global.ext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_global.ext.d.ts","sourceRoot":"","sources":["../_src/_global.ext.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,yCAAyC,CAAA;AAC7D;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,6CAA6C,CAAA;AACjE;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,4CAA4C,CAAA;AAChE;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,8CAA8C,CAAA;AAKlE;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAClD;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,6BAA6B,CAAA;AAEjD;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,oCAAoC,CAAA;AAExD;;GAEG;AACH,OAAO,EAAE,MAAM,mCAAmC,CAAA;AAClD,OAAO,EAAE,CAAC,EAAE,MAAM,2BAA2B,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;;;;;AAKtD,eAAO,MAAM,WAAW,YAAa,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,gDAAkD,CAAA;;;;;AAK3G,eAAO,MAAM,eAAe,gBAAiB,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,qDAA4C,CAAA;;;;;AAKlH,eAAO,MAAM,YAAY,eAAgB,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,wDAA0C,CAAA;;;;;AAKnH,eAAO,MAAM,SAAS,eAAgB,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,YAAY,GAAG,SAAS,MAC/D,CAAA"}
+{"version":3,"file":"_global.ext.d.ts","sourceRoot":"","sources":["../_src/_global.ext.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,yCAAyC,CAAA;AAC7D;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,6CAA6C,CAAA;AACjE;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,4CAA4C,CAAA;AAChE;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,8CAA8C,CAAA;AAGlE;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAClD;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,6BAA6B,CAAA;AAEjD;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,oCAAoC,CAAA;AAExD;;GAEG;AACH,OAAO,EAAE,MAAM,mCAAmC,CAAA;AAlBlD,OAAO,6BAA6B,CAAA"}