@effect-app/infra 0.222.0 → 0.223.1

package/dist/services/Store/utils.js

@@ -45,4 +45,4 @@ export function greaterThan(valA, valB) {
 export function greaterThanExclusive(valA, valB) {
     return valA >= valB;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvU3RvcmUvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0MsT0FBTyxVQUFVLE1BQU0sYUFBYSxDQUFBO0FBQ3BDLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ2hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUc5QyxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FDdEIsRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUssRUFDZixFQUFFLENBQUUsQ0FBQztJQUNSLEdBQUcsQ0FBQztJQUNKLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO0NBQ3JCLENBQVMsQ0FBQTtBQUNWLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FDekIsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQXdELENBQUksRUFBRSxPQUFrQixFQUFFLEVBQUUsQ0FDcEcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBQyxDQUFDO0lBQ3BCLElBQUksQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ1osS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNOLE1BQU0sQ0FBQyxRQUFRLENBQ2IsT0FBTyxFQUNQLEdBQUcsRUFBRSxDQUFDLElBQUksOEJBQThCLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQzFGLENBQ0YsQ0FBQTtJQUNILENBQUM7SUFDRCxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzlELE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNiLElBQUksOEJBQThCLENBQUM7WUFDakMsSUFBSTtZQUNKLEVBQUUsRUFBRSxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDcEIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSztZQUM1QixLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUs7U0FDZixDQUFDLENBQ0gsQ0FBQTtJQUNILENBQUM7SUFDRCxNQUFNLElBQUksR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDeEIsT0FBTyxJQUFJLENBQUE7QUFDYixDQUFDLENBQUMsQ0FBQTtBQUVOLE1BQU0sVUFBVSxVQUFVLENBQXlDLE1BQWtCO0lBQ25GLE9BQU8sQ0FBQyxDQUFJLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUE7QUFDcEcsQ0FBQztBQUVELE1BQU0sVUFBVSxpQkFBaUIsQ0FBSSxHQUFNO0lBQ3pDLElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDNUIsT0FBTyxHQUFHLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDMUIsQ0FBQztJQUNELE9BQU8sR0FBRyxDQUFBO0FBQ1osQ0FBQztBQUVELE1BQU0sVUFBVSxPQUFPLENBQUMsSUFBYSxFQUFFLElBQWE7SUFDbEQsT0FBTyxJQUFJLEtBQUssSUFBSSxDQUFBO0FBQ3RCLENBQUM7QUFFRCxNQUFNLFVBQVUsU0FBUyxDQUFDLElBQXNCLEVBQUUsSUFBc0I7SUFDdEUsT0FBTyxJQUFJLEdBQUcsSUFBSSxDQUFBO0FBQ3BCLENBQUM7QUFFRCxNQUFNLFVBQVUsa0JBQWtCLENBQUMsSUFBc0IsRUFBRSxJQUFzQjtJQUMvRSxPQUFPLElBQUksSUFBSSxJQUFJLENBQUE7QUFDckIsQ0FBQztBQUVELE1BQU0sVUFBVSxXQUFXLENBQUMsSUFBc0IsRUFBRSxJQUFzQjtJQUN4RSxPQUFPLElBQUksR0FBRyxJQUFJLENBQUE7QUFDcEIsQ0FBQztBQUVELE1BQU0sVUFBVSxvQkFBb0IsQ0FBQyxJQUFzQixFQUFFLElBQXNCO0lBQ2pGLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQTtBQUNyQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvU3RvcmUvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0MsT0FBTyxVQUFVLE1BQU0sYUFBYSxDQUFBO0FBQ3BDLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ2hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUc5QyxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FDdEIsRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUssRUFDZixFQUFFLENBQUUsQ0FBQztJQUNSLEdBQUcsQ0FBQztJQUNKLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO0NBQ3JCLENBQVMsQ0FBQTtBQUNWLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FDekIsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQWlELENBQUksRUFBRSxPQUFrQixFQUFFLEVBQUUsQ0FDN0YsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBQyxDQUFDO0lBQ3BCLElBQUksQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ1osS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNOLE1BQU0sQ0FBQyxRQUFRLENBQ2IsT0FBTyxFQUNQLEdBQUcsRUFBRSxDQUFDLElBQUksOEJBQThCLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQzFGLENBQ0YsQ0FBQTtJQUNILENBQUM7SUFDRCxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzlELE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNiLElBQUksOEJBQThCLENBQUM7WUFDakMsSUFBSTtZQUNKLEVBQUUsRUFBRSxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDcEIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSztZQUM1QixLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUs7U0FDZixDQUFDLENBQ0gsQ0FBQTtJQUNILENBQUM7SUFDRCxNQUFNLElBQUksR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDeEIsT0FBTyxJQUFJLENBQUE7QUFDYixDQUFDLENBQUMsQ0FBQTtBQUVOLE1BQU0sVUFBVSxVQUFVLENBQXlDLE1BQWtCO0lBQ25GLE9BQU8sQ0FBQyxDQUFJLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUE7QUFDcEcsQ0FBQztBQUVELE1BQU0sVUFBVSxpQkFBaUIsQ0FBSSxHQUFNO0lBQ3pDLElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDNUIsT0FBTyxHQUFHLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDMUIsQ0FBQztJQUNELE9BQU8sR0FBRyxDQUFBO0FBQ1osQ0FBQztBQUVELE1BQU0sVUFBVSxPQUFPLENBQUMsSUFBYSxFQUFFLElBQWE7SUFDbEQsT0FBTyxJQUFJLEtBQUssSUFBSSxDQUFBO0FBQ3RCLENBQUM7QUFFRCxNQUFNLFVBQVUsU0FBUyxDQUFDLElBQXNCLEVBQUUsSUFBc0I7SUFDdEUsT0FBTyxJQUFJLEdBQUcsSUFBSSxDQUFBO0FBQ3BCLENBQUM7QUFFRCxNQUFNLFVBQVUsa0JBQWtCLENBQUMsSUFBc0IsRUFBRSxJQUFzQjtJQUMvRSxPQUFPLElBQUksSUFBSSxJQUFJLENBQUE7QUFDckIsQ0FBQztBQUVELE1BQU0sVUFBVSxXQUFXLENBQUMsSUFBc0IsRUFBRSxJQUFzQjtJQUN4RSxPQUFPLElBQUksR0FBRyxJQUFJLENBQUE7QUFDcEIsQ0FBQztBQUVELE1BQU0sVUFBVSxvQkFBb0IsQ0FBQyxJQUFzQixFQUFFLElBQXNCO0lBQ2pGLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQTtBQUNyQixDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.222.0",
+  "version": "0.223.1",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -18,17 +18,17 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
-    "@effect-app/core": "0.156.0",
-    "@effect-app/fluent-extensions": "0.150.0",
-    "effect-app": "0.189.0",
-    "@effect-app/schema": "0.210.0",
-    "@effect-app/infra-adapters": "0.144.0"
+    "@effect-app/fluent-extensions": "0.151.0",
+    "@effect-app/core": "0.156.1",
+    "@effect-app/infra-adapters": "0.144.1",
+    "effect-app": "0.189.1",
+    "@effect-app/schema": "0.210.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",
     "@sentry/node": "^7.107.0",
     "@types/express": "^4.17.21",
-    "@types/node": "~20.11.27",
+    "@types/node": "~20.11.28",
     "@types/proper-lockfile": "^4.1.4",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.7",
@@ -39,12 +39,12 @@
     "redis": "^3.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.2",
-    "vitest": "^1.3.1"
+    "vitest": "^1.4.0"
   },
   "peerDependencies": {
     "express": "^4.18.3",
-    "@effect/platform": "^0.48.7",
-    "@effect/schema": "^0.64.4",
+    "@effect/platform": "^0.48.8",
+    "@effect/schema": "^0.64.5",
     "effect": "^2.4.7"
   },
   "typesVersions": {

package/src/services/Repository/ext.ts

@@ -5,7 +5,6 @@ import { Effect, ReadonlyArray } from "effect-app"
 import type { NonEmptyArray } from "effect-app"
 import { type FixEnv, runTerm } from "effect-app/Pure"
 import { NotFoundError } from "../../errors.js"
-import type { PersistenceModelType } from "../../services/Store.js"
 import type { RepositoryBaseC } from "../RepositoryBase.js"
 import { AnyPureDSL } from "./dsl.js"
 import type { Repository } from "./service.js"
@@ -15,11 +14,11 @@ import type { Repository } from "./service.js"
  */
 export function get<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
 >(
-  self: RepositoryBaseC<T, PM, Evt, ItemType>,
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
   id: T["id"]
 ) {
   return self
@@ -32,10 +31,10 @@ export function get<
  */
 export function log<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
->(_: RepositoryBaseC<T, PM, Evt, ItemType>) {
+>(_: RepositoryBaseC<T, Encoded, Evt, ItemType>) {
   return (evt: Evt) => AnyPureDSL.log(evt)
 }
 
@@ -44,10 +43,10 @@ export function log<
  */
 export function byIdAndSaveWithPure<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
->(self: RepositoryBaseC<T, PM, Evt, ItemType>, id: T["id"]) {
+>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"]) {
   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)))
 }
@@ -58,10 +57,10 @@ export function byIdAndSaveWithPure<
  */
 export function handleByIdAndSaveWithPure<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
->(self: RepositoryBaseC<T, PM, Evt, ItemType>) {
+>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>) {
   return <Req extends { id: T["id"] }, Context, R, A, E, S2 extends T>(
     pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>
   ) =>
@@ -74,7 +73,7 @@ export function handleByIdAndSaveWithPure<
 export function saveManyWithPure_<
   R,
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   A,
   E,
   Evt,
@@ -82,7 +81,7 @@ export function saveManyWithPure_<
   S2 extends T,
   ItemType extends string
 >(
-  self: RepositoryBaseC<T, PM, Evt, ItemType>,
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
   items: Iterable<S1>,
   pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
 ) {
@@ -98,7 +97,7 @@ export function saveManyWithPure_<
 export function saveWithPure_<
   R,
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   A,
   E,
   Evt,
@@ -106,7 +105,7 @@ export function saveWithPure_<
   S2 extends T,
   ItemType extends string
 >(
-  self: RepositoryBaseC<T, PM, Evt, ItemType>,
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
   item: S1,
   pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>
 ) {
@@ -120,7 +119,7 @@ export function saveWithPure_<
 
 export function saveAllWithEffectInt<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   P extends T,
   Evt,
   ItemType extends string,
@@ -128,7 +127,7 @@ export function saveAllWithEffectInt<
   E,
   A
 >(
-  self: RepositoryBaseC<T, PM, Evt, ItemType>,
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
   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)))
@@ -139,10 +138,10 @@ export function saveAllWithEffectInt<
  */
 export function saveManyWithPureBatched<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
->(self: RepositoryBaseC<T, PM, Evt, ItemType>, batchSize = 100) {
+>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, 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)
 }
@@ -153,7 +152,7 @@ export function saveManyWithPureBatched<
 export function saveManyWithPureBatched_<
   R,
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   A,
   E,
   Evt,
@@ -161,7 +160,7 @@ export function saveManyWithPureBatched_<
   S2 extends T,
   ItemType extends string
 >(
-  self: RepositoryBaseC<T, PM, Evt, ItemType>,
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType>,
   items: Iterable<S1>,
   pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>,
   batchSize = 100
@@ -181,11 +180,11 @@ export function saveManyWithPureBatched_<
  */
 export function save<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
 >(
-  self: RepositoryBaseC<T, PM, Evt, ItemType>
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType>
 ) {
   return (...items: NonEmptyArray<T>) => self.saveAndPublish(items)
 }
@@ -195,11 +194,11 @@ export function save<
  */
 export function saveWithEvents<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
 >(
-  self: RepositoryBaseC<T, PM, Evt, ItemType>
+  self: RepositoryBaseC<T, Encoded, Evt, ItemType>
 ) {
   return (events: Iterable<Evt>) => (...items: NonEmptyArray<T>) => self.saveAndPublish(items, events)
 }
@@ -211,11 +210,11 @@ export function itemUpdateWithEffect<
   R,
   E,
   T extends { id: string },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
 >(
-  repo: RepositoryBaseC<T, PM, Evt, ItemType>,
+  repo: RepositoryBaseC<T, Encoded, Evt, ItemType>,
   id: T["id"],
   mod: (item: T) => Effect<T, E, R>
 ) {
@@ -227,11 +226,11 @@ export function itemUpdateWithEffect<
  */
 export function itemUpdate<
   T extends { id: string },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
 >(
-  repo: RepositoryBaseC<T, PM, Evt, ItemType>,
+  repo: RepositoryBaseC<T, Encoded, Evt, ItemType>,
   id: T["id"],
   mod: (item: T) => T
 ) {
@@ -248,11 +247,11 @@ export function itemUpdate<
  */
 export function removeById<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
 >(
-  self: Repository<T, PM, Evt, ItemType>,
+  self: Repository<T, Encoded, Evt, ItemType>,
   id: T["id"]
 ) {
   return get(self, id).pipe(Effect.flatMap((_) => self.removeAndPublish([_])))

package/src/services/Repository/service.ts

@@ -1,12 +1,11 @@
 import type { RepositoryBaseC } from "../RepositoryBase.js"
-import type { PersistenceModelType } from "../Store.js"
 
 /**
  * @tsplus type Repository
  */
 export interface Repository<
   T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
+  Encoded extends { id: string },
   Evt,
   ItemType extends string
-> extends RepositoryBaseC<T, PM, Evt, ItemType> {}
+> extends RepositoryBaseC<T, Encoded, Evt, ItemType> {}