klubok 0.4.2 → 0.4.4

package/dist/index.js

@@ -16,17 +16,47 @@ exports.onError = onError;
 function klubok(...fns) {
     const funcs = fns.filter(f => !f.onError);
     const onError = fns.find(f => f.onError);
-    return (rootCtx = {}, mock, only) => {
+    return async (rootCtx = {}, mock, only) => {
         let isExit = false;
-        return funcs.reduce(mock == null && only == null
-            ? (acc, fn) => acc.then(ctx => !fn.mutable && Reflect.has(ctx, fn.key)
-                ? Promise.reject(new Error(`Try to override existing alias "${fn.key}". Let's rename alias or use "mut" wrapper`))
+        if (mock == null && only == null) {
+            let ctx = rootCtx;
+            for (const fn of funcs) {
+                if (!fn.mutable && ctx[fn.key]) {
+                    throw new Error(`Try to override existing alias "${fn.key}". Let's rename alias or use "mut" wrapper`);
+                }
+                if (isExit) {
+                    break;
+                }
+                try {
+                    const resp = await fn(ctx);
+                    if (fn.exitable && resp) {
+                        isExit = true;
+                    }
+                    ctx = { ...ctx, [fn.key]: resp };
+                }
+                catch (error) {
+                    await onError?.({ ...ctx, $error: error });
+                    if (error instanceof Error) {
+                        error.stack += '\ncontext: ' + (0, node_util_1.inspect)(ctx);
+                    }
+                    throw error;
+                }
+            }
+            return ctx;
+        }
+        return funcs.reduce((acc, fn) => acc.then(ctx => !fn.mutable && Reflect.has(ctx, fn.key) && !Reflect.has(mock ?? {}, fn.key)
+            ? Promise.reject(new Error(`Try to override existing alias "${fn.key}". Let's rename alias or use "mut" wrapper`))
+            : (mock && Reflect.has(mock, fn.key) && typeof Reflect.get(mock, fn.key) !== 'function') ||
+                (only && only.length && !only.includes(fn.key))
+                ? ctx
                 : (async () => {
                     try {
                         if (isExit) {
                             return ctx;
                         }
-                        return await Promise.resolve(fn(ctx)).then(resp => (fn.exitable && resp && (isExit = true), { ...ctx, [fn.key]: resp }));
+                        return await Promise.resolve(mock && Reflect.has(mock, fn.key) && typeof Reflect.get(mock, fn.key) === 'function'
+                            ? Reflect.get(mock, fn.key)(ctx)
+                            : fn(ctx)).then(resp => (fn.exitable && resp && (isExit = true), { ...ctx, [fn.key]: resp }));
                     }
                     catch (error) {
                         await onError?.({ ...ctx, $error: error });
@@ -35,28 +65,6 @@ function klubok(...fns) {
                         }
                         throw error;
                     }
-                })())
-            : (acc, fn) => acc.then(ctx => !fn.mutable && Reflect.has(ctx, fn.key) && !Reflect.has(mock ?? {}, fn.key)
-                ? Promise.reject(new Error(`Try to override existing alias "${fn.key}". Let's rename alias or use "mut" wrapper`))
-                : (mock && Reflect.has(mock, fn.key) && typeof Reflect.get(mock, fn.key) !== 'function') ||
-                    (only && only.length && !only.includes(fn.key))
-                    ? ctx
-                    : (async () => {
-                        try {
-                            if (isExit) {
-                                return ctx;
-                            }
-                            return await Promise.resolve(mock && Reflect.has(mock, fn.key) && typeof Reflect.get(mock, fn.key) === 'function'
-                                ? Reflect.get(mock, fn.key)(ctx)
-                                : fn(ctx)).then(resp => (fn.exitable && resp && (isExit = true), { ...ctx, [fn.key]: resp }));
-                        }
-                        catch (error) {
-                            await onError?.({ ...ctx, $error: error });
-                            if (error instanceof Error) {
-                                error.stack += '\ncontext: ' + (0, node_util_1.inspect)(ctx);
-                            }
-                            throw error;
-                        }
-                    })()), Promise.resolve({ ...rootCtx, ...mock }));
+                })()), Promise.resolve({ ...rootCtx, ...mock }));
     };
 }

package/package.json

@@ -1,20 +1,21 @@
 {
   "name": "klubok",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Do notation pipes for Promise-based or pure functions which easy to mock",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "git@github.com:darky/klubok.git"
+    "url": "git+ssh://git@github.com/darky/klubok.git"
   },
   "files": [
     "dist/index.js",
     "dist/index.d.ts"
   ],
   "scripts": {
+    "bench": "node ./bench.ts",
     "build": "rm -rf dist && tsc",
-    "test": "node --experimental-strip-types --test ./test.ts",
+    "test": "node --test ./test.ts",
     "test:types": "cp index.test-d.ts ./dist/ && npx tsd",
     "prepublishOnly": "npm run build"
   },
@@ -33,8 +34,10 @@
   "author": "Vladislav Botvin",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^22.10.6",
-    "tsd": "^0.31.2",
-    "typescript": "^5.7.3"
+    "@types/node": "^22.15.3",
+    "klubok": "0.4.3",
+    "tinybench": "^4.0.1",
+    "tsd": "^0.32.0",
+    "typescript": "^5.8.3"
   }
 }