@effect-app/infra 2.9.3 → 2.9.5

package/src/Model/Repository/makeRepo.ts

@@ -151,7 +151,9 @@ export function makeRepoInternal<
             return pipe(
               encodeId({ [idKey]: id } as any),
               Effect.orDie,
-              Effect.map((_) => (_ as any)[idKey]), // we will have idKey because the transform is undone again by the encode schema mumbo jumbo above
+              // we will have idKey because the transform is undone again by the encode schema mumbo jumbo above
+              // TODO: make reliable. (Security: isin: PrimaryKey(ISIN), idKey: "isin", does end up with "id")
+              Effect.map((_) => (_ as any)[idKey] ?? (_ as any).id),
               Effect.flatMap(findEId)
             )
           }
@@ -489,6 +491,54 @@ export interface Repos<
 
 export type GetRepoType<T> = T extends { type: infer R } ? R : never
 
+export interface RepositoryOptions<
+  IdKey extends keyof T,
+  Encoded extends {
+    id: string
+  },
+  T,
+  Evt = never,
+  RPublish = never,
+  E = never,
+  RInitial = never,
+  RCtx = never
+> {
+  /**
+   * Specify the idKey of the Type side, if it's different from the default "id".
+   * Does not change the Encoded side, which is always "id" to support database drivers.
+   * At this time as queries are operating on the Encoded side, the queries must still specify "id" regardless.
+   */
+  idKey: IdKey
+  /**
+   * just in time Migration: for complex migrations that aren't just default simple values
+   * use the config.defaultValues instead for simple default values
+   */
+  jitM?: (pm: Encoded) => Encoded
+  config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
+    partitionValue?: (a: Encoded) => string
+  }
+  /**
+   * Optional handler to be able to publish events after successfull save.
+   */
+  publishEvents?: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, RPublish>
+  /**
+   * Optional creator for initial data in the table when it's created for the first itme.
+   */
+  makeInitial?: Effect<readonly T[], E, RInitial>
+  /**
+   * Optional context to be provided to Schema decode/encode.
+   * Useful for effectful transformations like XWithItems, where items is a transformation retrieving elements from another database table or other source.
+   */
+  schemaContext?: Context.Context<RCtx>
+}
+
+/**
+ * Create a repository instance.
+ * @param itemType an identifier used for the table name and e.g NotFoundError
+ * @param schema the Schema used for this Repository
+ * @param options @see RepositoryOptions
+ * @returns a Repository
+ */
 export const makeRepo: {
   <
     ItemType extends string,
@@ -504,16 +554,7 @@ export const makeRepo: {
   >(
     itemType: ItemType,
     schema: S.Schema<T, Encoded, RSchema>,
-    options: {
-      idKey: IdKey
-      jitM?: (pm: Encoded) => Encoded
-      config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
-        partitionValue?: (a: Encoded) => string
-      }
-      publishEvents?: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, RPublish>
-      makeInitial?: Effect<readonly T[], E, RInitial>
-      schemaContext?: Context.Context<RCtx>
-    }
+    options: RepositoryOptions<IdKey, Encoded, T, Evt, RPublish, E, RInitial, RCtx>
   ): Effect.Effect<
     ExtendedRepository<T, Encoded, Evt, ItemType, IdKey, Exclude<RSchema, RCtx>, RPublish>,
     E,
@@ -532,15 +573,7 @@ export const makeRepo: {
   >(
     itemType: ItemType,
     schema: S.Schema<T, Encoded, RSchema>,
-    options: {
-      jitM?: (pm: Encoded) => Encoded
-      config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
-        partitionValue?: (a: Encoded) => string
-      }
-      publishEvents?: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, RPublish>
-      makeInitial?: Effect<readonly T[], E, RInitial>
-      schemaContext?: Context.Context<RCtx>
-    }
+    options: Omit<RepositoryOptions<"id", Encoded, T, Evt, RPublish, E, RInitial, RCtx>, "idKey">
   ): Effect.Effect<
     ExtendedRepository<T, Encoded, Evt, ItemType, "id", Exclude<RSchema, RCtx>, RPublish>,
     E,
@@ -554,22 +587,13 @@ export const makeRepo: {
   IdKey extends keyof T,
   E = never,
   RInitial = never,
-  R2 = never,
+  RPublish = never,
   Evt = never,
   RCtx = never
 >(
   itemType: ItemType,
   schema: S.Schema<T, Encoded, R>,
-  options: {
-    idKey?: IdKey
-    jitM?: (pm: Encoded) => Encoded
-    config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
-      partitionValue?: (a: Encoded) => string
-    }
-    publishEvents?: (evt: NonEmptyReadonlyArray<Evt>) => Effect<void, never, R2>
-    makeInitial?: Effect<readonly T[], E, RInitial>
-    schemaContext?: Context.Context<RCtx>
-  }
+  options: Omit<RepositoryOptions<IdKey, Encoded, T, Evt, RPublish, E, RInitial, RCtx>, "idKey"> & { idKey?: IdKey }
 ) =>
   Effect.gen(function*() {
     const mkRepo = makeRepoInternal<Evt>()(
@@ -579,7 +603,7 @@ export const makeRepo: {
       (e, _etag) => ({ ...e, _etag }),
       options.idKey ?? "id" as any
     )
-    const r = yield* mkRepo.make<RInitial, E, R2, RCtx>(options as any)
+    const r = yield* mkRepo.make<RInitial, E, RPublish, RCtx>(options as any)
     const repo = extendRepo(r)
     return repo
   })

package/src/Store/Cosmos.ts

@@ -272,7 +272,12 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                 .pipe(Effect
                   .withSpan("Cosmos.find [effect-app/infra/Store]", {
                     captureStackTrace: false,
-                    attributes: { "repository.container_id": containerId, "repository.model_name": name }
+                    attributes: {
+                      "repository.container_id": containerId,
+                      "repository.model_name": name,
+                      partitionValue: config?.partitionValue({ id } as Encoded),
+                      id
+                    }
                   })),
             set: (e) =>
               Option
@@ -322,7 +327,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                   Effect
                     .withSpan("Cosmos.set [effect-app/infra/Store]", {
                       captureStackTrace: false,
-                      attributes: { "repository.container_id": containerId, "repository.model_name": name }
+                      attributes: { "repository.container_id": containerId, "repository.model_name": name, id: e.id }
                     })
                 ),
             batchSet,
@@ -333,7 +338,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                 .pipe(Effect
                   .withSpan("Cosmos.remove [effect-app/infra/Store]", {
                     captureStackTrace: false,
-                    attributes: { "repository.container_id": containerId, "repository.model_name": name }
+                    attributes: { "repository.container_id": containerId, "repository.model_name": name, id: e.id }
                   }))
           }
 

package/src/Store/service.ts

@@ -7,12 +7,28 @@ import type { FilterResult } from "../Model/filter/filterApi.js"
 import type { FieldValues } from "../Model/filter/types.js"
 import type { FieldPath } from "../Model/filter/types/path/index.js"
 
-export type StoreConfig<E> = {
-  uniqueKeys?: UniqueKey[]
-  maxBulkSize?: number
+export interface StoreConfig<E> {
   partitionValue: (e: E) => string | undefined
+  /**
+   * Primarily used for testing, creating namespaces in the database to separate data e.g to run multiple tests in isolation within the same database
+   * currently only supported in disk/memory. CosmosDB is TODO.
+   */
   allowNamespace?: (namespace: string) => boolean
+  /**
+   * just in time migrations, supported by the database driver, supporting queries, for simple default values
+   */
   defaultValues?: Partial<E>
+
+  /**
+   * How many items can be processed in one batch at a time.
+   * Defaults to 100 for CosmosDB.
+   */
+  maxBulkSize?: number
+
+  /**
+   * Unique indexes, mainly for CosmosDB
+   */
+  uniqueKeys?: UniqueKey[]
 }
 
 export type SupportedValues = string | boolean | number | null

package/src/api/routing.ts

@@ -357,6 +357,7 @@ export const makeRouter = <
                 } as any
                 : req,
               (req) =>
+                // TODO: render more data... similar to console?
                 Effect
                   .annotateCurrentSpan(
                     "requestInput",

package/src/api/routing4.ts

@@ -342,6 +342,7 @@ export const makeRouter = <
                 } as any
                 : req,
               (req) =>
+                // TODO: render more data... similar to console?
                 Effect
                   .annotateCurrentSpan(
                     "requestInput",

package/vitest.config.ts.timestamp-1711744615239-dcf257a844e01.mjs

@@ -0,0 +1,37 @@
+// packages/infra/vitest.config.ts
+import { defineConfig } from "file:///Users/patrickroza/pj/effect-app/libs/node_modules/.pnpm/vite@5.2.6_@types+node@20.11.30/node_modules/vite/dist/node/index.js";
+
+// vite.config.base.ts
+import path from "path";
+import fs from "fs";
+var __vite_injected_original_dirname = "/Users/patrickroza/pj/effect-app/libs";
+function makeConfig(dirName) {
+  const prefix = path.resolve(__vite_injected_original_dirname, "packages");
+  const packages = fs.readdirSync(prefix).map((f) => prefix + "/" + f).filter((f) => fs.lstatSync(f).isDirectory());
+  const cfg = {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    //plugins: [autoImport],
+    test: {
+      include: ["./test/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
+      reporters: "verbose",
+      globals: true
+    },
+    resolve: {
+      alias: packages.reduce((acc, cur) => {
+        acc[JSON.parse(fs.readFileSync(cur + "/package.json", "utf-8")).name] = path.resolve(cur, cur.endsWith("core") ? "dist" : "src");
+        return acc;
+      }, {})
+      // "@effect-app/core/Prelude": path.join(__dirname, "packages/core/src/Prelude.code.ts")
+    }
+  };
+  console.log(cfg);
+  return cfg;
+}
+
+// packages/infra/vitest.config.ts
+var __vite_injected_original_dirname2 = "/Users/patrickroza/pj/effect-app/libs/packages/infra";
+var vitest_config_default = defineConfig(makeConfig(__vite_injected_original_dirname2));
+export {
+  vitest_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsicGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50cyIsICJ2aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYS92aXRlc3QuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvcGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoX19kaXJuYW1lKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCBwYXRoIGZyb20gXCJwYXRoXCJcbmltcG9ydCBmcyBmcm9tIFwiZnNcIlxuaW1wb3J0IEF1dG9JbXBvcnQgZnJvbSBcInVucGx1Z2luLWF1dG8taW1wb3J0L3ZpdGVcIlxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInZpdGVzdC9jb25maWdcIlxuXG4vLyBjb25zdCBhdXRvSW1wb3J0ID0gQXV0b0ltcG9ydCh7XG4vLyAgIGR0czogXCIuL3Rlc3QvYXV0by1pbXBvcnRzLmQudHNcIixcbi8vICAgLy8gaW5jbHVkZTogW1xuLy8gICAvLyAgIC9cXC50ZXN0XFwuW3RqXXN4PyQvIC8vIC50cywgLnRzeCwgLmpzLCAuanN4XG4vLyAgIC8vIF0sXG4vLyAgIGltcG9ydHM6IFtcbi8vICAgICBcInZpdGVzdFwiXG4vLyAgIF1cbi8vIH0pXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG1ha2VDb25maWcoZGlyTmFtZT86IHN0cmluZykge1xuICBjb25zdCBwcmVmaXggPSBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcInBhY2thZ2VzXCIpXG4gIGNvbnN0IHBhY2thZ2VzID0gZnMucmVhZGRpclN5bmMocHJlZml4KS5tYXAoZiA9PiBwcmVmaXggKyBcIi9cIiArIGYpLmZpbHRlcihmID0+IGZzLmxzdGF0U3luYyhmKS5pc0RpcmVjdG9yeSgpIClcbiAgY29uc3QgY2ZnID0ge1xuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdmFyLXJlcXVpcmVzXG4gICAgLy9wbHVnaW5zOiBbYXV0b0ltcG9ydF0sXG4gICAgdGVzdDoge1xuICAgICAgaW5jbHVkZTogIFtcIi4vdGVzdC8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICByZXNvbHZlOiB7XG4gICAgICBhbGlhczogcGFja2FnZXMucmVkdWNlKChhY2MsIGN1cikgPT4geyAvLyB3b3JrYXJvdW5kIGZvciAvUHJlbHVkZSBpc3N1ZVxuICAgICAgYWNjW0pTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKGN1ciArIFwiL3BhY2thZ2UuanNvblwiLCBcInV0Zi04XCIpKS5uYW1lXSA9IHBhdGgucmVzb2x2ZShjdXIsIGN1ci5lbmRzV2l0aChcImNvcmVcIikgPyBcImRpc3RcIiA6IFwic3JjXCIpXG4gICAgICByZXR1cm4gYWNjXG4gICAgfSwgeyB9KSAvLyBcIkBlZmZlY3QtYXBwL2NvcmUvUHJlbHVkZVwiOiBwYXRoLmpvaW4oX19kaXJuYW1lLCBcInBhY2thZ2VzL2NvcmUvc3JjL1ByZWx1ZGUuY29kZS50c1wiKVxuICB9XG4gIH1cbiAgY29uc29sZS5sb2coY2ZnKVxuICByZXR1cm4gY2ZnXG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixPQUFPLFVBQVU7QUFDakIsT0FBTyxRQUFRO0FBRmYsSUFBTSxtQ0FBbUM7QUFnQjFCLFNBQVIsV0FBNEIsU0FBa0I7QUFDbkQsUUFBTSxTQUFTLEtBQUssUUFBUSxrQ0FBVyxVQUFVO0FBQ2pELFFBQU0sV0FBVyxHQUFHLFlBQVksTUFBTSxFQUFFLElBQUksT0FBSyxTQUFTLE1BQU0sQ0FBQyxFQUFFLE9BQU8sT0FBSyxHQUFHLFVBQVUsQ0FBQyxFQUFFLFlBQVksQ0FBRTtBQUM3RyxRQUFNLE1BQU07QUFBQTtBQUFBO0FBQUEsSUFHVixNQUFNO0FBQUEsTUFDSixTQUFVLENBQUMsa0RBQWtEO0FBQUEsTUFDN0QsV0FBVztBQUFBLE1BQ1gsU0FBUztBQUFBLElBQ1g7QUFBQSxJQUNBLFNBQVM7QUFBQSxNQUNQLE9BQU8sU0FBUyxPQUFPLENBQUMsS0FBSyxRQUFRO0FBQ3JDLFlBQUksS0FBSyxNQUFNLEdBQUcsYUFBYSxNQUFNLGlCQUFpQixPQUFPLENBQUMsRUFBRSxJQUFJLElBQUksS0FBSyxRQUFRLEtBQUssSUFBSSxTQUFTLE1BQU0sSUFBSSxTQUFTLEtBQUs7QUFDL0gsZUFBTztBQUFBLE1BQ1QsR0FBRyxDQUFFLENBQUM7QUFBQTtBQUFBLElBQ1I7QUFBQSxFQUNBO0FBQ0EsVUFBUSxJQUFJLEdBQUc7QUFDZixTQUFPO0FBQ1Q7OztBRHBDQSxJQUFNQSxvQ0FBbUM7QUFJekMsSUFBTyx3QkFBUSxhQUFhLFdBQVdDLGlDQUFTLENBQUM7IiwKICAibmFtZXMiOiBbIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIiwgIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIl0KfQo=