ff-effect 0.0.6 → 0.0.7

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.7",
 	"type": "module",
 	"exports": {
 		".": {

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
+		>;
+}