@effect-app/infra 4.0.0-beta.20 → 4.0.0-beta.200

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/filter/types/path/eager.ts

@@ -217,8 +217,7 @@ export namespace RefinePathValueTests {
     | { nested: { a: string; _tag: "a" } | { b: number; _tag: "b" }; _tag: "ab" }
     | { nested: { b: number; _tag: "b" } | { c: boolean; _tag: "c" }; _tag: "bc" },
     "nested._tag",
-    "a",
-    false
+    "a"
   >
 
   expectTypeOf<test10>().toEqualTypeOf<{

package/src/Model/query/dsl.ts

@@ -54,7 +54,7 @@ type ExtractFieldValuesRefined<T> = T extends QueryTogether<any, infer TFieldVal
 
 export type RelationDirection = "some" | "every"
 export type Relation = { relation: RelationDirection }
-export type Query<TFieldValues extends FieldValues> = QueryTogether<TFieldValues, TFieldValues, false, "initial">
+export type Query<TFieldValues extends FieldValues> = QueryTogether<TFieldValues, TFieldValues>
 export type QueryWhere<
   TFieldValues extends FieldValues,
   TFieldValuesRefined extends TFieldValues = TFieldValues,
@@ -1538,7 +1538,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2, E2>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined2, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined2>
 
   <
     TFieldValues extends FieldValues,
@@ -1555,7 +1555,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined3, E3>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined3, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined3>
 
   <
     TFieldValues extends FieldValues,
@@ -1577,7 +1577,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined4, E4>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined4, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined4>
 
   <
     TFieldValues extends FieldValues,
@@ -1604,7 +1604,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined5, E5>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined5, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined5>
 
   <
     TFieldValues extends FieldValues,
@@ -1636,7 +1636,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined6, E6>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined6, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined6>
 
   <
     TFieldValues extends FieldValues,
@@ -1673,7 +1673,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined7, E7>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined7, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined7>
 
   <
     TFieldValues extends FieldValues,
@@ -1715,7 +1715,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined8, E8>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined2, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined2>
 
   <
     TFieldValues extends FieldValues,
@@ -1762,7 +1762,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined9, E9>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined9, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined9>
 
   <
     TFieldValues extends FieldValues,
@@ -1814,7 +1814,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined10, E10>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined10, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined10>
 
   <
     TFieldValues extends FieldValues,
@@ -1871,7 +1871,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined11, E11>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined11, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined11>
 
   <
     TFieldValues extends FieldValues,
@@ -1933,7 +1933,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined12, E12>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined12, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined12>
 
   <
     TFieldValues extends FieldValues,
@@ -2000,7 +2000,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined13, E13>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined13, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined13>
 
   <
     TFieldValues extends FieldValues,
@@ -2072,7 +2072,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined14, E14>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined14, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined14>
 }
 
 export type FilterWhere =
@@ -2099,12 +2099,12 @@ export type WhereEveryOrSome =
       subPath: TFieldName,
       dude: (
         current: Query<TFieldValues[TFieldName][number]>
-      ) => QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number], false>,
+      ) => QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number]>,
       ...dudes: ((
-        current: QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number], false>
-      ) => QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number], false>)[]
+        current: QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number]>
+      ) => QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number]>)[]
     ): (
       current: Query<TFieldValues>
-    ) => QueryWhere<TFieldValues, TFieldValues, false>
+    ) => QueryWhere<TFieldValues, TFieldValues>
   }
   & FilterContinuationsWithSubpath

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"