@effect-app/infra 0.221.0 → 0.223.0

package/src/services/Store/Cosmos.ts

@@ -18,12 +18,13 @@ function makeCosmosStore({ prefix }: StorageConfig) {
   return Effect.gen(function*($) {
     const { db } = yield* $(CosmosClient)
     return {
-      make: <Id extends string, PM extends PersistenceModelType<Id>, R = never, E = never>(
+      make: <Id extends string, Encoded extends { id: Id }, R = never, E = never>(
         name: string,
-        seed?: Effect<Iterable<PM>, E, R>,
-        config?: StoreConfig<PM>
+        seed?: Effect<Iterable<Encoded>, E, R>,
+        config?: StoreConfig<Encoded>
       ) =>
         Effect.gen(function*($) {
+          type PM = PersistenceModelType<Encoded>
           const containerId = `${prefix}${name}`
           yield* $(
             Effect.promise(() =>
@@ -121,7 +122,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                         )
                   )
                 )
-                return batchResult.flat() as unknown as NonEmptyReadonlyArray<PM>
+                return batchResult.flat() as unknown as NonEmptyReadonlyArray<Encoded>
               })
               .pipe(Effect.withSpan("Cosmos.bulkSet [effect-app/infra/Store]", {
                 attributes: { "repository.container_id": containerId, "repository.model_name": name }
@@ -183,7 +184,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                       return batch.map(([e], i) => ({
                         ...e,
                         _etag: result[i]?.eTag
-                      })) as unknown as NonEmptyReadonlyArray<PM>
+                      })) as unknown as NonEmptyReadonlyArray<Encoded>
                     })
                   ))
               })
@@ -193,7 +194,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                 }))
           }
 
-          const s: Store<PM, Id> = {
+          const s: Store<Encoded, Id> = {
             all: Effect
               .sync(() => ({
                 query: `SELECT * FROM ${name} f WHERE f.id != @id`,
@@ -218,13 +219,13 @@ function makeCosmosStore({ prefix }: StorageConfig) {
             /**
              * May return duplicate results for "join_find", when matching more than once.
              */
-            filter: <U extends keyof PM = never>(
-              f: FilterArgs<PM, U>
+            filter: <U extends keyof Encoded = never>(
+              f: FilterArgs<Encoded, U>
             ) => {
               const skip = f?.skip
               const limit = f?.limit
               const filter = f.filter ?? { type: "new-kid", build: () => [] }
-              type M = U extends undefined ? PM : Pick<PM, U>
+              type M = U extends undefined ? Encoded : Pick<Encoded, U>
               return Effect
                 .sync(() =>
                   buildWhereCosmosQuery3(
@@ -267,8 +268,8 @@ function makeCosmosStore({ prefix }: StorageConfig) {
               Effect
                 .promise(() =>
                   container
-                    .item(id, config?.partitionValue({ id } as PM))
-                    .read<PM>()
+                    .item(id, config?.partitionValue({ id } as Encoded))
+                    .read<Encoded>()
                     .then(({ resource }) =>
                       Option.fromNullable(resource).pipe(Option.map((_) => ({ ...defaultValues, ..._ })))
                     )
@@ -329,7 +330,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                 ),
             batchSet,
             bulkSet,
-            remove: (e: PM) =>
+            remove: (e: Encoded) =>
               Effect
                 .promise(() => container.item(e.id, config?.partitionValue(e)).delete())
                 .pipe(Effect

package/src/services/Store/Disk.ts

@@ -8,14 +8,15 @@ import { makeMemoryStoreInt, storeId } from "./Memory.js"
 import type { PersistenceModelType, StorageConfig, Store, StoreConfig } from "./service.js"
 import { StoreMaker } from "./service.js"
 
-function makeDiskStoreInt<Id extends string, PM extends PersistenceModelType<Id>, R, E>(
+function makeDiskStoreInt<Id extends string, Encoded extends { id: Id }, R, E>(
   prefix: string,
   namespace: string,
   dir: string,
   name: string,
-  seed?: Effect<Iterable<PM>, E, R>,
-  defaultValues?: Partial<PM>
+  seed?: Effect<Iterable<Encoded>, E, R>,
+  defaultValues?: Partial<Encoded>
 ) {
+  type PM = PersistenceModelType<Encoded>
   return Effect.gen(function*($) {
     if (namespace !== "primary") {
       dir = dir + "/" + namespace
@@ -58,7 +59,7 @@ function makeDiskStoreInt<Id extends string, PM extends PersistenceModelType<Id>
     }
 
     const store = yield* $(
-      makeMemoryStoreInt<Id, PM, R, E>(
+      makeMemoryStoreInt<Id, Encoded, R, E>(
         name,
         namespace,
         !fs.existsSync(file)
@@ -98,7 +99,7 @@ function makeDiskStoreInt<Id extends string, PM extends PersistenceModelType<Id>
         store.remove,
         Effect.tap(flushToDiskInBackground)
       )
-    } satisfies Store<PM, Id>
+    } satisfies Store<Encoded, Id>
   })
 }
 
@@ -112,15 +113,15 @@ export function makeDiskStore({ prefix }: StorageConfig, dir: string) {
       fs.mkdirSync(dir)
     }
     return {
-      make: <Id extends string, PM extends PersistenceModelType<Id>, R, E>(
+      make: <Id extends string, Encoded extends { id: Id }, R, E>(
         name: string,
-        seed?: Effect<Iterable<PM>, E, R>,
-        config?: StoreConfig<PM>
+        seed?: Effect<Iterable<Encoded>, E, R>,
+        config?: StoreConfig<Encoded>
       ) =>
         Effect.gen(function*($) {
           const storesSem = Effect.unsafeMakeSemaphore(1)
           const primary = yield* $(makeDiskStoreInt(prefix, "primary", dir, name, seed, config?.defaultValues))
-          const stores = new Map<string, Store<PM, Id>>([["primary", primary]])
+          const stores = new Map<string, Store<Encoded, Id>>([["primary", primary]])
           const ctx = yield* $(Effect.context<R>())
           const getStore = !config?.allowNamespace
             ? Effect.succeed(primary)
@@ -136,7 +137,7 @@ export function makeDiskStore({ prefix }: StorageConfig, dir: string) {
                 Effect.suspend(() => {
                   const existing = stores.get(namespace)
                   if (existing) return Effect.sync(() => existing)
-                  return makeDiskStoreInt<Id, PM, R, E>(prefix, namespace, dir, name, seed, config?.defaultValues)
+                  return makeDiskStoreInt<Id, Encoded, R, E>(prefix, namespace, dir, name, seed, config?.defaultValues)
                     .pipe(
                       Effect.orDie,
                       Effect.provide(ctx),
@@ -146,7 +147,7 @@ export function makeDiskStore({ prefix }: StorageConfig, dir: string) {
               )
             }))
 
-          const s: Store<PM, Id> = {
+          const s: Store<Encoded, Id> = {
             all: Effect.flatMap(getStore, (_) => _.all),
             find: (...args) => Effect.flatMap(getStore, (_) => _.find(...args)),
             filter: (...args) => Effect.flatMap(getStore, (_) => _.filter(...args)),

package/src/services/Store/Memory.ts

@@ -8,7 +8,7 @@ import type { FilterArgs, PersistenceModelType, Store, StoreConfig } from "./ser
 import { StoreMaker } from "./service.js"
 import { codeFilter, makeUpdateETag } from "./utils.js"
 
-export function memFilter<T extends PersistenceModelType<string>, U extends keyof T = never>(f: FilterArgs<T, U>) {
+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>
   return ((c: T[]): M[] => {
     const select = (r: T[]): M[] => (f.select ? r.map((_) => pick(_, f.select!)) : r) as any
@@ -78,18 +78,19 @@ function logQuery(f: FilterArgs<any, any>, defaultValues?: any) {
     }))
 }
 
-export function makeMemoryStoreInt<Id extends string, PM extends PersistenceModelType<Id>, R = never, E = never>(
+export function makeMemoryStoreInt<Id extends string, Encoded extends { id: Id }, R = never, E = never>(
   modelName: string,
   namespace: string,
-  seed?: Effect<Iterable<PM>, E, R>,
-  _defaultValues?: Partial<PM>
+  seed?: Effect<Iterable<Encoded>, E, R>,
+  _defaultValues?: Partial<Encoded>
 ) {
+  type PM = PersistenceModelType<Encoded>
   return Effect.gen(function*($) {
     const updateETag = makeUpdateETag(modelName)
     const items_ = yield* $(seed ?? Effect.sync(() => []))
     const defaultValues = _defaultValues ?? {}
 
-    const items = new Map([...items_].map((_) => [_.id, { ...defaultValues, ..._ }] as const))
+    const items = new Map([...items_].map((_) => [_.id, { _etag: undefined, ...defaultValues, ..._ }] as const))
     const store = Ref.unsafeMake<ReadonlyMap<Id, PM>>(items)
     const sem = Effect.unsafeMakeSemaphore(1)
     const withPermit = sem.withPermits(1)
@@ -120,7 +121,7 @@ export function makeMemoryStoreInt<Id extends string, PM extends PersistenceMode
             .map((_) => _ as NonEmptyArray<PM>),
           withPermit
         )
-    const s: Store<PM, Id> = {
+    const s: Store<Encoded, Id> = {
       all: all.pipe(Effect.withSpan("Memory.all [effect-app/infra/Store]", {
         attributes: {
           modelName,
@@ -189,7 +190,7 @@ export function makeMemoryStoreInt<Id extends string, PM extends PersistenceMode
             attributes: { "repository.model_name": modelName, "repository.namespace": namespace }
           }))
       ),
-      remove: (e: PM) =>
+      remove: (e: Encoded) =>
         Ref
           .get(store)
           .pipe(
@@ -206,14 +207,14 @@ export function makeMemoryStoreInt<Id extends string, PM extends PersistenceMode
 }
 
 export const makeMemoryStore = () => ({
-  make: <Id extends string, PM extends PersistenceModelType<Id>, R = never, E = never>(
+  make: <Id extends string, Encoded extends { id: Id }, R = never, E = never>(
     modelName: string,
-    seed?: Effect<Iterable<PM>, E, R>,
-    config?: StoreConfig<PM>
+    seed?: Effect<Iterable<Encoded>, E, R>,
+    config?: StoreConfig<Encoded>
   ) =>
     Effect.gen(function*($) {
       const storesSem = Effect.unsafeMakeSemaphore(1)
-      const primary = yield* $(makeMemoryStoreInt<Id, PM, R, E>(modelName, "primary", seed, config?.defaultValues))
+      const primary = yield* $(makeMemoryStoreInt<Id, Encoded, R, E>(modelName, "primary", seed, config?.defaultValues))
       const ctx = yield* $(Effect.context<R>())
       const stores = new Map([["primary", primary]])
       const getStore = !config?.allowNamespace
@@ -239,7 +240,7 @@ export const makeMemoryStore = () => ({
               )
           }))
         }))
-      const s: Store<PM, Id> = {
+      const s: Store<Encoded, Id> = {
         all: Effect.flatMap(getStore, (_) => _.all),
         find: (...args) => Effect.flatMap(getStore, (_) => _.find(...args)),
         filter: (...args) => Effect.flatMap(getStore, (_) => _.filter(...args)),

package/src/services/Store/index.test.ts.bak

@@ -14,7 +14,7 @@ describe("Optimistic Concurrency", () => {
       Effect.gen(function*($) {
         const existing = new Map<
           string,
-          { _etag: string | undefined; id: string; a: string }
+          { _etag?: string | undefined; id: string; a: string }
         >()
         const { make } = makeMemoryStore()
         const store = yield* $(make("test", Effect.sync(() => existing)))
@@ -48,7 +48,7 @@ describe("Optimistic Concurrency", () => {
       Effect.gen(function*($) {
         const existing = new Map<
           string,
-          { _etag: string | undefined; id: string; a: string }
+          { _etag?: string | undefined; id: string; a: string }
         >()
         const { make } = makeMemoryStore()
         const store = yield* $(make("test", Effect.sync(() => existing)))
@@ -86,7 +86,7 @@ describe("Optimistic Concurrency", () => {
       Effect.gen(function*($) {
         const existing = new Map<
           string,
-          { _etag: string | undefined; id: string; a: string }
+          { _etag?: string | undefined; id: string; a: string }
         >()
         const { make } = makeMemoryStore()
         const store = yield* $(make("test", Effect.sync(() => existing)))

package/src/services/Store/service.ts

@@ -36,26 +36,30 @@ export type Where =
 
 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 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<PM extends PersistenceModelType<Id>, Id> {
+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: (
@@ -65,9 +69,9 @@ export interface Store<PM extends PersistenceModelType<Id>, Id> {
     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>
 }
 
 /**
@@ -75,11 +79,11 @@ export interface Store<PM extends PersistenceModelType<Id>, Id> {
  * @tsplus companion StoreMaker.Ops
  */
 export class StoreMaker extends TagClassId("effect-app/StoreMaker")<StoreMaker, {
-  make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(
+  make: <Encoded extends { id: 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>
+    seed?: Effect<Iterable<Encoded>, E, R>,
+    config?: StoreConfig<Encoded>
+  ) => Effect<Store<Encoded, Id>, E, R>
 }>() {
 }
 
@@ -157,9 +161,8 @@ const makeMap = Effect.sync(() => makeContextMap())
 export class ContextMap extends TagClassMakeId("effect-app/ContextMap", makeMap)<ContextMap>() {
 }
 
-export interface PersistenceModelType<Id> extends Record<string, any> {
-  id: Id
-  _etag: string | undefined
+export type PersistenceModelType<Encoded> = Encoded & {
+  _etag?: string | undefined
 }
 
 export interface StorageConfig {

package/src/services/Store/utils.ts

@@ -4,14 +4,14 @@ import { OptimisticConcurrencyException } from "../../errors.js"
 import { codeFilter3_ } from "./codeFilter.js"
 import type { Filter, PersistenceModelType, SupportedValues2 } from "./service.js"
 
-export const makeETag = <E extends PersistenceModelType<Id>, Id extends string>(
+export const makeETag = <E extends PersistenceModelType<{}>>(
   { _etag, ...e }: E
 ): E => (({
   ...e,
   _etag: objectHash(e)
 }) as any)
 export const makeUpdateETag =
-  (type: string) => <E extends PersistenceModelType<Id>, Id extends string>(e: E, current: Option<E>) =>
+  (type: string) => <E extends PersistenceModelType<{ id: string }>>(e: E, current: Option<E>) =>
     Effect.gen(function*($) {
       if (e._etag) {
         yield* $(

package/test/query.test.ts

@@ -67,7 +67,7 @@ it("works", () => {
   expect(processed).toEqual(items.slice(0, 2).toReversed().map((_) => pick(_, "id", "displayName")))
 })
 
-class TestRepo extends RepositoryDefaultImpl<TestRepo>()<s.From & { _etag: string | undefined }, never>()(
+class TestRepo extends RepositoryDefaultImpl<TestRepo>()(
   "test",
   s
 ) {