@effect-app/infra 0.167.0 → 0.169.0

package/_src/services/RequestContextContainer.ts

@@ -6,11 +6,11 @@ import { RequestContext } from "../RequestContext.js"
  * @tsplus companion RequestContextContainer.Ops
  */
 export class RequestContextContainer extends TagClass<RequestContextContainer, {
-  requestContext: Effect<never, never, RequestContext>
-  update: (f: (rc: RequestContext) => RequestContext) => Effect<never, never, RequestContext>
-  start: (f: RequestContext) => Effect<never, never, void>
+  requestContext: Effect<RequestContext>
+  update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>
+  start: (f: RequestContext) => Effect<void>
 }>() {
-  static get get(): Effect<RequestContextContainer, never, RequestContext> {
+  static get get(): Effect<RequestContext, never, RequestContextContainer> {
     return RequestContextContainer.flatMap((_) => _.requestContext)
   }
   static get getOption() {
@@ -39,7 +39,7 @@ export const live = Effect
   .toLayerScoped(RequestContextContainer)
 
 /** @tsplus static RequestContext.Ops Tag */
-export const RCTag = Tag<RequestContext>()
+export const RCTag = GenericTag<RequestContext>("@services/RCTag")
 
 /**
  * @tsplus getter RequestContext spanAttributes
@@ -49,8 +49,7 @@ export const spanAttributes = (ctx: RequestContext) => ({
   "request.name": ctx.name,
   "request.locale": ctx.locale,
   "request.namespace": ctx.namespace,
-  ...ctx.userProfile?.sub
-    ? {
+  ...(ctx.userProfile?.sub ? {
       "request.user.sub": ctx
         .userProfile
         .sub,
@@ -58,6 +57,5 @@ export const spanAttributes = (ctx: RequestContext) => ({
           .userProfile
         ? ctx.userProfile.roles
         : undefined
-    }
-    : {}
+    } : {})
 })

package/_src/services/Store/ContextMapContainer.ts

@@ -10,10 +10,10 @@ import { ContextMap, makeContextMap } from "./service.js"
  * @tsplus companion ContextMapContainer.Ops
  */
 export class ContextMapContainer extends TagClass<ContextMapContainer, {
-  get: Effect<never, never, ContextMap>
-  start: Effect<never, never, void>
+  get: Effect<ContextMap>
+  start: Effect<void>
 }>() {
-  static get get(): Effect<ContextMapContainer, never, ContextMap> {
+  static get get(): Effect<ContextMap, never, ContextMapContainer> {
     return ContextMapContainer.flatMap((_) => _.get)
   }
   static get getOption() {
@@ -37,4 +37,4 @@ export const live = Effect
   .toLayerScoped(ContextMapContainer)
 
 /** @tsplus static ContextMap.Ops Tag */
-export const RCTag = Tag<ContextMap>()
+export const RCTag = GenericTag<ContextMap>("@services/RCTag")

package/_src/services/Store/Cosmos.ts

@@ -30,7 +30,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
     return {
       make: <Id extends string, PM extends PersistenceModelType<Id>, R = never, E = never>(
         name: string,
-        seed?: Effect<R, E, Iterable<PM>>,
+        seed?: Effect<Iterable<PM>, E, R>,
         config?: StoreConfig<PM>
       ) =>
         Effect.gen(function*($) {
@@ -433,8 +433,8 @@ function makeCosmosStore({ prefix }: StorageConfig) {
           }
           return s
         })
-    }
-  })
+    };
+  });
 }
 
 export function CosmosStoreLayer(cfg: StorageConfig) {

package/_src/services/Store/Disk.ts

@@ -12,7 +12,7 @@ function makeDiskStoreInt<Id extends string, PM extends PersistenceModelType<Id>
   namespace: string,
   dir: string,
   name: string,
-  seed?: Effect<R, E, Iterable<PM>>,
+  seed?: Effect<Iterable<PM>, E, R>,
   defaultValues?: Partial<PM>
 ) {
   return Effect.gen(function*($) {
@@ -102,7 +102,7 @@ export function makeDiskStore({ prefix }: StorageConfig, dir: string) {
     return {
       make: <Id extends string, PM extends PersistenceModelType<Id>, R, E>(
         name: string,
-        seed?: Effect<R, E, Iterable<PM>>,
+        seed?: Effect<Iterable<PM>, E, R>,
         config?: StoreConfig<PM>
       ) =>
         Effect.gen(function*($) {
@@ -142,8 +142,8 @@ export function makeDiskStore({ prefix }: StorageConfig, dir: string) {
           }
           return s
         })
-    }
-  })
+    };
+  });
 }
 
 export function DiskStoreLayer(config: StorageConfig, dir: string) {

package/_src/services/Store/Memory.ts

@@ -57,7 +57,7 @@ function logQuery(f: FilterArgs<any, any>, defaultValues?: any) {
 export function makeMemoryStoreInt<Id extends string, PM extends PersistenceModelType<Id>, R = never, E = never>(
   modelName: string,
   namespace: string,
-  seed?: Effect<R, E, Iterable<PM>>,
+  seed?: Effect<Iterable<PM>, E, R>,
   _defaultValues?: Partial<PM>
 ) {
   return Effect.gen(function*($) {
@@ -166,7 +166,7 @@ export function makeMemoryStoreInt<Id extends string, PM extends PersistenceMode
 export const makeMemoryStore = () => ({
   make: <Id extends string, PM extends PersistenceModelType<Id>, R = never, E = never>(
     modelName: string,
-    seed?: Effect<R, E, Iterable<PM>>,
+    seed?: Effect<Iterable<PM>, E, R>,
     config?: StoreConfig<PM>
   ) =>
     Effect.gen(function*($) {

package/_src/services/Store/Redis.ts

@@ -12,7 +12,7 @@ function makeRedisStore({ prefix }: StorageConfig) {
     return {
       make: <Id extends string, PM extends PersistenceModelType<Id>, R = never, E = never>(
         name: string,
-        seed?: Effect<R, E, Iterable<PM>>,
+        seed?: Effect<Iterable<PM>, E, R>,
         _config?: StoreConfig<PM>
       ) =>
         Effect.gen(function*($) {
@@ -78,8 +78,8 @@ function makeRedisStore({ prefix }: StorageConfig) {
           }
           return s
         })
-    }
-  })
+    };
+  });
 }
 export function RedisStoreLayer(cfg: StorageConfig) {
   return makeRedisStore(cfg)

package/_src/services/Store/service.ts

@@ -72,27 +72,27 @@ export interface FilterArgs<PM extends PersistenceModelType<unknown>, U extends
 
 export type FilterFunc<PM extends PersistenceModelType<unknown>> = <U extends keyof PM = never>(
   args: FilterArgs<PM, U>
-) => Effect<never, never, (U extends undefined ? PM : Pick<PM, U>)[]>
+) => Effect<(U extends undefined ? PM : Pick<PM, U>)[]>
 
 export interface Store<PM extends PersistenceModelType<Id>, Id> {
-  all: Effect<never, never, PM[]>
+  all: Effect<PM[]>
   filter: FilterFunc<PM>
   /** @deprecated */
   filterJoinSelect: <T extends object>(
     filter: FilterJoinSelect
-  ) => Effect<never, never, (T & { _rootId: string })[]>
-  find: (id: Id) => Effect<never, never, Option<PM>>
-  set: (e: PM) => Effect<never, OptimisticConcurrencyException, PM>
+  ) => Effect<(T & { _rootId: string })[]>
+  find: (id: Id) => Effect<Option<PM>>
+  set: (e: PM) => Effect<PM, OptimisticConcurrencyException>
   batchSet: (
     items: NonEmptyReadonlyArray<PM>
-  ) => Effect<never, OptimisticConcurrencyException, NonEmptyReadonlyArray<PM>>
+  ) => Effect<NonEmptyReadonlyArray<PM>, OptimisticConcurrencyException>
   bulkSet: (
     items: NonEmptyReadonlyArray<PM>
-  ) => Effect<never, OptimisticConcurrencyException, NonEmptyReadonlyArray<PM>>
+  ) => Effect<NonEmptyReadonlyArray<PM>, OptimisticConcurrencyException>
   /**
    * Requires the PM type, not Id, because various stores may need to calculate e.g partition keys.
    */
-  remove: (e: PM) => Effect<never, never, void>
+  remove: (e: PM) => Effect<void>
 }
 
 /**
@@ -102,9 +102,9 @@ export interface Store<PM extends PersistenceModelType<Id>, Id> {
 export class StoreMaker extends TagClass<StoreMaker, {
   make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(
     name: string,
-    seed?: Effect<R, E, Iterable<PM>>,
+    seed?: Effect<Iterable<PM>, E, R>,
     config?: StoreConfig<PM>
-  ) => Effect<R, E, Store<PM, Id>>
+  ) => Effect<Store<PM, Id>, E, R>
 }>() {
 }
 

package/_src/services/Store/utils.ts

@@ -10,10 +10,10 @@ import { codeFilter3_ } from "./codeFilter.js"
 export const makeETag = <E extends PersistenceModelType<Id>, Id extends string>(
   { _etag, ...e }: E
 ): E =>
-  ({
+  (({
     ...e,
     _etag: objectHash(e)
-  }) as any
+  }) as any)
 export const makeUpdateETag =
   (type: string) => <E extends PersistenceModelType<Id>, Id extends string>(e: E, current: Option<E>) =>
     Effect.gen(function*($) {

package/_src/services/simpledb/cosmosdb.ts

@@ -27,8 +27,8 @@ const setup = (type: string, indexingPolicy: IndexingPolicy) =>
 export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>() {
   return <REncode, RDecode, EDecode>(
     type: string,
-    encode: (record: A) => Effect<REncode, never, EA>,
-    decode: (d: EA) => Effect<RDecode, EDecode, A>,
+    encode: (record: A) => Effect<EA, never, REncode>,
+    decode: (d: EA) => Effect<A, EDecode, RDecode>,
     // schemaVersion: string,
     indexes: IndexingPolicy
   ) => {
@@ -144,5 +144,5 @@ WHERE (
         return { version, data: record } as CachedRecord<A>
       })
     }
-  }
+  };
 }

package/_src/services/simpledb/diskdb.ts

@@ -12,8 +12,8 @@ import type { Version } from "./simpledb.js"
 export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>() {
   return <REncode, RDecode, EDecode>(
     type: string,
-    encode: (record: A) => Effect<REncode, never, EA>,
-    decode: (d: EA) => Effect<RDecode, EDecode, A>,
+    encode: (record: A) => Effect<EA, never, REncode>,
+    decode: (d: EA) => Effect<A, EDecode, RDecode>,
     schemaVersion: string,
     makeIndexKey: (r: A) => Index,
     dir = "./data.js"
@@ -143,7 +143,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
     function getIdxName(type: string, id: string) {
       return `${dir}/v${schemaVersion}.${getIndexName(type, id)}.json`
     }
-  }
+  };
 }
 
 function lockFile(fileName: string) {

package/_src/services/simpledb/memdb.ts

@@ -14,8 +14,8 @@ const parseSDB = SerializedDBRecord.decodeUnknown
 export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>() {
   return <REncode, RDecode, EDecode>(
     type: string,
-    encode: (record: A) => Effect<REncode, never, EA>,
-    decode: (d: EA) => Effect<RDecode, EDecode, A>
+    encode: (record: A) => Effect<EA, never, REncode>,
+    decode: (d: EA) => Effect<A, EDecode, RDecode>
   ) => {
     return {
       find: simpledb.find(find, decode, type),
@@ -69,7 +69,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
         .flatMap((serialised) => storage.set(getRecordName(type, record.id), serialised))
         .map(() => ({ version, data: record } as CachedRecord<A>))
     }
-  }
+  };
 }
 
 function bogusLock() {

package/_src/services/simpledb/mongodb.ts

@@ -18,8 +18,8 @@ const setup = (type: string, indexes: IndexDescription[]) =>
 export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>() {
   return <REncode, RDecode, EDecode>(
     type: string,
-    encode: (record: A) => Effect<REncode, never, EA>,
-    decode: (d: EA) => Effect<RDecode, EDecode, A>,
+    encode: (record: A) => Effect<EA, never, REncode>,
+    decode: (d: EA) => Effect<A, EDecode, RDecode>,
     // schemaVersion: string,
     indexes: IndexDescription[]
   ) => {
@@ -102,5 +102,5 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
         return { version, data: record } as CachedRecord<A>
       })
     }
-  }
+  };
 }

package/_src/services/simpledb/redisdb.ts

@@ -13,8 +13,8 @@ const ttl = 10 * 1000
 export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>() {
   return <REncode, RDecode, EDecode>(
     type: string,
-    encode: (record: A) => Effect<REncode, never, EA>,
-    decode: (d: EA) => Effect<RDecode, EDecode, A>,
+    encode: (record: A) => Effect<EA, never, REncode>,
+    decode: (d: EA) => Effect<A, EDecode, RDecode>,
     schemaVersion: string,
     makeIndexKey: (r: A) => Index
   ) => {
@@ -166,13 +166,13 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
     function getIdxLockKey(index: Index) {
       return `v${schemaVersion}.locks.${getIndexName(type, index.doc)}_${index.key}`
     }
-  }
+  };
 
   function hmSetRec(key: string, val: RedisSerializedDBRecord) {
     const enc = RedisSerializedDBRecord.encodeSync(val)
     return RedisClient.flatMap(({ client }) =>
       Effect
-        .async<never, ConnectionException, void>((res) => {
+        .async<void, ConnectionException>((res) => {
           client.hmset(
             key,
             "version",
@@ -188,7 +188,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
           )
         })
         .uninterruptible
-    )
+    );
   }
 }
 

package/_src/services/simpledb/shared.ts

@@ -34,7 +34,8 @@ export class SerializedDBRecord extends S.Class<SerializedDBRecord>()({
 }) {}
 
 // unknown -> string -> SDB?
-export function makeSerialisedDBRecord(s: Schema<never, any>) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function makeSerialisedDBRecord(s: Schema<any>) {
   return S.struct({
     version: S.number,
     timestamp: S.Date,
@@ -74,8 +75,8 @@ export function makeMap<TKey, T>() {
 
 export interface EffectMap<TKey, T> {
   [Symbol.iterator](): IterableIterator<[TKey, T]>
-  find: (k: TKey) => Effect<never, never, Option<T>>
-  set: (k: TKey, v: T) => Effect<never, never, void>
+  find: (k: TKey) => Effect<Option<T>>
+  set: (k: TKey, v: T) => Effect<void>
 }
 
 // export function encodeOnlyWhenStrictMatch<A, E>(

package/_src/services/simpledb/simpledb.ts

@@ -26,19 +26,19 @@ export function makeLiveRecordCache() {
 export interface RecordCache extends ReturnType<typeof makeLiveRecordCache> {}
 
 // module tag
-export const RecordCache = Tag<RecordCache>()
+export const RecordCache = GenericTag<RecordCache>("@services/RecordCache")
 
 export const LiveRecordCache = Effect.sync(() => makeLiveRecordCache()).toLayer(RecordCache)
 
-const getM = <T>(type: string) => <R, E, A>(eff: (m: EffectMap<string, CachedRecord<T>>) => Effect<R, E, A>) =>
+const getM = <T>(type: string) => <R, E, A>(eff: (m: EffectMap<string, CachedRecord<T>>) => Effect<A, E, R>) =>
   Effect.gen(function*($) {
     const { get } = yield* $(RecordCache)
     return yield* $(get<T>(type).flatMap(eff))
   })
 
 export function find<R, RDecode, EDecode, E, EA, A>(
-  tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>,
-  decode: (d: EA) => Effect<RDecode, EDecode, A>,
+  tryRead: (id: string) => Effect<Option<CachedRecord<EA>>, E, R>,
+  decode: (d: EA) => Effect<A, EDecode, RDecode>,
   type: string
 ) {
   const getCache = getM<A>(type)
@@ -63,7 +63,7 @@ export function find<R, RDecode, EDecode, E, EA, A>(
 }
 
 export function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(
-  save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>,
+  save: (r: A, version: Option<Version>) => Effect<CachedRecord<A>, E, R>,
   type: string
 ) {
   const getCache = getM<A>(type)
@@ -79,9 +79,9 @@ export function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey
 }
 
 export function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(
-  tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>,
-  save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>,
-  lock: (id: string) => Effect<R2 | Scope, E2, unknown>,
+  tryRead: (id: string) => Effect<Option<CachedRecord<EA>>, E, R>,
+  save: (r: A, version: Option<Version>) => Effect<CachedRecord<A>, E, R>,
+  lock: (id: string) => Effect<unknown, E2, R2 | Scope>,
   type: string
 ) {
   const getCache = getM<A>(type)

package/dist/RequestContext.d.ts

@@ -1,15 +1,6 @@
 import { useClassFeaturesForSchema, TaggedClass, NonEmptyString255, struct, literal } from "@effect-app/prelude/schema";
 import { S } from "@effect-app/prelude";
-declare const RequestContextParent_base: S.EnhancedClass<never, {
-    readonly _tag: "RequestContext";
-    readonly id: string;
-    readonly name: string;
-    readonly locale: "en" | "de";
-    readonly createdAt: string;
-    readonly userProfile?: {
-        readonly sub: string;
-    } | undefined;
-}, {
+declare const RequestContextParent_base: S.EnhancedClass<{
     readonly _tag: "RequestContext";
     readonly id: S.NonEmptyString255;
     readonly name: string & S.NonEmptyString255Brand;
@@ -19,6 +10,15 @@ declare const RequestContextParent_base: S.EnhancedClass<never, {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
     } | undefined;
 }, {
+    readonly _tag: "RequestContext";
+    readonly id: string;
+    readonly name: string;
+    readonly locale: "en" | "de";
+    readonly createdAt: string;
+    readonly userProfile?: {
+        readonly sub: string;
+    } | undefined;
+}, never, {
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly userProfile?: {
@@ -27,27 +27,39 @@ declare const RequestContextParent_base: S.EnhancedClass<never, {
     readonly id?: S.NonEmptyString255;
     readonly createdAt?: Date;
 }, RequestContextParent, {
-    id: S.WithDefaults<S.Schema<never, string, S.NonEmptyString255> & {
+    id: S.WithDefaults<S.Schema<S.NonEmptyString255, string, never> & {
         make: () => S.NonEmptyString255;
-        withDefault: S.Schema<never, string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<never, string, S.NonEmptyString255>;
-    }> & S.Schema<never, string, S.NonEmptyString255> & {
+        withDefault: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
+    }> & S.Schema<S.NonEmptyString255, string, never> & {
         make: () => S.NonEmptyString255;
-        withDefault: S.Schema<never, string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<never, string, S.NonEmptyString255>;
+        withDefault: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
     };
-    name: S.WithDefaults<S.Schema<never, string, string & S.NonEmptyString255Brand>> & S.Schema<never, string, string & S.NonEmptyString255Brand>;
-    userProfile: S.PropertySignature<never, {
+    name: S.WithDefaults<S.Schema<string & S.NonEmptyString255Brand, string, never>> & S.Schema<string & S.NonEmptyString255Brand, string, never>;
+    userProfile: S.PropertySignature<{
         readonly sub: string;
     } | undefined, true, {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
-    } | undefined, true>;
-    locale: S.Schema<never, "en" | "de", "en" | "de"> & {
+    } | undefined, true, never>;
+    locale: S.Schema<"en" | "de", "en" | "de", never> & {
         literals: ["en", "de"];
     };
-    createdAt: S.Schema<never, string, Date> & S.ConstructorPropertyDescriptor<never, string, Date>;
-}, {}>;
+    createdAt: S.Schema<Date, string, never> & S.ConstructorPropertyDescriptor<Date, string, never>;
+}, {}, {}>;
 export declare class RequestContextParent extends RequestContextParent_base {
 }
-declare const RequestContext_base: S.EnhancedClass<never, {
+declare const RequestContext_base: S.EnhancedClass<{
+    readonly _tag: "RequestContext";
+    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 & S.NonEmptyString255Brand) | undefined;
+}, {
     readonly _tag: "RequestContext";
     readonly id: string;
     readonly name: string;
@@ -68,19 +80,7 @@ declare const RequestContext_base: S.EnhancedClass<never, {
         } | undefined;
     } | undefined;
     readonly namespace?: string | undefined;
-}, {
-    readonly _tag: "RequestContext";
-    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 & S.NonEmptyString255Brand) | undefined;
-}, {
+}, never, {
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly userProfile?: {
@@ -92,15 +92,15 @@ declare const RequestContext_base: S.EnhancedClass<never, {
     readonly createdAt?: Date;
     readonly rootId?: S.NonEmptyString255;
 }, RequestContext, {
-    id: S.Schema<never, string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<never, string, S.NonEmptyString255>;
-    rootId: S.WithDefaults<S.Schema<never, string, S.NonEmptyString255> & {
+    id: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
+    rootId: S.WithDefaults<S.Schema<S.NonEmptyString255, string, never> & {
         make: () => S.NonEmptyString255;
-        withDefault: S.Schema<never, string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<never, string, S.NonEmptyString255>;
-    }> & S.Schema<never, string, S.NonEmptyString255> & {
+        withDefault: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
+    }> & S.Schema<S.NonEmptyString255, string, never> & {
         make: () => S.NonEmptyString255;
-        withDefault: S.Schema<never, string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<never, string, S.NonEmptyString255>;
+        withDefault: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
     };
-    parent: S.PropertySignature<never, {
+    parent: S.PropertySignature<{
         readonly _tag: "RequestContext";
         readonly id: string;
         readonly name: string;
@@ -109,19 +109,19 @@ declare const RequestContext_base: S.EnhancedClass<never, {
         readonly userProfile?: {
             readonly sub: string;
         } | undefined;
-    } | undefined, true, RequestContextParent | undefined, true>;
-    namespace: S.PropertySignature<never, string | undefined, true, (string & S.NonEmptyString255Brand) | undefined, true>;
-    name: S.WithDefaults<S.Schema<never, string, string & S.NonEmptyString255Brand>> & S.Schema<never, string, string & S.NonEmptyString255Brand>;
-    userProfile: S.PropertySignature<never, {
+    } | undefined, true, RequestContextParent | undefined, true, never>;
+    namespace: S.PropertySignature<string | undefined, true, (string & S.NonEmptyString255Brand) | undefined, true, never>;
+    name: S.WithDefaults<S.Schema<string & S.NonEmptyString255Brand, string, never>> & S.Schema<string & S.NonEmptyString255Brand, string, never>;
+    userProfile: S.PropertySignature<{
         readonly sub: string;
     } | undefined, true, {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
-    } | undefined, true>;
-    locale: S.Schema<never, "en" | "de", "en" | "de"> & {
+    } | undefined, true, never>;
+    locale: S.Schema<"en" | "de", "en" | "de", never> & {
         literals: ["en", "de"];
     };
-    createdAt: S.Schema<never, string, Date> & S.ConstructorPropertyDescriptor<never, string, Date>;
-}, {}>;
+    createdAt: S.Schema<Date, string, never> & S.ConstructorPropertyDescriptor<Date, string, never>;
+}, {}, {}>;
 /**
  * @tsplus type RequestContext
  * @tsplus companion RequestContext.Ops

package/dist/RequestContext.js

@@ -6,13 +6,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 var RequestContext_1;
 import * as tsplus_module_1 from "@effect-app/prelude/schema";
-import * as tsplus_module_2 from "@effect/schema/Schema";
 import { S } from "@effect-app/prelude";
 import { RequestId, UserProfileId } from "@effect-app/prelude/ids";
 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 })),
+    userProfile: S.optional(tsplus_module_1.struct({ sub: UserProfileId })),
     locale: tsplus_module_1.literal("en", "de"),
     createdAt: S.Date.withDefault
 }) {
@@ -29,8 +28,8 @@ let RequestContext = RequestContext_1 = class RequestContext extends tsplus_modu
     ...RequestContextParent.omit("id"),
     id: RequestId.withDefault,
     rootId: RequestId,
-    parent: tsplus_module_2.optional(RequestContextParent),
-    namespace: tsplus_module_2.optional(tsplus_module_1.NonEmptyString255)
+    parent: S.optional(RequestContextParent),
+    namespace: S.optional(tsplus_module_1.NonEmptyString255)
     // ...RequestContextParent.omit("id").extend({
     //   id: RequestId.withDefault,
     //   rootId: RequestId,
@@ -61,4 +60,4 @@ RequestContext = RequestContext_1 = __decorate([
     tsplus_module_1.useClassFeaturesForSchema
 ], RequestContext);
 export { RequestContext };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUN2QyxPQUFPLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBRzNELElBQU0sb0JBQW9CLEdBQTFCLE1BQU0sb0JBQXFCLFNBQVEsZ0JBQUEsV0FBVyxFQUVsRCxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEVBQUUsRUFBRSxTQUFTO0lBQ2IsSUFBSSxrQkFBRSxpQkFBaUI7SUFDdkIsV0FBVyxFQUFFLHlCQUFBLGdCQUFBLE1BQU0sQ0FBQyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsQ0FBQyxDQUFXO0lBQ3RELE1BQU0sRUFBRSxnQkFBQSxPQUFPLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQztJQUMzQixTQUFTLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXO0NBQzlCLENBQUM7Q0FBRyxDQUFBO0FBUlEsb0JBQW9CO29CQURoQyx5QkFBeUI7R0FDYixvQkFBb0IsQ0FRNUI7O0FBRUw7OztHQUdHO0FBRUksSUFBTSxjQUFjLHNCQUFwQixNQUFNLGNBQWUsU0FBUSxnQkFBQSxXQUFXLEVBRTVDLENBQUMsZ0JBQWdCLEVBQUU7SUFDcEIsR0FBRyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO0lBQ2xDLEVBQUUsRUFBRSxTQUFTLENBQUMsV0FBVztJQUN6QixNQUFNLEVBQUUsU0FBUztJQUNqQixNQUFNLEVBQUUseUJBQUEsb0JBQW9CLENBQVc7SUFDdkMsU0FBUyxFQUFFLHlDQUFBLGlCQUFpQixDQUFXO0lBQ3ZDLDhDQUE4QztJQUM5QywrQkFBK0I7SUFDL0IsdUJBQXVCO0lBQ3ZCLDZDQUE2QztJQUM3Qyw0Q0FBNEM7SUFDNUMsS0FBSztDQUNOLENBQUM7SUFDQSw2Q0FBNkM7SUFDN0MsTUFBTSxDQUFDLE9BQU8sQ0FFWixNQUFzQixFQUN0QixPQUE4RDtRQUU5RCxPQUFPLElBQUksZ0JBQWMsQ0FBQztZQUN4QixTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVM7WUFDNUIsR0FBRyxPQUFPO1lBQ1YsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1lBQ3JCLE1BQU07U0FDUCxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQVksQ0FBYSxJQUFvQjtRQUNsRCxPQUFPO1lBQ0wsYUFBYSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ3hCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU07Z0JBQ2IsQ0FBQyxDQUFDLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFO2dCQUM3RSxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQTtJQUNILENBQUM7Q0FDRixDQUFBO0FBdENZLGNBQWM7b0JBRDFCLHlCQUF5QjtHQUNiLGNBQWMsQ0FzQzFCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFHM0QsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSxnQkFBQSxXQUFXLEVBRWxELENBQUMsZ0JBQWdCLEVBQUU7SUFDcEIsRUFBRSxFQUFFLFNBQVM7SUFDYixJQUFJLGtCQUFFLGlCQUFpQjtJQUN2QixXQUFXLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxnQkFBQSxNQUFNLENBQUMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLENBQUMsQ0FBQztJQUN2RCxNQUFNLEVBQUUsZ0JBQUEsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7SUFDM0IsU0FBUyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVztDQUM5QixDQUFDO0NBQUcsQ0FBQTtBQVJRLG9CQUFvQjtvQkFEaEMseUJBQXlCO0dBQ2Isb0JBQW9CLENBUTVCOztBQUVMOzs7R0FHRztBQUVJLElBQU0sY0FBYyxzQkFBcEIsTUFBTSxjQUFlLFNBQVEsZ0JBQUEsV0FBVyxFQUU1QyxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEdBQUcsb0JBQW9CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztJQUNsQyxFQUFFLEVBQUUsU0FBUyxDQUFDLFdBQVc7SUFDekIsTUFBTSxFQUFFLFNBQVM7SUFDakIsTUFBTSxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQUM7SUFDeEMsU0FBUyxFQUFFLENBQUMsQ0FBQyxRQUFRLGlCQUFDLGlCQUFpQixDQUFDO0lBQ3hDLDhDQUE4QztJQUM5QywrQkFBK0I7SUFDL0IsdUJBQXVCO0lBQ3ZCLDZDQUE2QztJQUM3Qyw0Q0FBNEM7SUFDNUMsS0FBSztDQUNOLENBQUM7SUFDQSw2Q0FBNkM7SUFDN0MsTUFBTSxDQUFDLE9BQU8sQ0FFWixNQUFzQixFQUN0QixPQUE4RDtRQUU5RCxPQUFPLElBQUksZ0JBQWMsQ0FBQztZQUN4QixTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVM7WUFDNUIsR0FBRyxPQUFPO1lBQ1YsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1lBQ3JCLE1BQU07U0FDUCxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQVksQ0FBYSxJQUFvQjtRQUNsRCxPQUFPO1lBQ0wsYUFBYSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ3hCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU07Z0JBQ2IsQ0FBQyxDQUFDLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFO2dCQUM3RSxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQTtJQUNILENBQUM7Q0FDRixDQUFBO0FBdENZLGNBQWM7b0JBRDFCLHlCQUF5QjtHQUNiLGNBQWMsQ0FzQzFCIn0=

package/dist/_ext/Array.d.ts

@@ -10,7 +10,7 @@ import { NotFoundError } from "../errors.js";
  */
 export declare function getFirstById_<A extends {
     id: unknown;
-}, Type extends string>(a: Iterable<A>, id: A["id"], type: Type): import("effect/Effect").Effect<never, NotFoundError<Type>, A>;
+}, Type extends string>(a: Iterable<A>, id: A["id"], type: Type): import("effect/Effect").Effect<A, NotFoundError<Type>, never>;
 /**
  * @tsplus fluent Object.Ops inspect
  * @tsplus location "@effect-app/infra/_ext/Array"

package/dist/api/codec.d.ts

@@ -1,5 +1,5 @@
 import * as S from "@effect-app/prelude/schema";
 export declare function makeCodec<From, To extends {
     id: Id;
-}, Id>(self: S.Schema<never, From, To>): readonly [(i: From, overrideOptions?: S.AST.ParseOptions | undefined) => To, (a: To, overrideOptions?: S.AST.ParseOptions | undefined) => From];
+}, Id>(self: S.Schema<To, From>): readonly [(i: From, overrideOptions?: S.AST.ParseOptions | undefined) => To, (a: To, overrideOptions?: S.AST.ParseOptions | undefined) => From];
 //# sourceMappingURL=codec.d.ts.map

package/dist/api/codec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codec.d.ts","sourceRoot":"","sources":["../../_src/api/codec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAA;AAE/C,wBAAgB,SAAS,CACvB,IAAI,EACJ,EAAE,SAAS;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,EACrB,EAAE,EACF,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,mJAEhC"}
+{"version":3,"file":"codec.d.ts","sourceRoot":"","sources":["../../_src/api/codec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAA;AAE/C,wBAAgB,SAAS,CACvB,IAAI,EACJ,EAAE,SAAS;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,EACrB,EAAE,EACF,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,mJAEzB"}

package/dist/api/codec.js

@@ -2,4 +2,4 @@ import * as S from "@effect-app/prelude/schema";
 export function makeCodec(self) {
     return [S.decodeSync(self), S.encodeSync(self)];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL2FwaS9jb2RlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssQ0FBQyxNQUFNLDRCQUE0QixDQUFBO0FBRS9DLE1BQU0sVUFBVSxTQUFTLENBSXZCLElBQStCO0lBQy9CLE9BQU8sQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQVUsQ0FBQTtBQUMxRCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL2FwaS9jb2RlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssQ0FBQyxNQUFNLDRCQUE0QixDQUFBO0FBRS9DLE1BQU0sVUFBVSxTQUFTLENBSXZCLElBQXdCO0lBQ3hCLE9BQU8sQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQVUsQ0FBQTtBQUMxRCxDQUFDIn0=

package/dist/api/defaultErrorHandler.d.ts

@@ -1,6 +1,6 @@
 import { Effect } from "effect/Effect";
 import type { SupportedErrors, ValidationError } from "@effect-app/prelude/client/errors";
 import type express from "express";
-export declare function defaultBasicErrorHandler<R>(_req: express.Request, res: express.Response, r2: Effect<R, ValidationError, void>): import("effect/Effect").Effect<R, never, void | express.Response<any, Record<string, any>>>;
-export declare function defaultErrorHandler<R>(req: express.Request, res: express.Response, r2: Effect<R, SupportedErrors, void>): import("effect/Effect").Effect<R, never, void | express.Response<any, Record<string, any>>>;
+export declare function defaultBasicErrorHandler<R>(_req: express.Request, res: express.Response, r2: Effect<void, ValidationError, R>): import("effect/Effect").Effect<void | express.Response<any, Record<string, any>>, never, R>;
+export declare function defaultErrorHandler<R>(req: express.Request, res: express.Response, r2: Effect<void, SupportedErrors, R>): import("effect/Effect").Effect<void | express.Response<any, Record<string, any>>, never, R>;
 //# sourceMappingURL=defaultErrorHandler.d.ts.map