effect-app 4.0.0-beta.25 → 4.0.0-beta.251

package/src/Effect.ts

@@ -2,11 +2,13 @@
 /* eslint-disable prefer-destructuring */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
-import { Effect, Option, Ref, type ServiceMap } from "effect"
 import * as Def from "effect/Deferred"
-import * as Fiber from "effect/Fiber"
+import * as Effect from "effect/Effect"
+import * as Option from "effect/Option"
+import * as Ref from "effect/Ref"
 import type { Scope } from "effect/Scope"
 import type { Semaphore } from "effect/Semaphore"
+import type * as Context from "./Context.js"
 import { curry } from "./Function.js"
 import { typedKeysOf } from "./utils.js"
 
@@ -111,15 +113,11 @@ export function modifyWithPermitWithEffect<A>(ref: Ref.Ref<A>, semaphore: Semaph
     )
 }
 
-export function joinAll<E, A>(fibers: Iterable<Fiber.Fiber<A, E>>): Effect.Effect<readonly A[], E> {
-  return Fiber.joinAll(fibers) as any
-}
-
 type ServiceA<T> = T extends Effect.Effect<infer S, any, any> ? S
-  : T extends ServiceMap.Service<any, infer S> ? S
+  : T extends Context.Service<any, infer S> ? S
   : never
 type ServiceR<T> = T extends Effect.Effect<any, any, infer R> ? R
-  : T extends ServiceMap.Service<infer I, any> ? I
+  : T extends Context.Service<infer I, any> ? I
   : never
 type ServiceE<T> = T extends Effect.Effect<any, infer E, any> ? E : never
 // type Values<T> = T extends { [s: string]: infer S } ? ServiceA<S> : never
@@ -140,29 +138,29 @@ type ValuesE<T> = T extends { [s: string]: infer S } ? ServiceE<S> : never
  * const b = a({ str: "" })   // valid, but shouldn't be!
  * ```
  */
+// eslint-disable-next-line import/namespace
 export interface EffectUnunified<R, E, A> extends Effect.Effect<R, E, A> {}
 
 export type LowerFirst<S extends PropertyKey> = S extends `${infer First}${infer Rest}` ? `${Lowercase<First>}${Rest}`
   : S
-export type LowerServices<T extends Record<string, ServiceMap.Service<any, any> | Effect.Effect<any, any, any>>> = {
+export type LowerServices<T extends Record<string, Context.Service<any, any> | Effect.Effect<any, any, any>>> = {
   [key in keyof T as LowerFirst<key>]: ServiceA<T[key]>
 }
 
-export function allLower<T extends Record<string, ServiceMap.Service<any, any> | Effect.Effect<any, any, any>>>(
+export function allLower<T extends Record<string, Context.Service<any, any> | Effect.Effect<any, any, any>>>(
   services: T
 ) {
   return Effect.all(
     typedKeysOf(services).reduce((prev, cur) => {
       const svc = services[cur]!
-      prev[((cur as string)[0]!.toLowerCase() + (cur as string).slice(1)) as unknown as LowerFirst<typeof cur>] =
-        "asEffect" in svc ? svc.asEffect() : svc
+      prev[((cur as string)[0]!.toLowerCase() + (cur as string).slice(1)) as unknown as LowerFirst<typeof cur>] = svc
       return prev
     }, {} as any),
     { concurrency: "inherit" }
   ) as any as Effect.Effect<LowerServices<T>, ValuesE<T>, ValuesR<T>>
 }
 
-export function allLowerWith<T extends Record<string, ServiceMap.Service<any, any> | Effect.Effect<any, any, any>>, A>(
+export function allLowerWith<T extends Record<string, Context.Service<any, any> | Effect.Effect<any, any, any>>, A>(
   services: T,
   fn: (services: LowerServices<T>) => A
 ) {
@@ -170,7 +168,7 @@ export function allLowerWith<T extends Record<string, ServiceMap.Service<any, an
 }
 
 export function allLowerWithEffect<
-  T extends Record<string, ServiceMap.Service<any, any> | Effect.Effect<any, any, any>>,
+  T extends Record<string, Context.Service<any, any> | Effect.Effect<any, any, any>>,
   R,
   E,
   A

package/src/Emailer.ts

@@ -0,0 +1,51 @@
+import * as Data from "effect/Data"
+import type { NonEmptyReadonlyArray } from "./Array.js"
+import * as Context from "./Context.js"
+import type * as Effect from "./Effect.js"
+import type { Email } from "./Schema.js"
+
+export class SendMailError extends Data.TaggedError("SendMailError")<{
+  readonly raw: Error
+}> {}
+
+export class Emailer extends Context.Opaque<Emailer, {
+  sendMail: (msg: EmailMsgOptionalFrom) => Effect.Effect<void, SendMailError>
+}>()("effect-app/Emailer") {}
+
+export type EmailData = Email | {
+  name?: string
+  email: Email
+}
+
+export interface EmailContentPart {
+  type: string
+  value: string
+}
+
+export type EmailRecipients = EmailData | NonEmptyReadonlyArray<EmailData>
+
+export interface EmailMsgBase {
+  readonly to: EmailRecipients
+  readonly cc?: EmailRecipients
+  readonly bcc?: EmailRecipients
+  readonly from: EmailData
+  readonly replyTo?: EmailData
+  readonly subject?: string
+  /**
+   * should multiple `to` addresess be considered multiple emails?
+   * defaults to `true`, not to leak email addresses
+   */
+  readonly isMultiple?: boolean
+}
+
+export type EmailContent =
+  | { text: string }
+  | { html: string }
+  | { templateId: string }
+  | { content: NonEmptyReadonlyArray<EmailContentPart> }
+
+export type EmailMsg =
+  & EmailMsgBase
+  & EmailContent
+
+export type EmailMsgOptionalFrom = Omit<EmailMsgBase, "from"> & Partial<Pick<EmailMsg, "from">> & EmailContent

package/src/Layer.ts

@@ -1,6 +1,10 @@
-import { type Array, Effect, Layer, type Scope, type ServiceMap, type Types } from "effect"
-import { type Yieldable } from "effect/Effect"
+import type * as Array from "effect/Array"
+import * as Effect from "effect/Effect"
 import { dual } from "effect/Function"
+import * as Layer from "effect/Layer"
+import type * as Scope from "effect/Scope"
+import type * as Types from "effect/Types"
+import type * as Context from "./Context.js"
 import { type EffectGenUtils } from "./utils/gen.js"
 
 export * from "effect/Layer"
@@ -11,13 +15,13 @@ type MakeEff<S, E, R> = {
   readonly make: Effect.Effect<S, E, R>
 }
 type MakeGen<S, E = never, R = never> = {
-  readonly make: () => Generator<Yieldable<any, any, E, R>, S, any>
+  readonly make: () => Generator<Effect.Effect<any, E, R>, S>
 }
 type MakeGenNo<S> = {
   readonly make: () => Generator<unknown, S>
 }
 type MakeErr<Opts> = Opts extends { make: () => any } ? EffectGenUtils.Error<Opts["make"]> : never
-type MakeContext<Opts> = Opts extends { make: () => any } ? EffectGenUtils.ServiceMap<Opts["make"]> : never
+type MakeContext<Opts> = Opts extends { make: () => any } ? EffectGenUtils.Context<Opts["make"]> : never
 
 type DependenciesOpt = { dependencies?: Array.NonEmptyReadonlyArray<Layer.Any> }
 type Dependencies = { dependencies: Array.NonEmptyReadonlyArray<Layer.Any> }
@@ -41,12 +45,12 @@ type PackedOrUnpackedLayer<I, Opts> = Opts extends Dependencies ? PackedLayers<I
 
 export const make: {
   <I, S>(
-    tag: ServiceMap.Service<I, S>
+    tag: Context.Service<I, S>
   ): <Opts extends Make<Types.NoInfer<S>, any, any>>(
     options: Opts
   ) => PackedOrUnpackedLayer<I, Opts>
   <I, S, Opts extends Make<Types.NoInfer<S>, any, any>>(
-    tag: ServiceMap.Service<I, S>,
+    tag: Context.Service<I, S>,
     options: Opts
   ): PackedOrUnpackedLayer<I, Opts>
 } = dual(2, (tag, options) => {

package/src/Model/Repository/Registry.ts

@@ -0,0 +1,34 @@
+import * as Context from "../../Context.js"
+import * as Effect from "../../Effect.js"
+
+export interface RegisteredRepository {
+  readonly seedNamespace: (namespace: string) => Effect.Effect<void>
+}
+
+const make = Effect.sync(() => {
+  const repos = new Map<string, RegisteredRepository>()
+  return {
+    register(modelName: string, repo: RegisteredRepository) {
+      repos.set(modelName, repo)
+    },
+    seedNamespace: (namespace: string) =>
+      Effect.suspend(() =>
+        Effect.forEach(
+          repos.values(),
+          (r) => r.seedNamespace(namespace),
+          { concurrency: "unbounded", discard: true }
+        )
+      ),
+    get entries(): ReadonlyMap<string, RegisteredRepository> {
+      return repos
+    }
+  }
+})
+
+export class RepositoryRegistry extends Context.Opaque<RepositoryRegistry, {
+  readonly register: (modelName: string, repo: RegisteredRepository) => void
+  readonly seedNamespace: (namespace: string) => Effect.Effect<void>
+  readonly entries: ReadonlyMap<string, RegisteredRepository>
+}>()("effect-app/RepositoryRegistry", { make }) {}
+
+export const RepositoryRegistryLive = RepositoryRegistry.toLayer(RepositoryRegistry.make)

package/src/Model/Repository/ext.ts

@@ -0,0 +1,375 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+import * as Exit from "effect/Exit"
+import * as Request from "effect/Request"
+import * as RequestResolver from "effect/RequestResolver"
+import * as Array from "../../Array.js"
+import type { NonEmptyArray } from "../../Array.js"
+import { type InvalidStateError, NotFoundError, type OptimisticConcurrencyException } from "../../client/errors.js"
+import * as Effect from "../../Effect.js"
+import * as Option from "../../Option.js"
+import { type FixEnv, type PureEnv, runTerm } from "../../Pure.js"
+import { AnyPureDSL } from "../dsl.js"
+import type { FieldValues } from "../filter/types.js"
+import type { Query, QueryEnd, QueryWhere } from "../query.js"
+import * as Q from "../query.js"
+import type { Repository } from "./service.js"
+
+interface BatchOptions {
+  readonly batch?: true | number
+}
+
+const asReadonlyArray = <T>(itemOrItems: T | ReadonlyArray<T>): ReadonlyArray<T> =>
+  globalThis.Array.isArray(itemOrItems)
+    ? itemOrItems as ReadonlyArray<T>
+    : [itemOrItems as T]
+
+const getBatchSize = (batch?: true | number) =>
+  batch === true
+    ? 100
+    : typeof batch === "number" && Number.isFinite(batch) && batch > 0
+    ? Math.floor(batch)
+    : undefined
+
+export const extendRepo = <
+  T,
+  Encoded extends FieldValues,
+  Evt,
+  ItemType extends string,
+  IdKey extends keyof T & keyof Encoded,
+  RSchema,
+  RPublish,
+  RProvided = never
+>(
+  repo: Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish, RProvided>
+) => {
+  const get = (id: T[IdKey]) =>
+    repo.find(id).pipe(
+      Effect.flatMap(Option.match({
+        onNone: () => Effect.fail(new NotFoundError<ItemType>({ type: repo.itemType, id })),
+        onSome: Effect.succeed
+      }))
+    )
+  function saveManyWithPure_<
+    R,
+    A,
+    E,
+    S1 extends T,
+    S2 extends T
+  >(
+    items: Iterable<S1>,
+    pure: Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
+  ) {
+    return saveAllWithEffectInt(
+      runTerm(pure, [...items])
+    )
+  }
+
+  function saveWithPure_<
+    R,
+    A,
+    E,
+    S1 extends T,
+    S2 extends T
+  >(
+    item: S1,
+    pure: Effect.Effect<A, E, FixEnv<R, Evt, S1, S2>>
+  ) {
+    return saveAllWithEffectInt(
+      runTerm(pure, item)
+        .pipe(Effect
+          .map(([item, events, a]) => [[item], events, a]))
+    )
+  }
+
+  function saveAllWithEffectInt<
+    P extends T,
+    R,
+    E,
+    A
+  >(
+    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)))
+  }
+
+  function saveManyWithPureBatched_<
+    R,
+    A,
+    E,
+    S1 extends T,
+    S2 extends T
+  >(
+    items: Iterable<S1>,
+    pure: Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>,
+    batchSize = 100
+  ) {
+    return Effect.forEach(
+      Array.chunksOf(items, batchSize),
+      (batch) =>
+        saveAllWithEffectInt(
+          runTerm(pure, batch)
+        )
+    )
+  }
+
+  const queryAndSavePure: {
+    <A, E2, R2, T2 extends T>(
+      q: (
+        q: Query<Encoded>
+      ) => QueryEnd<Encoded, "one">,
+      pure: Effect.Effect<A, E2, FixEnv<R2, Evt, T, T2>>
+    ): Effect.Effect<
+      A,
+      InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E2,
+      Exclude<R2, {
+        env: PureEnv<Evt, T, T2>
+      }>
+    >
+    <A, E2, R2, T2 extends T>(
+      q: (
+        q: Query<Encoded>
+      ) =>
+        | Query<Encoded>
+        | QueryWhere<Encoded>
+        | QueryEnd<Encoded>,
+      pure: Effect.Effect<A, E2, FixEnv<R2, Evt, readonly T[], readonly T2[]>>
+    ): Effect.Effect<
+      A,
+      InvalidStateError | OptimisticConcurrencyException | E2,
+      | RSchema
+      | RPublish
+      | Exclude<R2, {
+        env: PureEnv<Evt, readonly T[], readonly T2[]>
+      }>
+    >
+    <A, E2, R2, T2 extends T>(
+      q: (
+        q: Query<Encoded>
+      ) =>
+        | Query<Encoded>
+        | QueryWhere<Encoded>
+        | QueryEnd<Encoded>,
+      pure: Effect.Effect<A, E2, FixEnv<R2, Evt, readonly T[], readonly T2[]>>,
+      batch: "batched" | number
+    ): Effect.Effect<
+      A[],
+      InvalidStateError | OptimisticConcurrencyException | E2,
+      | RSchema
+      | RPublish
+      | Exclude<R2, {
+        env: PureEnv<Evt, readonly T[], readonly T2[]>
+      }>
+    >
+  } = (q, pure, batch?: "batched" | number) =>
+    repo.query(q).pipe(
+      Effect.andThen((_) =>
+        Array.isArray(_)
+          ? batch === undefined
+            ? saveManyWithPure_(_ as any, pure as any)
+            : saveManyWithPureBatched_(_ as any, pure as any, batch === "batched" ? 100 : batch)
+          : saveWithPure_(_ as any, pure as any)
+      )
+    ) as any
+
+  const saveManyWithPure: {
+    <R, A, E, S1 extends T, S2 extends T>(
+      items: Iterable<S1>,
+      pure: Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
+    ): Effect.Effect<
+      A,
+      InvalidStateError | OptimisticConcurrencyException | E,
+      | RSchema
+      | RPublish
+      | Exclude<R, {
+        env: PureEnv<Evt, readonly S1[], readonly S2[]>
+      }>
+    >
+    <R, A, E, S1 extends T, S2 extends T>(
+      items: Iterable<S1>,
+      pure: Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>,
+      batch: "batched" | number
+    ): Effect.Effect<
+      A[],
+      InvalidStateError | OptimisticConcurrencyException | E,
+      | RSchema
+      | RPublish
+      | Exclude<R, {
+        env: PureEnv<Evt, readonly S1[], readonly S2[]>
+      }>
+    >
+  } = (items, pure, batch?: "batched" | number) =>
+    batch
+      ? Effect.forEach(
+        Array.chunksOf(items, batch === "batched" ? 100 : batch),
+        (batch) =>
+          saveAllWithEffectInt(
+            runTerm(pure, batch)
+          )
+      )
+      : saveAllWithEffectInt(
+        runTerm(pure, [...items])
+      )
+
+  const byIdAndSaveWithPure: {
+    <R, A, E, S2 extends T>(
+      id: T[IdKey],
+      pure: Effect.Effect<A, E, FixEnv<R, Evt, T, S2>>
+    ): Effect.Effect<
+      A,
+      InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E,
+      | RSchema
+      | RPublish
+      | Exclude<R, {
+        env: PureEnv<Evt, T, S2>
+      }>
+    >
+  } = (id, pure): any => get(id).pipe(Effect.flatMap((item) => saveWithPure_(item, pure)))
+
+  type Req =
+    & Request.Request<T, NotFoundError<ItemType>>
+    & { _tag: `Get${ItemType}`; id: T[IdKey] }
+  const _request = Request.tagged<Req>(`Get${repo.itemType}`)
+
+  const requestResolver = RequestResolver
+    .make((
+      entries: NonEmptyArray<Request.Entry<Req>>,
+      _key: unknown
+    ) =>
+      (repo.query(Q.where(repo.idKey as any, "in" as any, entries.map((_) => _.request.id)) as any) as Effect.Effect<
+        readonly T[]
+      >)
+        // TODO
+        .pipe(
+          Effect.andThen((items) =>
+            Effect.forEach(entries, (entry) =>
+              Request.complete(
+                Array
+                  .findFirst(items, (_) => _[repo.idKey] === entry.request.id)
+                  .pipe(Option.match({
+                    onNone: () => Exit.fail(new NotFoundError({ type: repo.itemType, id: entry.request.id })),
+                    onSome: Exit.succeed
+                  }))
+              )(entry), { discard: true })
+          ),
+          Effect
+            .catchCause((cause) =>
+              Effect.forEach(entries, (entry) => Request.complete(Exit.failCause(cause))(entry), { discard: true })
+            )
+        )
+    )
+    .pipe(
+      RequestResolver.batchN(20)
+    )
+
+  const exts = {
+    request: (id: T[IdKey]) => Effect.request(_request({ id }), requestResolver),
+    get,
+    log: (evt: Evt) => AnyPureDSL.log(evt),
+    /**
+     * Enables chunked writes for large batches via `options.batch`.
+     * Note: batching breaks transactional properties because chunks are saved independently.
+     */
+    save: ((itemOrItems: T | ReadonlyArray<T>, options?: BatchOptions) => {
+      const items = asReadonlyArray(itemOrItems)
+      if (!Array.isReadonlyArrayNonEmpty(items)) {
+        return Effect.void
+      }
+      const batchSize = getBatchSize(options?.batch)
+      if (batchSize === undefined) {
+        return repo.saveAndPublish(items)
+      }
+      return Effect.forEach(
+        Array.chunksOf(items, batchSize),
+        (batch) => repo.saveAndPublish(batch),
+        { discard: true }
+      )
+    }) as (
+      itemOrItems: T | ReadonlyArray<T>,
+      options?: BatchOptions
+    ) => Effect.Effect<
+      void,
+      InvalidStateError | OptimisticConcurrencyException,
+      RSchema | RPublish
+    >,
+    saveWithEvents: (events: Iterable<Evt>) => (...items: NonEmptyArray<T>) => repo.saveAndPublish(items, events),
+    /**
+     * Enables chunked deletes for large batches via `options.batch`.
+     * Note: batching breaks transactional properties because chunks are removed independently.
+     */
+    remove: ((itemOrItems: T | ReadonlyArray<T>, options?: BatchOptions) => {
+      const items = asReadonlyArray(itemOrItems)
+      if (!Array.isReadonlyArrayNonEmpty(items)) {
+        return Effect.void
+      }
+      const batchSize = getBatchSize(options?.batch)
+      if (batchSize === undefined) {
+        return repo.removeAndPublish(items)
+      }
+      return Effect.forEach(
+        Array.chunksOf(items, batchSize),
+        (batch) => repo.removeAndPublish(batch),
+        { discard: true }
+      )
+    }) as (
+      itemOrItems: T | ReadonlyArray<T>,
+      options?: BatchOptions
+    ) => Effect.Effect<void, never, RSchema | RPublish>,
+    /**
+     * Enables chunked deletes for large batches via `options.batch`.
+     * Note: batching breaks transactional properties because chunks are removed independently.
+     */
+    removeById: ((idOrIds: T[IdKey] | ReadonlyArray<T[IdKey]>, options?: BatchOptions) => {
+      const ids = asReadonlyArray(idOrIds)
+      if (!Array.isReadonlyArrayNonEmpty(ids)) {
+        return Effect.void
+      }
+      const batchSize = getBatchSize(options?.batch)
+      if (batchSize === undefined) {
+        return repo.removeById(ids)
+      }
+      return Effect.forEach(
+        Array.chunksOf(ids, batchSize),
+        (batch) => repo.removeById(batch),
+        { discard: true }
+      )
+    }) as (
+      idOrIds: T[IdKey] | ReadonlyArray<T[IdKey]>,
+      options?: BatchOptions
+    ) => Effect.Effect<void, never, RSchema>,
+    queryAndSavePure,
+    saveManyWithPure,
+    byIdAndSaveWithPure,
+    saveWithPure: <
+      R,
+      A,
+      E,
+      S1 extends T,
+      S2 extends T
+    >(
+      item: S1,
+      pure: Effect.Effect<A, E, FixEnv<R, Evt, S1, S2>>
+    ) =>
+      saveAllWithEffectInt(
+        runTerm(pure, item)
+          .pipe(Effect.map(([item, events, a]) => [[item], events, a]))
+      )
+  }
+
+  return {
+    ...repo,
+    ...exts
+  } as Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish, RProvided> & typeof exts
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface ExtendedRepository<
+  T,
+  Encoded extends FieldValues,
+  Evt,
+  ItemType extends string,
+  IdKey extends keyof T & keyof Encoded,
+  RSchema,
+  RPublish,
+  RProvided = never
+> extends ReturnType<typeof extendRepo<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish, RProvided>> {}