@zokugun/xtry 0.7.1 → 0.7.2

package/lib/cjs/async.d.cts

@@ -1,3 +1,4 @@
+export type { XDeferAsync, XDeferSync } from './defer.cjs';
 export { xdefer as xdeferUnknown, xdeferAsync as xdefer, xdeferSync } from './defer.cjs';
 export type { YResult, YSuccess, YFailure } from './partial.cjs';
 export { yok, yerr, yres as yresUnknown, yresAsync as yres, yresSync, yep, YOK, YOK_NULL, YOK_TRUE, YOK_FALSE } from './partial.cjs';

package/lib/cjs/defer.cjs

@@ -5,7 +5,7 @@ exports.xdeferAsync = xdeferAsync;
 exports.xdeferSync = xdeferSync;
 const result_js_1 = require("./result.cjs");
 const is_promise_like_js_1 = require("./utils/is-promise-like.cjs");
-function xdefer(callback) {
+function xdefer(callback, bind, ...args) {
     // eslint-disable-next-line @typescript-eslint/promise-function-async
     return ((result) => {
         const finalize = (deferResult) => {
@@ -17,16 +17,36 @@ function xdefer(callback) {
             }
             return (result) ?? (0, result_js_1.ok)();
         };
-        const deferredValue = callback instanceof Function ? callback() : callback;
+        let deferredValue;
+        if (callback instanceof Function) {
+            if (bind) {
+                deferredValue = Reflect.apply(callback, bind, args);
+            }
+            else {
+                deferredValue = callback(...args);
+            }
+        }
+        else {
+            deferredValue = callback;
+        }
         if ((0, is_promise_like_js_1.isPromiseLike)(deferredValue)) {
             return Promise.resolve(deferredValue).then(finalize);
         }
         return finalize(deferredValue);
     });
 }
-function xdeferAsync(callback) {
+function xdeferAsync(callback, bind, ...args) {
     return (async (result) => {
-        const deferResult = await (callback instanceof Promise ? callback : callback());
+        let deferResult;
+        if (callback instanceof Promise) {
+            deferResult = await callback;
+        }
+        else if (bind) {
+            deferResult = await callback.apply(bind, args);
+        }
+        else {
+            deferResult = await callback(...args);
+        }
         if (deferResult.fails) {
             if (result?.fails) {
                 return result;
@@ -36,9 +56,9 @@ function xdeferAsync(callback) {
         return result ?? (0, result_js_1.ok)();
     });
 }
-function xdeferSync(callback) {
+function xdeferSync(callback, bind, ...args) {
     return ((result) => {
-        const deferResult = callback();
+        const deferResult = bind ? callback.apply(bind, args) : callback(...args);
         if (deferResult.fails) {
             if (result?.fails) {
                 return result;

package/lib/cjs/defer.d.cts

@@ -1,19 +1,20 @@
 import { type Failure, type Result, type Success } from './result.cjs';
-import { type NonPromiseCallback, type PromiseCallback } from './utils/types.cjs';
-type DeferAsync<E> = {
+import { type NonPromiseCallback } from './utils/types.cjs';
+export type XDeferAsync<E> = {
     (): Promise<Success<void>>;
     <T>(result: Success<T>): Promise<Result<T, E>>;
     <F>(result: Failure<F>): Promise<Failure<F>>;
     <T, F>(result: Result<T, F>): Promise<Result<T, E | F>>;
 };
-type DeferSync<E> = {
+export type XDeferSync<E> = {
     (): Success<void>;
     <T>(result: Success<T>): Result<T, E>;
     <F>(result: Failure<F>): Failure<F>;
     <T, F>(result: Result<T, F>): Result<T, E | F>;
 };
-export declare function xdefer<E>(callback: NonPromiseCallback<Result<unknown, E>>): DeferSync<E>;
-export declare function xdefer<E>(callback: PromiseCallback<Result<unknown, E>>): DeferAsync<E>;
-export declare function xdeferAsync<E>(callback: PromiseCallback<Result<unknown, E>>): DeferAsync<E>;
-export declare function xdeferSync<E>(callback: NonPromiseCallback<Result<unknown, E>>): DeferSync<E>;
-export {};
+export declare function xdefer<E, Args extends unknown[]>(callback: NonPromiseCallback<Result<unknown, E>, Args>, bind?: object, ...args: Args): XDeferSync<E>;
+export declare function xdefer<E>(callback: Promise<Result<unknown, E>>): XDeferAsync<E>;
+export declare function xdefer<E, Args extends unknown[]>(callback: (...args: Args) => Promise<Result<unknown, E>>, bind?: object, ...args: Args): XDeferAsync<E>;
+export declare function xdeferAsync<E>(callback: Promise<Result<unknown, E>>): XDeferAsync<E>;
+export declare function xdeferAsync<E, Args extends unknown[]>(callback: (...args: Args) => Promise<Result<unknown, E>>, bind?: object, ...args: Args): XDeferAsync<E>;
+export declare function xdeferSync<E, Args extends unknown[]>(callback: NonPromiseCallback<Result<unknown, E>, Args>, bind?: object, ...args: Args): XDeferSync<E>;

package/lib/cjs/index.d.cts

@@ -1,3 +1,4 @@
+export type { XDeferAsync, XDeferSync } from './defer.cjs';
 export { xdefer, xdeferAsync, xdeferSync } from './defer.cjs';
 export type { YResult, YSuccess, YFailure } from './partial.cjs';
 export { yok, yerr, yres, yresAsync, yresSync, yep, YOK, YOK_NULL, YOK_TRUE, YOK_FALSE } from './partial.cjs';

package/lib/cjs/sync.d.cts

@@ -1,3 +1,4 @@
+export type { XDeferAsync, XDeferSync } from './defer.cjs';
 export { xdefer as xdeferUnknown, xdeferAsync, xdeferSync as xdefer } from './defer.cjs';
 export type { YResult, YSuccess, YFailure } from './partial.cjs';
 export { yok, yerr, yres as yresUnknown, yresAsync, yresSync as yres, yep, YOK, YOK_NULL, YOK_TRUE, YOK_FALSE } from './partial.cjs';

package/lib/cjs/utils/types.d.cts

@@ -1,5 +1,5 @@
 export type NotPromise<T> = Exclude<T, Promise<unknown>>;
-export type NonPromiseCallback<T> = () => NotPromise<T>;
-export type PromiseCallback<T> = (() => Promise<T>) | Promise<T>;
-export type Callback<T> = NonPromiseCallback<T> | PromiseCallback<T>;
+export type NonPromiseCallback<T, Args extends unknown[] = []> = (...args: Args) => NotPromise<T>;
+export type PromiseCallback<T, Args extends unknown[] = []> = ((...args: Args) => Promise<T>) | Promise<T>;
+export type Callback<T, Args extends unknown[] = []> = NonPromiseCallback<T, Args> | PromiseCallback<T, Args>;
 export type MaybePromise<T> = T | Promise<T>;

package/lib/esm/async.d.mts

@@ -1,3 +1,4 @@
+export type { XDeferAsync, XDeferSync } from './defer.mjs';
 export { xdefer as xdeferUnknown, xdeferAsync as xdefer, xdeferSync } from './defer.mjs';
 export type { YResult, YSuccess, YFailure } from './partial.mjs';
 export { yok, yerr, yres as yresUnknown, yresAsync as yres, yresSync, yep, YOK, YOK_NULL, YOK_TRUE, YOK_FALSE } from './partial.mjs';

package/lib/esm/defer.d.mts

@@ -1,19 +1,20 @@
 import { type Failure, type Result, type Success } from './result.mjs';
-import { type NonPromiseCallback, type PromiseCallback } from './utils/types.mjs';
-type DeferAsync<E> = {
+import { type NonPromiseCallback } from './utils/types.mjs';
+export type XDeferAsync<E> = {
     (): Promise<Success<void>>;
     <T>(result: Success<T>): Promise<Result<T, E>>;
     <F>(result: Failure<F>): Promise<Failure<F>>;
     <T, F>(result: Result<T, F>): Promise<Result<T, E | F>>;
 };
-type DeferSync<E> = {
+export type XDeferSync<E> = {
     (): Success<void>;
     <T>(result: Success<T>): Result<T, E>;
     <F>(result: Failure<F>): Failure<F>;
     <T, F>(result: Result<T, F>): Result<T, E | F>;
 };
-export declare function xdefer<E>(callback: NonPromiseCallback<Result<unknown, E>>): DeferSync<E>;
-export declare function xdefer<E>(callback: PromiseCallback<Result<unknown, E>>): DeferAsync<E>;
-export declare function xdeferAsync<E>(callback: PromiseCallback<Result<unknown, E>>): DeferAsync<E>;
-export declare function xdeferSync<E>(callback: NonPromiseCallback<Result<unknown, E>>): DeferSync<E>;
-export {};
+export declare function xdefer<E, Args extends unknown[]>(callback: NonPromiseCallback<Result<unknown, E>, Args>, bind?: object, ...args: Args): XDeferSync<E>;
+export declare function xdefer<E>(callback: Promise<Result<unknown, E>>): XDeferAsync<E>;
+export declare function xdefer<E, Args extends unknown[]>(callback: (...args: Args) => Promise<Result<unknown, E>>, bind?: object, ...args: Args): XDeferAsync<E>;
+export declare function xdeferAsync<E>(callback: Promise<Result<unknown, E>>): XDeferAsync<E>;
+export declare function xdeferAsync<E, Args extends unknown[]>(callback: (...args: Args) => Promise<Result<unknown, E>>, bind?: object, ...args: Args): XDeferAsync<E>;
+export declare function xdeferSync<E, Args extends unknown[]>(callback: NonPromiseCallback<Result<unknown, E>, Args>, bind?: object, ...args: Args): XDeferSync<E>;

package/lib/esm/defer.mjs

@@ -1,6 +1,6 @@
 import { ok } from './result.mjs';
 import { isPromiseLike } from './utils/is-promise-like.mjs';
-export function xdefer(callback) {
+export function xdefer(callback, bind, ...args) {
     // eslint-disable-next-line @typescript-eslint/promise-function-async
     return ((result) => {
         const finalize = (deferResult) => {
@@ -12,16 +12,36 @@ export function xdefer(callback) {
             }
             return (result) ?? ok();
         };
-        const deferredValue = callback instanceof Function ? callback() : callback;
+        let deferredValue;
+        if (callback instanceof Function) {
+            if (bind) {
+                deferredValue = Reflect.apply(callback, bind, args);
+            }
+            else {
+                deferredValue = callback(...args);
+            }
+        }
+        else {
+            deferredValue = callback;
+        }
         if (isPromiseLike(deferredValue)) {
             return Promise.resolve(deferredValue).then(finalize);
         }
         return finalize(deferredValue);
     });
 }
-export function xdeferAsync(callback) {
+export function xdeferAsync(callback, bind, ...args) {
     return (async (result) => {
-        const deferResult = await (callback instanceof Promise ? callback : callback());
+        let deferResult;
+        if (callback instanceof Promise) {
+            deferResult = await callback;
+        }
+        else if (bind) {
+            deferResult = await callback.apply(bind, args);
+        }
+        else {
+            deferResult = await callback(...args);
+        }
         if (deferResult.fails) {
             if (result?.fails) {
                 return result;
@@ -31,9 +51,9 @@ export function xdeferAsync(callback) {
         return result ?? ok();
     });
 }
-export function xdeferSync(callback) {
+export function xdeferSync(callback, bind, ...args) {
     return ((result) => {
-        const deferResult = callback();
+        const deferResult = bind ? callback.apply(bind, args) : callback(...args);
         if (deferResult.fails) {
             if (result?.fails) {
                 return result;

package/lib/esm/index.d.mts

@@ -1,3 +1,4 @@
+export type { XDeferAsync, XDeferSync } from './defer.mjs';
 export { xdefer, xdeferAsync, xdeferSync } from './defer.mjs';
 export type { YResult, YSuccess, YFailure } from './partial.mjs';
 export { yok, yerr, yres, yresAsync, yresSync, yep, YOK, YOK_NULL, YOK_TRUE, YOK_FALSE } from './partial.mjs';

package/lib/esm/sync.d.mts

@@ -1,3 +1,4 @@
+export type { XDeferAsync, XDeferSync } from './defer.mjs';
 export { xdefer as xdeferUnknown, xdeferAsync, xdeferSync as xdefer } from './defer.mjs';
 export type { YResult, YSuccess, YFailure } from './partial.mjs';
 export { yok, yerr, yres as yresUnknown, yresAsync, yresSync as yres, yep, YOK, YOK_NULL, YOK_TRUE, YOK_FALSE } from './partial.mjs';

package/lib/esm/utils/types.d.mts

@@ -1,5 +1,5 @@
 export type NotPromise<T> = Exclude<T, Promise<unknown>>;
-export type NonPromiseCallback<T> = () => NotPromise<T>;
-export type PromiseCallback<T> = (() => Promise<T>) | Promise<T>;
-export type Callback<T> = NonPromiseCallback<T> | PromiseCallback<T>;
+export type NonPromiseCallback<T, Args extends unknown[] = []> = (...args: Args) => NotPromise<T>;
+export type PromiseCallback<T, Args extends unknown[] = []> = ((...args: Args) => Promise<T>) | Promise<T>;
+export type Callback<T, Args extends unknown[] = []> = NonPromiseCallback<T, Args> | PromiseCallback<T, Args>;
 export type MaybePromise<T> = T | Promise<T>;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@zokugun/xtry",
 	"description": "simple try/catch wrapper returning Result",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"author": {
 		"name": "Baptiste Augrain",
 		"email": "daiyam@zokugun.org"