@effect-app/infra 0.118.0 → 0.120.0

package/_src/services/Repository.ts

@@ -4,7 +4,7 @@
 import type { FixEnv, PureLogT } from "@effect-app/prelude/Pure"
 import { Pure } from "@effect-app/prelude/Pure"
 import { NotFoundError } from "../errors.js"
-import type { Filter } from "../services/Store.js"
+import type { Filter, PersistenceModelType } from "../services/Store.js"
 import type { RepositoryBaseC } from "./RepositoryBase.js"
 
 /**
@@ -12,7 +12,7 @@ import type { RepositoryBaseC } from "./RepositoryBase.js"
  */
 export interface Repository<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 > extends RepositoryBaseC<T, PM, Evt, ItemType> {}
@@ -34,7 +34,7 @@ export const AnyPureDSL: PureDSL<any, any, any> = {
  */
 export function get<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(
@@ -44,50 +44,12 @@ export function get<
   return self.find(id).flatMap((_) => _.encaseInEffect(() => new NotFoundError({ type: self.itemType, id })))
 }
 
-/**
- * @tsplus fluent Repository filter
- */
-export function filter<
-  T extends { id: string },
-  PM extends { id: string },
-  Evt,
-  ItemType extends string
->(self: RepositoryBaseC<T, PM, Evt, ItemType>, filter: Predicate<T>) {
-  return self.all.map((_) => _.filter(filter))
-}
-
-/**
- * @tsplus fluent Repository filterAll
- */
-export function filterAll<
-  T extends { id: string },
-  PM extends { id: string },
-  Evt,
-  ItemType extends string,
-  S extends T
->(self: RepositoryBaseC<T, PM, Evt, ItemType>, map: (items: T[]) => S[]) {
-  return self.all.map(map)
-}
-
-/**
- * @tsplus fluent Repository collect
- */
-export function collect<
-  T extends { id: string },
-  PM extends { id: string },
-  Evt,
-  ItemType extends string,
-  S extends T
->(self: RepositoryBaseC<T, PM, Evt, ItemType>, collect: (item: T) => Option<S>) {
-  return self.all.map((_) => _.filterMap(collect))
-}
-
 /**
  * @tsplus getter Repository log
  */
 export function log<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(_: RepositoryBaseC<T, PM, Evt, ItemType>) {
@@ -100,7 +62,7 @@ export function log<
  */
 export function projectEffect<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   R,
@@ -108,11 +70,66 @@ export function projectEffect<
   S = PM
 >(
   self: RepositoryBaseC<T, PM, Evt, ItemType>,
-  map: Effect<R, E, { filter?: Filter<PM>; collect?: (t: PM) => Option<S>; limit?: number; skip?: number }>
-) {
+  map: Effect<
+    R,
+    E,
+    {
+      filter?: Filter<PM>
+      collect?: (t: PM) => Option<S>
+      limit?: number
+      skip?: number
+    }
+  >
+): Effect<R, E, S[]>
+export function projectEffect<
+  T extends { id: string },
+  PM extends PersistenceModelType<string>,
+  Evt,
+  ItemType extends string,
+  R,
+  E,
+  U extends keyof PM
+>(
+  self: RepositoryBaseC<T, PM, Evt, ItemType>,
+  map: Effect<
+    R,
+    E,
+    {
+      filter?: Filter<PM>
+      select: readonly U[]
+      limit?: number
+      skip?: number
+    }
+  >
+): Effect<R, E, Pick<PM, U>[]>
+export function projectEffect<
+  T extends { id: string },
+  PM extends PersistenceModelType<string>,
+  Evt,
+  ItemType extends string,
+  R,
+  E,
+  U extends keyof PM,
+  S = Pick<PM, U>
+>(
+  self: RepositoryBaseC<T, PM, Evt, ItemType>,
+  map: Effect<
+    R,
+    E,
+    {
+      filter?: Filter<PM>
+      select?: readonly U[]
+      collect?: (t: Pick<PM, U>) => Option<S>
+      limit?: number
+      skip?: number
+    }
+  >
+): Effect<R, E, S[]> {
   // TODO: a projection that gets sent to the db instead.
   return map.flatMap((f) =>
-    (f.filter ? self.utils.filter(f.filter, { limit: f.limit, skip: f.skip }) : self.utils.all)
+    self
+      .utils
+      .filter(f)
       .map((_) => f.collect ? _.filterMap(f.collect) : _ as unknown as S[])
   )
 }
@@ -123,14 +140,51 @@ export function projectEffect<
  */
 export function project<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   S = PM
 >(
   self: RepositoryBaseC<T, PM, Evt, ItemType>,
-  map: { filter?: Filter<PM>; collect?: (t: PM) => Option<S>; limit?: number; skip?: number }
-) {
+  map: {
+    filter?: Filter<PM>
+    collect?: (t: PM) => Option<S>
+    limit?: number
+    skip?: number
+  }
+): Effect<never, never, S[]>
+export function project<
+  T extends { id: string },
+  PM extends PersistenceModelType<string>,
+  Evt,
+  ItemType extends string,
+  U extends keyof PM
+>(
+  self: RepositoryBaseC<T, PM, Evt, ItemType>,
+  map: {
+    filter?: Filter<PM>
+    select: readonly U[]
+    limit?: number
+    skip?: number
+  }
+): Effect<never, never, Pick<PM, U>[]>
+export function project<
+  T extends { id: string },
+  PM extends PersistenceModelType<string>,
+  Evt,
+  ItemType extends string,
+  U extends keyof PM,
+  S = Pick<PM, U>
+>(
+  self: RepositoryBaseC<T, PM, Evt, ItemType>,
+  map: {
+    filter?: Filter<PM>
+    select?: readonly U[]
+    collect?: (t: Pick<PM, U>) => Option<S>
+    limit?: number
+    skip?: number
+  }
+): Effect<never, never, S[]> {
   return self.projectEffect(Effect(map))
 }
 
@@ -140,7 +194,7 @@ export function project<
  */
 export function count<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(
@@ -157,7 +211,7 @@ export function count<
  */
 export function queryEffect<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   R,
@@ -169,7 +223,7 @@ export function queryEffect<
   map: Effect<R, E, { filter?: Filter<PM>; collect?: (t: T) => Option<S>; limit?: number; skip?: number }>
 ) {
   return map.flatMap((f) =>
-    (f.filter ? self.utils.filter(f.filter, { limit: f.limit, skip: f.skip }) : self.utils.all)
+    (f.filter ? self.utils.filter(f) : self.utils.all)
       .flatMap((_) => self.utils.parseMany(_))
       .map((_) => f.collect ? _.filterMap(f.collect) : _ as any as S[])
   )
@@ -180,7 +234,7 @@ export function queryEffect<
  */
 export function queryOneEffect<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   R,
@@ -192,7 +246,7 @@ export function queryOneEffect<
   map: Effect<R, E, { filter?: Filter<PM>; collect?: (t: T) => Option<S> }>
 ) {
   return map.flatMap((f) =>
-    (f.filter ? self.utils.filter(f.filter, { limit: 1 }) : self.utils.all)
+    (f.filter ? self.utils.filter({ filter: f.filter, limit: 1 }) : self.utils.all)
       .flatMap((_) => self.utils.parseMany(_))
       .flatMap((_) =>
         (f.collect ? _.filterMap(f.collect) : _ as any as S[])
@@ -208,7 +262,7 @@ export function queryOneEffect<
  */
 export function query<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   S = T
@@ -225,7 +279,7 @@ export function query<
  */
 export function queryOne<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   S = T
@@ -242,7 +296,7 @@ export function queryOne<
  */
 export function queryAndSavePureEffect<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   R,
@@ -263,7 +317,7 @@ export function queryAndSavePureEffect<
  */
 export function queryAndSavePure<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   S extends T = T
@@ -280,7 +334,7 @@ export function queryAndSavePure<
  */
 export function saveManyWithPure<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(self: RepositoryBaseC<T, PM, Evt, ItemType>) {
@@ -293,7 +347,7 @@ export function saveManyWithPure<
  */
 export function byIdAndSaveWithPure<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(self: RepositoryBaseC<T, PM, Evt, ItemType>, id: T["id"]) {
@@ -307,7 +361,7 @@ export function byIdAndSaveWithPure<
  */
 export function handleByIdAndSaveWithPure<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(self: RepositoryBaseC<T, PM, Evt, ItemType>) {
@@ -324,7 +378,7 @@ export function saveManyWithPure_<
   Id extends string,
   R,
   T extends { id: Id },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   A,
   E,
   Evt,
@@ -349,7 +403,7 @@ export function saveWithPure_<
   Id extends string,
   R,
   T extends { id: Id },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   A,
   E,
   Evt,
@@ -371,7 +425,7 @@ export function saveWithPure_<
 
 export function saveAllWithEffectInt<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   P extends T,
   Evt,
   ItemType extends string,
@@ -393,7 +447,7 @@ export function saveAllWithEffectInt<
  */
 export function queryAndSavePureEffectBatched<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   R,
@@ -415,7 +469,7 @@ export function queryAndSavePureEffectBatched<
  */
 export function queryAndSavePureBatched<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   S extends T = T
@@ -433,7 +487,7 @@ export function queryAndSavePureBatched<
  */
 export function saveManyWithPureBatched<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(self: RepositoryBaseC<T, PM, Evt, ItemType>, batchSize = 100) {
@@ -448,7 +502,7 @@ export function saveManyWithPureBatched_<
   Id extends string,
   R,
   T extends { id: Id },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   A,
   E,
   Evt,
@@ -600,7 +654,7 @@ export function ifAny_<T, R, E, A>(items: Iterable<T>, fn: (items: NonEmptyReado
  */
 export function save<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(
@@ -614,7 +668,7 @@ export function save<
  */
 export function saveWithEvents<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(

package/_src/services/RepositoryBase.ts

@@ -3,7 +3,7 @@
 import type { ParserEnv } from "@effect-app/schema/custom/Parser"
 import type { Repository } from "./Repository.js"
 import { StoreMaker } from "./Store.js"
-import type { Filter, StoreConfig, Where } from "./Store.js"
+import type { Filter, FilterArgs, FilterFunc, PersistenceModelType, StoreConfig, Where } from "./Store.js"
 import type {} from "effect/Equal"
 import type {} from "effect/Hash"
 import type { Opt } from "@effect-app/core/Option"
@@ -13,13 +13,14 @@ import type { Schema } from "@effect-app/prelude"
 import { EParserFor } from "@effect-app/prelude/schema"
 import type { InvalidStateError, OptimisticConcurrencyException } from "../errors.js"
 import { ContextMapContainer } from "./Store/ContextMapContainer.js"
+import { QueryBuilder } from "./Store/filterApi/query.js"
 
 /**
  * @tsplus type Repository
  */
 export abstract class RepositoryBaseC<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 > {
@@ -33,7 +34,7 @@ export abstract class RepositoryBaseC<
   abstract readonly utils: {
     parseMany: (a: readonly PM[], env?: ParserEnv | undefined) => Effect<never, never, readonly T[]>
     all: Effect<never, never, PM[]>
-    filter: (filter: Filter<PM>, cursor?: { limit?: number; skip?: number }) => Effect<never, never, PM[]>
+    filter: FilterFunc<PM>
     // count: (filter?: Filter<PM>) => Effect<never, never, PositiveInt>
   }
   abstract readonly changeFeed: PubSub<[T[], "save" | "remove"]>
@@ -45,7 +46,7 @@ export abstract class RepositoryBaseC<
 
 export abstract class RepositoryBaseC1<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 > extends RepositoryBaseC<T, PM, Evt, ItemType> {
@@ -56,9 +57,12 @@ export abstract class RepositoryBaseC1<
   }
 }
 
-export class RepositoryBaseC2<T extends { id: string }, PM extends { id: string }, Evt, ItemType extends string>
-  extends RepositoryBaseC1<T, PM, Evt, ItemType>
-{
+export class RepositoryBaseC2<
+  T extends { id: string },
+  PM extends PersistenceModelType<string>,
+  Evt,
+  ItemType extends string
+> extends RepositoryBaseC1<T, PM, Evt, ItemType> {
   constructor(
     itemType: ItemType,
     protected readonly impl: Repository<T, PM, Evt, ItemType>
@@ -212,9 +216,14 @@ export function makeRepo<
            */
           utils: {
             parseMany: (items) => cms.get.map((cm) => items.map((_) => p(mapReverse(_, cm.set)))),
-            filter: store
-              .filter
-              .flow((_) => _.tap((items) => cms.get.map(({ set }) => items.forEach((_) => set(_.id, _._etag))))),
+            filter: <U extends keyof PM = keyof PM>(args: FilterArgs<PM, U>) =>
+              store
+                .filter(args)
+                .tap((items) =>
+                  args.select
+                    ? Effect.unit
+                    : cms.get.map(({ set }) => items.forEach((_) => set((_ as PM).id, (_ as PM)._etag)))
+                ),
             all: store.all.tap((items) => cms.get.map(({ set }) => items.forEach((_) => set(_.id, _._etag))))
           },
           changeFeed,
@@ -232,7 +241,8 @@ export function makeRepo<
 
     return {
       make,
-      where
+      where,
+      query: QueryBuilder.make<PM>()
     }
   }
 }
@@ -243,7 +253,7 @@ export function makeRepo<
  */
 export function removeById<
   T extends { id: string },
-  PM extends { id: string },
+  PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
 >(
@@ -391,7 +401,9 @@ export interface Repos<
     E,
     Out
   >
+  /** @deprecated use `query` instead */
   readonly where: ReturnType<typeof makeWhere<PM>>
+  readonly query: ReturnType<typeof QueryBuilder.make<PM>>
   readonly type: Repository<T, PM, Evt, ItemType>
 }
 
@@ -431,6 +443,7 @@ export const RepositoryBaseImpl = <Service>() => {
       static readonly makeWith = ((a: any, b: any) => mkRepo.make(a).map(b)) as any
 
       static readonly where = makeWhere<PM>()
+      static readonly query = QueryBuilder.make<PM>()
       static readonly type: Repository<T, PM, Evt, ItemType> = undefined as any
     }
     return assignTag<Service>()(Cls) as any
@@ -475,6 +488,7 @@ export const RepositoryDefaultImpl = <Service>() => {
       static readonly makeWith = ((a: any, b: any) => mkRepo.make(a).map(b)) as any
 
       static readonly where = makeWhere<PM>()
+      static readonly query = QueryBuilder.make<PM>()
 
       static readonly type: Repository<T, PM, Evt, ItemType> = undefined as any
     }