ff-effect 0.0.6 → 0.0.8

package/dist/for/drizzle/index.cjs

@@ -0,0 +1,89 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/for/drizzle/index.ts
+var drizzle_exports = {};
+__export(drizzle_exports, {
+  DrizzleError: () => DrizzleError,
+  TagTypeId: () => TagTypeId,
+  createDatabase: () => createDatabase
+});
+module.exports = __toCommonJS(drizzle_exports);
+var import_effect = require("effect");
+var TagTypeId = import_effect.Context.TagTypeId;
+var DrizzleError = class extends import_effect.Data.TaggedError("ff-effect/DrizzleError") {
+};
+var WrappedTxError = class extends Error {
+};
+function createDatabase(tagId, createClient) {
+  class Drizzle extends import_effect.Context.Tag(tagId)() {
+  }
+  const txTag = `${tagId}.tx`;
+  class DrizzleTx extends import_effect.Context.Tag(txTag)() {
+  }
+  const db = (fn) => import_effect.Effect.gen(function* () {
+    const client = yield* Drizzle;
+    return yield* import_effect.Effect.tryPromise({
+      try: () => fn(client),
+      catch: (cause) => new DrizzleError({ message: "Database operation failed", cause })
+    });
+  });
+  const tx = (fn) => import_effect.Effect.gen(function* () {
+    const client = yield* DrizzleTx;
+    return yield* import_effect.Effect.tryPromise({
+      try: () => fn(client),
+      catch: (cause) => new DrizzleError({ message: "Database operation failed", cause })
+    });
+  });
+  const withTransaction = (effect) => import_effect.Effect.gen(function* () {
+    const client = yield* Drizzle;
+    const runFork = yield* import_effect.FiberSet.makeRuntimePromise();
+    return yield* import_effect.Effect.tryPromise({
+      try: () => client.transaction(
+        (txClient) => runFork(
+          effect.pipe(
+            import_effect.Effect.provideService(Drizzle, txClient),
+            import_effect.Effect.provideService(DrizzleTx, txClient),
+            import_effect.Effect.mapError((e) => new WrappedTxError("", { cause: e }))
+          )
+        )
+      ),
+      catch: (error) => {
+        if (error instanceof WrappedTxError) return error.cause;
+        return new DrizzleError({
+          message: "Transaction failed",
+          cause: error
+        });
+      }
+    });
+  }).pipe(import_effect.Effect.scoped);
+  return {
+    db,
+    tx,
+    withTransaction,
+    layer: import_effect.Layer.effect(Drizzle, createClient)
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DrizzleError,
+  TagTypeId,
+  createDatabase
+});
+//# sourceMappingURL=index.cjs.map

package/dist/for/drizzle/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/for/drizzle/index.ts"],"sourcesContent":["import { Context, Data, Effect, FiberSet, Layer } from 'effect';\n\n// TypeScript issue where the return type of createDatabase\n// contains internal Effect types (TagTypeId) that aren't exported\n// from this module,\n// so TypeScript can't \"name\" them in the declaration file.\nexport const TagTypeId = Context.TagTypeId;\n\nexport class DrizzleError extends Data.TaggedError('ff-effect/DrizzleError')<{\n\tmessage: string;\n\tcause?: unknown;\n}> {}\n\ntype AnyDrizzleClient = {\n\ttransaction: (fn: (tx: any) => Promise<any>) => Promise<any>;\n};\n\ntype TxClient<TClient extends AnyDrizzleClient> = Parameters<\n\tParameters<TClient['transaction']>[0]\n>[0];\n\nclass WrappedTxError extends Error {}\n\nexport function createDatabase<\n\tTAG extends string,\n\tTClient extends AnyDrizzleClient,\n\tE,\n\tR,\n>(tagId: TAG, createClient: Effect.Effect<TClient, E, R>) {\n\ttype Client = TClient | TxClient<TClient>;\n\ttype Tx = TxClient<TClient>;\n\n\tclass Drizzle extends Context.Tag(tagId)<Drizzle, Client>() {}\n\tconst txTag = `${tagId}.tx` as const;\n\tclass DrizzleTx extends Context.Tag(txTag)<DrizzleTx, Tx>() {}\n\n\tconst db = <T>(fn: (client: Client) => Promise<T>) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst client = yield* Drizzle;\n\t\t\treturn yield* Effect.tryPromise({\n\t\t\t\ttry: () => fn(client),\n\t\t\t\tcatch: (cause) =>\n\t\t\t\t\tnew DrizzleError({ message: 'Database operation failed', cause }),\n\t\t\t});\n\t\t});\n\n\t/** Requires being inside withTransaction - enforces transaction at compile time */\n\tconst tx = <T>(fn: (client: Tx) => Promise<T>) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst client = yield* DrizzleTx;\n\t\t\treturn yield* Effect.tryPromise({\n\t\t\t\ttry: () => fn(client),\n\t\t\t\tcatch: (cause) =>\n\t\t\t\t\tnew DrizzleError({ message: 'Database operation failed', cause }),\n\t\t\t});\n\t\t});\n\n\tconst withTransaction = <A, E, R>(effect: Effect.Effect<A, E, R>) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst client = yield* Drizzle;\n\t\t\tconst runFork =\n\t\t\t\tyield* FiberSet.makeRuntimePromise<Exclude<R, DrizzleTx>>();\n\n\t\t\treturn yield* Effect.tryPromise<A, E | DrizzleError>({\n\t\t\t\ttry: () =>\n\t\t\t\t\t(client as TClient).transaction((txClient) =>\n\t\t\t\t\t\trunFork(\n\t\t\t\t\t\t\teffect.pipe(\n\t\t\t\t\t\t\t\tEffect.provideService(Drizzle, txClient as Client),\n\t\t\t\t\t\t\t\tEffect.provideService(DrizzleTx, txClient as Tx),\n\t\t\t\t\t\t\t\tEffect.mapError((e) => new WrappedTxError('', { cause: e })),\n\t\t\t\t\t\t\t) as Effect.Effect<A, WrappedTxError, Exclude<R, DrizzleTx>>,\n\t\t\t\t\t\t),\n\t\t\t\t\t),\n\t\t\t\tcatch: (error) => {\n\t\t\t\t\tif (error instanceof WrappedTxError) return error.cause as E;\n\t\t\t\t\treturn new DrizzleError({\n\t\t\t\t\t\tmessage: 'Transaction failed',\n\t\t\t\t\t\tcause: error,\n\t\t\t\t\t});\n\t\t\t\t},\n\t\t\t});\n\t\t}).pipe(Effect.scoped);\n\n\treturn {\n\t\tdb,\n\t\ttx,\n\t\twithTransaction,\n\t\tlayer: Layer.effect(Drizzle, createClient),\n\t};\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAuD;AAMhD,IAAM,YAAY,sBAAQ;AAE1B,IAAM,eAAN,cAA2B,mBAAK,YAAY,wBAAwB,EAGxE;AAAC;AAUJ,IAAM,iBAAN,cAA6B,MAAM;AAAC;AAE7B,SAAS,eAKd,OAAY,cAA4C;AAAA,EAIzD,MAAM,gBAAgB,sBAAQ,IAAI,KAAK,EAAmB,EAAE;AAAA,EAAC;AAC7D,QAAM,QAAQ,GAAG,KAAK;AAAA,EACtB,MAAM,kBAAkB,sBAAQ,IAAI,KAAK,EAAiB,EAAE;AAAA,EAAC;AAE7D,QAAM,KAAK,CAAI,OACd,qBAAO,IAAI,aAAa;AACvB,UAAM,SAAS,OAAO;AACtB,WAAO,OAAO,qBAAO,WAAW;AAAA,MAC/B,KAAK,MAAM,GAAG,MAAM;AAAA,MACpB,OAAO,CAAC,UACP,IAAI,aAAa,EAAE,SAAS,6BAA6B,MAAM,CAAC;AAAA,IAClE,CAAC;AAAA,EACF,CAAC;AAGF,QAAM,KAAK,CAAI,OACd,qBAAO,IAAI,aAAa;AACvB,UAAM,SAAS,OAAO;AACtB,WAAO,OAAO,qBAAO,WAAW;AAAA,MAC/B,KAAK,MAAM,GAAG,MAAM;AAAA,MACpB,OAAO,CAAC,UACP,IAAI,aAAa,EAAE,SAAS,6BAA6B,MAAM,CAAC;AAAA,IAClE,CAAC;AAAA,EACF,CAAC;AAEF,QAAM,kBAAkB,CAAU,WACjC,qBAAO,IAAI,aAAa;AACvB,UAAM,SAAS,OAAO;AACtB,UAAM,UACL,OAAO,uBAAS,mBAA0C;AAE3D,WAAO,OAAO,qBAAO,WAAgC;AAAA,MACpD,KAAK,MACH,OAAmB;AAAA,QAAY,CAAC,aAChC;AAAA,UACC,OAAO;AAAA,YACN,qBAAO,eAAe,SAAS,QAAkB;AAAA,YACjD,qBAAO,eAAe,WAAW,QAAc;AAAA,YAC/C,qBAAO,SAAS,CAAC,MAAM,IAAI,eAAe,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAAA,UAC5D;AAAA,QACD;AAAA,MACD;AAAA,MACD,OAAO,CAAC,UAAU;AACjB,YAAI,iBAAiB,eAAgB,QAAO,MAAM;AAClD,eAAO,IAAI,aAAa;AAAA,UACvB,SAAS;AAAA,UACT,OAAO;AAAA,QACR,CAAC;AAAA,MACF;AAAA,IACD,CAAC;AAAA,EACF,CAAC,EAAE,KAAK,qBAAO,MAAM;AAEtB,SAAO;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO,oBAAM,OAAO,SAAS,YAAY;AAAA,EAC1C;AACD;","names":[]}

package/dist/for/drizzle/index.d.cts

@@ -0,0 +1,46 @@
+import * as effect_Scope from 'effect/Scope';
+import * as effect_Cause from 'effect/Cause';
+import * as effect_Types from 'effect/Types';
+import { Effect, Context, Layer } from 'effect';
+
+declare const TagTypeId: symbol;
+declare const DrizzleError_base: new <A extends Record<string, any> = {}>(args: effect_Types.Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => effect_Cause.YieldableError & {
+    readonly _tag: "ff-effect/DrizzleError";
+} & Readonly<A>;
+declare class DrizzleError extends DrizzleError_base<{
+    message: string;
+    cause?: unknown;
+}> {
+}
+type AnyDrizzleClient = {
+    transaction: (fn: (tx: any) => Promise<any>) => Promise<any>;
+};
+type TxClient<TClient extends AnyDrizzleClient> = Parameters<Parameters<TClient['transaction']>[0]>[0];
+declare function createDatabase<TAG extends string, TClient extends AnyDrizzleClient, E, R>(tagId: TAG, createClient: Effect.Effect<TClient, E, R>): {
+    db: <T>(fn: (client: TClient | TxClient<TClient>) => Promise<T>) => Effect.Effect<T, DrizzleError, {
+        readonly Id: TAG;
+        readonly Type: TClient | TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    }>;
+    tx: <T>(fn: (client: TxClient<TClient>) => Promise<T>) => Effect.Effect<T, DrizzleError, {
+        readonly Id: `${TAG}.tx`;
+        readonly Type: TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    }>;
+    withTransaction: <A, E_1, R_1>(effect: Effect.Effect<A, E_1, R_1>) => Effect.Effect<A, DrizzleError | E_1, {
+        readonly Id: TAG;
+        readonly Type: TClient | TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    } | Exclude<Exclude<R_1, {
+        readonly Id: `${TAG}.tx`;
+        readonly Type: TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    }>, effect_Scope.Scope>>;
+    layer: Layer.Layer<{
+        readonly Id: TAG;
+        readonly Type: TClient | TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    }, E, R>;
+};
+
+export { DrizzleError, TagTypeId, createDatabase };

package/dist/for/drizzle/index.d.ts

@@ -0,0 +1,46 @@
+import * as effect_Scope from 'effect/Scope';
+import * as effect_Cause from 'effect/Cause';
+import * as effect_Types from 'effect/Types';
+import { Effect, Context, Layer } from 'effect';
+
+declare const TagTypeId: symbol;
+declare const DrizzleError_base: new <A extends Record<string, any> = {}>(args: effect_Types.Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => effect_Cause.YieldableError & {
+    readonly _tag: "ff-effect/DrizzleError";
+} & Readonly<A>;
+declare class DrizzleError extends DrizzleError_base<{
+    message: string;
+    cause?: unknown;
+}> {
+}
+type AnyDrizzleClient = {
+    transaction: (fn: (tx: any) => Promise<any>) => Promise<any>;
+};
+type TxClient<TClient extends AnyDrizzleClient> = Parameters<Parameters<TClient['transaction']>[0]>[0];
+declare function createDatabase<TAG extends string, TClient extends AnyDrizzleClient, E, R>(tagId: TAG, createClient: Effect.Effect<TClient, E, R>): {
+    db: <T>(fn: (client: TClient | TxClient<TClient>) => Promise<T>) => Effect.Effect<T, DrizzleError, {
+        readonly Id: TAG;
+        readonly Type: TClient | TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    }>;
+    tx: <T>(fn: (client: TxClient<TClient>) => Promise<T>) => Effect.Effect<T, DrizzleError, {
+        readonly Id: `${TAG}.tx`;
+        readonly Type: TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    }>;
+    withTransaction: <A, E_1, R_1>(effect: Effect.Effect<A, E_1, R_1>) => Effect.Effect<A, DrizzleError | E_1, {
+        readonly Id: TAG;
+        readonly Type: TClient | TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    } | Exclude<Exclude<R_1, {
+        readonly Id: `${TAG}.tx`;
+        readonly Type: TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    }>, effect_Scope.Scope>>;
+    layer: Layer.Layer<{
+        readonly Id: TAG;
+        readonly Type: TClient | TxClient<TClient>;
+        readonly [TagTypeId]: Context.TagTypeId;
+    }, E, R>;
+};
+
+export { DrizzleError, TagTypeId, createDatabase };

package/dist/for/drizzle/index.js

@@ -0,0 +1,62 @@
+// src/for/drizzle/index.ts
+import { Context, Data, Effect, FiberSet, Layer } from "effect";
+var TagTypeId = Context.TagTypeId;
+var DrizzleError = class extends Data.TaggedError("ff-effect/DrizzleError") {
+};
+var WrappedTxError = class extends Error {
+};
+function createDatabase(tagId, createClient) {
+  class Drizzle extends Context.Tag(tagId)() {
+  }
+  const txTag = `${tagId}.tx`;
+  class DrizzleTx extends Context.Tag(txTag)() {
+  }
+  const db = (fn) => Effect.gen(function* () {
+    const client = yield* Drizzle;
+    return yield* Effect.tryPromise({
+      try: () => fn(client),
+      catch: (cause) => new DrizzleError({ message: "Database operation failed", cause })
+    });
+  });
+  const tx = (fn) => Effect.gen(function* () {
+    const client = yield* DrizzleTx;
+    return yield* Effect.tryPromise({
+      try: () => fn(client),
+      catch: (cause) => new DrizzleError({ message: "Database operation failed", cause })
+    });
+  });
+  const withTransaction = (effect) => Effect.gen(function* () {
+    const client = yield* Drizzle;
+    const runFork = yield* FiberSet.makeRuntimePromise();
+    return yield* Effect.tryPromise({
+      try: () => client.transaction(
+        (txClient) => runFork(
+          effect.pipe(
+            Effect.provideService(Drizzle, txClient),
+            Effect.provideService(DrizzleTx, txClient),
+            Effect.mapError((e) => new WrappedTxError("", { cause: e }))
+          )
+        )
+      ),
+      catch: (error) => {
+        if (error instanceof WrappedTxError) return error.cause;
+        return new DrizzleError({
+          message: "Transaction failed",
+          cause: error
+        });
+      }
+    });
+  }).pipe(Effect.scoped);
+  return {
+    db,
+    tx,
+    withTransaction,
+    layer: Layer.effect(Drizzle, createClient)
+  };
+}
+export {
+  DrizzleError,
+  TagTypeId,
+  createDatabase
+};
+//# sourceMappingURL=index.js.map

package/dist/for/drizzle/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/for/drizzle/index.ts"],"sourcesContent":["import { Context, Data, Effect, FiberSet, Layer } from 'effect';\n\n// TypeScript issue where the return type of createDatabase\n// contains internal Effect types (TagTypeId) that aren't exported\n// from this module,\n// so TypeScript can't \"name\" them in the declaration file.\nexport const TagTypeId = Context.TagTypeId;\n\nexport class DrizzleError extends Data.TaggedError('ff-effect/DrizzleError')<{\n\tmessage: string;\n\tcause?: unknown;\n}> {}\n\ntype AnyDrizzleClient = {\n\ttransaction: (fn: (tx: any) => Promise<any>) => Promise<any>;\n};\n\ntype TxClient<TClient extends AnyDrizzleClient> = Parameters<\n\tParameters<TClient['transaction']>[0]\n>[0];\n\nclass WrappedTxError extends Error {}\n\nexport function createDatabase<\n\tTAG extends string,\n\tTClient extends AnyDrizzleClient,\n\tE,\n\tR,\n>(tagId: TAG, createClient: Effect.Effect<TClient, E, R>) {\n\ttype Client = TClient | TxClient<TClient>;\n\ttype Tx = TxClient<TClient>;\n\n\tclass Drizzle extends Context.Tag(tagId)<Drizzle, Client>() {}\n\tconst txTag = `${tagId}.tx` as const;\n\tclass DrizzleTx extends Context.Tag(txTag)<DrizzleTx, Tx>() {}\n\n\tconst db = <T>(fn: (client: Client) => Promise<T>) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst client = yield* Drizzle;\n\t\t\treturn yield* Effect.tryPromise({\n\t\t\t\ttry: () => fn(client),\n\t\t\t\tcatch: (cause) =>\n\t\t\t\t\tnew DrizzleError({ message: 'Database operation failed', cause }),\n\t\t\t});\n\t\t});\n\n\t/** Requires being inside withTransaction - enforces transaction at compile time */\n\tconst tx = <T>(fn: (client: Tx) => Promise<T>) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst client = yield* DrizzleTx;\n\t\t\treturn yield* Effect.tryPromise({\n\t\t\t\ttry: () => fn(client),\n\t\t\t\tcatch: (cause) =>\n\t\t\t\t\tnew DrizzleError({ message: 'Database operation failed', cause }),\n\t\t\t});\n\t\t});\n\n\tconst withTransaction = <A, E, R>(effect: Effect.Effect<A, E, R>) =>\n\t\tEffect.gen(function* () {\n\t\t\tconst client = yield* Drizzle;\n\t\t\tconst runFork =\n\t\t\t\tyield* FiberSet.makeRuntimePromise<Exclude<R, DrizzleTx>>();\n\n\t\t\treturn yield* Effect.tryPromise<A, E | DrizzleError>({\n\t\t\t\ttry: () =>\n\t\t\t\t\t(client as TClient).transaction((txClient) =>\n\t\t\t\t\t\trunFork(\n\t\t\t\t\t\t\teffect.pipe(\n\t\t\t\t\t\t\t\tEffect.provideService(Drizzle, txClient as Client),\n\t\t\t\t\t\t\t\tEffect.provideService(DrizzleTx, txClient as Tx),\n\t\t\t\t\t\t\t\tEffect.mapError((e) => new WrappedTxError('', { cause: e })),\n\t\t\t\t\t\t\t) as Effect.Effect<A, WrappedTxError, Exclude<R, DrizzleTx>>,\n\t\t\t\t\t\t),\n\t\t\t\t\t),\n\t\t\t\tcatch: (error) => {\n\t\t\t\t\tif (error instanceof WrappedTxError) return error.cause as E;\n\t\t\t\t\treturn new DrizzleError({\n\t\t\t\t\t\tmessage: 'Transaction failed',\n\t\t\t\t\t\tcause: error,\n\t\t\t\t\t});\n\t\t\t\t},\n\t\t\t});\n\t\t}).pipe(Effect.scoped);\n\n\treturn {\n\t\tdb,\n\t\ttx,\n\t\twithTransaction,\n\t\tlayer: Layer.effect(Drizzle, createClient),\n\t};\n}\n"],"mappings":";AAAA,SAAS,SAAS,MAAM,QAAQ,UAAU,aAAa;AAMhD,IAAM,YAAY,QAAQ;AAE1B,IAAM,eAAN,cAA2B,KAAK,YAAY,wBAAwB,EAGxE;AAAC;AAUJ,IAAM,iBAAN,cAA6B,MAAM;AAAC;AAE7B,SAAS,eAKd,OAAY,cAA4C;AAAA,EAIzD,MAAM,gBAAgB,QAAQ,IAAI,KAAK,EAAmB,EAAE;AAAA,EAAC;AAC7D,QAAM,QAAQ,GAAG,KAAK;AAAA,EACtB,MAAM,kBAAkB,QAAQ,IAAI,KAAK,EAAiB,EAAE;AAAA,EAAC;AAE7D,QAAM,KAAK,CAAI,OACd,OAAO,IAAI,aAAa;AACvB,UAAM,SAAS,OAAO;AACtB,WAAO,OAAO,OAAO,WAAW;AAAA,MAC/B,KAAK,MAAM,GAAG,MAAM;AAAA,MACpB,OAAO,CAAC,UACP,IAAI,aAAa,EAAE,SAAS,6BAA6B,MAAM,CAAC;AAAA,IAClE,CAAC;AAAA,EACF,CAAC;AAGF,QAAM,KAAK,CAAI,OACd,OAAO,IAAI,aAAa;AACvB,UAAM,SAAS,OAAO;AACtB,WAAO,OAAO,OAAO,WAAW;AAAA,MAC/B,KAAK,MAAM,GAAG,MAAM;AAAA,MACpB,OAAO,CAAC,UACP,IAAI,aAAa,EAAE,SAAS,6BAA6B,MAAM,CAAC;AAAA,IAClE,CAAC;AAAA,EACF,CAAC;AAEF,QAAM,kBAAkB,CAAU,WACjC,OAAO,IAAI,aAAa;AACvB,UAAM,SAAS,OAAO;AACtB,UAAM,UACL,OAAO,SAAS,mBAA0C;AAE3D,WAAO,OAAO,OAAO,WAAgC;AAAA,MACpD,KAAK,MACH,OAAmB;AAAA,QAAY,CAAC,aAChC;AAAA,UACC,OAAO;AAAA,YACN,OAAO,eAAe,SAAS,QAAkB;AAAA,YACjD,OAAO,eAAe,WAAW,QAAc;AAAA,YAC/C,OAAO,SAAS,CAAC,MAAM,IAAI,eAAe,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAAA,UAC5D;AAAA,QACD;AAAA,MACD;AAAA,MACD,OAAO,CAAC,UAAU;AACjB,YAAI,iBAAiB,eAAgB,QAAO,MAAM;AAClD,eAAO,IAAI,aAAa;AAAA,UACvB,SAAS;AAAA,UACT,OAAO;AAAA,QACR,CAAC;AAAA,MACF;AAAA,IACD,CAAC;AAAA,EACF,CAAC,EAAE,KAAK,OAAO,MAAM;AAEtB,SAAO;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO,MAAM,OAAO,SAAS,YAAY;AAAA,EAC1C;AACD;","names":[]}

package/dist/index.cjs

@@ -59,7 +59,10 @@ function wrapClient(opts) {
   return (func, overrides) => import_effect3.Effect.tryPromise({
     try: () => func(opts.client),
     catch: (cause) => {
-      const message = overrides?.error != null ? isMessage(overrides.error) ? overrides.error : overrides.error(cause) : void 0;
+      if (overrides?.errorHandler) {
+        return overrides.errorHandler(cause);
+      }
+      const message = overrides?.errorMessage != null ? isMessage(overrides.errorMessage) ? overrides.errorMessage : overrides.errorMessage(cause) : void 0;
       return opts.error({
         cause,
         ...message != null && { message }

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/extract.ts","../src/run-promise-unwrapped.ts","../src/wrap-client.ts"],"sourcesContent":["export { extract } from './extract.js';\nexport { runPromiseUnwrapped } from './run-promise-unwrapped.js';\nexport { wrapClient } from './wrap-client.js';\n","import { Context, Effect, pipe } from \"effect\";\n\ntype InferClass<T> = T extends new (...args: any[]) => infer R ? R : never;\n\n// biome-ignore lint/suspicious/noExplicitAny: intended\nexport function extract<\n\tP extends any[],\n\tA,\n\tE,\n\tR,\n\tINFERRED_EXCLUDED extends Context.Tag<any, any> = never,\n\tEXCLUDED = InferClass<INFERRED_EXCLUDED>,\n>(\n\teffect: (...params: P) => Effect.Effect<A, E, R>,\n\toptions?: { exclude?: Array<INFERRED_EXCLUDED> }\n): Effect.Effect<\n\t(...params: P) => Effect.Effect<A, E, Extract<R, EXCLUDED>>,\n\tnever,\n\tExclude<R, EXCLUDED>\n> {\n\t// @ts-expect-error quite hard to type, check unit test\n\treturn Effect.gen(function* () {\n\t\tconst runtime = yield* Effect.runtime();\n\n\t\tconst context = runtime.context.pipe(\n\t\t\toptions?.exclude ? Context.omit(...options.exclude) : (e) => e\n\t\t) as Context.Context<Exclude<R, EXCLUDED>>;\n\n\t\treturn (...params: P) =>\n\t\t\tpipe(effect(...params), Effect.provide(context));\n\t});\n}\n","import { Cause, Effect, Exit } from \"effect\";\n\n/**\n * A simple wrapper around Effect.runPromiseExit that throws the error if it's a failure\n **/\nexport async function runPromiseUnwrapped<A, E>(\n\teffect: Effect.Effect<A, E, never>\n) {\n\tconst exit = await Effect.runPromiseExit(effect);\n\treturn Exit.match(exit, {\n\t\tonSuccess: (value) => value,\n\t\tonFailure: (cause) => {\n\t\t\tthrow Cause.isFailType(cause) ? cause.error : cause;\n\t\t},\n\t});\n}\n","import { Effect } from 'effect';\n\ntype Cause = unknown;\ntype Message = string;\nfunction isMessage(x: unknown): x is Message {\n\treturn typeof x === 'string';\n}\n\nexport function wrapClient<CLIENT, ERROR extends Error>(opts: {\n\tclient: CLIENT;\n\terror: (ctx: { cause: Cause; message?: Message }) => ERROR;\n}) {\n\treturn <OUTPUT>(\n\t\tfunc: (client: CLIENT) => Promise<OUTPUT>,\n\t\toverrides?: { error?: ((cause: Cause) => Message) | Message },\n\t) =>\n\t\tEffect.tryPromise({\n\t\t\ttry: () => func(opts.client),\n\t\t\tcatch: (cause) => {\n\t\t\t\tconst message =\n\t\t\t\t\toverrides?.error != null\n\t\t\t\t\t\t? isMessage(overrides.error)\n\t\t\t\t\t\t\t? overrides.error\n\t\t\t\t\t\t\t: overrides.error(cause)\n\t\t\t\t\t\t: undefined;\n\t\t\t\treturn opts.error({\n\t\t\t\t\tcause,\n\t\t\t\t\t...(message != null && { message }),\n\t\t\t\t});\n\t\t\t},\n\t\t});\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,oBAAsC;AAK/B,SAAS,QAQf,QACA,SAKC;AAED,SAAO,qBAAO,IAAI,aAAa;AAC9B,UAAM,UAAU,OAAO,qBAAO,QAAQ;AAEtC,UAAM,UAAU,QAAQ,QAAQ;AAAA,MAC/B,SAAS,UAAU,sBAAQ,KAAK,GAAG,QAAQ,OAAO,IAAI,CAAC,MAAM;AAAA,IAC9D;AAEA,WAAO,IAAI,eACV,oBAAK,OAAO,GAAG,MAAM,GAAG,qBAAO,QAAQ,OAAO,CAAC;AAAA,EACjD,CAAC;AACF;;;AC/BA,IAAAA,iBAAoC;AAKpC,eAAsB,oBACrB,QACC;AACD,QAAM,OAAO,MAAM,sBAAO,eAAe,MAAM;AAC/C,SAAO,oBAAK,MAAM,MAAM;AAAA,IACvB,WAAW,CAAC,UAAU;AAAA,IACtB,WAAW,CAAC,UAAU;AACrB,YAAM,qBAAM,WAAW,KAAK,IAAI,MAAM,QAAQ;AAAA,IAC/C;AAAA,EACD,CAAC;AACF;;;ACfA,IAAAC,iBAAuB;AAIvB,SAAS,UAAU,GAA0B;AAC5C,SAAO,OAAO,MAAM;AACrB;AAEO,SAAS,WAAwC,MAGrD;AACF,SAAO,CACN,MACA,cAEA,sBAAO,WAAW;AAAA,IACjB,KAAK,MAAM,KAAK,KAAK,MAAM;AAAA,IAC3B,OAAO,CAAC,UAAU;AACjB,YAAM,UACL,WAAW,SAAS,OACjB,UAAU,UAAU,KAAK,IACxB,UAAU,QACV,UAAU,MAAM,KAAK,IACtB;AACJ,aAAO,KAAK,MAAM;AAAA,QACjB;AAAA,QACA,GAAI,WAAW,QAAQ,EAAE,QAAQ;AAAA,MAClC,CAAC;AAAA,IACF;AAAA,EACD,CAAC;AACH;","names":["import_effect","import_effect"]}
+{"version":3,"sources":["../src/index.ts","../src/extract.ts","../src/run-promise-unwrapped.ts","../src/wrap-client.ts"],"sourcesContent":["export { extract } from './extract.js';\nexport { runPromiseUnwrapped } from './run-promise-unwrapped.js';\nexport { wrapClient } from './wrap-client.js';\n","import { Context, Effect, pipe } from \"effect\";\n\ntype InferClass<T> = T extends new (...args: any[]) => infer R ? R : never;\n\n// biome-ignore lint/suspicious/noExplicitAny: intended\nexport function extract<\n\tP extends any[],\n\tA,\n\tE,\n\tR,\n\tINFERRED_EXCLUDED extends Context.Tag<any, any> = never,\n\tEXCLUDED = InferClass<INFERRED_EXCLUDED>,\n>(\n\teffect: (...params: P) => Effect.Effect<A, E, R>,\n\toptions?: { exclude?: Array<INFERRED_EXCLUDED> }\n): Effect.Effect<\n\t(...params: P) => Effect.Effect<A, E, Extract<R, EXCLUDED>>,\n\tnever,\n\tExclude<R, EXCLUDED>\n> {\n\t// @ts-expect-error quite hard to type, check unit test\n\treturn Effect.gen(function* () {\n\t\tconst runtime = yield* Effect.runtime();\n\n\t\tconst context = runtime.context.pipe(\n\t\t\toptions?.exclude ? Context.omit(...options.exclude) : (e) => e\n\t\t) as Context.Context<Exclude<R, EXCLUDED>>;\n\n\t\treturn (...params: P) =>\n\t\t\tpipe(effect(...params), Effect.provide(context));\n\t});\n}\n","import { Cause, Effect, Exit } from \"effect\";\n\n/**\n * A simple wrapper around Effect.runPromiseExit that throws the error if it's a failure\n **/\nexport async function runPromiseUnwrapped<A, E>(\n\teffect: Effect.Effect<A, E, never>\n) {\n\tconst exit = await Effect.runPromiseExit(effect);\n\treturn Exit.match(exit, {\n\t\tonSuccess: (value) => value,\n\t\tonFailure: (cause) => {\n\t\t\tthrow Cause.isFailType(cause) ? cause.error : cause;\n\t\t},\n\t});\n}\n","import { Effect } from 'effect';\n\ntype Cause = unknown;\ntype Message = string;\nfunction isMessage(x: unknown): x is Message {\n\treturn typeof x === 'string';\n}\n\nexport function wrapClient<CLIENT, ERROR extends Error>(opts: {\n\tclient: CLIENT;\n\terror: (ctx: { cause: Cause; message?: Message }) => ERROR;\n}) {\n\treturn <OUTPUT, OVERRIDEN_ERROR>(\n\t\tfunc: (client: CLIENT) => Promise<OUTPUT>,\n\t\toverrides?: {\n\t\t\terrorHandler?: (cause: Cause) => OVERRIDEN_ERROR;\n\t\t\terrorMessage?: ((cause: Cause) => Message) | Message;\n\t\t},\n\t) =>\n\t\tEffect.tryPromise({\n\t\t\ttry: () => func(opts.client),\n\t\t\tcatch: (cause) => {\n\t\t\t\tif (overrides?.errorHandler) {\n\t\t\t\t\treturn overrides.errorHandler(cause);\n\t\t\t\t}\n\n\t\t\t\tconst message =\n\t\t\t\t\toverrides?.errorMessage != null\n\t\t\t\t\t\t? isMessage(overrides.errorMessage)\n\t\t\t\t\t\t\t? overrides.errorMessage\n\t\t\t\t\t\t\t: overrides.errorMessage(cause)\n\t\t\t\t\t\t: undefined;\n\t\t\t\treturn opts.error({\n\t\t\t\t\tcause,\n\t\t\t\t\t...(message != null && { message }),\n\t\t\t\t});\n\t\t\t},\n\t\t}) as Effect.Effect<\n\t\t\tOUTPUT,\n\t\t\tunknown extends OVERRIDEN_ERROR ? ERROR : OVERRIDEN_ERROR\n\t\t>;\n}"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,oBAAsC;AAK/B,SAAS,QAQf,QACA,SAKC;AAED,SAAO,qBAAO,IAAI,aAAa;AAC9B,UAAM,UAAU,OAAO,qBAAO,QAAQ;AAEtC,UAAM,UAAU,QAAQ,QAAQ;AAAA,MAC/B,SAAS,UAAU,sBAAQ,KAAK,GAAG,QAAQ,OAAO,IAAI,CAAC,MAAM;AAAA,IAC9D;AAEA,WAAO,IAAI,eACV,oBAAK,OAAO,GAAG,MAAM,GAAG,qBAAO,QAAQ,OAAO,CAAC;AAAA,EACjD,CAAC;AACF;;;AC/BA,IAAAA,iBAAoC;AAKpC,eAAsB,oBACrB,QACC;AACD,QAAM,OAAO,MAAM,sBAAO,eAAe,MAAM;AAC/C,SAAO,oBAAK,MAAM,MAAM;AAAA,IACvB,WAAW,CAAC,UAAU;AAAA,IACtB,WAAW,CAAC,UAAU;AACrB,YAAM,qBAAM,WAAW,KAAK,IAAI,MAAM,QAAQ;AAAA,IAC/C;AAAA,EACD,CAAC;AACF;;;ACfA,IAAAC,iBAAuB;AAIvB,SAAS,UAAU,GAA0B;AAC5C,SAAO,OAAO,MAAM;AACrB;AAEO,SAAS,WAAwC,MAGrD;AACF,SAAO,CACN,MACA,cAKA,sBAAO,WAAW;AAAA,IACjB,KAAK,MAAM,KAAK,KAAK,MAAM;AAAA,IAC3B,OAAO,CAAC,UAAU;AACjB,UAAI,WAAW,cAAc;AAC5B,eAAO,UAAU,aAAa,KAAK;AAAA,MACpC;AAEA,YAAM,UACL,WAAW,gBAAgB,OACxB,UAAU,UAAU,YAAY,IAC/B,UAAU,eACV,UAAU,aAAa,KAAK,IAC7B;AACJ,aAAO,KAAK,MAAM;AAAA,QACjB;AAAA,QACA,GAAI,WAAW,QAAQ,EAAE,QAAQ;AAAA,MAClC,CAAC;AAAA,IACF;AAAA,EACD,CAAC;AAIH;","names":["import_effect","import_effect"]}

package/dist/index.d.cts

@@ -18,8 +18,9 @@ declare function wrapClient<CLIENT, ERROR extends Error>(opts: {
         cause: Cause;
         message?: Message;
     }) => ERROR;
-}): <OUTPUT>(func: (client: CLIENT) => Promise<OUTPUT>, overrides?: {
-    error?: ((cause: Cause) => Message) | Message;
-}) => Effect.Effect<OUTPUT, ERROR, never>;
+}): <OUTPUT, OVERRIDEN_ERROR>(func: (client: CLIENT) => Promise<OUTPUT>, overrides?: {
+    errorHandler?: (cause: Cause) => OVERRIDEN_ERROR;
+    errorMessage?: ((cause: Cause) => Message) | Message;
+}) => Effect.Effect<OUTPUT, unknown extends OVERRIDEN_ERROR ? ERROR : OVERRIDEN_ERROR>;
 
 export { extract, runPromiseUnwrapped, wrapClient };

package/dist/index.d.ts

@@ -18,8 +18,9 @@ declare function wrapClient<CLIENT, ERROR extends Error>(opts: {
         cause: Cause;
         message?: Message;
     }) => ERROR;
-}): <OUTPUT>(func: (client: CLIENT) => Promise<OUTPUT>, overrides?: {
-    error?: ((cause: Cause) => Message) | Message;
-}) => Effect.Effect<OUTPUT, ERROR, never>;
+}): <OUTPUT, OVERRIDEN_ERROR>(func: (client: CLIENT) => Promise<OUTPUT>, overrides?: {
+    errorHandler?: (cause: Cause) => OVERRIDEN_ERROR;
+    errorMessage?: ((cause: Cause) => Message) | Message;
+}) => Effect.Effect<OUTPUT, unknown extends OVERRIDEN_ERROR ? ERROR : OVERRIDEN_ERROR>;
 
 export { extract, runPromiseUnwrapped, wrapClient };

package/dist/index.js

@@ -31,7 +31,10 @@ function wrapClient(opts) {
   return (func, overrides) => Effect3.tryPromise({
     try: () => func(opts.client),
     catch: (cause) => {
-      const message = overrides?.error != null ? isMessage(overrides.error) ? overrides.error : overrides.error(cause) : void 0;
+      if (overrides?.errorHandler) {
+        return overrides.errorHandler(cause);
+      }
+      const message = overrides?.errorMessage != null ? isMessage(overrides.errorMessage) ? overrides.errorMessage : overrides.errorMessage(cause) : void 0;
       return opts.error({
         cause,
         ...message != null && { message }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/extract.ts","../src/run-promise-unwrapped.ts","../src/wrap-client.ts"],"sourcesContent":["import { Context, Effect, pipe } from \"effect\";\n\ntype InferClass<T> = T extends new (...args: any[]) => infer R ? R : never;\n\n// biome-ignore lint/suspicious/noExplicitAny: intended\nexport function extract<\n\tP extends any[],\n\tA,\n\tE,\n\tR,\n\tINFERRED_EXCLUDED extends Context.Tag<any, any> = never,\n\tEXCLUDED = InferClass<INFERRED_EXCLUDED>,\n>(\n\teffect: (...params: P) => Effect.Effect<A, E, R>,\n\toptions?: { exclude?: Array<INFERRED_EXCLUDED> }\n): Effect.Effect<\n\t(...params: P) => Effect.Effect<A, E, Extract<R, EXCLUDED>>,\n\tnever,\n\tExclude<R, EXCLUDED>\n> {\n\t// @ts-expect-error quite hard to type, check unit test\n\treturn Effect.gen(function* () {\n\t\tconst runtime = yield* Effect.runtime();\n\n\t\tconst context = runtime.context.pipe(\n\t\t\toptions?.exclude ? Context.omit(...options.exclude) : (e) => e\n\t\t) as Context.Context<Exclude<R, EXCLUDED>>;\n\n\t\treturn (...params: P) =>\n\t\t\tpipe(effect(...params), Effect.provide(context));\n\t});\n}\n","import { Cause, Effect, Exit } from \"effect\";\n\n/**\n * A simple wrapper around Effect.runPromiseExit that throws the error if it's a failure\n **/\nexport async function runPromiseUnwrapped<A, E>(\n\teffect: Effect.Effect<A, E, never>\n) {\n\tconst exit = await Effect.runPromiseExit(effect);\n\treturn Exit.match(exit, {\n\t\tonSuccess: (value) => value,\n\t\tonFailure: (cause) => {\n\t\t\tthrow Cause.isFailType(cause) ? cause.error : cause;\n\t\t},\n\t});\n}\n","import { Effect } from 'effect';\n\ntype Cause = unknown;\ntype Message = string;\nfunction isMessage(x: unknown): x is Message {\n\treturn typeof x === 'string';\n}\n\nexport function wrapClient<CLIENT, ERROR extends Error>(opts: {\n\tclient: CLIENT;\n\terror: (ctx: { cause: Cause; message?: Message }) => ERROR;\n}) {\n\treturn <OUTPUT>(\n\t\tfunc: (client: CLIENT) => Promise<OUTPUT>,\n\t\toverrides?: { error?: ((cause: Cause) => Message) | Message },\n\t) =>\n\t\tEffect.tryPromise({\n\t\t\ttry: () => func(opts.client),\n\t\t\tcatch: (cause) => {\n\t\t\t\tconst message =\n\t\t\t\t\toverrides?.error != null\n\t\t\t\t\t\t? isMessage(overrides.error)\n\t\t\t\t\t\t\t? overrides.error\n\t\t\t\t\t\t\t: overrides.error(cause)\n\t\t\t\t\t\t: undefined;\n\t\t\t\treturn opts.error({\n\t\t\t\t\tcause,\n\t\t\t\t\t...(message != null && { message }),\n\t\t\t\t});\n\t\t\t},\n\t\t});\n}\n"],"mappings":";AAAA,SAAS,SAAS,QAAQ,YAAY;AAK/B,SAAS,QAQf,QACA,SAKC;AAED,SAAO,OAAO,IAAI,aAAa;AAC9B,UAAM,UAAU,OAAO,OAAO,QAAQ;AAEtC,UAAM,UAAU,QAAQ,QAAQ;AAAA,MAC/B,SAAS,UAAU,QAAQ,KAAK,GAAG,QAAQ,OAAO,IAAI,CAAC,MAAM;AAAA,IAC9D;AAEA,WAAO,IAAI,WACV,KAAK,OAAO,GAAG,MAAM,GAAG,OAAO,QAAQ,OAAO,CAAC;AAAA,EACjD,CAAC;AACF;;;AC/BA,SAAS,OAAO,UAAAA,SAAQ,YAAY;AAKpC,eAAsB,oBACrB,QACC;AACD,QAAM,OAAO,MAAMA,QAAO,eAAe,MAAM;AAC/C,SAAO,KAAK,MAAM,MAAM;AAAA,IACvB,WAAW,CAAC,UAAU;AAAA,IACtB,WAAW,CAAC,UAAU;AACrB,YAAM,MAAM,WAAW,KAAK,IAAI,MAAM,QAAQ;AAAA,IAC/C;AAAA,EACD,CAAC;AACF;;;ACfA,SAAS,UAAAC,eAAc;AAIvB,SAAS,UAAU,GAA0B;AAC5C,SAAO,OAAO,MAAM;AACrB;AAEO,SAAS,WAAwC,MAGrD;AACF,SAAO,CACN,MACA,cAEAA,QAAO,WAAW;AAAA,IACjB,KAAK,MAAM,KAAK,KAAK,MAAM;AAAA,IAC3B,OAAO,CAAC,UAAU;AACjB,YAAM,UACL,WAAW,SAAS,OACjB,UAAU,UAAU,KAAK,IACxB,UAAU,QACV,UAAU,MAAM,KAAK,IACtB;AACJ,aAAO,KAAK,MAAM;AAAA,QACjB;AAAA,QACA,GAAI,WAAW,QAAQ,EAAE,QAAQ;AAAA,MAClC,CAAC;AAAA,IACF;AAAA,EACD,CAAC;AACH;","names":["Effect","Effect"]}
+{"version":3,"sources":["../src/extract.ts","../src/run-promise-unwrapped.ts","../src/wrap-client.ts"],"sourcesContent":["import { Context, Effect, pipe } from \"effect\";\n\ntype InferClass<T> = T extends new (...args: any[]) => infer R ? R : never;\n\n// biome-ignore lint/suspicious/noExplicitAny: intended\nexport function extract<\n\tP extends any[],\n\tA,\n\tE,\n\tR,\n\tINFERRED_EXCLUDED extends Context.Tag<any, any> = never,\n\tEXCLUDED = InferClass<INFERRED_EXCLUDED>,\n>(\n\teffect: (...params: P) => Effect.Effect<A, E, R>,\n\toptions?: { exclude?: Array<INFERRED_EXCLUDED> }\n): Effect.Effect<\n\t(...params: P) => Effect.Effect<A, E, Extract<R, EXCLUDED>>,\n\tnever,\n\tExclude<R, EXCLUDED>\n> {\n\t// @ts-expect-error quite hard to type, check unit test\n\treturn Effect.gen(function* () {\n\t\tconst runtime = yield* Effect.runtime();\n\n\t\tconst context = runtime.context.pipe(\n\t\t\toptions?.exclude ? Context.omit(...options.exclude) : (e) => e\n\t\t) as Context.Context<Exclude<R, EXCLUDED>>;\n\n\t\treturn (...params: P) =>\n\t\t\tpipe(effect(...params), Effect.provide(context));\n\t});\n}\n","import { Cause, Effect, Exit } from \"effect\";\n\n/**\n * A simple wrapper around Effect.runPromiseExit that throws the error if it's a failure\n **/\nexport async function runPromiseUnwrapped<A, E>(\n\teffect: Effect.Effect<A, E, never>\n) {\n\tconst exit = await Effect.runPromiseExit(effect);\n\treturn Exit.match(exit, {\n\t\tonSuccess: (value) => value,\n\t\tonFailure: (cause) => {\n\t\t\tthrow Cause.isFailType(cause) ? cause.error : cause;\n\t\t},\n\t});\n}\n","import { Effect } from 'effect';\n\ntype Cause = unknown;\ntype Message = string;\nfunction isMessage(x: unknown): x is Message {\n\treturn typeof x === 'string';\n}\n\nexport function wrapClient<CLIENT, ERROR extends Error>(opts: {\n\tclient: CLIENT;\n\terror: (ctx: { cause: Cause; message?: Message }) => ERROR;\n}) {\n\treturn <OUTPUT, OVERRIDEN_ERROR>(\n\t\tfunc: (client: CLIENT) => Promise<OUTPUT>,\n\t\toverrides?: {\n\t\t\terrorHandler?: (cause: Cause) => OVERRIDEN_ERROR;\n\t\t\terrorMessage?: ((cause: Cause) => Message) | Message;\n\t\t},\n\t) =>\n\t\tEffect.tryPromise({\n\t\t\ttry: () => func(opts.client),\n\t\t\tcatch: (cause) => {\n\t\t\t\tif (overrides?.errorHandler) {\n\t\t\t\t\treturn overrides.errorHandler(cause);\n\t\t\t\t}\n\n\t\t\t\tconst message =\n\t\t\t\t\toverrides?.errorMessage != null\n\t\t\t\t\t\t? isMessage(overrides.errorMessage)\n\t\t\t\t\t\t\t? overrides.errorMessage\n\t\t\t\t\t\t\t: overrides.errorMessage(cause)\n\t\t\t\t\t\t: undefined;\n\t\t\t\treturn opts.error({\n\t\t\t\t\tcause,\n\t\t\t\t\t...(message != null && { message }),\n\t\t\t\t});\n\t\t\t},\n\t\t}) as Effect.Effect<\n\t\t\tOUTPUT,\n\t\t\tunknown extends OVERRIDEN_ERROR ? ERROR : OVERRIDEN_ERROR\n\t\t>;\n}"],"mappings":";AAAA,SAAS,SAAS,QAAQ,YAAY;AAK/B,SAAS,QAQf,QACA,SAKC;AAED,SAAO,OAAO,IAAI,aAAa;AAC9B,UAAM,UAAU,OAAO,OAAO,QAAQ;AAEtC,UAAM,UAAU,QAAQ,QAAQ;AAAA,MAC/B,SAAS,UAAU,QAAQ,KAAK,GAAG,QAAQ,OAAO,IAAI,CAAC,MAAM;AAAA,IAC9D;AAEA,WAAO,IAAI,WACV,KAAK,OAAO,GAAG,MAAM,GAAG,OAAO,QAAQ,OAAO,CAAC;AAAA,EACjD,CAAC;AACF;;;AC/BA,SAAS,OAAO,UAAAA,SAAQ,YAAY;AAKpC,eAAsB,oBACrB,QACC;AACD,QAAM,OAAO,MAAMA,QAAO,eAAe,MAAM;AAC/C,SAAO,KAAK,MAAM,MAAM;AAAA,IACvB,WAAW,CAAC,UAAU;AAAA,IACtB,WAAW,CAAC,UAAU;AACrB,YAAM,MAAM,WAAW,KAAK,IAAI,MAAM,QAAQ;AAAA,IAC/C;AAAA,EACD,CAAC;AACF;;;ACfA,SAAS,UAAAC,eAAc;AAIvB,SAAS,UAAU,GAA0B;AAC5C,SAAO,OAAO,MAAM;AACrB;AAEO,SAAS,WAAwC,MAGrD;AACF,SAAO,CACN,MACA,cAKAA,QAAO,WAAW;AAAA,IACjB,KAAK,MAAM,KAAK,KAAK,MAAM;AAAA,IAC3B,OAAO,CAAC,UAAU;AACjB,UAAI,WAAW,cAAc;AAC5B,eAAO,UAAU,aAAa,KAAK;AAAA,MACpC;AAEA,YAAM,UACL,WAAW,gBAAgB,OACxB,UAAU,UAAU,YAAY,IAC/B,UAAU,eACV,UAAU,aAAa,KAAK,IAC7B;AACJ,aAAO,KAAK,MAAM;AAAA,QACjB;AAAA,QACA,GAAI,WAAW,QAAQ,EAAE,QAAQ;AAAA,MAClC,CAAC;AAAA,IACF;AAAA,EACD,CAAC;AAIH;","names":["Effect","Effect"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ff-effect",
-	"version": "0.0.6",
+	"version": "0.0.8",
 	"type": "module",
 	"exports": {
 		".": {
@@ -20,23 +20,34 @@
 	],
 	"scripts": {
 		"build": "tsup",
-		"test": "vitest run",
+		"test": "bun -b vitest run",
 		"dev": "tsup --watch"
 	},
 	"devDependencies": {
+		"@effect/platform": "^0.94.2",
+		"@effect/platform-bun": "^0.87.1",
+		"@effect/platform-node": "^0.104.1",
 		"@effect/vitest": "^0.27.0",
+		"@libsql/client": "^0.17.0",
 		"@orpc/contract": "^1.11.3",
 		"@orpc/server": "^1.11.3",
 		"@total-typescript/tsconfig": "^1.0.4",
 		"@types/bun": "^1.3.2",
+		"@typescript/native-preview": "^7.0.0-dev.20260122.4",
 		"tsup": "^8.5.0",
 		"typescript": "^5.9.3",
 		"valibot": "^1.1.0",
 		"vitest": "^4.0.10"
 	},
 	"peerDependencies": {
+		"drizzle-orm": "^0.44.7",
 		"effect": "^3.19.3"
 	},
+	"peerDependenciesMeta": {
+		"drizzle-orm": {
+			"optional": true
+		}
+	},
 	"publishConfig": {
 		"access": "public"
 	},

package/src/for/drizzle/index.test.ts

@@ -0,0 +1,150 @@
+import { randomUUID } from 'node:crypto';
+import { FileSystem, Path } from '@effect/platform';
+import * as BunContext from '@effect/platform-bun/BunContext';
+import { describe, expect, layer } from '@effect/vitest';
+import { createClient } from '@libsql/client';
+import { sql } from 'drizzle-orm';
+import { drizzle } from 'drizzle-orm/libsql';
+import { sqliteTable, text } from 'drizzle-orm/sqlite-core';
+import { Effect } from 'effect';
+import { expectTypeOf } from 'vitest';
+import { createDatabase, DrizzleError } from './index.js';
+
+const users = sqliteTable('users', {
+	id: text('id').primaryKey(),
+	name: text('name').notNull(),
+});
+
+const schema = { users };
+
+const createTestDb = Effect.gen(function* () {
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+
+	const tmpDir = yield* fs.makeTempDirectoryScoped();
+	const dbPath = path.join(tmpDir, `test-${randomUUID()}.db`);
+
+	const client = createClient({ url: `file:${dbPath}` });
+	return drizzle(client, { schema });
+});
+
+const setupTable = (testDb: ReturnType<typeof drizzle>) =>
+	Effect.gen(function* () {
+		yield* Effect.promise(() => testDb.run(sql`DROP TABLE IF EXISTS users`));
+		yield* Effect.promise(() =>
+			testDb.run(
+				sql`CREATE TABLE users (id TEXT PRIMARY KEY, name TEXT NOT NULL)`,
+			),
+		);
+	});
+
+layer(BunContext.layer)((it) => {
+	describe('db', () => {
+		it.scoped('wraps promises and returns correct data', () =>
+			Effect.gen(function* () {
+				const testDb = yield* createTestDb;
+				yield* setupTable(testDb);
+				yield* Effect.promise(() =>
+					testDb.insert(users).values({ id: '1', name: 'Alice' }),
+				);
+
+				const database = createDatabase('test/db', Effect.succeed(testDb));
+
+				const result = yield* database
+					.db((d) => d.select().from(users))
+					.pipe(Effect.provide(database.layer));
+
+				expect(result).toEqual([{ id: '1', name: 'Alice' }]);
+			}),
+		);
+
+		it.scoped('surfaces errors as DrizzleError', () =>
+			Effect.gen(function* () {
+				const testDb = yield* createTestDb;
+
+				const database = createDatabase(
+					'test/db-error',
+					Effect.succeed(testDb),
+				);
+
+				const result = yield* database
+					.db(() => Promise.reject(new Error('DB failure')))
+					.pipe(Effect.provide(database.layer), Effect.flip);
+
+				expect(result).toBeInstanceOf(DrizzleError);
+				expect(result.message).toBe('Database operation failed');
+				expect(result.cause).toBeInstanceOf(Error);
+				expect((result.cause as Error).message).toBe('DB failure');
+			}),
+		);
+	});
+
+	describe('withTransaction', () => {
+		it.scoped('provides transaction context to nested db calls', () =>
+			Effect.gen(function* () {
+				const testDb = yield* createTestDb;
+				yield* setupTable(testDb);
+
+				const database = createDatabase('test/db-tx', Effect.succeed(testDb));
+
+				yield* Effect.gen(function* () {
+					const ok = 'ok' as const;
+					const txResult = yield* database.withTransaction(
+						Effect.gen(function* () {
+							yield* database.db((d) =>
+								d.insert(users).values({ id: '1', name: 'Bob' }),
+							);
+							yield* database.db((d) =>
+								d.insert(users).values({ id: '2', name: 'Carol' }),
+							);
+							return ok;
+						}),
+					);
+					expectTypeOf(txResult).toEqualTypeOf<typeof ok>();
+
+					const result = yield* database.db((d) => d.select().from(users));
+					expect(result).toHaveLength(2);
+					expect(result).toEqual([
+						{ id: '1', name: 'Bob' },
+						{ id: '2', name: 'Carol' },
+					]);
+				}).pipe(Effect.provide(database.layer));
+			}),
+		);
+
+		it.scoped('rolls back on error', () =>
+			Effect.gen(function* () {
+				const testDb = yield* createTestDb;
+				yield* setupTable(testDb);
+
+				const database = createDatabase(
+					'test/db-rollback',
+					Effect.succeed(testDb),
+				);
+
+				const result = yield* Effect.gen(function* () {
+					const txResult = yield* database
+						.withTransaction(
+							Effect.gen(function* () {
+								yield* database.db((d) =>
+									d.insert(users).values({ id: '1', name: 'Dave' }),
+								);
+
+								yield* database.tx((d) =>
+									d.insert(users).values({ id: '2', name: 'Bob' }),
+								);
+								return yield* Effect.fail(new Error('Intentional failure'));
+							}),
+						)
+						.pipe(Effect.either);
+
+					expect(txResult._tag).toBe('Left');
+
+					return yield* database.db((d) => d.select().from(users));
+				}).pipe(Effect.provide(database.layer));
+
+				expect(result).toEqual([]);
+			}),
+		);
+	});
+});

package/src/for/drizzle/index.ts

@@ -0,0 +1,91 @@
+import { Context, Data, Effect, FiberSet, Layer } from 'effect';
+
+// TypeScript issue where the return type of createDatabase
+// contains internal Effect types (TagTypeId) that aren't exported
+// from this module,
+// so TypeScript can't "name" them in the declaration file.
+export const TagTypeId = Context.TagTypeId;
+
+export class DrizzleError extends Data.TaggedError('ff-effect/DrizzleError')<{
+	message: string;
+	cause?: unknown;
+}> {}
+
+type AnyDrizzleClient = {
+	transaction: (fn: (tx: any) => Promise<any>) => Promise<any>;
+};
+
+type TxClient<TClient extends AnyDrizzleClient> = Parameters<
+	Parameters<TClient['transaction']>[0]
+>[0];
+
+class WrappedTxError extends Error {}
+
+export function createDatabase<
+	TAG extends string,
+	TClient extends AnyDrizzleClient,
+	E,
+	R,
+>(tagId: TAG, createClient: Effect.Effect<TClient, E, R>) {
+	type Client = TClient | TxClient<TClient>;
+	type Tx = TxClient<TClient>;
+
+	class Drizzle extends Context.Tag(tagId)<Drizzle, Client>() {}
+	const txTag = `${tagId}.tx` as const;
+	class DrizzleTx extends Context.Tag(txTag)<DrizzleTx, Tx>() {}
+
+	const db = <T>(fn: (client: Client) => Promise<T>) =>
+		Effect.gen(function* () {
+			const client = yield* Drizzle;
+			return yield* Effect.tryPromise({
+				try: () => fn(client),
+				catch: (cause) =>
+					new DrizzleError({ message: 'Database operation failed', cause }),
+			});
+		});
+
+	/** Requires being inside withTransaction - enforces transaction at compile time */
+	const tx = <T>(fn: (client: Tx) => Promise<T>) =>
+		Effect.gen(function* () {
+			const client = yield* DrizzleTx;
+			return yield* Effect.tryPromise({
+				try: () => fn(client),
+				catch: (cause) =>
+					new DrizzleError({ message: 'Database operation failed', cause }),
+			});
+		});
+
+	const withTransaction = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+		Effect.gen(function* () {
+			const client = yield* Drizzle;
+			const runFork =
+				yield* FiberSet.makeRuntimePromise<Exclude<R, DrizzleTx>>();
+
+			return yield* Effect.tryPromise<A, E | DrizzleError>({
+				try: () =>
+					(client as TClient).transaction((txClient) =>
+						runFork(
+							effect.pipe(
+								Effect.provideService(Drizzle, txClient as Client),
+								Effect.provideService(DrizzleTx, txClient as Tx),
+								Effect.mapError((e) => new WrappedTxError('', { cause: e })),
+							) as Effect.Effect<A, WrappedTxError, Exclude<R, DrizzleTx>>,
+						),
+					),
+				catch: (error) => {
+					if (error instanceof WrappedTxError) return error.cause as E;
+					return new DrizzleError({
+						message: 'Transaction failed',
+						cause: error,
+					});
+				},
+			});
+		}).pipe(Effect.scoped);
+
+	return {
+		db,
+		tx,
+		withTransaction,
+		layer: Layer.effect(Drizzle, createClient),
+	};
+}

package/src/wrap-client.test.ts

@@ -1,5 +1,5 @@
-import { Effect } from 'effect';
-import { expect, test } from 'vitest';
+import { Data, Effect } from 'effect';
+import { describe, expect, test } from 'vitest';
 import { wrapClient } from './wrap-client.js';
 
 class TestError extends Error {
@@ -28,60 +28,87 @@ test('resolves successfully', () =>
 		expect(result).toBe('test-value');
 	}).pipe(Effect.runPromise));
 
-test('rejects without message when no overrides provided', () =>
-	Effect.gen(function* () {
-		const client: TestClient = { value: 'test-value' };
-		const wrap = wrapClient({
-			client,
-			error: ({ cause, message }) => new TestError(cause, message),
-		});
-
-		const causedBy = new Error('original error');
-		const effect = wrap(() => Promise.reject(causedBy));
-
-		const result = yield* Effect.flip(effect);
-
-		expect(result).toBeInstanceOf(TestError);
-		expect(result._cause).toBe(causedBy);
-		expect(result._message).toBeUndefined();
-	}).pipe(Effect.runPromise));
-
-test('rejects with string override', () =>
-	Effect.gen(function* () {
-		const client: TestClient = { value: 'test-value' };
-		const wrap = wrapClient({
-			client,
-			error: ({ cause, message }) => new TestError(cause, message),
-		});
-
-		const causedBy = new Error('original error');
-		const effect = wrap(() => Promise.reject(causedBy), {
-			error: 'custom message',
-		});
-
-		const result = yield* Effect.flip(effect);
-
-		expect(result).toBeInstanceOf(TestError);
-		expect(result._cause).toBe(causedBy);
-		expect(result._message).toBe('custom message');
-	}).pipe(Effect.runPromise));
-
-test('rejects with function override', () =>
-	Effect.gen(function* () {
-		const client: TestClient = { value: 'test-value' };
-		const wrap = wrapClient({
-			client,
-			error: ({ cause, message }) => new TestError(cause, message),
-		});
-
-		const causedBy = new Error('original error');
-		const effect = wrap(() => Promise.reject(causedBy), {
-			error: (cause) => `Error: ${(cause as Error).message}`,
-		});
-
-		const result = yield* Effect.flip(effect);
-
-		expect(result).toBeInstanceOf(TestError);
-		expect(result._cause).toBe(causedBy);
-		expect(result._message).toBe('Error: original error');
-	}).pipe(Effect.runPromise));
+describe('rejects', () => {
+	test('default - rejects without message when no overrides provided', () =>
+		Effect.gen(function* () {
+			const client: TestClient = { value: 'test-value' };
+			const wrap = wrapClient({
+				client,
+				error: ({ cause, message }) => new TestError(cause, message),
+			});
+
+			const causedBy = new Error('original error');
+			const effect = wrap(() => Promise.reject(causedBy));
+
+			const result = yield* Effect.flip(effect);
+
+			expect(result).toBeInstanceOf(TestError);
+			expect(result._cause).toBe(causedBy);
+			expect(result._message).toBeUndefined();
+		}).pipe(Effect.runPromise));
+
+	test('errorHandler override', () =>
+		Effect.gen(function* () {
+			class CustomError extends Data.TaggedError('CustomError')<{
+				cause: unknown;
+			}> {}
+
+			const client: TestClient = { value: 'test-value' };
+			const wrap = wrapClient({
+				client,
+				error: ({ cause, message }) => new TestError(cause, message),
+			});
+
+			const causedBy = new Error('original error');
+			const effect = wrap(() => Promise.reject(causedBy), {
+				errorHandler: (cause) => new CustomError({ cause }),
+			});
+
+			const result = yield* Effect.flip(effect);
+
+			expect(result).toBeInstanceOf(CustomError);
+			expect(result.cause).toBe(causedBy);
+		}).pipe(Effect.runPromise));
+
+	describe('errorMessage override', () => {
+		test('string', () =>
+			Effect.gen(function* () {
+				const client: TestClient = { value: 'test-value' };
+				const wrap = wrapClient({
+					client,
+					error: ({ cause, message }) => new TestError(cause, message),
+				});
+
+				const causedBy = new Error('original error');
+				const effect = wrap(() => Promise.reject(causedBy), {
+					errorMessage: 'custom message',
+				});
+
+				const result = yield* Effect.flip(effect);
+
+				expect(result).toBeInstanceOf(TestError);
+				expect(result._cause).toBe(causedBy);
+				expect(result._message).toBe('custom message');
+			}).pipe(Effect.runPromise));
+
+		test('handler', () =>
+			Effect.gen(function* () {
+				const client: TestClient = { value: 'test-value' };
+				const wrap = wrapClient({
+					client,
+					error: ({ cause, message }) => new TestError(cause, message),
+				});
+
+				const causedBy = new Error('original error');
+				const effect = wrap(() => Promise.reject(causedBy), {
+					errorMessage: (cause) => `Error: ${(cause as Error).message}`,
+				});
+
+				const result = yield* Effect.flip(effect);
+
+				expect(result).toBeInstanceOf(TestError);
+				expect(result._cause).toBe(causedBy);
+				expect(result._message).toBe('Error: original error');
+			}).pipe(Effect.runPromise));
+	});
+});

package/src/wrap-client.ts

@@ -10,23 +10,33 @@ export function wrapClient<CLIENT, ERROR extends Error>(opts: {
 	client: CLIENT;
 	error: (ctx: { cause: Cause; message?: Message }) => ERROR;
 }) {
-	return <OUTPUT>(
+	return <OUTPUT, OVERRIDEN_ERROR>(
 		func: (client: CLIENT) => Promise<OUTPUT>,
-		overrides?: { error?: ((cause: Cause) => Message) | Message },
+		overrides?: {
+			errorHandler?: (cause: Cause) => OVERRIDEN_ERROR;
+			errorMessage?: ((cause: Cause) => Message) | Message;
+		},
 	) =>
 		Effect.tryPromise({
 			try: () => func(opts.client),
 			catch: (cause) => {
+				if (overrides?.errorHandler) {
+					return overrides.errorHandler(cause);
+				}
+
 				const message =
-					overrides?.error != null
-						? isMessage(overrides.error)
-							? overrides.error
-							: overrides.error(cause)
+					overrides?.errorMessage != null
+						? isMessage(overrides.errorMessage)
+							? overrides.errorMessage
+							: overrides.errorMessage(cause)
 						: undefined;
 				return opts.error({
 					cause,
 					...(message != null && { message }),
 				});
 			},
-		});
-}
+		}) as Effect.Effect<
+			OUTPUT,
+			unknown extends OVERRIDEN_ERROR ? ERROR : OVERRIDEN_ERROR
+		>;
+}