@effect-app/infra 3.0.13 → 3.0.15

package/dist/rateLimit.js

@@ -5,7 +5,7 @@
 //  * failure, or interruption.
 //  */
 // export function withPermitsDuration(permits: number, duration: Duration) {
-//   return (self: TSemaphore): <R, E, A>(effect: Effect<R, E, A>) => Effect<R, E, A> => {
+//   return (self: TSemaphore): <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A> => {
 //     return effect =>
 //       Effect.uninterruptibleMask(
 //         restore =>
@@ -49,8 +49,8 @@ export function batch(n, forEachItem, forEachBatch) {
 // ) {
 //   return <T>(items: Iterable<T>) =>
 //     <R, E, A, R2, E2, A2>(
-//       forEachItem: (i: T) => Effect<R, E, A>,
-//       forEachBatch: (a: Chunk<A>) => Effect<R2, E2, A2>
+//       forEachItem: (i: T) => Effect.Effect<R, E, A>,
+//       forEachBatch: (a: Chunk<A>) => Effect.Effect<R2, E2, A2>
 //     ) =>
 //       Stream.fromCollection(items)
 //         .rechunk(n)
@@ -66,4 +66,4 @@ export function naiveRateLimit(n, d) {
         .forEach(batch, forEachItem, { concurrency: n })
         .pipe(Effect.flatMap(forEachBatch))))));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmF0ZUxpbWl0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3JhdGVMaW1pdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNO0FBQ04sOEVBQThFO0FBQzlFLHVFQUF1RTtBQUN2RSxtRkFBbUY7QUFDbkYsK0JBQStCO0FBQy9CLE1BQU07QUFDTiw2RUFBNkU7QUFDN0UsMEZBQTBGO0FBQzFGLHVCQUF1QjtBQUN2QixvQ0FBb0M7QUFDcEMscUJBQXFCO0FBQ3JCLG1EQUFtRDtBQUNuRCxnQ0FBZ0M7QUFDaEMsMkJBQTJCO0FBQzNCLHlDQUF5QztBQUN6Qyw0QkFBNEI7QUFDNUIscUNBQXFDO0FBQ3JDLGtCQUFrQjtBQUNsQixVQUFVO0FBQ1YsTUFBTTtBQUNOLElBQUk7QUFFSixPQUFPLEVBQUUsS0FBSyxFQUFpQixNQUFNLEVBQXNCLE1BQU0sWUFBWSxDQUFBO0FBRzdFOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLHVCQUF1QixDQUFDLE9BQWUsRUFBRSxRQUFrQjtJQUN6RSxPQUFPLENBQUMsSUFBZSxFQUF5RCxFQUFFO1FBQ2hGLE9BQU8sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUNoQixNQUFNLENBQUMsbUJBQW1CLENBQ3hCLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FDVixPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQzthQUN4QixJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FDbEIsT0FBTyxDQUFDLE1BQU0sQ0FBQzthQUNaLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUNuQixNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsUUFBUSxDQUFDLENBQzlDLENBQUMsQ0FDTCxDQUFDLENBQ1AsQ0FBQTtJQUNMLENBQUMsQ0FBQTtBQUNILENBQUM7QUFFRCxNQUFNLFVBQVUsUUFBUSxDQUN0QixDQUFTLEVBQ1QsV0FBK0UsRUFDL0Us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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmF0ZUxpbWl0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3JhdGVMaW1pdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNO0FBQ04sOEVBQThFO0FBQzlFLHVFQUF1RTtBQUN2RSxtRkFBbUY7QUFDbkYsK0JBQStCO0FBQy9CLE1BQU07QUFDTiw2RUFBNkU7QUFDN0Usd0dBQXdHO0FBQ3hHLHVCQUF1QjtBQUN2QixvQ0FBb0M7QUFDcEMscUJBQXFCO0FBQ3JCLG1EQUFtRDtBQUNuRCxnQ0FBZ0M7QUFDaEMsMkJBQTJCO0FBQzNCLHlDQUF5QztBQUN6Qyw0QkFBNEI7QUFDNUIscUNBQXFDO0FBQ3JDLGtCQUFrQjtBQUNsQixVQUFVO0FBQ1YsTUFBTTtBQUNOLElBQUk7QUFFSixPQUFPLEVBQUUsS0FBSyxFQUFpQixNQUFNLEVBQXNCLE1BQU0sWUFBWSxDQUFBO0FBRzdFOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLHVCQUF1QixDQUFDLE9BQWUsRUFBRSxRQUEyQjtJQUNsRixPQUFPLENBQUMsSUFBZSxFQUF1RSxFQUFFO1FBQzlGLE9BQU8sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUNoQixNQUFNLENBQUMsbUJBQW1CLENBQ3hCLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FDVixPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQzthQUN4QixJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FDbEIsT0FBTyxDQUFDLE1BQU0sQ0FBQzthQUNaLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUNuQixNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsUUFBUSxDQUFDLENBQzlDLENBQUMsQ0FDTCxDQUFDLENBQ1AsQ0FBQTtJQUNMLENBQUMsQ0FBQTtBQUNILENBQUM7QUFFRCxNQUFNLFVBQVUsUUFBUSxDQUN0QixDQUFTLEVBQ1QsV0FBc0YsRUFDdEYsWUFBMkU7SUFFM0UsT0FBTyxDQUFDLEtBQWtCLEVBQUUsRUFBRSxDQUM1QixNQUFNLENBQUMsT0FBTyxDQUNaLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxFQUN0QixDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUNQLE1BQU07U0FDSCxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLENBQUM7U0FDdEUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxDQUFxQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFDeEUsRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLENBQzNCLENBQUE7QUFDTCxDQUFDO0FBRUQsTUFBTSxVQUFVLEtBQUssQ0FDbkIsQ0FBUyxFQUNULFdBQXNGLEVBQ3RGLFlBQTJFO0lBRTNFLE9BQU8sQ0FBQyxLQUFrQixFQUFFLEVBQUUsQ0FDNUIsTUFBTSxDQUFDLE9BQU8sQ0FDWixLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsRUFDdEIsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FDUCxNQUFNO1NBQ0gsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLFNBQVMsRUFBRSxDQUFDO1NBQ3RFLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxZQUFZLENBQUMsQ0FBcUIsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQ3pFLENBQUE7QUFDTCxDQUFDO0FBRUQsNkJBQTZCO0FBQzdCLGVBQWU7QUFDZixXQUFXO0FBQ1gsTUFBTTtBQUNOLHNDQUFzQztBQUN0Qyw2QkFBNkI7QUFDN0IsdURBQXVEO0FBQ3ZELGlFQUFpRTtBQUNqRSxXQUFXO0FBQ1gscUNBQXFDO0FBQ3JDLHNCQUFzQjtBQUN0Qix3Q0FBd0M7QUFDeEMsbUZBQW1GO0FBQ25GLHNCQUFzQjtBQUN0QixJQUFJO0FBRUosTUFBTSxVQUFVLGNBQWMsQ0FDNUIsQ0FBUyxFQUNULENBQW9CO0lBRXBCLE9BQU8sQ0FBSSxLQUFrQixFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQ2pDLFdBQTZDLEVBQzdDLFlBQW1ELEVBQ25ELEVBQUUsQ0FDRixNQUFNLENBQUMsT0FBTyxDQUNaLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxFQUN0QixDQUFDLEtBQUssRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUNYLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ1IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJO1FBQ2IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDakIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQ25CLE1BQU07U0FDSCxPQUFPLENBQUMsS0FBSyxFQUFFLFdBQVcsRUFBRSxFQUFFLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQztTQUMvQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUN0QyxDQUFDLENBQ1AsQ0FBQyxDQUFBO0FBQ04sQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "7.0.1",
     "query-string": "^9.2.2",
-    "effect-app": "3.0.9"
+    "effect-app": "3.1.0"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.5.0",

package/src/Emailer/service.ts

@@ -8,7 +8,7 @@ export class SendMailError extends Data.TaggedError("SendMailError")<{
 }> {}
 
 export class Emailer extends Context.TagId("effect-app/Emailer")<Emailer, {
-  sendMail: (msg: EmailMsgOptionalFrom) => Effect<void, SendMailError>
+  sendMail: (msg: EmailMsgOptionalFrom) => Effect.Effect<void, SendMailError>
 }>() {}
 
 export type EmailData = Email | {

package/src/MainFiberSet.ts

@@ -39,7 +39,7 @@ const make = Effect.gen(function*() {
    * The parent span is set to the root span of the current fiber.
    * Reports and then swallows errors.
    */
-  function forkDaemonReport<A, E, R>(self: Effect<A, E, R>) {
+  function forkDaemonReport<A, E, R>(self: Effect.Effect<A, E, R>) {
     return self.pipe(
       Effect.asVoid,
       Effect.catchAllCause(reportNonInterruptedFailureCause({})),
@@ -66,6 +66,7 @@ const make = Effect.gen(function*() {
 export class MainFiberSet extends Context.TagMakeId("MainFiberSet", make)<MainFiberSet>() {
   static readonly Live = this.toLayerScoped()
   static readonly JoinLive = this.pipe(Effect.andThen((_) => _.join), Layer.effectDiscard, Layer.provide(this.Live))
-  static readonly run = <A, R>(self: Effect<A, never, R>) => this.use((_) => _.run(self))
-  static readonly forkDaemonReport = <A, E, R>(self: Effect<A, E, R>) => this.use((_) => _.forkDaemonReport(self))
+  static readonly run = <A, R>(self: Effect.Effect<A, never, R>) => this.use((_) => _.run(self))
+  static readonly forkDaemonReport = <A, E, R>(self: Effect.Effect<A, E, R>) =>
+    this.use((_) => _.forkDaemonReport(self))
 }

package/src/Model/Repository/ext.ts

@@ -33,7 +33,7 @@ export const extendRepo = <
     S2 extends T
   >(
     items: Iterable<S1>,
-    pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
+    pure: Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
   ) {
     return saveAllWithEffectInt(
       runTerm(pure, [...items])
@@ -48,7 +48,7 @@ export const extendRepo = <
     S2 extends T
   >(
     item: S1,
-    pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>
+    pure: Effect.Effect<A, E, FixEnv<R, Evt, S1, S2>>
   ) {
     return saveAllWithEffectInt(
       runTerm(pure, item)
@@ -63,7 +63,7 @@ export const extendRepo = <
     E,
     A
   >(
-    gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>
+    gen: Effect.Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>
   ) {
     return Effect.flatMap(gen, ([items, events, a]) => repo.saveAndPublish(items, events).pipe(Effect.map(() => a)))
   }
@@ -76,7 +76,7 @@ export const extendRepo = <
     S2 extends T
   >(
     items: Iterable<S1>,
-    pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>,
+    pure: Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>,
     batchSize = 100
   ) {
     return Effect.forEach(
@@ -93,7 +93,7 @@ export const extendRepo = <
       q: (
         q: Query<Encoded>
       ) => QueryEnd<Encoded, "one">,
-      pure: Effect<A, E2, FixEnv<R2, Evt, T, T2>>
+      pure: Effect.Effect<A, E2, FixEnv<R2, Evt, T, T2>>
     ): Effect.Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E2,
@@ -108,7 +108,7 @@ export const extendRepo = <
         | Query<Encoded>
         | QueryWhere<Encoded>
         | QueryEnd<Encoded, "many">,
-      pure: Effect<A, E2, FixEnv<R2, Evt, readonly T[], readonly T2[]>>
+      pure: Effect.Effect<A, E2, FixEnv<R2, Evt, readonly T[], readonly T2[]>>
     ): Effect.Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | E2,
@@ -125,7 +125,7 @@ export const extendRepo = <
         | Query<Encoded>
         | QueryWhere<Encoded>
         | QueryEnd<Encoded, "many">,
-      pure: Effect<A, E2, FixEnv<R2, Evt, readonly T[], readonly T2[]>>,
+      pure: Effect.Effect<A, E2, FixEnv<R2, Evt, readonly T[], readonly T2[]>>,
       batch: "batched" | number
     ): Effect.Effect<
       A[],
@@ -150,7 +150,7 @@ export const extendRepo = <
   const saveManyWithPure: {
     <R, A, E, S1 extends T, S2 extends T>(
       items: Iterable<S1>,
-      pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
+      pure: Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
     ): Effect.Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | E,
@@ -162,7 +162,7 @@ export const extendRepo = <
     >
     <R, A, E, S1 extends T, S2 extends T>(
       items: Iterable<S1>,
-      pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>,
+      pure: Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>,
       batch: "batched" | number
     ): Effect.Effect<
       A[],
@@ -189,8 +189,8 @@ export const extendRepo = <
   const byIdAndSaveWithPure: {
     <R, A, E, S2 extends T>(
       id: T[IdKey],
-      pure: Effect<A, E, FixEnv<R, Evt, T, S2>>
-    ): Effect<
+      pure: Effect.Effect<A, E, FixEnv<R, Evt, T, S2>>
+    ): Effect.Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E,
       | RSchema
@@ -210,7 +210,7 @@ export const extendRepo = <
     .makeBatched((
       requests: NonEmptyReadonlyArray<Req>
     ) =>
-      (repo.query(Q.where(repo.idKey as any, "in" as any, requests.map((_) => _.id)) as any) as Effect<
+      (repo.query(Q.where(repo.idKey as any, "in" as any, requests.map((_) => _.id)) as any) as Effect.Effect<
         readonly T[],
         never
       >)
@@ -256,7 +256,7 @@ export const extendRepo = <
       S2 extends T
     >(
       item: S1,
-      pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>
+      pure: Effect.Effect<A, E, FixEnv<R, Evt, S1, S2>>
     ) =>
       saveAllWithEffectInt(
         runTerm(pure, item)

package/src/Model/Repository/internal/internal.ts

@@ -55,15 +55,15 @@ export function makeRepoInternal<
     function make<RInitial = never, E = never, RPublish = never, RCtx = never>(
       args: [Evt] extends [never] ? {
           schemaContext?: Context.Context<RCtx>
-          makeInitial?: Effect<readonly T[], E, RInitial> | undefined
+          makeInitial?: Effect.Effect<readonly T[], E, RInitial> | undefined
           config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
             partitionValue?: (a: Encoded) => string
           }
         }
         : {
           schemaContext?: Context.Context<RCtx>
-          publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, RPublish>
-          makeInitial?: Effect<readonly T[], E, RInitial> | undefined
+          publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect.Effect<void, never, RPublish>
+          makeInitial?: Effect.Effect<readonly T[], E, RInitial> | undefined
           config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
             partitionValue?: (a: Encoded) => string
           }
@@ -71,7 +71,7 @@ export function makeRepoInternal<
     ) {
       return Effect
         .gen(function*() {
-          const rctx: Context<RCtx> = args.schemaContext ?? Context.empty() as any
+          const rctx: Context.Context<RCtx> = args.schemaContext ?? Context.empty() as any
           const provideRctx = Effect.provide(rctx)
           const encodeMany = flow(
             S.encode(S.Array(schema)),
@@ -390,7 +390,7 @@ export function makeStore<Encoded extends FieldValues>() {
     idKey: IdKey
   ) => {
     function makeStore<RInitial = never, EInitial = never>(
-      makeInitial?: Effect<readonly T[], EInitial, RInitial> | undefined,
+      makeInitial?: Effect.Effect<readonly T[], EInitial, RInitial> | undefined,
       config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
         partitionValue?: (a: Encoded) => string
       }
@@ -452,35 +452,35 @@ export interface Repos<
 > {
   make<RInitial = never, E = never, R2 = never>(
     args: [Evt] extends [never] ? {
-        makeInitial?: Effect<readonly T[], E, RInitial> | undefined
+        makeInitial?: Effect.Effect<readonly T[], E, RInitial> | undefined
         config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
           partitionValue?: (a: Encoded) => string
         }
       }
       : {
-        publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, R2>
-        makeInitial?: Effect<readonly T[], E, RInitial> | undefined
+        publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect.Effect<void, never, R2>
+        makeInitial?: Effect.Effect<readonly T[], E, RInitial> | undefined
         config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
           partitionValue?: (a: Encoded) => string
         }
       }
-  ): Effect<Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>, E, StoreMaker | RInitial | R2>
+  ): Effect.Effect<Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>, E, StoreMaker | RInitial | R2>
   makeWith<Out, RInitial = never, E = never, R2 = never>(
     args: [Evt] extends [never] ? {
-        makeInitial?: Effect<readonly T[], E, RInitial> | undefined
+        makeInitial?: Effect.Effect<readonly T[], E, RInitial> | undefined
         config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
           partitionValue?: (a: Encoded) => string
         }
       }
       : {
-        publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, R2>
-        makeInitial?: Effect<readonly T[], E, RInitial> | undefined
+        publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect.Effect<void, never, R2>
+        makeInitial?: Effect.Effect<readonly T[], E, RInitial> | undefined
         config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
           partitionValue?: (a: Encoded) => string
         }
       },
     f: (r: Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>) => Out
-  ): Effect<Out, E, StoreMaker | RInitial | R2>
+  ): Effect.Effect<Out, E, StoreMaker | RInitial | R2>
   readonly Q: ReturnType<typeof Q.make<Encoded>>
   readonly type: Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>
 }

package/src/Model/Repository/legacy.ts

@@ -4,14 +4,14 @@ import type { Effect, Option, ParseResult, S } from "effect-app"
 import type { OptimisticConcurrencyException } from "effect-app/client/errors"
 
 export interface Mapped1<A, IdKey extends keyof A, R> {
-  all: Effect<A[], ParseResult.ParseError, R>
-  save: (...xes: readonly A[]) => Effect<void, OptimisticConcurrencyException | ParseResult.ParseError, R>
-  find: (id: A[IdKey]) => Effect<Option<A>, ParseResult.ParseError, R>
+  all: Effect.Effect<A[], ParseResult.ParseError, R>
+  save: (...xes: readonly A[]) => Effect.Effect<void, OptimisticConcurrencyException | ParseResult.ParseError, R>
+  find: (id: A[IdKey]) => Effect.Effect<Option.Option<A>, ParseResult.ParseError, R>
 }
 
 // TODO: auto use project, and select fields from the From side of schema only
 export interface Mapped2<A, R> {
-  all: Effect<A[], ParseResult.ParseError, R>
+  all: Effect.Effect<A[], ParseResult.ParseError, R>
 }
 
 export interface Mapped<Encoded> {
@@ -21,7 +21,7 @@ export interface Mapped<Encoded> {
 }
 
 export interface MM<Repo, Encoded> {
-  <A, R, IdKey extends keyof A>(schema: S.Schema<A, Encoded, R>): Effect<Mapped1<A, IdKey, R>, never, Repo>
+  <A, R, IdKey extends keyof A>(schema: S.Schema<A, Encoded, R>): Effect.Effect<Mapped1<A, IdKey, R>, never, Repo>
   // TODO: constrain on Encoded2 having to contain only fields that fit Encoded
-  <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Effect<Mapped2<A, R>, never, Repo>
+  <A, Encoded2, R>(schema: S.Schema<A, Encoded2, R>): Effect.Effect<Mapped2<A, R>, never, Repo>
 }

package/src/Model/Repository/makeRepo.ts

@@ -43,11 +43,11 @@ export interface RepositoryOptions<
   /**
    * Optional handler to be able to publish events after successfull save.
    */
-  publishEvents?: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, RPublish>
+  publishEvents?: (evt: NonEmptyReadonlyArray<Evt>) => Effect.Effect<void, never, RPublish>
   /**
    * Optional creator for initial data in the table when it's created for the first itme.
    */
-  makeInitial?: Effect<readonly T[], E, RInitial> | undefined
+  makeInitial?: Effect.Effect<readonly T[], E, RInitial> | undefined
   /**
    * Optional context to be provided to Schema decode/encode.
    * Useful for effectful transformations like XWithItems, where items is a transformation retrieving elements from another database table or other source.

package/src/Model/Repository/service.ts

@@ -17,22 +17,22 @@ export interface Repository<
 > {
   readonly itemType: ItemType
   readonly idKey: IdKey
-  readonly find: (id: T[IdKey]) => Effect<Option<T>, never, RSchema>
-  readonly all: Effect<T[], never, RSchema>
+  readonly find: (id: T[IdKey]) => Effect.Effect<Option.Option<T>, never, RSchema>
+  readonly all: Effect.Effect<T[], never, RSchema>
   readonly saveAndPublish: (
     items: Iterable<T>,
     events?: Iterable<Evt>
-  ) => Effect<void, InvalidStateError | OptimisticConcurrencyException, RSchema | RPublish>
+  ) => Effect.Effect<void, InvalidStateError | OptimisticConcurrencyException, RSchema | RPublish>
   readonly changeFeed: PubSub.PubSub<[T[], "save" | "remove"]>
   readonly removeAndPublish: (
     items: Iterable<T>,
     events?: Iterable<Evt>
-  ) => Effect<void, never, RSchema | RPublish>
+  ) => Effect.Effect<void, never, RSchema | RPublish>
 
   readonly queryRaw: <T, Out, R>(
     schema: S.Schema<T, Out, R>,
     raw: RawQuery<Encoded, Out>
-  ) => Effect<readonly T[], S.ParseResult.ParseError, R>
+  ) => Effect.Effect<readonly T[], S.ParseResult.ParseError, R>
 
   readonly query: {
     // ending with projection

package/src/Model/dsl.ts

@@ -19,20 +19,20 @@ const anyDSL = makeDSL<any, any, any>()
 
 export type AllDSL<T, Evt> =
   & (<R, A, E, S1 extends T, S2 extends T>(
-    pure: (dsl: PureDSL<S1[], S2[], Evt>) => Effect<A, E, R>
-  ) => Effect<A, E, FixEnv<R, Evt, S1[], S2[]>>)
+    pure: (dsl: PureDSL<S1[], S2[], Evt>) => Effect.Effect<A, E, R>
+  ) => Effect.Effect<A, E, FixEnv<R, Evt, S1[], S2[]>>)
   & AllDSLExt<T, Evt>
 
 export interface AllDSLExt<T, Evt> {
   modify: <R, E, A, S1 extends T, S2 extends T>(
-    pure: (items: readonly S1[], dsl: PureDSL<readonly S1[], readonly S2[], Evt>) => Effect<A, E, R>
-  ) => Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
+    pure: (items: readonly S1[], dsl: PureDSL<readonly S1[], readonly S2[], Evt>) => Effect.Effect<A, E, R>
+  ) => Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
   update: <R, E, S1 extends T, S2 extends T>(
-    pure: (items: readonly S1[], log: (...evt: Evt[]) => PureLogT<Evt>) => Effect<readonly S2[], E, R>
-  ) => Effect<readonly S2[], E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
+    pure: (items: readonly S1[], log: (...evt: Evt[]) => PureLogT<Evt>) => Effect.Effect<readonly S2[], E, R>
+  ) => Effect.Effect<readonly S2[], E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
   updateWith: <S1 extends T, S2 extends T>(
     upd: (item: readonly S1[]) => readonly S2[]
-  ) => Effect<readonly S2[], never, PureEnvEnv<Evt, readonly S1[], readonly S2[]>>
+  ) => Effect.Effect<readonly S2[], never, PureEnvEnv<Evt, readonly S1[], readonly S2[]>>
 }
 
 export function makeAllDSL<T, Evt>() {
@@ -42,20 +42,20 @@ export function makeAllDSL<T, Evt>() {
 
 export type OneDSL<T, Evt> =
   & (<R, A, E, S1 extends T, S2 extends T>(
-    pure: (dsl: PureDSL<S1, S2, Evt>) => Effect<A, E, FixEnv<R, Evt, S1, S2>>
-  ) => Effect<A, E, FixEnv<R, Evt, S1, S2>>)
+    pure: (dsl: PureDSL<S1, S2, Evt>) => Effect.Effect<A, E, FixEnv<R, Evt, S1, S2>>
+  ) => Effect.Effect<A, E, FixEnv<R, Evt, S1, S2>>)
   & OneDSLExt<T, Evt>
 
 export interface OneDSLExt<T, Evt> {
   modify: <R, E, A, S1 extends T, S2 extends T>(
-    pure: (items: S1, dsl: PureDSL<S1, S2, Evt>) => Effect<A, E, FixEnv<R, Evt, S1, S2>>
-  ) => Effect<A, E, FixEnv<R, Evt, S1, S2> | PureEnvEnv<Evt, S1, S1>>
+    pure: (items: S1, dsl: PureDSL<S1, S2, Evt>) => Effect.Effect<A, E, FixEnv<R, Evt, S1, S2>>
+  ) => Effect.Effect<A, E, FixEnv<R, Evt, S1, S2> | PureEnvEnv<Evt, S1, S1>>
   update: <R, E, S1 extends T, S2 extends T>(
-    pure: (items: S1, log: (...evt: Evt[]) => PureLogT<Evt>) => Effect<S2, E, FixEnv<R, Evt, S1, S2>>
-  ) => Effect<S2, E, FixEnv<R, Evt, S1, S2>>
+    pure: (items: S1, log: (...evt: Evt[]) => PureLogT<Evt>) => Effect.Effect<S2, E, FixEnv<R, Evt, S1, S2>>
+  ) => Effect.Effect<S2, E, FixEnv<R, Evt, S1, S2>>
   updateWith: <S1 extends T, S2 extends T>(
     upd: (item: S1) => S2
-  ) => Effect<S2, never, PureEnvEnv<Evt, S1, S2>>
+  ) => Effect.Effect<S2, never, PureEnvEnv<Evt, S1, S2>>
 }
 
 export function makeOneDSL<T, Evt>(): OneDSL<T, Evt> {
@@ -73,8 +73,8 @@ export function makeDSL<S1, S2, Evt>() {
     pure: (
       items: S1,
       dsl: PureDSL<S1, S2, Evt>
-    ) => Effect<A, E, R>
-  ): Effect<A, E, FixEnv<R, Evt, S1, S2>> {
+    ) => Effect.Effect<A, E, R>
+  ): Effect.Effect<A, E, FixEnv<R, Evt, S1, S2>> {
     return dsl.get.pipe(Effect.flatMap((items) => pure(items, dsl))) as any
   }
 
@@ -85,8 +85,8 @@ export function makeDSL<S1, S2, Evt>() {
     pure: (
       items: S1,
       log: (...evt: Evt[]) => PureLogT<Evt>
-    ) => Effect<S2, E, R>
-  ): Effect<S2, E, FixEnv<R, Evt, S1, S2>> {
+    ) => Effect.Effect<S2, E, R>
+  ): Effect.Effect<S2, E, FixEnv<R, Evt, S1, S2>> {
     return dsl.get.pipe(Effect.flatMap((items) => pure(items, dsl.log).pipe(Effect.tap(dsl.set)))) as any
   }
 
@@ -95,8 +95,8 @@ export function makeDSL<S1, S2, Evt>() {
     A,
     E
   >(
-    pure: (dsl: PureDSL<S1, S2, Evt>) => Effect<A, E, R>
-  ): Effect<A, E, FixEnv<R, Evt, S1, S2>> {
+    pure: (dsl: PureDSL<S1, S2, Evt>) => Effect.Effect<A, E, R>
+  ): Effect.Effect<A, E, FixEnv<R, Evt, S1, S2>> {
     return pure(AnyPureDSL) as any
   }
 
@@ -116,10 +116,13 @@ export function makeDSL<S1, S2, Evt>() {
 
 export interface DSLExt<S1, S2, Evt> extends ReturnType<typeof makeDSL<S1, S2, Evt>> {}
 
-export function ifAny<T, R, E, A>(fn: (items: NonEmptyReadonlyArray<T>) => Effect<A, E, R>) {
+export function ifAny<T, R, E, A>(fn: (items: NonEmptyReadonlyArray<T>) => Effect.Effect<A, E, R>) {
   return (items: Iterable<T>) => Effect.flatMapOption(Effect.sync(() => toNonEmptyArray([...items])), fn)
 }
 
-export function ifAny_<T, R, E, A>(items: Iterable<T>, fn: (items: NonEmptyReadonlyArray<T>) => Effect<A, E, R>) {
+export function ifAny_<T, R, E, A>(
+  items: Iterable<T>,
+  fn: (items: NonEmptyReadonlyArray<T>) => Effect.Effect<A, E, R>
+) {
   return Effect.flatMapOption(Effect.sync(() => toNonEmptyArray([...items])), fn)
 }

package/src/Model/query/dsl.ts

@@ -308,7 +308,7 @@ export const project: {
     E extends boolean = ExtractExclusiveness<Q>
   >(
     schema: S.Schema<
-      Option<A>,
+      Option.Option<A>,
       {
         [K in keyof I]: K extends keyof ExtractFieldValuesRefined<Q> ? I[K] : never
       },

package/src/Operations.ts

@@ -42,7 +42,7 @@ const make = Effect.gen(function*() {
   function findOp(id: OperationId) {
     return repo.find(id)
   }
-  function finishOp(id: OperationId, exit: Exit<unknown, unknown>) {
+  function finishOp(id: OperationId, exit: Exit.Exit<unknown, unknown>) {
     return Effect
       .flatMap(repo.get(id).pipe(Effect.orDie), (_) =>
         repo
@@ -79,10 +79,10 @@ const make = Effect.gen(function*() {
   }
 
   function fork<R, R2, E, E2, A, A2>(
-    self: (id: OperationId) => Effect<A, E, R>,
-    fnc: (id: OperationId) => Effect<A2, E2, R2>,
+    self: (id: OperationId) => Effect.Effect<A, E, R>,
+    fnc: (id: OperationId) => Effect.Effect<A2, E2, R2>,
     title: NonEmptyString2k
-  ): Effect<
+  ): Effect.Effect<
     RunningOperation<A, E>,
     never,
     Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>
@@ -114,15 +114,15 @@ const make = Effect.gen(function*() {
 
   const fork2: {
     (title: NonEmptyString2k): <R, E, A>(
-      self: (opId: OperationId) => Effect<A, E, R>
-    ) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
+      self: (opId: OperationId) => Effect.Effect<A, E, R>
+    ) => Effect.Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
     <R, E, A>(
-      self: (opId: OperationId) => Effect<A, E, R>,
+      self: (opId: OperationId) => Effect.Effect<A, E, R>,
       title: NonEmptyString2k
-    ): Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
+    ): Effect.Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
   } = dual(
     2,
-    <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>, title: NonEmptyString2k) =>
+    <R, E, A>(self: (opId: OperationId) => Effect.Effect<A, E, R>, title: NonEmptyString2k) =>
       Effect.flatMap(
         Scope.make(),
         (scope) =>
@@ -144,15 +144,15 @@ const make = Effect.gen(function*() {
 
   const forkOperation: {
     (title: NonEmptyString2k): <R, E, A>(
-      self: Effect<A, E, R>
-    ) => Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
+      self: Effect.Effect<A, E, R>
+    ) => Effect.Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
     <R, E, A>(
-      self: Effect<A, E, R>,
+      self: Effect.Effect<A, E, R>,
       title: NonEmptyString2k
-    ): Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
+    ): Effect.Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
   } = dual(
     2,
-    <R, E, A>(self: Effect<A, E, R>, title: NonEmptyString2k) =>
+    <R, E, A>(self: Effect.Effect<A, E, R>, title: NonEmptyString2k) =>
       Effect.flatMap(
         Scope.make(),
         (scope) =>
@@ -172,7 +172,7 @@ const make = Effect.gen(function*() {
       )
   )
 
-  function forkOperationFunction<R, E, A, Inp>(fnc: (inp: Inp) => Effect<A, E, R>, title: NonEmptyString2k) {
+  function forkOperationFunction<R, E, A, Inp>(fnc: (inp: Inp) => Effect.Effect<A, E, R>, title: NonEmptyString2k) {
     return (inp: Inp) => fnc(inp).pipe((_) => forkOperation(_, title))
   }
 
@@ -211,18 +211,18 @@ export class Operations extends Context.TagMakeId("effect-app/Operations", make)
 
   static readonly Live = this.CleanupLive.pipe(Layer.provideMerge(this.toLayer()), Layer.provide(RequestFiberSet.Live))
 
-  static readonly forkOperation = (title: NonEmptyString2k) => <R, E, A>(self: Effect<A, E, R>) =>
+  static readonly forkOperation = (title: NonEmptyString2k) => <R, E, A>(self: Effect.Effect<A, E, R>) =>
     this.use((_) => _.forkOperation(self, title))
   static readonly forkOperationFunction =
-    <R, E, A, Inp>(fnc: (inp: Inp) => Effect<A, E, R>, title: NonEmptyString2k) => (inp: Inp) =>
+    <R, E, A, Inp>(fnc: (inp: Inp) => Effect.Effect<A, E, R>, title: NonEmptyString2k) => (inp: Inp) =>
       this.use((_) => _.forkOperationFunction(fnc, title)(inp))
   static readonly fork = <R, R2, E, E2, A, A2>(
-    self: (id: OperationId) => Effect<A, E, R>,
-    fnc: (id: OperationId) => Effect<A2, E2, R2>,
+    self: (id: OperationId) => Effect.Effect<A, E, R>,
+    fnc: (id: OperationId) => Effect.Effect<A2, E2, R2>,
     title: NonEmptyString2k
   ) => this.use((_) => _.fork(self, fnc, title))
 
-  static readonly fork2 = (title: NonEmptyString2k) => <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>) =>
+  static readonly fork2 = (title: NonEmptyString2k) => <R, E, A>(self: (opId: OperationId) => Effect.Effect<A, E, R>) =>
     this.use((_) => _.fork2(self, title))
 }
 

package/src/QueueMaker/SQLQueue.ts

@@ -128,7 +128,7 @@ export function makeSQLQueue<
             })
           ),
       drain: <DrainE, DrainR>(
-        handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>,
+        handleEvent: (ks: DrainEvt) => Effect.Effect<void, DrainE, DrainR>,
         sessionId?: string
       ) =>
         Effect.gen(function*() {

package/src/QueueMaker/errors.ts

@@ -3,12 +3,12 @@ import { Cause, Effect, Exit } from "effect-app"
 
 const reportQueueError_ = reportError("Queue")
 
-export const reportQueueError = <E>(cause: Cause<E>, extras?: Record<string, unknown>) =>
+export const reportQueueError = <E>(cause: Cause.Cause<E>, extras?: Record<string, unknown>) =>
   reportQueueError_(cause, extras)
 
 export function reportNonInterruptedFailure(context?: Record<string, unknown>) {
   const report = reportNonInterruptedFailureCause(context)
-  return <A, E, R>(inp: Effect<A, E, R>): Effect<Exit<A, E>, never, R> =>
+  return <A, E, R>(inp: Effect.Effect<A, E, R>): Effect.Effect<Exit.Exit<A, E>, never, R> =>
     inp.pipe(
       Effect.onExit(
         Exit.match({
@@ -21,9 +21,9 @@ export function reportNonInterruptedFailure(context?: Record<string, unknown>) {
 }
 
 export function reportNonInterruptedFailureCause(context?: Record<string, unknown>) {
-  return <E>(cause: Cause<E>): Effect<void> => {
+  return <E>(cause: Cause.Cause<E>): Effect.Effect<void> => {
     if (Cause.isInterruptedOnly(cause)) {
-      return Effect.failCause(cause as Cause<never>)
+      return Effect.failCause(cause as Cause.Cause<never>)
     }
     return reportQueueError(cause, context)
   }

package/src/QueueMaker/memQueue.ts

@@ -51,7 +51,7 @@ export function makeMemQueue<
             })
           ),
       drain: <DrainE, DrainR>(
-        handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>,
+        handleEvent: (ks: DrainEvt) => Effect.Effect<void, DrainE, DrainR>,
         sessionId?: string
       ) =>
         Effect.gen(function*() {

package/src/QueueMaker/sbqueue.ts

@@ -36,7 +36,7 @@ export function makeServiceBusQueue<
 
     return {
       drain: <DrainE, DrainR>(
-        handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>,
+        handleEvent: (ks: DrainEvt) => Effect.Effect<void, DrainE, DrainR>,
         sessionId?: string
       ) =>
         Effect

package/src/QueueMaker/service.ts

@@ -3,12 +3,12 @@ import { RequestContext } from "../RequestContext.js"
 
 export interface QueueBase<Evt, DrainEvt> {
   drain: <DrainE, DrainR>(
-    makeHandleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>,
+    makeHandleEvent: (ks: DrainEvt) => Effect.Effect<void, DrainE, DrainR>,
     sessionId?: string
-  ) => Effect<never, never, Scope | DrainR>
+  ) => Effect.Effect<never, never, Scope.Scope | DrainR>
   publish: (
     ...messages: NonEmptyReadonlyArray<Evt>
-  ) => Effect<void>
+  ) => Effect.Effect<void>
 }
 
 export interface QueueMakerOps {}