@effect-app/infra 1.44.6 → 1.45.0

package/dist/services/RepositoryBase.js

@@ -83,7 +83,7 @@ const dedupe = Array.dedupeWith(Equivalence.string);
  * A base implementation to create a repository.
  */
 export function makeRepo() {
-    return (name, schema, mapFrom, mapTo) => {
+    return (name, schema, mapFrom, mapTo, idKey) => {
         function mapToPersistenceModel(e, getEtag) {
             return mapTo(e, getEtag(e.id));
         }
@@ -120,7 +120,7 @@ export function makeRepo() {
                     .pipe((_) => _.ast._tag === "Union"
                     // we need to get the TypeLiteral, incase of class it's behind a transform...
                     ? S.Union(..._.ast.types.map((_) => S.make(_._tag === "Transformation" ? _.from : _)
-                        .pipe(S.pick("id"))))
+                        .pipe(S.pick(idKey))))
                     : _
                         .ast
                         ._tag === "Transformation"
@@ -129,10 +129,10 @@ export function makeRepo() {
                             .ast
                             .from)
                             .pipe(S
-                            .pick("id"))
+                            .pick(idKey))
                         : _
                             .pipe(S
-                            .pick("id")));
+                            .pick(idKey)));
                 const encodeId = flow(S.encode(i), Effect.provide(rctx));
                 function findEId(id) {
                     return Effect.flatMap(store.find(id), (item) => Effect.gen(function* () {
@@ -140,8 +140,9 @@ export function makeRepo() {
                         return item.pipe(Option.map((_) => mapReverse(_, set)));
                     }));
                 }
+                // TODO: deal with idKey <-> "id" in encoded
                 function findE(id) {
-                    return pipe(encodeId({ id }), Effect.orDie, Effect.map((_) => _.id), Effect.flatMap(findEId));
+                    return pipe(encodeId({ [idKey]: id }), Effect.orDie, Effect.map((_) => _.id), Effect.flatMap(findEId));
                 }
                 function find(id) {
                     return Effect.flatMapOption(findE(id), (_) => Effect.orDie(decode(_)));
@@ -335,8 +336,8 @@ const makeRepoFunctions = (tag, itemType) => {
     };
 };
 export const RepositoryBaseImpl = () => {
-    return () => (itemType, schema, jitM) => {
-        const mkRepo = makeRepo()(itemType, schema, jitM ? (pm) => jitM(pm) : (pm) => pm, (e, _etag) => ({ ...e, _etag }));
+    return () => (itemType, schema, idKey, jitM) => {
+        const mkRepo = makeRepo()(itemType, schema, jitM ? (pm) => jitM(pm) : (pm) => pm, (e, _etag) => ({ ...e, _etag }), idKey);
         class Cls extends RepositoryBaseC1 {
             constructor() {
                 super(itemType);
@@ -354,8 +355,10 @@ export const RepositoryBaseImpl = () => {
     };
 };
 export const RepositoryDefaultImpl = () => {
-    return (itemType, schema, jitM) => {
-        const mkRepo = makeRepo()(itemType, schema, jitM ? (pm) => jitM(pm) : (pm) => pm, (e, _etag) => ({ ...e, _etag }));
+    const f = (itemType, schema, idKeyOrJitM, jitM) => {
+        if (!jitM && idKeyOrJitM !== undefined && typeof idKeyOrJitM === "function")
+            jitM = idKeyOrJitM;
+        const mkRepo = makeRepo()(itemType, schema, jitM ? (pm) => jitM(pm) : (pm) => pm, (e, _etag) => ({ ...e, _etag }), idKeyOrJitM ?? "id");
         class Cls extends RepositoryBaseC3 {
             constructor(impl) {
                 super(itemType, impl);
@@ -371,9 +374,10 @@ export const RepositoryDefaultImpl = () => {
         Error.stackTraceLimit = limit;
         return Context.assignTag(undefined, creationError)(Object.assign(Cls, makeRepoFunctions(Cls, itemType))); // impl is missing, but its marked protected
     };
+    return f;
 };
 export const RepositoryDefaultImpl2 = () => {
-    return (itemType, schema, options) => {
+    const f = (itemType, schema, options) => {
         let layerCache = undefined;
         let layerCache2 = undefined;
         class Cls extends RepositoryBaseC3 {
@@ -386,7 +390,7 @@ export const RepositoryDefaultImpl2 = () => {
                 return layerCache ??= Effect
                     .gen(function* () {
                     const opts = yield* options.options ?? Effect.succeed({});
-                    const mkRepo = makeRepo()(itemType, schema, options?.jitM ? (pm) => options.jitM(pm) : (pm) => pm, (e, _etag) => ({ ...e, _etag }));
+                    const mkRepo = makeRepo()(itemType, schema, options?.jitM ? (pm) => options.jitM(pm) : (pm) => pm, (e, _etag) => ({ ...e, _etag }), options.idKey ?? "id");
                     const r = yield* mkRepo.make({ ...options, ...opts });
                     return Layer.succeed(self, new self(Object.assign(r, "ext" in opts ? opts.ext : {})));
                 })
@@ -408,15 +412,16 @@ export const RepositoryDefaultImpl2 = () => {
         Error.stackTraceLimit = limit;
         return Context.assignTag(undefined, creationError)(Object.assign(Cls, makeRepoFunctions(Cls, itemType))); // impl is missing, but its marked protected
     };
+    return f;
 };
 // TODO: integrate with repo
-export const makeRequest = (repo) => {
+export const makeRequest = (repo, idKey) => {
     const _request = Request.tagged(`Get${repo.itemType}`);
     const requestResolver = RequestResolver
         .makeBatched((requests) => repo
         .query(Q.where("id", "in", requests.map((_) => _.id))) // TODO
         .pipe(Effect.andThen((items) => Effect.forEach(requests, (r) => Request.complete(r, Array
-        .findFirst(items, (_) => _.id === r.id)
+        .findFirst(items, (_) => _[idKey] === r.id)
         .pipe(Option.match({
         onNone: () => Exit.fail(new NotFoundError({ type: repo.itemType, id: r.id })),
         onSome: Exit.succeed
@@ -425,4 +430,4 @@ export const makeRequest = (repo) => {
         .pipe(RequestResolver.batchN(20), RequestResolver.contextFromServices(repo));
     return (id) => Effect.request(_request({ id }), requestResolver);
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}

package/dist/services/RequestContextContainer.d.ts

@@ -25,7 +25,7 @@ declare const RequestContextContainer_base: (abstract new (service: {
         requestContext: Effect<RequestContext>;
         update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>;
         start: (f: RequestContext) => Effect<void>;
-    }) => X) => X extends Effect<infer A_1, infer E_1, infer R_3> ? Effect<A_1, E_1, RequestContextContainer | R_3> : Effect<X, never, RequestContextContainer>;
+    }) => X) => X extends Effect<infer A_1, infer E_1, infer R_3> ? Effect<A_1, E_1, R_3 | RequestContextContainer> : Effect<X, never, RequestContextContainer>;
 };
 /**
  * @tsplus type RequestContextContainer

package/dist/services/Store/service.d.ts

@@ -87,7 +87,7 @@ declare const StoreMaker_base: (abstract new (service: {
         make: <Encoded extends {
             id: Id;
         }, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<Encoded>, E, R>, config?: StoreConfig<Encoded>) => Effect<Store<Encoded, Id>, E, R>;
-    }) => X) => X extends Effect<infer A_1, infer E_1, infer R_3> ? Effect<A_1, E_1, R_3 | StoreMaker> : Effect<X, never, StoreMaker>;
+    }) => X) => X extends Effect<infer A_1, infer E_1, infer R_3> ? Effect<A_1, E_1, StoreMaker | R_3> : Effect<X, never, StoreMaker>;
 };
 /**
  * @tsplus type StoreMaker

package/examples/query.ts

@@ -1,4 +1,4 @@
-import { RepositoryDefaultImpl } from "@effect-app/infra/services/RepositoryBase"
+import { RepositoryDefaultImpl2 } from "@effect-app/infra/services/RepositoryBase"
 import { Effect, flow, Layer, ManagedRuntime, S } from "effect-app"
 import { and, or, order, page, project, where } from "../src/services/query.js"
 import { ContextMapContainer } from "../src/services/Store/ContextMapContainer.js"
@@ -28,9 +28,10 @@ const items = [
   })
 ]
 
-class SomethingRepo extends RepositoryDefaultImpl<SomethingRepo>()(
+class SomethingRepo extends RepositoryDefaultImpl2<SomethingRepo>()(
   "Something",
-  Something
+  Something,
+  { idKey: "id" }
 ) {
   static readonly Test = Layer
     .effect(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.44.6",
+  "version": "1.45.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -20,16 +20,16 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
-    "@effect-app/core": "1.17.1",
     "@effect-app/infra-adapters": "1.20.6",
+    "@effect-app/schema": "1.19.1",
     "effect-app": "1.30.5",
-    "@effect-app/schema": "1.19.1"
+    "@effect-app/core": "1.17.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.7",
     "@sentry/node": "^8.34.0",
     "@types/express": "^5.0.0",
-    "@types/node": "~22.7.6",
+    "@types/node": "~22.7.7",
     "@types/proper-lockfile": "^4.1.4",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.7",

package/src/services/Repository/ext.ts

@@ -13,13 +13,14 @@ import type { Repository } from "./service.js"
  * @tsplus fluent Repository get
  */
 export function get<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
+  ItemType extends string,
+  IdKey extends keyof T
 >(
-  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
-  id: T["id"]
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>,
+  id: T[IdKey]
 ) {
   return self
     .find(id)
@@ -30,11 +31,12 @@ export function get<
  * @tsplus getter Repository log
  */
 export function log<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
->(_: RepositoryBaseC<T, Encoded, Evt, ItemType>) {
+  ItemType extends string,
+  IdKey extends keyof T
+>(_: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>) {
   return (evt: Evt) => AnyPureDSL.log(evt)
 }
 
@@ -42,11 +44,12 @@ export function log<
  * @tsplus fluent Repository byIdAndSaveWithPure
  */
 export function byIdAndSaveWithPure<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
->(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"]) {
+  ItemType extends string,
+  IdKey extends keyof T
+>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, id: T[IdKey]) {
   return <R, A, E, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, T, S2>>) =>
     get(self, id).pipe(Effect.flatMap((item) => saveWithPure_(self, item, pure)))
 }
@@ -56,12 +59,13 @@ export function byIdAndSaveWithPure<
  * @tsplus getter Repository handleByIdAndSaveWithPure
  */
 export function handleByIdAndSaveWithPure<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
->(self: RepositoryBaseC<T, Encoded, Evt, ItemType>) {
-  return <Req extends { id: T["id"] }, Context, R, A, E, S2 extends T>(
+  ItemType extends string,
+  IdKey extends keyof T
+>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>) {
+  return <Req extends { id: T[IdKey] }, Context, R, A, E, S2 extends T>(
     pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>
   ) =>
   (req: Req, ctx: Context) => byIdAndSaveWithPure(self, req.id)(pure(req, ctx))
@@ -72,16 +76,17 @@ export function handleByIdAndSaveWithPure<
  */
 export function saveManyWithPure_<
   R,
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   A,
   E,
   Evt,
   S1 extends T,
   S2 extends T,
-  ItemType extends string
+  ItemType extends string,
+  IdKey extends keyof T
 >(
-  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>,
   items: Iterable<S1>,
   pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
 ) {
@@ -96,16 +101,17 @@ export function saveManyWithPure_<
  */
 export function saveWithPure_<
   R,
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   A,
   E,
   Evt,
   S1 extends T,
   S2 extends T,
-  ItemType extends string
+  ItemType extends string,
+  IdKey extends keyof T
 >(
-  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>,
   item: S1,
   pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>
 ) {
@@ -118,16 +124,17 @@ export function saveWithPure_<
 }
 
 export function saveAllWithEffectInt<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   P extends T,
   Evt,
   ItemType extends string,
+  IdKey extends keyof T,
   R,
   E,
   A
 >(
-  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>,
   gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>
 ) {
   return Effect.flatMap(gen, ([items, events, a]) => self.saveAndPublish(items, events).pipe(Effect.map(() => a)))
@@ -137,11 +144,12 @@ export function saveAllWithEffectInt<
  * @tsplus fluent Repository saveManyWithPureBatched
  */
 export function saveManyWithPureBatched<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
->(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, batchSize = 100) {
+  ItemType extends string,
+  IdKey extends keyof T
+>(self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>, batchSize = 100) {
   return <R, A, E, S1 extends T, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>) =>
   (items: Iterable<S1>) => saveManyWithPureBatched_(self, items, pure, batchSize)
 }
@@ -151,16 +159,17 @@ export function saveManyWithPureBatched<
  */
 export function saveManyWithPureBatched_<
   R,
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   A,
   E,
   Evt,
   S1 extends T,
   S2 extends T,
-  ItemType extends string
+  ItemType extends string,
+  IdKey extends keyof T
 >(
-  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>,
   items: Iterable<S1>,
   pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>,
   batchSize = 100
@@ -179,12 +188,13 @@ export function saveManyWithPureBatched_<
  * @tsplus getter Repository save
  */
 export function save<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
+  ItemType extends string,
+  IdKey extends keyof T
 >(
-  self: RepositoryBaseC<T, Encoded, Evt, ItemType>
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>
 ) {
   return (...items: NonEmptyArray<T>) => self.saveAndPublish(items)
 }
@@ -193,12 +203,13 @@ export function save<
  * @tsplus getter Repository saveWithEvents
  */
 export function saveWithEvents<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
+  ItemType extends string,
+  IdKey extends keyof T
 >(
-  self: RepositoryBaseC<T, Encoded, Evt, ItemType>
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>
 ) {
   return (events: Iterable<Evt>) => (...items: NonEmptyArray<T>) => self.saveAndPublish(items, events)
 }
@@ -212,10 +223,11 @@ export function itemUpdateWithEffect<
   T extends { id: string },
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
+  ItemType extends string,
+  IdKey extends keyof T
 >(
-  repo: RepositoryBaseC<T, Encoded, Evt, ItemType>,
-  id: T["id"],
+  repo: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>,
+  id: T[IdKey],
   mod: (item: T) => Effect<T, E, R>
 ) {
   return get(repo, id).pipe(Effect.andThen(mod), Effect.andThen(save(repo)))
@@ -228,10 +240,11 @@ export function itemUpdate<
   T extends { id: string },
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
+  ItemType extends string,
+  IdKey extends keyof T
 >(
-  repo: RepositoryBaseC<T, Encoded, Evt, ItemType>,
-  id: T["id"],
+  repo: RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey>,
+  id: T[IdKey],
   mod: (item: T) => T
 ) {
   return itemUpdateWithEffect(
@@ -246,13 +259,14 @@ export function itemUpdate<
  * @tsplus fluent Repository removeById
  */
 export function removeById<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
+  ItemType extends string,
+  IdKey extends keyof T
 >(
-  self: Repository<T, Encoded, Evt, ItemType>,
-  id: T["id"]
+  self: Repository<T, Encoded, Evt, ItemType, IdKey>,
+  id: T[IdKey]
 ) {
   return get(self, id).pipe(Effect.flatMap((_) => self.removeAndPublish([_])))
 }

package/src/services/Repository/service.ts

@@ -4,8 +4,9 @@ import type { RepositoryBaseC } from "../RepositoryBase.js"
  * @tsplus type Repository
  */
 export interface Repository<
-  T extends { id: unknown },
+  T,
   Encoded extends { id: string },
   Evt,
-  ItemType extends string
-> extends RepositoryBaseC<T, Encoded, Evt, ItemType> {}
+  ItemType extends string,
+  IdKey extends keyof T
+> extends RepositoryBaseC<T, Encoded, Evt, ItemType, IdKey> {}