@effect-app/infra 0.133.0-next.9 → 0.133.0

package/_src/services/Repository.ts

@@ -3,7 +3,6 @@
 // Modify = Must `set` updated items, and can return anything.
 import type { FixEnv, PureLogT } from "@effect-app/prelude/Pure"
 import { Pure } from "@effect-app/prelude/Pure"
-import type { S } from "vitest/dist/reporters-O4LBziQ_.js"
 import type { InvalidStateError, OptimisticConcurrencyException } from "../errors.js"
 import { NotFoundError } from "../errors.js"
 import type { Filter, PersistenceModelType } from "../services/Store.js"
@@ -14,7 +13,7 @@ import type { QueryBuilder } from "./Store/filterApi/query.js"
  * @tsplus type Repository
  */
 export interface Repository<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -36,7 +35,7 @@ export const AnyPureDSL: PureDSL<any, any, any> = {
  * @tsplus fluent Repository get
  */
 export function get<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -44,14 +43,14 @@ export function get<
   self: RepositoryBaseC<T, PM, Evt, ItemType>,
   id: T["id"]
 ) {
-  return self.find(id).flatMap((_) => _.encaseInEffect(() => new NotFoundError({ type: self.itemType, id })))
+  return self.find(id).flatMap((_) => _.encaseInEffect(() => new NotFoundError<ItemType>({ type: self.itemType, id })))
 }
 
 /**
  * @tsplus getter Repository log
  */
 export function log<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -64,7 +63,7 @@ export function log<
  * @tsplus fluent Repository projectEffect
  */
 export function projectEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -85,13 +84,14 @@ export function projectEffect<
   >
 ): Effect<R, E, S[]>
 export function projectEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
   R,
   E,
-  U extends keyof PM
+  U extends keyof PM,
+  S = PM
 >(
   self: RepositoryBaseC<T, PM, Evt, ItemType>,
   map: Effect<
@@ -106,7 +106,7 @@ export function projectEffect<
   >
 ): Effect<R, E, Pick<PM, U>[]>
 export function projectEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -142,7 +142,7 @@ export function projectEffect<
  * @tsplus fluent Repository project
  */
 export function project<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -157,7 +157,7 @@ export function project<
   }
 ): Effect<never, never, S[]>
 export function project<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -172,7 +172,7 @@ export function project<
   }
 ): Effect<never, never, Pick<PM, U>[]>
 export function project<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -196,7 +196,7 @@ export function project<
  * @tsplus fluent Repository project
  */
 export function count<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -213,7 +213,7 @@ export function count<
  * @tsplus fluent Repository queryEffect
  */
 export function queryEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -236,7 +236,7 @@ export function queryEffect<
  * @tsplus fluent Repository queryOneEffect
  */
 export function queryOneEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -248,7 +248,7 @@ export function queryOneEffect<
   map: Effect<R, E, { filter?: Filter<PM> }>
 ): Effect<R, E | NotFoundError<ItemType>, T>
 export function queryOneEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -261,7 +261,7 @@ export function queryOneEffect<
   map: Effect<R, E, { filter?: Filter<PM>; collect: (t: T) => Option<S> }>
 ): Effect<R, E | NotFoundError<ItemType>, S>
 export function queryOneEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -279,7 +279,7 @@ export function queryOneEffect<
       .flatMap((_) =>
         (f.collect ? _.filterMap(f.collect) : _ as any as S[])
           .toNonEmpty
-          .encaseInEffect(() => new NotFoundError({ type: self.itemType, id: JSON.stringify(f.filter) }))
+          .encaseInEffect(() => new NotFoundError<ItemType>({ type: self.itemType, id: f.filter }))
           .map((_) => _[0])
       )
   )
@@ -289,7 +289,7 @@ export function queryOneEffect<
  * @tsplus fluent Repository query
  */
 export function query<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -306,7 +306,7 @@ export function query<
  * @tsplus fluent Repository queryOne
  */
 export function queryOne<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -316,7 +316,7 @@ export function queryOne<
   map: { filter?: Filter<PM>; collect: (t: T) => Option<S> }
 ): Effect<never, NotFoundError<ItemType>, S>
 export function queryOne<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -325,7 +325,7 @@ export function queryOne<
   map: { filter?: Filter<PM> }
 ): Effect<never, NotFoundError<ItemType>, T>
 export function queryOne<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -341,7 +341,7 @@ export function queryOne<
  * @tsplus fluent Repository queryAndSaveOnePureEffect
  */
 export function queryAndSaveOnePureEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -360,7 +360,7 @@ export function queryAndSaveOnePureEffect<
   A
 >
 export function queryAndSaveOnePureEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -391,7 +391,7 @@ export function queryAndSaveOnePureEffect(
  */
 
 export function queryAndSaveOnePure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -407,7 +407,7 @@ export function queryAndSaveOnePure<
   A
 >
 export function queryAndSaveOnePure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -432,7 +432,7 @@ export function queryAndSaveOnePure(
  * @tsplus fluent Repository queryAndSavePureEffect
  */
 export function queryAndSavePureEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -452,7 +452,7 @@ export function queryAndSavePureEffect<
  * @tsplus fluent Repository queryAndSavePure
  */
 export function queryAndSavePure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -468,7 +468,7 @@ export function queryAndSavePure<
  * @tsplus getter Repository saveManyWithPure
  */
 export function saveManyWithPure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -481,7 +481,7 @@ export function saveManyWithPure<
  * @tsplus fluent Repository byIdAndSaveWithPure
  */
 export function byIdAndSaveWithPure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -495,7 +495,7 @@ export function byIdAndSaveWithPure<
  * @tsplus getter Repository handleByIdAndSaveWithPure
  */
 export function handleByIdAndSaveWithPure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -510,9 +510,8 @@ export function handleByIdAndSaveWithPure<
  * @tsplus fluent Repository saveManyWithPure_
  */
 export function saveManyWithPure_<
-  Id extends string,
   R,
-  T extends { id: Id },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   A,
   E,
@@ -535,9 +534,8 @@ export function saveManyWithPure_<
  * @tsplus fluent Repository saveWithPure_
  */
 export function saveWithPure_<
-  Id extends string,
   R,
-  T extends { id: Id },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   A,
   E,
@@ -559,7 +557,7 @@ export function saveWithPure_<
 }
 
 export function saveAllWithEffectInt<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   P extends T,
   Evt,
@@ -581,7 +579,7 @@ export function saveAllWithEffectInt<
  * @tsplus fluent Repository queryAndSavePureEffectBatched
  */
 export function queryAndSavePureEffectBatched<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -603,7 +601,7 @@ export function queryAndSavePureEffectBatched<
  * @tsplus fluent Repository queryAndSavePureBatched
  */
 export function queryAndSavePureBatched<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -621,7 +619,7 @@ export function queryAndSavePureBatched<
  * @tsplus fluent Repository saveManyWithPureBatched
  */
 export function saveManyWithPureBatched<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -634,9 +632,8 @@ export function saveManyWithPureBatched<
  * @tsplus fluent Repository saveManyWithPureBatched_
  */
 export function saveManyWithPureBatched_<
-  Id extends string,
   R,
-  T extends { id: Id },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   A,
   E,
@@ -788,7 +785,7 @@ export function ifAny_<T, R, E, A>(items: Iterable<T>, fn: (items: NonEmptyReado
  * @tsplus getter Repository save
  */
 export function save<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -802,7 +799,7 @@ export function save<
  * @tsplus getter Repository saveWithEvents
  */
 export function saveWithEvents<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string

package/_src/services/RepositoryBase.ts

@@ -9,7 +9,7 @@ import type {} from "effect/Hash"
 import type { Opt } from "@effect-app/core/Option"
 import { makeCodec } from "@effect-app/infra/api/codec"
 import { makeFilters } from "@effect-app/infra/filter"
-import type { Schema2 } from "@effect-app/prelude"
+import { S } from "@effect-app/prelude"
 import type { InvalidStateError, OptimisticConcurrencyException } from "../errors.js"
 import { ContextMapContainer } from "./Store/ContextMapContainer.js"
 import { QueryBuilder } from "./Store/filterApi/query.js"
@@ -18,7 +18,7 @@ import { QueryBuilder } from "./Store/filterApi/query.js"
  * @tsplus type Repository
  */
 export abstract class RepositoryBaseC<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -44,7 +44,7 @@ export abstract class RepositoryBaseC<
 }
 
 export abstract class RepositoryBaseC1<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -57,7 +57,7 @@ export abstract class RepositoryBaseC1<
 }
 
 export class RepositoryBaseC2<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -87,11 +87,11 @@ export function makeRepo<
 >() {
   return <
     ItemType extends string,
-    T extends { id: string },
+    T extends { id: unknown },
     From extends { id: string }
   >(
     name: ItemType,
-    schema: Schema2.Schema<From, T>,
+    schema: S.Schema<From, T>,
     mapFrom: (pm: Omit<PM, "_etag">) => From,
     mapTo: (e: From, etag: string | undefined) => PM
   ) => {
@@ -147,7 +147,10 @@ export function makeRepo<
 
         const all = allE.flatMap((_) => _.forEachEffect((_) => parse(_)))
 
-        function findE(id: T["id"]) {
+        const structSchema = schema as unknown as { struct: typeof schema }
+        const i = ("struct" in structSchema ? structSchema["struct"] : schema).pipe(S.pick("id"))
+        function findE(_id: T["id"]) {
+          const { id } = i.encodeSync({ id: _id })
           return store
             .find(id)
             .flatMap((items) =>
@@ -172,6 +175,7 @@ export function makeRepo<
                 ret.forEach((_) => set(_.id, _._etag))
               })
             )
+            .asUnit
         const encode = (i: T) => schema.encodeSync(i)
 
         const saveAll = (a: Iterable<T>) => saveAllE(a.toChunk.map(encode))
@@ -179,10 +183,12 @@ export function makeRepo<
         const saveAndPublish = (items: Iterable<T>, events: Iterable<Evt> = []) => {
           const it = items.toChunk
           return saveAll(it)
-            > Effect(events.toNonEmptyArray)
-              // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
-              .flatMapOpt(pub)
-            > changeFeed.publish([it.toArray, "save"])
+            .andThen(Effect(events.toNonEmptyArray))
+            // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
+            .flatMapOpt(pub)
+            .andThen(changeFeed
+              .publish([it.toArray, "save"]))
+            .asUnit
         }
 
         function removeAndPublish(a: Iterable<T>, events: Iterable<Evt> = []) {
@@ -205,7 +211,7 @@ export function makeRepo<
           })
         }
 
-        const p = schema.parseSync
+        const p = schema.decodeSync
 
         const r: Repository<T, PM, Evt, ItemType> = {
           /**
@@ -249,7 +255,7 @@ export function makeRepo<
  * @tsplus fluent Repository removeById
  */
 export function removeById<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -297,11 +303,11 @@ export function makeStore<
 >() {
   return <
     ItemType extends string,
-    T extends { id: string },
+    T extends { id: unknown },
     E extends { id: string }
   >(
     name: ItemType,
-    schema: Schema2.Schema<E, T>,
+    schema: S.Schema<E, T>,
     mapTo: (e: E, etag: string | undefined) => PM
   ) => {
     const [_dec, encode] = makeCodec(schema)
@@ -352,7 +358,7 @@ export function makeStore<
 }
 
 export interface Repos<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends { id: string; _etag: string | undefined },
   Evt,
   ItemType extends string
@@ -409,9 +415,9 @@ export const RepositoryBaseImpl = <Service>() => {
     PM extends { id: string; _etag: string | undefined },
     Evt = never
   >() =>
-  <ItemType extends string, T extends { id: string }, From extends { id: string }>(
+  <ItemType extends string, T extends { id: unknown }, From extends { id: string }>(
     itemType: ItemType,
-    schema: Schema2.Schema<From, T>,
+    schema: S.Schema<From, T>,
     jitM?: (pm: From) => From
   ): Exact<PM, From & { _etag: string | undefined }> extends true ?
       & (abstract new() => RepositoryBaseC1<T, PM, Evt, ItemType>)
@@ -450,9 +456,9 @@ export const RepositoryDefaultImpl = <Service>() => {
     PM extends { id: string; _etag: string | undefined },
     Evt = never
   >() =>
-  <ItemType extends string, T extends { id: string }, From extends { id: string }>(
+  <ItemType extends string, T extends { id: unknown }, From extends { id: string }>(
     itemType: ItemType,
-    schema: Schema2.Schema<From, T>,
+    schema: S.Schema<From, T>,
     jitM?: (pm: From) => From
   ): Exact<PM, From & { _etag: string | undefined }> extends true ?
       & (abstract new(

package/_src/services/Store/Redis.ts

@@ -30,7 +30,7 @@ function makeRedisStore({ prefix }: StorageConfig) {
           }
           const get = redis
             .get(key)
-            .flatMap((x) => x.encaseInEffect(() => new NotFoundError({ type: "data", id: "" })))
+            .flatMap((x) => x.encaseInEffect(() => new NotFoundError<"data">({ type: "data", id: "" })))
             .orDie
             .map((x) => JSON.parse(x) as { data: readonly PM[] })
             .map((_) => _.data)

package/_src/services/Store/service.ts

@@ -63,18 +63,18 @@ export type FilterJoinSelect = {
   value: any /* value path[valueKey] of E */
 }
 
-export interface FilterArgs<PM extends PersistenceModelType<string>, U extends keyof PM = never> {
+export interface FilterArgs<PM extends PersistenceModelType<unknown>, U extends keyof PM = never> {
   filter?: Filter<PM> | undefined
   select?: NonEmptyReadonlyArray<U> | undefined
   limit?: number | undefined
   skip?: number | undefined
 }
 
-export type FilterFunc<PM extends PersistenceModelType<string>> = <U extends keyof PM = never>(
+export type FilterFunc<PM extends PersistenceModelType<unknown>> = <U extends keyof PM = never>(
   args: FilterArgs<PM, U>
 ) => Effect<never, never, (U extends undefined ? PM : Pick<PM, U>)[]>
 
-export interface Store<PM extends PersistenceModelType<Id>, Id extends string> {
+export interface Store<PM extends PersistenceModelType<Id>, Id> {
   all: Effect<never, never, PM[]>
   filter: FilterFunc<PM>
   /** @deprecated */
@@ -189,7 +189,7 @@ export class ContextMap extends TagClass<ContextMap, {
 }>() {
 }
 
-export interface PersistenceModelType<Id extends string> {
+export interface PersistenceModelType<Id> {
   id: Id
   _etag: string | undefined
 }

package/_src/test.arbs.ts

@@ -1,23 +1,26 @@
 // Do not import to frontend
 
 import { setFaker } from "@effect-app/prelude/faker"
+import type { A } from "@effect-app/schema"
 import { faker } from "@faker-js/faker"
+import { Random } from "fast-check"
+import * as fc from "fast-check"
+import * as rand from "pure-rand"
 
-// const rnd = new Random(rand.congruential32(5))
+const rnd = new Random(rand.congruential32(5))
 
 setFaker(faker)
 
-// /**
-//  * @tsplus getter FastCheck generate
-//  */
-// export function generate<T>(arb: fc.Arbitrary<T>) {
-//   return arb.generate(rnd, undefined)
-// }
+/**
+ * @tsplus getter FastCheck generate
+ */
+export function generate<T>(arb: fc.Arbitrary<T>) {
+  return arb.generate(rnd, undefined)
+}
 
-// /**
-//  * @tsplus getter ets/Schema/Arbitrary/Gen generate
-//  */
-
-// export function generateFromArbitrary<T>(arb: Arbitrary.Gen<T>) {
-//   return generate(arb(fc))
-// }
+/**
+ * @tsplus getter effect/schema/Arbitrary generate
+ */
+export function generateFromArbitrary<T>(arb: A.Arbitrary<T>) {
+  return generate(arb(fc))
+}