@effect-app/infra 2.3.2 → 2.3.4

package/src/services/RepositoryBase.ts

@@ -329,7 +329,7 @@ const dedupe = Array.dedupeWith(Equivalence.string)
 /**
  * A base implementation to create a repository.
  */
-export function makeRepo<
+export function makeRepoInternal<
   Evt = never
 >() {
   return <
@@ -979,7 +979,7 @@ export const RepositoryBaseImpl = <Service>() => {
     >
     & RepoFunctions<T, Encoded, Evt, ItemType, IdKey, Service> =>
   {
-    const mkRepo = makeRepo<Evt>()(
+    const mkRepo = makeRepoInternal<Evt>()(
       itemType,
       schema,
       jitM ? (pm) => jitM(pm as unknown as Encoded) : (pm) => pm as any,
@@ -1052,7 +1052,7 @@ export const RepositoryDefaultImpl = <Service, Evt = never>() => {
     jitM?: (pm: Encoded) => Encoded
   ) => {
     if (!jitM && idKeyOrJitM !== undefined && typeof idKeyOrJitM === "function") jitM = idKeyOrJitM
-    const mkRepo = makeRepo<Evt>()(
+    const mkRepo = makeRepoInternal<Evt>()(
       itemType,
       schema,
       jitM ? (pm) => jitM(pm) : (pm) => pm,
@@ -1312,7 +1312,7 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
         return layerCache ??= Effect
           .gen(function*() {
             const opts = yield* options.options ?? Effect.succeed({})
-            const mkRepo = makeRepo<Evt>()(
+            const mkRepo = makeRepoInternal<Evt>()(
               itemType,
               schema,
               options?.jitM ? (pm) => options.jitM!(pm) : (pm) => pm,
@@ -1320,7 +1320,8 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
               options.idKey ?? "id" as any
             )
             const r = yield* mkRepo.make({ ...options, ...opts } as any)
-            return Layer.succeed(self, new self(Object.assign(r, "ext" in opts ? opts.ext : {})))
+            const repo = new self(Object.assign(r, "ext" in opts ? opts.ext : {}))
+            return Layer.succeed(self, repo)
           })
           .pipe(Layer.unwrapEffect)
       }
@@ -1347,6 +1348,112 @@ export const RepositoryDefaultImpl2 = <Service, Evt = never>() => {
   return f
 }
 
+export const makeRepo = <Evt = never>() => {
+  const f: {
+    <
+      ItemType extends string,
+      R,
+      Encoded extends { id: string },
+      T,
+      IdKey extends keyof T,
+      E = never,
+      RInitial = never,
+      R2 = never
+    >(
+      itemType: ItemType,
+      schema: S.Schema<T, Encoded, R>,
+      options: [Evt] extends [never] ? {
+          idKey: IdKey
+          config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
+            partitionValue?: (a: Encoded) => string
+          }
+          jitM?: (pm: Encoded) => Encoded
+          makeInitial?: Effect<readonly T[], E, RInitial>
+        }
+        : {
+          idKey: IdKey
+          jitM?: (pm: Encoded) => Encoded
+          config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
+            partitionValue?: (a: Encoded) => string
+          }
+          publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, R2>
+          makeInitial?: Effect<readonly T[], E, RInitial>
+        }
+    ): // TODO: drop ext
+    Effect.Effect<RepositoryBaseC3<T, Encoded, Evt, ItemType, {}, IdKey>, E, R | RInitial | R2 | StoreMaker>
+    <
+      ItemType extends string,
+      R,
+      Encoded extends { id: string },
+      T extends { id: unknown },
+      E = never,
+      RInitial = never,
+      R2 = never
+    >(
+      itemType: ItemType,
+      schema: S.Schema<T, Encoded, R>,
+      options: [Evt] extends [never] ? {
+          config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
+            partitionValue?: (a: Encoded) => string
+          }
+          jitM?: (pm: Encoded) => Encoded
+          makeInitial?: Effect<readonly T[], E, RInitial>
+        }
+        : {
+          jitM?: (pm: Encoded) => Encoded
+          config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
+            partitionValue?: (a: Encoded) => string
+          }
+          publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, R2>
+          makeInitial?: Effect<readonly T[], E, RInitial>
+        }
+    ): Effect.Effect<RepositoryBaseC3<T, Encoded, Evt, ItemType, {}, "id">, E, R | RInitial | R2 | StoreMaker>
+  } = <
+    ItemType extends string,
+    R,
+    Encoded extends { id: string },
+    T,
+    IdKey extends keyof T,
+    E = never,
+    RInitial = never,
+    R2 = never
+  >(
+    itemType: ItemType,
+    schema: S.Schema<T, Encoded, R>,
+    options: [Evt] extends [never] ? {
+        idKey?: IdKey
+        config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
+          partitionValue?: (a: Encoded) => string
+        }
+        jitM?: (pm: Encoded) => Encoded
+        makeInitial?: Effect<readonly T[], E, RInitial>
+      }
+      : {
+        idKey?: IdKey
+        jitM?: (pm: Encoded) => Encoded
+        config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
+          partitionValue?: (a: Encoded) => string
+        }
+        publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, R2>
+        makeInitial?: Effect<readonly T[], E, RInitial>
+      }
+  ) =>
+    Effect.gen(function*() {
+      const mkRepo = makeRepoInternal<Evt>()(
+        itemType,
+        schema,
+        options?.jitM ? (pm) => options.jitM!(pm) : (pm) => pm,
+        (e, _etag) => ({ ...e, _etag }),
+        options.idKey ?? "id" as any
+      )
+      const r = yield* mkRepo.make(options)
+      const repo = new RepositoryBaseC3(itemType, r)
+      return repo
+    })
+
+  return f
+}
+
 const names = new Map<string, number>()
 const registerName = (name: string) => {
   const existing = names.get(name)

package/src/services/Store/Memory.ts

@@ -5,9 +5,10 @@ import type { NonEmptyReadonlyArray } from "effect-app"
 import { NonEmptyString255 } from "effect-app/Schema"
 import { get } from "effect-app/utils"
 import { InfraLogger } from "../../logger.js"
+import { codeFilter } from "./codeFilter.js"
 import type { FilterArgs, PersistenceModelType, Store, StoreConfig } from "./service.js"
 import { StoreMaker } from "./service.js"
-import { codeFilter, makeUpdateETag } from "./utils.js"
+import { makeUpdateETag } from "./utils.js"
 
 export function memFilter<T extends { id: string }, U extends keyof T = never>(f: FilterArgs<T, U>) {
   type M = U extends undefined ? T : Pick<T, U>

package/src/services/Store/codeFilter.ts

@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-import { Array } from "effect-app"
+import { Array, Option } from "effect-app"
 import { assertUnreachable, get } from "effect-app/utils"
 import type { FilterR, FilterResult } from "./filterApi/query.js"
+import type { Filter } from "./service.js"
 import { compare, greaterThan, greaterThanExclusive, lowerThan, lowerThanExclusive } from "./utils.js"
 
 const vAsArr = (v: string) => v as unknown as any[]
@@ -118,3 +119,7 @@ export const codeFilter3_ = <E>(state: readonly FilterResult[], sut: E): boolean
   const s = codeFilter3__(state, sut, statements)
   return eval(s)
 }
+
+export function codeFilter<E extends { id: string }, NE extends E>(filter: Filter) {
+  return (x: E) => codeFilter3_(filter, x) ? Option.some(x as unknown as NE) : Option.none()
+}

package/src/services/Store/utils.ts

@@ -1,8 +1,7 @@
 import { Effect, Option } from "effect-app"
 import objectHash from "object-hash"
 import { OptimisticConcurrencyException } from "../../errors.js"
-import { codeFilter3_ } from "./codeFilter.js"
-import type { Filter, PersistenceModelType, SupportedValues2 } from "./service.js"
+import type { PersistenceModelType, SupportedValues2 } from "./service.js"
 
 export const makeETag = <E extends PersistenceModelType<{}>>(
   { _etag, ...e }: E
@@ -31,10 +30,6 @@ export const makeUpdateETag =
       return newE
     })
 
-export function codeFilter<E extends { id: string }, NE extends E>(filter: Filter) {
-  return (x: E) => codeFilter3_(filter, x) ? Option.some(x as unknown as NE) : Option.none()
-}
-
 export function lowercaseIfString<T>(val: T) {
   if (typeof val === "string") {
     return val.toLowerCase()

package/src/services/adapters/SQL.ts

@@ -1 +1 @@
-export * as Model from "./SQL/Model.js"
+export * as SQLModel from "./SQL/Model.js"

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

@@ -5,7 +5,7 @@ import { toNonEmptyArray } from "effect-app/Array"
 import { dropUndefinedT } from "effect-app/utils"
 import type { FieldValues } from "../../filter/types.js"
 import type { FieldPath } from "../../filter/types/path/eager.js"
-import { make, type Q, type QAll } from "../query.js"
+import { make, type Q, type QAll } from "../query/dsl.js"
 import type { FilterResult } from "../Store/filterApi/query.js"
 
 type Result<TFieldValues extends FieldValues, A = TFieldValues, R = never> = {