@effect-app/infra 2.7.0 → 2.8.0

package/src/{services/CUPS.ts → CUPS.ts}

@@ -8,7 +8,7 @@ import fs from "fs"
 import os from "os"
 import path from "path"
 import util from "util"
-import { InfraLogger } from "../logger.js"
+import { InfraLogger } from "./logger.js"
 
 export const PrinterId = NonEmptyString255
 export type PrinterId = NonEmptyString255

package/src/{services/Emailer → Emailer}/Sendgrid.ts

@@ -3,7 +3,7 @@ import sgMail from "@sendgrid/mail"
 import { Array, Effect, Equivalence, Secret } from "effect-app"
 import { dropUndefinedT } from "effect-app/utils"
 import { inspect } from "util"
-import { InfraLogger } from "../../logger.js"
+import { InfraLogger } from "../logger.js"
 import { Emailer } from "./service.js"
 import type { EmailMsg, EmailMsgOptionalFrom, SendgridConfig } from "./service.js"
 

package/src/{services/Emailer → Emailer}/fake.ts

@@ -1,6 +1,6 @@
 import { Effect } from "effect-app"
 import { pretty } from "effect-app/utils"
-import { InfraLogger } from "../../logger.js"
+import { InfraLogger } from "../logger.js"
 import { Emailer } from "./service.js"
 
 const makeFake = InfraLogger

package/src/{services/MainFiberSet.ts → MainFiberSet.ts}

@@ -1,7 +1,7 @@
 import { Context, Effect, Fiber, FiberSet, Layer } from "effect-app"
 import type {} from "effect/Scope"
 import type {} from "effect/Context"
-import { InfraLogger } from "../logger.js"
+import { InfraLogger } from "./logger.js"
 import { reportNonInterruptedFailureCause } from "./QueueMaker/errors.js"
 import { setRootParentSpan } from "./RequestFiberSet.js"
 

package/src/{services → Model}/Repository/ext.ts

@@ -6,9 +6,9 @@ import type { InvalidStateError, OptimisticConcurrencyException } from "effect-a
 import { NotFoundError } from "effect-app/client"
 import type { FixEnv, PureEnv } from "effect-app/Pure"
 import { runTerm } from "effect-app/Pure"
+import { AnyPureDSL } from "../dsl.js"
 import type { Query, QueryEnd, QueryWhere } from "../query.js"
 import * as Q from "../query.js"
-import { AnyPureDSL } from "./dsl.js"
 import type { Repository } from "./service.js"
 
 export const extendRepo = <
@@ -17,9 +17,10 @@ export const extendRepo = <
   Evt,
   ItemType extends string,
   IdKey extends keyof T,
-  R
+  RSchema,
+  RPublish
 >(
-  repo: Repository<T, Encoded, Evt, ItemType, IdKey, R>
+  repo: Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>
 ) => {
   const get = (id: T[IdKey]) =>
     Effect.flatMap(
@@ -113,7 +114,9 @@ export const extendRepo = <
     ): Effect.Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | E2,
-      Exclude<R2, {
+      | RSchema
+      | RPublish
+      | Exclude<R2, {
         env: PureEnv<Evt, readonly T[], readonly T2[]>
       }>
     >
@@ -129,7 +132,9 @@ export const extendRepo = <
     ): Effect.Effect<
       A[],
       InvalidStateError | OptimisticConcurrencyException | E2,
-      Exclude<R2, {
+      | RSchema
+      | RPublish
+      | Exclude<R2, {
         env: PureEnv<Evt, readonly T[], readonly T2[]>
       }>
     >
@@ -151,7 +156,9 @@ export const extendRepo = <
     ): Effect.Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | E,
-      Exclude<R, {
+      | RSchema
+      | RPublish
+      | Exclude<R, {
         env: PureEnv<Evt, readonly S1[], readonly S2[]>
       }>
     >
@@ -162,7 +169,9 @@ export const extendRepo = <
     ): Effect.Effect<
       A[],
       InvalidStateError | OptimisticConcurrencyException | E,
-      Exclude<R, {
+      | RSchema
+      | RPublish
+      | Exclude<R, {
         env: PureEnv<Evt, readonly S1[], readonly S2[]>
       }>
     >
@@ -186,7 +195,9 @@ export const extendRepo = <
     ): Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E,
-      Exclude<R, {
+      | RSchema
+      | RPublish
+      | Exclude<R, {
         env: PureEnv<Evt, T, S2>
       }>
     >
@@ -255,7 +266,7 @@ export const extendRepo = <
   return {
     ...repo,
     ...exts
-  } as Repository<T, Encoded, Evt, ItemType, IdKey, R> & typeof exts
+  } as Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish> & typeof exts
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
@@ -265,5 +276,6 @@ export interface ExtendedRepository<
   Evt,
   ItemType extends string,
   IdKey extends keyof T,
-  R
-> extends ReturnType<typeof extendRepo<T, Encoded, Evt, ItemType, IdKey, R>> {}
+  RSchema,
+  RPublish
+> extends ReturnType<typeof extendRepo<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>> {}

package/src/{services → Model}/Repository/legacy.ts

@@ -5,12 +5,13 @@ import { Context, Effect, Layer } from "effect-app"
 import type { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
 import type { FixEnv, PureEnv } from "effect-app/Pure"
 import type { NonNegativeInt } from "effect-app/Schema"
-import type { FieldValues } from "../../filter/types.js"
+import type { StoreConfig, StoreMaker } from "../../Store.js"
+import type { FieldValues } from "../filter/types.js"
 import * as Q from "../query.js"
-import type { Repos } from "../RepositoryBase.js"
-import { makeRepoInternal } from "../RepositoryBase.js"
-import type { StoreConfig, StoreMaker } from "../Store.js"
-import { type ExtendedRepository, extendRepo } from "./ext.js"
+import type { ExtendedRepository } from "./ext.js"
+import { extendRepo } from "./ext.js"
+import type { Repos } from "./makeRepo.js"
+import { makeRepoInternal } from "./makeRepo.js"
 import type { RefineTHelper, Repository } from "./service.js"
 
 const names = new Map<string, number>()
@@ -29,22 +30,31 @@ const registerName = (name: string) => {
 /**
  * @deprecated
  */
-export interface RepoFunctions<T, Encoded extends { id: string }, Evt, ItemType, IdKey extends keyof T, Service> {
+export interface RepoFunctions<
+  T,
+  Encoded extends { id: string },
+  Evt,
+  ItemType,
+  IdKey extends keyof T,
+  RSchema,
+  RPublish,
+  Service
+> {
   itemType: ItemType
   T: T
-  all: Effect<readonly T[], never, Service>
-  find: (id: T[IdKey]) => Effect<Option<T>, never, Service>
-  removeById: (id: T[IdKey]) => Effect<void, NotFoundError<ItemType>, Service>
+  all: Effect<readonly T[], never, RSchema | Service>
+  find: (id: T[IdKey]) => Effect<Option<T>, never, RSchema | Service>
+  removeById: (id: T[IdKey]) => Effect<void, NotFoundError<ItemType>, RSchema | Service>
   saveAndPublish: (
     items: Iterable<T>,
     events?: Iterable<Evt>
-  ) => Effect<void, InvalidStateError | OptimisticConcurrencyException, Service>
+  ) => Effect<void, InvalidStateError | OptimisticConcurrencyException, RSchema | RPublish | Service>
   removeAndPublish: (
     items: Iterable<T>,
     events?: Iterable<Evt>
-  ) => Effect<void, never, Service>
-  save: (...items: T[]) => Effect<void, InvalidStateError | OptimisticConcurrencyException, Service>
-  get: (id: T[IdKey]) => Effect<T, NotFoundError<ItemType>, Service>
+  ) => Effect<void, never, RSchema | Service>
+  save: (...items: T[]) => Effect<void, InvalidStateError | OptimisticConcurrencyException, RSchema | Service>
+  get: (id: T[IdKey]) => Effect<T, NotFoundError<ItemType>, RSchema | RPublish | Service>
   queryAndSavePure: {
     <A, E2, R2, T2 extends T>(
       q: (
@@ -54,6 +64,8 @@ export interface RepoFunctions<T, Encoded extends { id: string }, Evt, ItemType,
     ): Effect.Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E2,
+      | RSchema
+      | RPublish
       | Service
       | Exclude<R2, {
         env: PureEnv<Evt, T, T2>
@@ -70,6 +82,8 @@ export interface RepoFunctions<T, Encoded extends { id: string }, Evt, ItemType,
     ): Effect.Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | E2,
+      | RSchema
+      | RPublish
       | Service
       | Exclude<R2, {
         env: PureEnv<Evt, readonly T[], readonly T2[]>
@@ -87,6 +101,8 @@ export interface RepoFunctions<T, Encoded extends { id: string }, Evt, ItemType,
     ): Effect.Effect<
       A[],
       InvalidStateError | OptimisticConcurrencyException | E2,
+      | RSchema
+      | RPublish
       | Service
       | Exclude<R2, {
         env: PureEnv<Evt, readonly T[], readonly T2[]>
@@ -102,7 +118,7 @@ export interface RepoFunctions<T, Encoded extends { id: string }, Evt, ItemType,
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.ParseResult.ParseError),
-      R | Service
+      R | RSchema | Service
     >
     <
       R = never,
@@ -115,7 +131,7 @@ export interface RepoFunctions<T, Encoded extends { id: string }, Evt, ItemType,
     ): Effect.Effect<
       TType extends "many" ? readonly RefineTHelper<T, EncodedRefined>[] : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | Service
+      R | RSchema | Service
     >
   }
   byIdAndSaveWithPure: {
@@ -125,6 +141,8 @@ export interface RepoFunctions<T, Encoded extends { id: string }, Evt, ItemType,
     ): Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | E | NotFoundError<ItemType>,
+      | RSchema
+      | RPublish
       | Service
       | Exclude<R, {
         env: PureEnv<Evt, T, S2>
@@ -138,7 +156,10 @@ export interface RepoFunctions<T, Encoded extends { id: string }, Evt, ItemType,
     ): Effect.Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | E,
-      Exclude<R, {
+      | RSchema
+      | RPublish
+      | Service
+      | Exclude<R, {
         env: PureEnv<Evt, readonly S1[], readonly S2[]>
       }>
     >
@@ -149,7 +170,10 @@ export interface RepoFunctions<T, Encoded extends { id: string }, Evt, ItemType,
     ): Effect.Effect<
       A[],
       InvalidStateError | OptimisticConcurrencyException | E,
-      Exclude<R, {
+      | RSchema
+      | RPublish
+      | Service
+      | Exclude<R, {
         env: PureEnv<Evt, readonly S1[], readonly S2[]>
       }>
     >
@@ -205,9 +229,10 @@ export class RepositoryBase<
   ItemType extends string,
   Ext,
   IdKey extends keyof T,
-  R
-> implements ExtendedRepository<T, Encoded, Evt, ItemType, IdKey, R> {
-  constructor(protected readonly impl: ExtendedRepository<T, Encoded, Evt, ItemType, IdKey, R> & Ext) {
+  RSchema,
+  RPublish
+> implements ExtendedRepository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish> {
+  constructor(protected readonly impl: ExtendedRepository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish> & Ext) {
     this.saveAndPublish = this.impl.saveAndPublish
     this.removeAndPublish = this.impl.removeAndPublish
     this.find = this.impl.find
@@ -228,7 +253,7 @@ export class RepositoryBase<
     this.saveWithPure = this.impl.saveWithPure
     this.request = this.impl.request
   }
-  get: (id: T[IdKey]) => Effect<T, NotFoundError<ItemType>, R>
+  get: (id: T[IdKey]) => Effect<T, NotFoundError<ItemType>, RSchema>
   idKey
   request
   itemType
@@ -253,13 +278,13 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
   const f: {
     <
       ItemType extends string,
-      R,
+      RSchema,
       Encoded extends { id: string },
       T,
       IdKey extends keyof T,
       E = never,
       RInitial = never,
-      R2 = never,
+      RPublish = never,
       Layers extends [Layer.Layer.Any, ...Layer.Layer.Any[]] = [Layer.Layer<never>],
       E1 = never,
       R1 = never,
@@ -267,7 +292,7 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
       Ext = {}
     >(
       itemType: ItemType,
-      schema: S.Schema<T, Encoded, R>,
+      schema: S.Schema<T, Encoded, RSchema>,
       options: [Evt] extends [never] ? {
           dependencies?: Layers
           idKey: IdKey
@@ -293,7 +318,7 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
           }
           options?: Effect<
             {
-              publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, R2>
+              publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, RPublish>
               makeInitial?: Effect<readonly T[], E, RInitial>
               ext?: Ext
             },
@@ -303,41 +328,42 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
         }
     ):
       & (abstract new(
-        impl: Repository<T, Encoded, Evt, ItemType, IdKey, R> & Ext
-      ) => RepositoryBase<T, Encoded, Evt, ItemType, Ext, IdKey, R>)
+        impl: Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish> & Ext
+      ) => RepositoryBase<T, Encoded, Evt, ItemType, Ext, IdKey, RSchema, RPublish>)
       & Context.Tag<Service, Service>
-      & RepoFunctions<T, Encoded, Evt, ItemType, IdKey, Service>
+      & RepoFunctions<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish, Service>
       & {
         Default: Layer.Layer<
           Service,
-          E1 | Layer.Layer.Error<Layers[number]>,
+          E | E1 | Layer.Layer.Error<Layers[number]>,
           Exclude<
-            R1 | R | StoreMaker,
+            R1 | StoreMaker,
             { [k in keyof Layers]: Layer.Layer.Success<Layers[k]> }[number]
           >
         >
         DefaultWithoutDependencies: Layer.Layer<
           Service,
           E1,
-          R1 | R | StoreMaker
+          R1 | StoreMaker
         >
       }
       & Repos<
         T,
         Encoded,
-        R,
+        RSchema,
         Evt,
         ItemType,
-        IdKey
+        IdKey,
+        RPublish
       >
     <
       ItemType extends string,
-      R,
+      RSchema,
       Encoded extends { id: string },
       T extends { id: unknown },
       E = never,
       RInitial = never,
-      R2 = never,
+      RPublish = never,
       Layers extends [Layer.Layer.Any, ...Layer.Layer.Any[]] = [Layer.Layer<never>],
       E1 = never,
       R1 = never,
@@ -345,7 +371,7 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
       Ext = {}
     >(
       itemType: ItemType,
-      schema: S.Schema<T, Encoded, R>,
+      schema: S.Schema<T, Encoded, RSchema>,
       options: [Evt] extends [never] ? {
           dependencies?: Layers
           config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
@@ -369,7 +395,7 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
           }
           options?: Effect<
             {
-              publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, R2>
+              publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, RPublish>
               makeInitial?: Effect<readonly T[], E, RInitial>
               ext?: Ext
             },
@@ -379,42 +405,43 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
         }
     ):
       & (abstract new(
-        impl: Repository<T, Encoded, Evt, ItemType, "id", R> & Ext
-      ) => RepositoryBase<T, Encoded, Evt, ItemType, Ext, "id", R>)
+        impl: Repository<T, Encoded, Evt, ItemType, "id", RSchema, RPublish> & Ext
+      ) => RepositoryBase<T, Encoded, Evt, ItemType, Ext, "id", RSchema, RPublish>)
       & Context.Tag<Service, Service>
-      & RepoFunctions<T, Encoded, Evt, ItemType, "id", Service>
+      & RepoFunctions<T, Encoded, Evt, ItemType, "id", RSchema, RPublish, Service>
       & {
         Default: Layer.Layer<
           Service,
-          E1 | Layer.Layer.Error<Layers[number]>,
+          E | E1 | Layer.Layer.Error<Layers[number]>,
           Exclude<
-            R1 | R | StoreMaker,
+            R1 | StoreMaker,
             { [k in keyof Layers]: Layer.Layer.Success<Layers[k]> }[number]
           >
         >
         DefaultWithoutDependencies: Layer.Layer<
           Service,
           E1,
-          R1 | R | StoreMaker
+          R1 | StoreMaker
         >
       }
       & Repos<
         T,
         Encoded,
-        R,
+        RSchema,
         Evt,
         ItemType,
-        "id"
+        "id",
+        RPublish
       >
   } = <
     ItemType extends string,
-    R,
+    RSchema,
     Encoded extends { id: string },
     T,
     IdKey extends keyof T,
     E = never,
     RInitial = never,
-    R2 = never,
+    RPublish = never,
     Layers extends [Layer.Layer.Any, ...Layer.Layer.Any[]] = [Layer.Layer<never>],
     E1 = never,
     R1 = never,
@@ -422,7 +449,7 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
     Ext = {}
   >(
     itemType: ItemType,
-    schema: S.Schema<T, Encoded, R>,
+    schema: S.Schema<T, Encoded, RSchema>,
     options: [Evt] extends [never] ? {
         dependencies?: Layers
         idKey?: IdKey
@@ -448,7 +475,7 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
         }
         options?: Effect<
           {
-            publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, R2>
+            publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, RPublish>
             makeInitial?: Effect<readonly T[], E, RInitial>
             ext?: Ext
           },
@@ -466,7 +493,8 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
       ItemType,
       Ext,
       IdKey,
-      R
+      RSchema,
+      RPublish
     > {
       static readonly Q = Q.make<Encoded>()
       static get DefaultWithoutDependencies() {
@@ -495,7 +523,6 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
             .pipe(Layer.provide(options.dependencies as any))
           : self.DefaultWithoutDependencies
       }
-      static readonly type: Repository<T, Encoded, Evt, ItemType, IdKey, R> = undefined as any
     }
     const limit = Error.stackTraceLimit
     Error.stackTraceLimit = 2