effect-app 4.0.0-beta.29 → 4.0.0-beta.290

package/src/DataDependencies.ts

@@ -0,0 +1,114 @@
+import * as Ref from "effect/Ref"
+import * as Stream from "effect/Stream"
+import * as Effect from "./Effect.ts"
+import * as RequestScopedDependencies from "./RequestScopedDependencies.ts"
+import * as S from "./Schema.ts"
+
+export const DataDependency = S.Struct({
+  type: S.Literals(["repo", "signal"]),
+  name: S.String
+})
+export type DataDependency = S.Schema.Type<typeof DataDependency>
+
+export const DataDependencies = S.ReadonlySet(DataDependency)
+export type DataDependencies = S.Schema.Type<typeof DataDependencies>
+
+export const empty = (): DataDependencies => new Set()
+
+export const DataDependencySet = S.Struct({
+  reads: DataDependencies,
+  writes: DataDependencies
+})
+export type DataDependencySet = S.Schema.Type<typeof DataDependencySet>
+
+export interface DataDependencyRecorderService {
+  readonly read: (dependency: DataDependency) => Effect.Effect<void>
+  readonly write: (dependency: DataDependency) => Effect.Effect<void>
+  readonly get: Effect.Effect<DataDependencySet>
+  readonly drain: Effect.Effect<DataDependencySet>
+  readonly drainWrites: Effect.Effect<DataDependencies>
+}
+
+const containsDependency = (dependencies: ReadonlySet<DataDependency>, dependency: DataDependency) => {
+  for (const _ of dependencies) {
+    if (_.type === dependency.type && _.name === dependency.name) return true
+  }
+  return false
+}
+
+const appendDependency = (dependency: DataDependency) => (dependencies: DataDependencies): DataDependencies =>
+  containsDependency(dependencies, dependency) ? dependencies : new Set([...dependencies, dependency])
+
+export const DataDependencyRecorder = RequestScopedDependencies.make(
+  "effect-app/DataDependencyRecorder",
+  Effect.gen(function*() {
+    const readsRef = yield* Ref.make(empty())
+    const writesRef = yield* Ref.make(empty())
+    return makeDataDependencyRecorder(readsRef, writesRef)
+  })
+)
+export type DataDependencyRecorder = typeof DataDependencyRecorder
+
+export type DataDependencyRecorderNotStartedError = RequestScopedDependencies.RequestScopedDependencyNotStartedError
+
+export const getDataDependencyRecorder = DataDependencyRecorder.current
+
+/**
+ * Guarantee a recorder is in scope for `self`, providing a fresh one per request when none is
+ * (e.g. a top-level client call with no parent query/command tracking its dependencies). An
+ * existing recorder is inherited, so nested calls forward into their parent rather than shadow it.
+ */
+export const ensureDataDependencyRecorder = <A, E, R>(self: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
+  Effect.flatMap(
+    DataDependencyRecorder,
+    (current) => current === "root" ? Effect.provide(self, DataDependencyRecorder.layer) : self
+  )
+
+/** Stream variant of {@link ensureDataDependencyRecorder}. */
+export const ensureDataDependencyRecorderStream = <A, E, R>(self: Stream.Stream<A, E, R>): Stream.Stream<A, E, R> =>
+  Stream.unwrap(
+    Effect.map(
+      DataDependencyRecorder,
+      (current) => current === "root" ? Stream.provide(self, DataDependencyRecorder.layer) : self
+    )
+  )
+
+export const makeDataDependencyRecorder = (
+  readsRef: Ref.Ref<DataDependencies>,
+  writesRef: Ref.Ref<DataDependencies>
+): DataDependencyRecorderService => ({
+  read: (dependency) => Ref.update(readsRef, appendDependency(dependency)),
+  write: (dependency) => Ref.update(writesRef, appendDependency(dependency)),
+  get: Effect.all({
+    reads: Ref.get(readsRef),
+    writes: Ref.get(writesRef)
+  }),
+  drain: Effect.all({
+    reads: Ref.getAndSet(readsRef, empty()),
+    writes: Ref.getAndSet(writesRef, empty())
+  }),
+  drainWrites: Ref.getAndSet(writesRef, empty())
+})
+
+export const repo = (name: string): DataDependency => ({ type: "repo", name })
+export const signal = (name: string): DataDependency => ({ type: "signal", name })
+
+export const QueryReadDependenciesMetaKey = "effect-app.query.readDependencies"
+
+export const read = (dependency: DataDependency) =>
+  getDataDependencyRecorder.pipe(Effect.flatMap((_) => _.read(dependency)))
+
+export const write = (dependency: DataDependency) =>
+  getDataDependencyRecorder.pipe(Effect.flatMap((_) => _.write(dependency)))
+
+export const intersects = (
+  a: ReadonlySet<DataDependency>,
+  b: ReadonlySet<DataDependency>
+) => {
+  for (const dependency of a) {
+    if (containsDependency(b, dependency)) return true
+  }
+  return false
+}
+
+export const isNonEmpty = (dependencies: DataDependencies) => dependencies.size > 0

package/src/Effect.ts

@@ -2,13 +2,15 @@
 /* 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 { curry } from "./Function.js"
-import { typedKeysOf } from "./utils.js"
+import type * as Context from "./Context.ts"
+import { curry } from "./Function.ts"
+import { typedKeysOf } from "./utils.ts"
 
 export * from "effect/Effect"
 // v4: Effect interface not re-exported by `export *` due to local binding collision
@@ -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.ts"
+import * as Context from "./Context.ts"
+import type * as Effect from "./Effect.ts"
+import type { Email } from "./Schema.ts"
+
+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/Inputify.type.ts

@@ -1,6 +1,6 @@
 import type { BuiltInObject } from "effect-app/utils"
 
-import type { Primitive } from "./Widen.type.js"
+import type { Primitive } from "./Widen.type.ts"
 
 // Get rid of Date | string, and replace with Date | null
 export type Inputify<T> = Date extends T ? string extends T ? Date | null

package/src/Layer.ts

@@ -1,7 +1,11 @@
-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 { type EffectGenUtils } from "./utils/gen.js"
+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.ts"
+import { type EffectGenUtils } from "./utils/gen.ts"
 
 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,35 @@
+import type { DatabaseError } from "../../client/errors.ts"
+import * as Context from "../../Context.ts"
+import * as Effect from "../../Effect.ts"
+
+export interface RegisteredRepository {
+  readonly seedNamespace: (namespace: string) => Effect.Effect<void, DatabaseError>
+}
+
+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, DatabaseError>
+  readonly entries: ReadonlyMap<string, RegisteredRepository>
+}>()("effect-app/RepositoryRegistry", { make }) {}
+
+export const RepositoryRegistryLive = RepositoryRegistry.toLayer(RepositoryRegistry.make)