@effect-app/infra 4.0.0-beta.26 → 4.0.0-beta.260

package/test/workflow-engine-sqlite.test.ts

@@ -0,0 +1,299 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { SqliteClient } from "@effect/sql-sqlite-node"
+import { assert, describe, it } from "@effect/vitest"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as Option from "effect-app/Option"
+import * as S from "effect-app/Schema"
+import * as Duration from "effect/Duration"
+import * as Exit from "effect/Exit"
+import * as Schema from "effect/Schema"
+import { SqlClient } from "effect/unstable/sql"
+import { Activity, DurableDeferred, Workflow } from "effect/unstable/workflow"
+import { layerSqlite } from "../src/WorkflowEngineSqlite.js"
+
+// --- Shared mutable counter service -----------------------------------
+
+class CounterRef extends Context.Service<CounterRef, { count: number }>()("CounterRef") {
+  static readonly layer = Layer.effect(CounterRef, Effect.sync(() => ({ count: 0 })))
+}
+
+// --- Workflow definitions --------------------------------------------
+
+const Increment = Workflow.make({
+  name: "Sqlite/Increment",
+  payload: { value: Schema.Number },
+  success: Schema.Number,
+  idempotencyKey: ({ value }) => `inc-${value}`
+})
+
+const IncrementHandler = Increment.toLayer(Effect.fn(function*({ value }) {
+  const counter = yield* CounterRef
+  yield* Activity.make({
+    name: "Bump",
+    success: Schema.Number,
+    execute: Effect.sync(() => {
+      counter.count++
+      return counter.count
+    })
+  })
+  return value + 1
+}))
+
+const TickHandler = Increment.toLayer(({ value }) => Effect.succeed(value + 1))
+
+const EmailReceived = DurableDeferred.make("EmailReceived", { success: Schema.String })
+
+const AwaitEmail = Workflow.make({
+  name: "Sqlite/AwaitEmail",
+  payload: { id: Schema.String },
+  success: Schema.String,
+  idempotencyKey: ({ id }) => `email-${id}`
+})
+
+const AwaitEmailHandler = AwaitEmail.toLayer(Effect.fn(function*() {
+  return yield* DurableDeferred.await(EmailReceived)
+}))
+
+// Reproduces the adapter's opaque activity-result codec so tests can seed
+// schema-encoded values into the activity table directly.
+const ActivityResultCodec = S.fromJsonString(
+  S.toCodecJson(Workflow.Result({ success: S.Union([S.Any, S.Void]), error: S.Union([S.Any, S.Void]) }))
+)
+
+// --- Layer wiring ----------------------------------------------------
+
+type TestOpts = {
+  readonly recoveryInterval?: Duration.Duration
+  readonly clockPollInterval?: Duration.Duration
+}
+
+const makeBase = (opts?: TestOpts) => {
+  const Sqlite = SqliteClient.layer({ filename: ":memory:" })
+  const Engine = layerSqlite({
+    recoveryInterval: opts?.recoveryInterval ?? Duration.millis(100),
+    clockPollInterval: opts?.clockPollInterval ?? Duration.millis(100)
+  })
+    .pipe(Layer.provide(Sqlite))
+  return { Sqlite, Engine }
+}
+
+const incrementLayer = (opts?: TestOpts) => {
+  const { Sqlite, Engine } = makeBase(opts)
+  return IncrementHandler.pipe(
+    Layer.provideMerge(CounterRef.layer),
+    Layer.provideMerge(Engine),
+    Layer.provideMerge(Sqlite)
+  )
+}
+
+const tickLayer = (opts?: TestOpts) => {
+  const { Sqlite, Engine } = makeBase(opts)
+  return TickHandler.pipe(Layer.provideMerge(Engine), Layer.provideMerge(Sqlite))
+}
+
+const awaitEmailLayer = (opts?: TestOpts) => {
+  const { Sqlite, Engine } = makeBase(opts)
+  return AwaitEmailHandler.pipe(Layer.provideMerge(Engine), Layer.provideMerge(Sqlite))
+}
+
+// --- Tests ------------------------------------------------------------
+
+describe("WorkflowEngine (SQLite)", () => {
+  it.live("executes a workflow and persists completion", () =>
+    Effect
+      .gen(function*() {
+        const executionId = yield* Increment.execute({ value: 10 }, { discard: true })
+        const result = yield* Increment.execute({ value: 10 })
+        const polled = yield* Increment.poll(executionId)
+
+        assert.strictEqual(result, 11)
+        assert(
+          Option.isSome(polled)
+            && polled.value._tag === "Complete"
+            && Exit.isSuccess(polled.value.exit)
+        )
+        assert.strictEqual(polled.value.exit.value, 11)
+      })
+      .pipe(Effect.provide(incrementLayer())))
+
+  it.live("re-executing the same id is idempotent (activity runs once)", () =>
+    Effect
+      .gen(function*() {
+        const counter = yield* CounterRef
+        yield* Increment.execute({ value: 1 })
+        yield* Increment.execute({ value: 1 })
+        yield* Increment.execute({ value: 1 })
+        assert.strictEqual(counter.count, 1)
+      })
+      .pipe(Effect.provide(incrementLayer())))
+
+  it.live("persists activity results across replay", () =>
+    Effect
+      .gen(function*() {
+        const sql = yield* SqlClient.SqlClient
+        yield* Increment.execute({ value: 2 })
+        const rows = yield* sql
+          .unsafe(
+            `SELECT execution_id, name, attempt, result FROM workflow_activity`
+          )
+          .pipe(Effect.orDie)
+        assert.strictEqual(rows.length, 1)
+        assert.strictEqual((rows[0] as any).name, "Bump")
+        // Stored value is schema-encoded JSON, not a raw runtime object.
+        const decoded = S.decodeSync(ActivityResultCodec)((rows[0] as any).result)
+        assert.strictEqual(decoded._tag, "Complete")
+      })
+      .pipe(Effect.provide(incrementLayer())))
+
+  it.live("durable deferred completion resumes a suspended workflow", () =>
+    Effect
+      .gen(function*() {
+        const completion = Effect.gen(function*() {
+          yield* Effect.sleep(Duration.millis(50))
+          const token = yield* DurableDeferred.tokenFromPayload(EmailReceived, {
+            workflow: AwaitEmail,
+            payload: { id: "x" }
+          })
+          yield* DurableDeferred.done(EmailReceived, { token, exit: Exit.succeed("delivered") })
+        })
+        const [result] = yield* Effect.all(
+          [AwaitEmail.execute({ id: "x" }), completion],
+          { concurrency: "unbounded" }
+        )
+        assert.strictEqual(result, "delivered")
+      })
+      .pipe(Effect.provide(awaitEmailLayer())))
+
+  it.live("interrupt marks the execution row", () =>
+    Effect
+      .gen(function*() {
+        const sql = yield* SqlClient.SqlClient
+        const executionId = yield* AwaitEmail.executionId({ id: "i" })
+        // Start the workflow as discard (does not block) so it suspends in the
+        // background; then mark it interrupted.
+        yield* AwaitEmail.execute({ id: "i" }, { discard: true })
+        yield* Effect.sleep(Duration.millis(50))
+        yield* AwaitEmail.interrupt(executionId)
+        yield* Effect.sleep(Duration.millis(50))
+        const rows = yield* sql
+          .unsafe(
+            `SELECT interrupted FROM workflow_exec WHERE execution_id = ?`,
+            [executionId] as any
+          )
+          .pipe(Effect.orDie)
+        assert.strictEqual((rows[0] as any).interrupted, 1)
+      })
+      .pipe(Effect.provide(awaitEmailLayer())))
+
+  it.live("clock poller fires past-due clocks", () =>
+    Effect
+      .gen(function*() {
+        const sql = yield* SqlClient.SqlClient
+        yield* sql
+          .unsafe(
+            `INSERT INTO workflow_exec (execution_id, workflow_name, payload, status, suspended, interrupted, etag)
+         VALUES ('exec-clock', 'Sqlite/AwaitEmail', '{"id":"x"}', 'running', 0, 0, 'e1')`
+          )
+          .pipe(Effect.orDie)
+        yield* sql
+          .unsafe(
+            `INSERT INTO workflow_clock (execution_id, name, workflow_name, deferred_name, fire_at)
+         VALUES ('exec-clock', 'wake', 'Sqlite/AwaitEmail', 'EmailReceived', ?)`,
+            [Date.now() - 1000] as any
+          )
+          .pipe(Effect.orDie)
+
+        yield* Effect.sleep(Duration.millis(400))
+
+        const deferred = yield* sql
+          .unsafe(
+            `SELECT exit FROM workflow_deferred WHERE execution_id = 'exec-clock' AND name = 'EmailReceived'`
+          )
+          .pipe(Effect.orDie)
+        const clockGone = yield* sql
+          .unsafe(
+            `SELECT execution_id FROM workflow_clock WHERE execution_id = 'exec-clock' AND name = 'wake'`
+          )
+          .pipe(Effect.orDie)
+        assert.strictEqual(deferred.length, 1)
+        assert.strictEqual(clockGone.length, 0)
+      })
+      .pipe(Effect.provide(awaitEmailLayer())))
+
+  it.live("recovery poller drives execs with stale leases", () =>
+    Effect
+      .gen(function*() {
+        const sql = yield* SqlClient.SqlClient
+        yield* sql
+          .unsafe(
+            `INSERT INTO workflow_exec (execution_id, workflow_name, payload, status, suspended, interrupted, lease_expires_at, etag)
+         VALUES ('recover-1', 'Sqlite/Increment', '{"value":99}', 'running', 0, 0, 0, 'e0')`
+          )
+          .pipe(Effect.orDie)
+
+        yield* Effect.sleep(Duration.millis(500))
+
+        const rows = yield* sql
+          .unsafe(
+            `SELECT status, completed_result FROM workflow_exec WHERE execution_id = 'recover-1'`
+          )
+          .pipe(Effect.orDie)
+        assert.strictEqual((rows[0] as any).status, "complete")
+        const completedResult = JSON.parse((rows[0] as any).completed_result) as { _tag: string }
+        assert.strictEqual(completedResult._tag, "Complete")
+      })
+      .pipe(Effect.provide(tickLayer())))
+
+  it.live("activity dedup: a pre-existing persisted result wins over a fresh run", () =>
+    Effect
+      .gen(function*() {
+        const sql = yield* SqlClient.SqlClient
+        const counter = yield* CounterRef
+        const executionId = yield* Increment.executionId({ value: 7 })
+        yield* sql
+          .unsafe(
+            `INSERT INTO workflow_exec (execution_id, workflow_name, payload, status, suspended, interrupted, etag)
+         VALUES (?, 'Sqlite/Increment', '{"value":7}', 'running', 0, 0, 'e0')`,
+            [executionId] as any
+          )
+          .pipe(Effect.orDie)
+        const seeded = S.encodeSync(ActivityResultCodec)(
+          new Workflow.Complete({ exit: Exit.succeed(999) })
+        )
+        yield* sql
+          .unsafe(
+            `INSERT INTO workflow_activity (execution_id, name, attempt, result)
+         VALUES (?, 'Bump', 1, ?)`,
+            [executionId, seeded] as any
+          )
+          .pipe(Effect.orDie)
+
+        const result = yield* Increment.execute({ value: 7 })
+        assert.strictEqual(result, 8)
+        // Bump's user effect must NOT have run — counter stays at 0.
+        assert.strictEqual(counter.count, 0)
+      })
+      .pipe(Effect.provide(incrementLayer())))
+
+  it.live("deferredDone is idempotent (first-writer-wins)", () =>
+    Effect
+      .gen(function*() {
+        const completion = Effect.gen(function*() {
+          yield* Effect.sleep(Duration.millis(50))
+          const token = yield* DurableDeferred.tokenFromPayload(EmailReceived, {
+            workflow: AwaitEmail,
+            payload: { id: "dup" }
+          })
+          yield* DurableDeferred.done(EmailReceived, { token, exit: Exit.succeed("first") })
+          yield* DurableDeferred.done(EmailReceived, { token, exit: Exit.succeed("second") })
+        })
+        const [result] = yield* Effect.all(
+          [AwaitEmail.execute({ id: "dup" }), completion],
+          { concurrency: "unbounded" }
+        )
+        assert.strictEqual(result, "first")
+      })
+      .pipe(Effect.provide(awaitEmailLayer())))
+})

package/tsconfig.examples.json

@@ -12,4 +12,4 @@
     "tsBuildInfoFile": ".tsbuildinfo/examples.tsbuildinfo",
     "rootDir": "examples"
   }
-}
+}

package/tsconfig.json

@@ -32,9 +32,10 @@
     "outDir": "build/dist",
     "resolveJsonModule": true,
     "moduleResolution": "Node16",
-    "downlevelIteration": true,
     "noErrorTruncation": true,
     "forceConsistentCasingInFileNames": true,
+    "rewriteRelativeImportExtensions": true,
+    "allowImportingTsExtensions": true,
     "types": [
       "node"
     ]

package/tsconfig.json.bak

@@ -8,5 +8,5 @@
     {
       "path": "./tsconfig.test.json"
     }
-  ],
-}
+  ]
+}

package/tsconfig.src.json

@@ -1,38 +1,38 @@
 {
-    "extends": "../../tsconfig.base.json",
-    "compilerOptions": {
-        "lib": [
-            "esnext"
-        ],
-        "tsBuildInfoFile": "./dist/.tsbuildinfo",
-        "esModuleInterop": true,
-        "rootDir": "./src",
-        // keep in here, cause madge can't detect it from extended tsconfig
-        "moduleResolution": "Node16",
-        "types": [
-            "./types/modules"
-        ],
-        "outDir": "./dist"
-    },
-    "include": [
-        "./src/**/*.ts"
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "lib": [
+      "esnext"
     ],
-    "exclude": [
-        "./dist",
-        "*.test.ts",
-        "node_modules",
-        "build",
-        "lib",
-        "dist",
-        "**/*.d.ts.map",
-        ".git",
-        ".data",
-        "**/.*",
-        "**/*.tmp"
+    "tsBuildInfoFile": "./dist/.tsbuildinfo",
+    "esModuleInterop": true,
+    "rootDir": "./src",
+    // keep in here, cause madge can't detect it from extended tsconfig
+    "moduleResolution": "Node16",
+    "types": [
+      "./types/modules"
     ],
-    "references": [
-        {
-            "path": "../effect-app"
-        },
-    ]
-}
+    "outDir": "./dist"
+  },
+  "include": [
+    "./src/**/*.ts"
+  ],
+  "exclude": [
+    "./dist",
+    "*.test.ts",
+    "node_modules",
+    "build",
+    "lib",
+    "dist",
+    "**/*.d.ts.map",
+    ".git",
+    ".data",
+    "**/.*",
+    "**/*.tmp"
+  ],
+  "references": [
+    {
+      "path": "../effect-app"
+    }
+  ]
+}

package/tsconfig.test.json

@@ -28,6 +28,6 @@
   "references": [
     {
       "path": "./tsconfig.src.json"
-    },
+    }
   ]
-}
+}

package/dist/Emailer/service.d.ts

@@ -1,55 +0,0 @@
-import type { MailContent, MailData } from "@sendgrid/helpers/classes/mail.js";
-import type { ResponseError } from "@sendgrid/mail";
-import { type Effect, type NonEmptyReadonlyArray, type Redacted, ServiceMap } from "effect-app";
-import type { Email } from "effect-app/Schema";
-declare const SendMailError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
-    readonly _tag: "SendMailError";
-} & Readonly<A>;
-export declare class SendMailError extends SendMailError_base<{
-    readonly raw: Error | ResponseError;
-}> {
-}
-declare const Emailer_base: ServiceMap.OpaqueClass<Emailer, "effect-app/Emailer", {
-    sendMail: (msg: EmailMsgOptionalFrom) => Effect.Effect<void, SendMailError>;
-}>;
-export declare class Emailer extends Emailer_base {
-}
-export type EmailData = Email | {
-    name?: string;
-    email: Email;
-};
-export interface SendgridConfig {
-    defaultReplyTo?: EmailData;
-    subjectPrefix: string;
-    realMail: boolean;
-    defaultFrom: EmailData;
-    apiKey: Redacted.Redacted<string>;
-}
-export type EmailTemplateMsg = MailData & {
-    templateId: string;
-};
-export type EmailRecipients = EmailData | NonEmptyReadonlyArray<EmailData>;
-export type EmailMsgBase = Omit<MailData, "from" | "to" | "bcc" | "cc" | "content"> & {
-    to: EmailData | NonEmptyReadonlyArray<EmailData>;
-    cc?: EmailData | NonEmptyReadonlyArray<EmailData>;
-    bcc?: EmailData | NonEmptyReadonlyArray<EmailData>;
-    from: EmailData;
-    /**
-     * should multiple `to` addresess be considered multiple emails?
-     * defaults to `true`, not to leak email addresses
-     */
-    isMultiple?: boolean;
-};
-export type EmailContent = {
-    text: string;
-} | {
-    html: string;
-} | {
-    templateId: string;
-} | {
-    content: NonEmptyReadonlyArray<MailContent>;
-};
-export type EmailMsg = EmailMsgBase & EmailContent;
-export type EmailMsgOptionalFrom = Omit<EmailMsgBase, "from"> & Partial<Pick<EmailMsg, "from">> & EmailContent;
-export {};
-//# sourceMappingURL=service.d.ts.map

package/dist/Emailer/service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/Emailer/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAQ,KAAK,MAAM,EAAE,KAAK,qBAAqB,EAAE,KAAK,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACrG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;;;;AAE9C,qBAAa,aAAc,SAAQ,mBAAkC;IACnE,QAAQ,CAAC,GAAG,EAAE,KAAK,GAAG,aAAa,CAAA;CACpC,CAAC;CAAG;;cAGO,CAAC,GAAG,EAAE,oBAAoB,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC;;AAD7E,qBAAa,OAAQ,SAAQ,YAEH;CAAG;AAE7B,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B,cAAc,CAAC,EAAE,SAAS,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,SAAS,CAAA;IACtB,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;CAClC;AACD,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhE,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAA;AAE1E,MAAM,MAAM,YAAY,GACpB,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC,GACxD;IACA,EAAE,EAAE,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAA;IAChD,EAAE,CAAC,EAAE,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAA;IACjD,GAAG,CAAC,EAAE,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAA;IAClD,IAAI,EAAE,SAAS,CAAA;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA;AAEH,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG;IACxF,OAAO,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAA;CAC5C,CAAA;AAED,MAAM,MAAM,QAAQ,GAChB,YAAY,GACZ,YAAY,CAAA;AAEhB,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,GAAG,YAAY,CAAA"}

package/dist/Emailer/service.js

@@ -1,6 +0,0 @@
-import { Data, ServiceMap } from "effect-app";
-export class SendMailError extends Data.TaggedError("SendMailError") {
-}
-export class Emailer extends ServiceMap.Opaque()("effect-app/Emailer") {
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9FbWFpbGVyL3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLElBQUksRUFBMEQsVUFBVSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBR3JHLE1BQU0sT0FBTyxhQUFjLFNBQVEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxlQUFlLENBRWpFO0NBQUc7QUFFTCxNQUFNLE9BQU8sT0FBUSxTQUFRLFVBQVUsQ0FBQyxNQUFNLEVBRTFDLENBQUMsb0JBQW9CLENBQUM7Q0FBRyJ9

package/dist/Emailer.d.ts

@@ -1,2 +0,0 @@
-export * from "./Emailer/service.js";
-//# sourceMappingURL=Emailer.d.ts.map

package/dist/Emailer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Emailer.d.ts","sourceRoot":"","sources":["../src/Emailer.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAA"}

package/dist/Emailer.js

@@ -1,2 +0,0 @@
-export * from "./Emailer/service.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW1haWxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9FbWFpbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsc0JBQXNCLENBQUEifQ==

package/dist/Model/Repository/ext.d.ts

@@ -1,41 +0,0 @@
-import { Effect, type NonEmptyArray } from "effect-app";
-import { type InvalidStateError, NotFoundError, type OptimisticConcurrencyException } from "effect-app/client/errors";
-import { type FixEnv, type PureEnv } from "effect-app/Pure";
-import type { FieldValues } from "../filter/types.js";
-import type { Query, QueryEnd, QueryWhere } from "../query.js";
-import type { Repository } from "./service.js";
-export declare const extendRepo: <T, Encoded extends FieldValues, Evt, ItemType extends string, IdKey extends keyof T & keyof Encoded, RSchema, RPublish>(repo: Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>) => Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish> & {
-    request: (id: T[IdKey]) => Effect.Effect<T, NotFoundError<ItemType>, never>;
-    get: (id: T[IdKey]) => Effect.Effect<T, NotFoundError<ItemType>, RSchema>;
-    log: (evt: Evt) => import("effect-app/Pure").PureLogT<any>;
-    save: (items_0: T, ...items: T[]) => Effect.Effect<void, OptimisticConcurrencyException | InvalidStateError, RSchema | RPublish>;
-    saveWithEvents: (events: Iterable<Evt>) => (...items: NonEmptyArray<T>) => Effect.Effect<void, OptimisticConcurrencyException | InvalidStateError, RSchema | RPublish>;
-    queryAndSavePure: {
-        <A, E2, R2, T2 extends T>(q: (q: Query<Encoded>) => QueryEnd<Encoded, "one">, pure: Effect.Effect<A, E2, FixEnv<R2, Evt, T, T2>>): Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E2, Exclude<R2, {
-            env: PureEnv<Evt, T, T2>;
-        }>>;
-        <A, E2_1, R2_1, T2_1 extends T>(q: (q: Query<Encoded>) => Query<Encoded> | QueryWhere<Encoded> | QueryEnd<Encoded, "many">, pure: Effect.Effect<A, E2_1, FixEnv<R2_1, Evt, readonly T[], readonly T2_1[]>>): Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | E2_1, RSchema | RPublish | Exclude<R2_1, {
-            env: PureEnv<Evt, readonly T[], readonly T2_1[]>;
-        }>>;
-        <A, E2_2, R2_2, T2_2 extends T>(q: (q: Query<Encoded>) => Query<Encoded> | QueryWhere<Encoded> | QueryEnd<Encoded, "many">, pure: Effect.Effect<A, E2_2, FixEnv<R2_2, Evt, readonly T[], readonly T2_2[]>>, batch: "batched" | number): Effect.Effect<A[], InvalidStateError | OptimisticConcurrencyException | E2_2, RSchema | RPublish | Exclude<R2_2, {
-            env: PureEnv<Evt, readonly T[], readonly T2_2[]>;
-        }>>;
-    };
-    saveManyWithPure: {
-        <R, A, E, S1 extends T, S2 extends T>(items: Iterable<S1>, pure: Effect.Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | E, RSchema | RPublish | Exclude<R, {
-            env: PureEnv<Evt, readonly S1[], readonly S2[]>;
-        }>>;
-        <R, A_1, E_1, S1_1 extends T, S2_1 extends T>(items: Iterable<S1_1>, pure: Effect.Effect<A_1, E_1, FixEnv<R, Evt, readonly S1_1[], readonly S2_1[]>>, batch: "batched" | number): Effect.Effect<A_1[], InvalidStateError | OptimisticConcurrencyException | E_1, RSchema | RPublish | Exclude<R, {
-            env: PureEnv<Evt, readonly S1_1[], readonly S2_1[]>;
-        }>>;
-    };
-    byIdAndSaveWithPure: <R, A_2, E_2, S2_2 extends T>(id: T[IdKey], pure: Effect.Effect<A_2, E_2, FixEnv<R, Evt, T, S2_2>>) => Effect.Effect<A_2, InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E_2, RSchema | RPublish | Exclude<R, {
-        env: PureEnv<Evt, T, S2_2>;
-    }>>;
-    saveWithPure: <R, A_3, E_3, S1_2 extends T, S2_3 extends T>(item: S1_2, pure: Effect.Effect<A_3, E_3, FixEnv<R, Evt, S1_2, S2_3>>) => Effect.Effect<A_3, OptimisticConcurrencyException | InvalidStateError | E_3, RSchema | RPublish | Exclude<R, {
-        env: PureEnv<Evt, S1_2, S2_3>;
-    }>>;
-};
-export interface ExtendedRepository<T, Encoded extends FieldValues, Evt, ItemType extends string, IdKey extends keyof T & keyof Encoded, RSchema, RPublish> extends ReturnType<typeof extendRepo<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>> {
-}
-//# sourceMappingURL=ext.d.ts.map

package/dist/Model/Repository/ext.d.ts.map

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

package/dist/Model/Repository/ext.js

@@ -1,65 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-import { Array, Effect, Exit, Option, Request, RequestResolver } from "effect-app";
-import { NotFoundError } from "effect-app/client/errors";
-import { runTerm } from "effect-app/Pure";
-import { AnyPureDSL } from "../dsl.js";
-import * as Q from "../query.js";
-export const extendRepo = (repo) => {
-    const get = (id) => repo.find(id).pipe(Effect.flatMap(Option.match({
-        onNone: () => Effect.fail(new NotFoundError({ type: repo.itemType, id })),
-        onSome: Effect.succeed
-    })));
-    function saveManyWithPure_(items, pure) {
-        return saveAllWithEffectInt(runTerm(pure, [...items]));
-    }
-    function saveWithPure_(item, pure) {
-        return saveAllWithEffectInt(runTerm(pure, item)
-            .pipe(Effect
-            .map(([item, events, a]) => [[item], events, a])));
-    }
-    function saveAllWithEffectInt(gen) {
-        return Effect.flatMap(gen, ([items, events, a]) => repo.saveAndPublish(items, events).pipe(Effect.map(() => a)));
-    }
-    function saveManyWithPureBatched_(items, pure, batchSize = 100) {
-        return Effect.forEach(Array.chunksOf(items, batchSize), (batch) => saveAllWithEffectInt(runTerm(pure, batch)));
-    }
-    const queryAndSavePure = (q, pure, batch) => repo.query(q).pipe(Effect.andThen((_) => Array.isArray(_)
-        ? batch === undefined
-            ? saveManyWithPure_(_, pure)
-            : saveManyWithPureBatched_(_, pure, batch === "batched" ? 100 : batch)
-        : saveWithPure_(_, pure)));
-    const saveManyWithPure = (items, pure, batch) => batch
-        ? Effect.forEach(Array.chunksOf(items, batch === "batched" ? 100 : batch), (batch) => saveAllWithEffectInt(runTerm(pure, batch)))
-        : saveAllWithEffectInt(runTerm(pure, [...items]));
-    const byIdAndSaveWithPure = (id, pure) => get(id).pipe(Effect.flatMap((item) => saveWithPure_(item, pure)));
-    const _request = Request.tagged(`Get${repo.itemType}`);
-    const requestResolver = RequestResolver
-        .make((entries, _key) => repo.query(Q.where(repo.idKey, "in", entries.map((_) => _.request.id)))
-        // TODO
-        .pipe(Effect.andThen((items) => Effect.forEach(entries, (entry) => Request.complete(Array
-        .findFirst(items, (_) => _[repo.idKey] === entry.request.id)
-        .pipe(Option.match({
-        onNone: () => Exit.fail(new NotFoundError({ type: repo.itemType, id: entry.request.id })),
-        onSome: Exit.succeed
-    })))(entry), { discard: true })), Effect
-        .catchCause((cause) => Effect.forEach(entries, (entry) => Request.complete(Exit.failCause(cause))(entry), { discard: true }))))
-        .pipe(RequestResolver.batchN(20));
-    const exts = {
-        request: (id) => Effect.request(_request({ id }), requestResolver),
-        get,
-        log: (evt) => AnyPureDSL.log(evt),
-        save: (...items) => repo.saveAndPublish(items),
-        saveWithEvents: (events) => (...items) => repo.saveAndPublish(items, events),
-        queryAndSavePure,
-        saveManyWithPure,
-        byIdAndSaveWithPure,
-        saveWithPure: (item, pure) => saveAllWithEffectInt(runTerm(pure, item)
-            .pipe(Effect.map(([item, events, a]) => [[item], events, a])))
-    };
-    return {
-        ...repo,
-        ...exts
-    };
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL01vZGVsL1JlcG9zaXRvcnkvZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCx3REFBd0Q7QUFDeEQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFzQixNQUFNLEVBQUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUN0RyxPQUFPLEVBQTBCLGFBQWEsRUFBdUMsTUFBTSwwQkFBMEIsQ0FBQTtBQUNySCxPQUFPLEVBQTZCLE9BQU8sRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ3BFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxXQUFXLENBQUE7QUFHdEMsT0FBTyxLQUFLLENBQUMsTUFBTSxhQUFhLENBQUE7QUFHaEMsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLENBU3hCLElBQXFFLEVBQ3JFLEVBQUU7SUFDRixNQUFNLEdBQUcsR0FBRyxDQUFDLEVBQVksRUFBRSxFQUFFLENBQzNCLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUNoQixNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDMUIsTUFBTSxFQUFFLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxhQUFhLENBQVcsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ25GLE1BQU0sRUFBRSxNQUFNLENBQUMsT0FBTztLQUN2QixDQUFDLENBQUMsQ0FDSixDQUFBO0lBQ0gsU0FBUyxpQkFBaUIsQ0FPeEIsS0FBbUIsRUFDbkIsSUFBdUU7UUFFdkUsT0FBTyxvQkFBb0IsQ0FDekIsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FDMUIsQ0FBQTtJQUNILENBQUM7SUFF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