@effect-app/infra 4.0.0-beta.18 → 4.0.0-beta.181

package/src/Model/Repository/service.ts

@@ -14,7 +14,8 @@ export interface Repository<
   ItemType extends string,
   IdKey extends keyof T,
   RSchema,
-  RPublish
+  RPublish,
+  RProvided = never
 > {
   readonly itemType: ItemType
   readonly idKey: IdKey
@@ -30,13 +31,21 @@ export interface Repository<
     events?: Iterable<Evt>
   ) => Effect.Effect<void, never, RSchema | RPublish>
 
-  readonly removeById: (...id: readonly T[IdKey][]) => Effect.Effect<void, never, RSchema>
+  readonly removeById: (
+    idOrIds: T[IdKey] | ReadonlyArray<T[IdKey]>
+  ) => Effect.Effect<void, never, RSchema>
 
   readonly queryRaw: <T, Out, R>(
     schema: S.Codec<T, Out, R>,
     raw: RawQuery<Encoded, Out>
   ) => Effect.Effect<readonly T[], S.SchemaError, R>
 
+  /**
+   * Explicitly seed a namespace. Primary is seeded eagerly on initialization.
+   * Non-primary namespaces must be seeded explicitly before use.
+   */
+  readonly seedNamespace: (namespace: string) => Effect.Effect<void>
+
   readonly query: {
     // ending with projection
     <
@@ -53,7 +62,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -73,7 +82,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -95,7 +104,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -119,7 +128,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -145,7 +154,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -171,7 +180,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -199,7 +208,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -229,7 +238,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -261,7 +270,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -295,7 +304,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
 
     // ending with generic query
@@ -309,7 +318,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -325,7 +334,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -345,7 +354,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -365,7 +374,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -387,7 +396,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -411,7 +420,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -437,7 +446,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -466,7 +475,7 @@ export interface Repository<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined>
         : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -497,7 +506,7 @@ export interface Repository<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined>
         : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -530,7 +539,7 @@ export interface Repository<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined>
         : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
   }
 

package/src/Model/Repository/validation.ts

@@ -5,7 +5,7 @@ import { NonNegativeInt } from "effect-app/Schema"
  * Represents a single validation error when decoding a repository item.
  * Contains full context for debugging: raw data, jitM result, and decode error.
  */
-export class ValidationError extends S.Class<ValidationError>("@effect-app/infra/ValidationError")({
+export class ValidationError extends S.Opaque<ValidationError>()(S.Struct({
   /** the id of the item that failed validation */
   id: S.Unknown,
   /** the raw data from the database before jitM */
@@ -14,12 +14,12 @@ export class ValidationError extends S.Class<ValidationError>("@effect-app/infra
   jitMResult: S.Unknown,
   /** the S.SchemaError from schema decode */
   error: S.Unknown
-}) {}
+})) {}
 
 /**
  * Result of validating a sample of repository items.
  */
-export class ValidationResult extends S.Class<ValidationResult>("@effect-app/infra/ValidationResult")({
+export class ValidationResult extends S.Opaque<ValidationResult>()(S.Struct({
   /** total number of items in the repository */
   total: NonNegativeInt,
   /** number of items that were sampled for validation */
@@ -28,4 +28,4 @@ export class ValidationResult extends S.Class<ValidationResult>("@effect-app/inf
   valid: NonNegativeInt,
   /** list of validation errors with full context */
   errors: S.Array(ValidationError)
-}) {}
+})) {}

package/src/Model/Repository.ts

@@ -1,5 +1,6 @@
 export * from "./Repository/ext.js"
 export * from "./Repository/legacy.js"
 export { makeRepo } from "./Repository/makeRepo.js"
+export * from "./Repository/Registry.js"
 export * from "./Repository/service.js"
 export * from "./Repository/validation.js"

package/src/Model/dsl.ts

@@ -42,16 +42,16 @@ 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.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>>)
   & 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.Effect<A, E, FixEnv<R, Evt, S1, S2>>
+    pure: (items: S1, dsl: PureDSL<S1, S2, Evt>) => Effect.Effect<A, E, R>
   ) => 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.Effect<S2, E, FixEnv<R, Evt, S1, S2>>
+    pure: (items: S1, log: (...evt: Evt[]) => PureLogT<Evt>) => Effect.Effect<S2, E, R>
   ) => Effect.Effect<S2, E, FixEnv<R, Evt, S1, S2>>
   updateWith: <S1 extends T, S2 extends T>(
     upd: (item: S1) => S2

package/src/Model/query/new-kid-interpreter.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { Array, identity, Match, Option, pipe, S } from "effect-app"
+import { Array, identity, Match, Option, pipe, S, SchemaAST } from "effect-app"
 import { toNonEmptyArray } from "effect-app/Array"
 import { dropUndefinedT } from "effect-app/utils"
 import type { FilterResult } from "../filter/filterApi.js"
@@ -165,7 +165,7 @@ export const toFilter = <
   let select: (keyof TFieldValues | { key: string; subKeys: string[] })[] = []
   // TODO: support more complex (nested) schemas?
   if (schema) {
-    const t = walkTransformation(schema.ast)
+    const t = walkTransformation(SchemaAST.toEncoded(schema.ast))
     if (S.AST.isObjects(t)) {
       select = t.propertySignatures.map((_) => _.name as string)
       for (const prop of t.propertySignatures) {

package/src/Model.ts

@@ -1,3 +1,4 @@
 export * from "./Model/dsl.js"
 export * as Q from "./Model/query.js"
 export { makeRepo } from "./Model/Repository.js"
+export { type RegisteredRepository, RepositoryRegistry, RepositoryRegistryLive } from "./Model/Repository.js"

package/src/Operations.ts

@@ -1,6 +1,6 @@
 import { reportError } from "@effect-app/infra/errorReporter"
 import { subHours } from "date-fns"
-import { Cause, copy, Duration, Effect, Exit, type Fiber, Layer, Option, S, Schedule, ServiceMap } from "effect-app"
+import { Cause, Context, copy, Duration, Effect, Exit, type Fiber, Layer, Option, S, Schedule } from "effect-app"
 import { annotateLogscoped } from "effect-app/Effect"
 import { dual, pipe } from "effect-app/Function"
 import { Operation, OperationFailure, OperationId, type OperationProgress, OperationSuccess } from "effect-app/Operations"
@@ -20,6 +20,33 @@ const make = Effect.gen(function*() {
   const reqFiberSet = yield* RequestFiberSet
   const makeOp = Effect.sync(() => OperationId.make())
 
+  const addOp = Effect.fnUntraced(function*(id: OperationId, title: NonEmptyString2k) {
+    return yield* repo.save(Operation.make({ id, title })).pipe(Effect.orDie)
+  })
+
+  const finishOp = Effect.fnUntraced(function*(id: OperationId, exit: Exit.Exit<unknown, unknown>) {
+    const op = yield* repo.get(id).pipe(Effect.orDie)
+    const result = Exit.isSuccess(exit)
+      ? OperationSuccess.make({})
+      : OperationFailure.make({
+        message: Cause.hasInterruptsOnly(exit.cause)
+          ? NonEmptyString2k("Interrupted")
+          : Cause.hasDies(exit.cause)
+          ? NonEmptyString2k("Unknown error")
+          : Cause
+            .findErrorOption(exit.cause)
+            .pipe(
+              Option.flatMap((_) =>
+                typeof _ === "object" && _ !== null && "message" in _ && S.is(NonEmptyString2k)(_.message)
+                  ? Option.some(_.message)
+                  : Option.none()
+              ),
+              Option.getOrNull
+            )
+      })
+    return yield* repo.save(copy(op, { updatedAt: new Date(), result })).pipe(Effect.orDie)
+  })
+
   const register = (title: NonEmptyString2k) =>
     Effect.tap(
       makeOp,
@@ -30,53 +57,20 @@ const make = Effect.gen(function*() {
         )
     )
 
-  const cleanup = Effect.sync(() => subHours(new Date(), 1)).pipe(
-    Effect.andThen((before) => repo.query(where("updatedAt", "lt", before.toISOString()))),
-    Effect.andThen((ops) => pipe(ops, batch(100, Effect.succeed, (items) => repo.removeAndPublish(items)))),
-    setupRequestContextFromCurrent("Operations.cleanup")
-  )
+  const cleanup = Effect
+    .gen(function*() {
+      const before = subHours(new Date(), 1)
+      const ops = yield* repo.query(where("updatedAt", "lt", before.toISOString()))
+      return yield* pipe(ops, batch(100, Effect.succeed, (items) => repo.removeAndPublish(items)))
+    })
+    .pipe(setupRequestContextFromCurrent("Operations.cleanup"))
 
-  function addOp(id: OperationId, title: NonEmptyString2k) {
-    return repo.save(new Operation({ id, title })).pipe(Effect.orDie)
-  }
-  function findOp(id: OperationId) {
-    return repo.find(id)
-  }
-  function finishOp(id: OperationId, exit: Exit.Exit<unknown, unknown>) {
-    return Effect
-      .flatMap(repo.get(id).pipe(Effect.orDie), (_) =>
-        repo
-          .save(
-            copy(_, {
-              updatedAt: new Date(),
-              result: Exit.isSuccess(exit)
-                ? new OperationSuccess()
-                : new OperationFailure({
-                  message: Cause.hasInterruptsOnly(exit.cause)
-                    ? NonEmptyString2k("Interrupted")
-                    : Cause.hasDies(exit.cause)
-                    ? NonEmptyString2k("Unknown error")
-                    : Cause
-                      .findErrorOption(exit.cause)
-                      .pipe(
-                        Option.flatMap((_) =>
-                          typeof _ === "object" && _ !== null && "message" in _ && S.is(NonEmptyString2k)(_.message)
-                            ? Option.some(_.message)
-                            : Option.none()
-                        ),
-                        Option.getOrNull
-                      )
-                })
-            })
-          )
-          .pipe(Effect.orDie))
-  }
-  function update(id: OperationId, progress: OperationProgress) {
-    return Effect.flatMap(
-      repo.get(id).pipe(Effect.orDie),
-      (_) => repo.save(copy(_, { updatedAt: new Date(), progress })).pipe(Effect.orDie)
-    )
-  }
+  const findOp = (id: OperationId) => repo.find(id)
+
+  const update = Effect.fnUntraced(function*(id: OperationId, progress: OperationProgress) {
+    const op = yield* repo.get(id).pipe(Effect.orDie)
+    return yield* repo.save(copy(op, { updatedAt: new Date(), progress })).pipe(Effect.orDie)
+  })
 
   function fork<R, R2, E, E2, A, A2>(
     self: (id: OperationId) => Effect.Effect<A, E, R>,
@@ -87,29 +81,18 @@ const make = Effect.gen(function*() {
     never,
     Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>
   > {
-    return Effect
-      .flatMap(
-        Scope.make(),
-        (scope) =>
-          register(title)
-            .pipe(
-              Scope.provide(scope),
-              Effect.flatMap((id) =>
-                reqFiberSet
-                  .forkDaemonReportUnexpected(Scope.use(
-                    self(id).pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
-                    scope
-                  ))
-                  .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
-              ),
-              Effect.tap(({ id }) =>
-                Effect.interruptible(fnc(id)).pipe(
-                  Effect.forkScoped,
-                  Scope.provide(scope)
-                )
-              )
-            )
+    return Effect.gen(function*() {
+      const scope = yield* Scope.make()
+      const id = yield* Scope.provide(register(title), scope)
+      const fiber = yield* reqFiberSet.forkDaemonReportUnexpected(
+        Scope.use(
+          self(id).pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
+          scope
+        )
       )
+      yield* Scope.provide(Effect.forkScoped(Effect.interruptible(fnc(id))), scope)
+      return { fiber, id } satisfies RunningOperation<A, E>
+    })
   }
 
   const fork2: {
@@ -122,24 +105,20 @@ const make = Effect.gen(function*() {
     ): Effect.Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
   } = dual(
     2,
-    <R, E, A>(self: (opId: OperationId) => Effect.Effect<A, E, R>, title: NonEmptyString2k) =>
-      Effect.flatMap(
-        Scope.make(),
-        (scope) =>
-          register(title)
-            .pipe(
-              Scope.provide(scope),
-              Effect
-                .flatMap((id) =>
-                  reqFiberSet
-                    .forkDaemonReportUnexpected(Scope.use(
-                      self(id).pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
-                      scope
-                    ))
-                    .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
-                )
-            )
+    Effect.fnUntraced(function*<R, E, A>(
+      self: (opId: OperationId) => Effect.Effect<A, E, R>,
+      title: NonEmptyString2k
+    ) {
+      const scope = yield* Scope.make()
+      const id = yield* Scope.provide(register(title), scope)
+      const fiber = yield* reqFiberSet.forkDaemonReportUnexpected(
+        Scope.use(
+          self(id).pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
+          scope
+        )
       )
+      return { fiber, id } satisfies RunningOperation<A, E>
+    })
   )
 
   const forkOperation: {
@@ -152,28 +131,21 @@ const make = Effect.gen(function*() {
     ): Effect.Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
   } = dual(
     2,
-    <R, E, A>(self: Effect.Effect<A, E, R>, title: NonEmptyString2k) =>
-      Effect.flatMap(
-        Scope.make(),
-        (scope) =>
-          register(title)
-            .pipe(
-              Scope.provide(scope),
-              Effect
-                .flatMap((id) =>
-                  reqFiberSet
-                    .forkDaemonReportUnexpected(Scope.use(
-                      self.pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
-                      scope
-                    ))
-                    .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
-                )
-            )
+    Effect.fnUntraced(function*<R, E, A>(self: Effect.Effect<A, E, R>, title: NonEmptyString2k) {
+      const scope = yield* Scope.make()
+      const id = yield* Scope.provide(register(title), scope)
+      const fiber = yield* reqFiberSet.forkDaemonReportUnexpected(
+        Scope.use(
+          self.pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
+          scope
+        )
       )
+      return { fiber, id } satisfies RunningOperation<A, E>
+    })
   )
 
   function forkOperationFunction<R, E, A, Inp>(fnc: (inp: Inp) => Effect.Effect<A, E, R>, title: NonEmptyString2k) {
-    return (inp: Inp) => fnc(inp).pipe((_) => forkOperation(_, title))
+    return (inp: Inp) => forkOperation(fnc(inp), title)
   }
 
   return {
@@ -189,19 +161,12 @@ const make = Effect.gen(function*() {
   }
 })
 
-export class Operations extends ServiceMap.Opaque<Operations>()("effect-app/Operations", { make }) {
+export class Operations extends Context.Opaque<Operations>()("effect-app/Operations", { make }) {
   private static readonly CleanupLive = this
     .use((_) =>
       _.cleanup.pipe(
         Effect.exit,
-        Effect
-          .flatMap((_) => {
-            if (Exit.isSuccess(_)) {
-              return Effect.void
-            } else {
-              return reportAppError(_.cause)
-            }
-          }),
+        Effect.flatMap((exit) => Exit.isSuccess(exit) ? Effect.void : reportAppError(exit.cause)),
         Effect.schedule(Schedule.fixed(Duration.minutes(20))),
         Effect.map((_) => _ as never),
         MainFiberSet.run

package/src/OperationsRepo.ts

@@ -1,8 +1,8 @@
-import { Effect, ServiceMap } from "effect-app"
+import { Context, Effect } from "effect-app"
 import { Operation } from "effect-app/Operations"
 import { makeRepo } from "./Model.js"
 
-export class OperationsRepo extends ServiceMap.Service<OperationsRepo>()(
+export class OperationsRepo extends Context.Service<OperationsRepo>()(
   "OperationRepo",
   {
     make: Effect.gen(function*() {