@effect-app/infra 0.221.0 → 0.223.0

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

@@ -35,43 +35,59 @@ export type Where = {
     value: readonly (SupportedValues)[];
 };
 export type Filter<E extends FieldValues> = QueryBuilder<E>;
-export interface O<PM extends PersistenceModelType<unknown>> {
-    key: keyof PM;
+export interface O<Encoded extends {
+    id: string;
+}> {
+    key: keyof Encoded;
     direction: "ASC" | "DESC";
 }
-export interface FilterArgs<PM extends PersistenceModelType<unknown>, U extends keyof PM = never> {
-    filter?: Filter<PM> | undefined;
+export interface FilterArgs<Encoded extends {
+    id: string;
+}, U extends keyof Encoded = never> {
+    filter?: Filter<Encoded> | undefined;
     select?: NonEmptyReadonlyArray<U> | undefined;
-    order?: NonEmptyReadonlyArray<O<PM>>;
+    order?: NonEmptyReadonlyArray<O<Encoded>>;
     limit?: number | undefined;
     skip?: number | undefined;
 }
-export type FilterFunc<PM extends PersistenceModelType<unknown>> = <U extends keyof PM = never>(args: FilterArgs<PM, U>) => Effect<(U extends undefined ? PM : Pick<PM, U>)[]>;
-export interface Store<PM extends PersistenceModelType<Id>, Id> {
+export type FilterFunc<Encoded extends {
+    id: string;
+}> = <U extends keyof Encoded = never>(args: FilterArgs<Encoded, U>) => Effect<(U extends undefined ? Encoded : Pick<Encoded, U>)[]>;
+export interface Store<Encoded extends {
+    id: Id;
+}, Id extends string, PM extends PersistenceModelType<Encoded> = PersistenceModelType<Encoded>> {
     all: Effect<PM[]>;
-    filter: FilterFunc<PM>;
+    filter: FilterFunc<Encoded>;
     find: (id: Id) => Effect<Option<PM>>;
     set: (e: PM) => Effect<PM, OptimisticConcurrencyException>;
     batchSet: (items: NonEmptyReadonlyArray<PM>) => Effect<NonEmptyReadonlyArray<PM>, OptimisticConcurrencyException>;
     bulkSet: (items: NonEmptyReadonlyArray<PM>) => Effect<NonEmptyReadonlyArray<PM>, OptimisticConcurrencyException>;
     /**
-     * Requires the PM type, not Id, because various stores may need to calculate e.g partition keys.
+     * Requires the Encoded type, not Id, because various stores may need to calculate e.g partition keys.
      */
-    remove: (e: PM) => Effect<void>;
+    remove: (e: Encoded) => Effect<void>;
 }
 declare const StoreMaker_base: (abstract new (service: {
-    make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
+    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>;
 }) => Readonly<{
-    make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
+    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>;
 }> & import("effect/Context").TagClassShape<"effect-app/StoreMaker", {
-    make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R>, config?: StoreConfig<PM>) => Effect<Store<PM, Id>, E, R>;
+    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>;
 }>) & {
     toLayer: <E_1, R_1>(eff: Effect<Omit<StoreMaker, keyof import("effect/Context").TagClassShape<any, any>>, E_1, R_1>) => import("effect-app").Layer<StoreMaker, E_1, R_1>;
     toLayerScoped: <E_1_1, R_1_1>(eff: Effect<Omit<StoreMaker, keyof import("effect/Context").TagClassShape<any, any>>, E_1_1, R_1_1>) => import("effect-app").Layer<StoreMaker, E_1_1, Exclude<R_1_1, import("effect/Scope").Scope>>;
     of: (service: Omit<StoreMaker, keyof import("effect/Context").TagClassShape<any, any>>) => StoreMaker;
 } & import("effect/Context").Tag<StoreMaker, StoreMaker> & {} & {
     use: <X>(body: (_: {
-        make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<PM>, E, R> | undefined, config?: StoreConfig<PM> | undefined) => Effect<Store<PM, Id>, E, R>;
+        make: <Encoded extends {
+            id: Id;
+        }, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<Encoded>, E, R> | undefined, config?: StoreConfig<Encoded> | undefined) => Effect<Store<Encoded, Id, PersistenceModelType<Encoded>>, E, R>;
     }) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, StoreMaker | R_4> : Effect<X, never, StoreMaker>;
 };
 /**
@@ -108,6 +124,10 @@ declare const ContextMap_base: (abstract new (service: {
     get: (id: string) => Effect<string | undefined, never, ContextMap>;
     set: (id: string, eTag: string | undefined) => Effect<void, never, ContextMap>;
 } & {
+    /**
+     * @tsplus type ContextMap
+     * @tsplus companion ContextMap.Ops
+     */
     use: <X>(body: (_: {
         get: (id: string) => string | undefined;
         set: (id: string, eTag: string | undefined) => void;
@@ -119,10 +139,9 @@ declare const ContextMap_base: (abstract new (service: {
  */
 export declare class ContextMap extends ContextMap_base {
 }
-export interface PersistenceModelType<Id> extends Record<string, any> {
-    id: Id;
-    _etag: string | undefined;
-}
+export type PersistenceModelType<Encoded> = Encoded & {
+    _etag?: string | undefined;
+};
 export interface StorageConfig {
     url: Secret.Secret;
     prefix: string;

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

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/services/Store/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/services/Store/service.ts"],"names":[],"mappings":"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"}

package/dist/services/Store/service.js

@@ -72,4 +72,4 @@ const makeMap = Effect.sync(() => makeContextMap());
  */
 export class ContextMap extends TagClassMakeId("effect-app/ContextMap", makeMap)() {
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9TdG9yZS9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFbkMsT0FBTyxFQUFFLFVBQVUsRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQW9FL0Q7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFVBQVcsU0FBUSxVQUFVLENBQUMsdUJBQXVCLENBQUMsRUFNL0Q7Q0FDSDtBQUVELE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxHQUFHLEVBQUU7SUFDakMsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUE7SUFDdkMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxFQUFVLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDN0MsTUFBTSxPQUFPLEdBQUcsQ0FBQyxFQUFVLEVBQUUsSUFBd0IsRUFBRSxFQUFFO1FBQ3ZELElBQUksS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFBO0lBQzdELENBQUMsQ0FBQTtJQUVELCtCQUErQjtJQUMvQiwyQkFBMkI7SUFDM0IsZ0RBQWdEO0lBQ2hELE1BQU07SUFFTiwrQkFBK0I7SUFDL0IsMkJBQTJCO0lBQzNCLHNDQUFzQztJQUN0QyxNQUFNO0lBRU4sa0NBQWtDO0lBQ2xDLHdCQUF3QjtJQUN4QixvQ0FBb0M7SUFDcEMsU0FBUztJQUNULDJCQUEyQjtJQUMzQixjQUFjO0lBQ2QsSUFBSTtJQUVKLGlDQUFpQztJQUNqQyxvRkFBb0Y7SUFDcEYsb0lBQW9JO0lBQ3BJLGdCQUFnQjtJQUNoQixhQUFhO0lBQ2IsNEdBQTRHO0lBQzVHLHNDQUFzQztJQUN0QyxrRUFBa0U7SUFDbEUsdURBQXVEO0lBQ3ZELHNCQUFzQjtJQUN0QixzQkFBc0I7SUFDdEIsU0FBUztJQUNULHFDQUFxQztJQUNyQyx5Q0FBeUM7SUFDekMsaUJBQWlCO0lBQ2pCLDZCQUE2QjtJQUM3QixtQkFBbUI7SUFDbkIsK0NBQStDO0lBQy9DLHFCQUFxQjtJQUNyQixtQkFBbUI7SUFDbkIsMkNBQTJDO0lBQzNDLHlCQUF5QjtJQUN6QixzQkFBc0I7SUFDdEIsWUFBWTtJQUNaLGlCQUFpQjtJQUNqQix5Q0FBeUM7SUFDekMscURBQXFEO0lBQ3JELG9CQUFvQjtJQUNwQixVQUFVO0lBQ1YsUUFBUTtJQUNSLE1BQU07SUFDTixJQUFJO0lBRUosT0FBTztRQUNMLEdBQUcsRUFBRSxPQUFPO1FBQ1osR0FBRyxFQUFFLE9BQU87UUFDWixZQUFZO0tBQ2IsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQUVELE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQTtBQUVuRDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sVUFBVyxTQUFRLGNBQWMsQ0FBQyx1QkFBdUIsRUFBRSxPQUFPLENBQUMsRUFBYztDQUM3RiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9TdG9yZS9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFbkMsT0FBTyxFQUFFLFVBQVUsRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQXdFL0Q7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFVBQVcsU0FBUSxVQUFVLENBQUMsdUJBQXVCLENBQUMsRUFNL0Q7Q0FDSDtBQUVELE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxHQUFHLEVBQUU7SUFDakMsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUE7SUFDdkMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxFQUFVLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDN0MsTUFBTSxPQUFPLEdBQUcsQ0FBQyxFQUFVLEVBQUUsSUFBd0IsRUFBRSxFQUFFO1FBQ3ZELElBQUksS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFBO0lBQzdELENBQUMsQ0FBQTtJQUVELCtCQUErQjtJQUMvQiwyQkFBMkI7SUFDM0IsZ0RBQWdEO0lBQ2hELE1BQU07SUFFTiwrQkFBK0I7SUFDL0IsMkJBQTJCO0lBQzNCLHNDQUFzQztJQUN0QyxNQUFNO0lBRU4sa0NBQWtDO0lBQ2xDLHdCQUF3QjtJQUN4QixvQ0FBb0M7SUFDcEMsU0FBUztJQUNULDJCQUEyQjtJQUMzQixjQUFjO0lBQ2QsSUFBSTtJQUVKLGlDQUFpQztJQUNqQyxvRkFBb0Y7SUFDcEYsb0lBQW9JO0lBQ3BJLGdCQUFnQjtJQUNoQixhQUFhO0lBQ2IsNEdBQTRHO0lBQzVHLHNDQUFzQztJQUN0QyxrRUFBa0U7SUFDbEUsdURBQXVEO0lBQ3ZELHNCQUFzQjtJQUN0QixzQkFBc0I7SUFDdEIsU0FBUztJQUNULHFDQUFxQztJQUNyQyx5Q0FBeUM7SUFDekMsaUJBQWlCO0lBQ2pCLDZCQUE2QjtJQUM3QixtQkFBbUI7SUFDbkIsK0NBQStDO0lBQy9DLHFCQUFxQjtJQUNyQixtQkFBbUI7SUFDbkIsMkNBQTJDO0lBQzNDLHlCQUF5QjtJQUN6QixzQkFBc0I7SUFDdEIsWUFBWTtJQUNaLGlCQUFpQjtJQUNqQix5Q0FBeUM7SUFDekMscURBQXFEO0lBQ3JELG9CQUFvQjtJQUNwQixVQUFVO0lBQ1YsUUFBUTtJQUNSLE1BQU07SUFDTixJQUFJO0lBRUosT0FBTztRQUNMLEdBQUcsRUFBRSxPQUFPO1FBQ1osR0FBRyxFQUFFLE9BQU87UUFDWixZQUFZO0tBQ2IsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQUVELE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQTtBQUVuRDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sVUFBVyxTQUFRLGNBQWMsQ0FBQyx1QkFBdUIsRUFBRSxPQUFPLENBQUMsRUFBYztDQUM3RiJ9

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

@@ -1,8 +1,12 @@
 import { Effect, Option } from "effect-app";
 import { OptimisticConcurrencyException } from "../../errors.js";
 import type { Filter, PersistenceModelType, SupportedValues2 } from "./service.js";
-export declare const makeETag: <E extends PersistenceModelType<Id>, Id extends string>({ _etag, ...e }: E) => E;
-export declare const makeUpdateETag: (type: string) => <E extends PersistenceModelType<Id>, Id extends string>(e: E, current: Option<E>) => Effect.Effect<E, OptimisticConcurrencyException, never>;
+export declare const makeETag: <E extends {
+    _etag?: string | undefined;
+}>({ _etag, ...e }: E) => E;
+export declare const makeUpdateETag: (type: string) => <E extends PersistenceModelType<{
+    id: string;
+}>>(e: E, current: Option<E>) => Effect.Effect<E, OptimisticConcurrencyException, never>;
 export declare function codeFilter<E extends {
     id: string;
 }, NE extends E>(filter: Filter<NE>): (x: E) => Option.None<NE> | Option.Some<NE>;

package/dist/services/Store/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/services/Store/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE3C,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAElF,eAAO,MAAM,QAAQ,2EACF,CAAC,KACjB,CAGO,CAAA;AACV,eAAO,MAAM,cAAc,SAClB,MAAM,gEAAgE,CAAC,WAAW,OAAO,CAAC,CAAC,4DAsB9F,CAAA;AAEN,wBAAgB,UAAU,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,OACxE,CAAC,uCACb;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,cAK1C;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,WAEnD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAEvE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAEhF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAEzE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAElF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/services/Store/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE3C,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAA;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAElF,eAAO,MAAM,QAAQ;;oBACF,CAAC,KACjB,CAGO,CAAA;AACV,eAAO,MAAM,cAAc,SAClB,MAAM;QAA2C,MAAM;OAAQ,CAAC,WAAW,OAAO,CAAC,CAAC,4DAsBvF,CAAA;AAEN,wBAAgB,UAAU,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,OACxE,CAAC,uCACb;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,cAK1C;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,WAEnD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAEvE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAEhF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAEzE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,WAElF"}

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/dist/services/query/new-kid-interpreter.d.ts

@@ -14,7 +14,7 @@ export declare const toFilter: <TFieldValues extends FieldValues, A, R>(q: QAll<
         key: import("../../filter/types/path/eager.js").Path<TFieldValues>;
         direction: "ASC" | "DESC";
     }[]];
-    ttype: "one" | "many" | "count";
+    ttype: "many" | "one" | "count";
     mode: "project" | "collect" | "transform";
     filter: QueryBuilder<any>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.221.0",
+  "version": "0.223.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -18,15 +18,15 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
-    "@effect-app/core": "0.155.0",
-    "@effect-app/fluent-extensions": "0.149.0",
-    "@effect-app/schema": "0.209.0",
-    "effect-app": "0.188.0",
-    "@effect-app/infra-adapters": "0.143.0"
+    "@effect-app/core": "0.156.0",
+    "@effect-app/fluent-extensions": "0.150.0",
+    "@effect-app/infra-adapters": "0.144.0",
+    "effect-app": "0.189.0",
+    "@effect-app/schema": "0.210.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",
-    "@sentry/node": "^7.106.1",
+    "@sentry/node": "^7.107.0",
     "@types/express": "^4.17.21",
     "@types/node": "~20.11.27",
     "@types/proper-lockfile": "^4.1.4",
@@ -43,9 +43,9 @@
   },
   "peerDependencies": {
     "express": "^4.18.3",
-    "@effect/platform": "^0.48.3",
-    "@effect/schema": "^0.64.2",
-    "effect": "^2.4.6"
+    "@effect/platform": "^0.48.7",
+    "@effect/schema": "^0.64.4",
+    "effect": "^2.4.7"
   },
   "typesVersions": {
     "*": {

package/src/services/Operations.ts

@@ -98,7 +98,7 @@ const make = Effect.sync(() => {
 })
 
 export class Operations extends TagClassMakeId("effect-app/Operations", make)<Operations>() {
-  static readonly Live = this
+  private static readonly CleanupLive = this
     .use((_) =>
       _.cleanup.pipe(
         Effect.exit,
@@ -115,7 +115,9 @@ export class Operations extends TagClassMakeId("effect-app/Operations", make)<Op
         FiberBag.run
       )
     )
-    .pipe(Layer.effectDiscard, Layer.provide(FiberBag.Live), Layer.provideMerge(this.toLayer()))
+    .pipe(Layer.effectDiscard, Layer.provide(FiberBag.Live))
+
+  static readonly Live = this.CleanupLive.pipe(Layer.provideMerge(this.toLayer()))
 }
 
 /**

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> {}