@nlozgachev/pipelined 0.27.0 → 0.29.0

package/dist/utils.js

@@ -43,18 +43,18 @@ var Deferred;
 var Result;
 ((Result2) => {
   Result2.ok = (value) => ({ kind: "Ok", value });
-  Result2.err = (error) => ({ kind: "Error", error });
+  Result2.error = (e) => ({ kind: "Error", error: e });
   Result2.isOk = (data) => data.kind === "Ok";
-  Result2.isErr = (data) => data.kind === "Error";
+  Result2.isError = (data) => data.kind === "Error";
   Result2.tryCatch = (f, onError) => {
     try {
       return (0, Result2.ok)(f());
     } catch (e) {
-      return (0, Result2.err)(onError(e));
+      return (0, Result2.error)(onError(e));
     }
   };
   Result2.map = (f) => (data) => (0, Result2.isOk)(data) ? (0, Result2.ok)(f(data.value)) : data;
-  Result2.mapError = (f) => (data) => (0, Result2.isErr)(data) ? (0, Result2.err)(f(data.error)) : data;
+  Result2.mapError = (f) => (data) => (0, Result2.isError)(data) ? (0, Result2.error)(f(data.error)) : data;
   Result2.chain = (f) => (data) => (0, Result2.isOk)(data) ? f(data.value) : data;
   Result2.fold = (onErr, onOk) => (data) => (0, Result2.isOk)(data) ? onOk(data.value) : onErr(data.error);
   Result2.match = (cases) => (data) => (0, Result2.isOk)(data) ? cases.ok(data.value) : cases.err(data.error);
@@ -64,14 +64,14 @@ var Result;
     return data;
   };
   Result2.tapError = (f) => (data) => {
-    if ((0, Result2.isErr)(data)) f(data.error);
+    if ((0, Result2.isError)(data)) f(data.error);
     return data;
   };
-  Result2.fromPredicate = (pred, onFalse) => (a) => pred(a) ? (0, Result2.ok)(a) : (0, Result2.err)(onFalse(a));
+  Result2.fromPredicate = (pred, onFalse) => (a) => pred(a) ? (0, Result2.ok)(a) : (0, Result2.error)(onFalse(a));
   Result2.recover = (fallback) => (data) => (0, Result2.isOk)(data) ? data : fallback(data.error);
-  Result2.recoverUnless = (blockedErr, fallback) => (data) => (0, Result2.isErr)(data) && data.error !== blockedErr ? fallback() : data;
+  Result2.recoverUnless = (isBlocked, fallback) => (data) => (0, Result2.isError)(data) && !isBlocked(data.error) ? fallback() : data;
   Result2.toMaybe = (data) => (0, Result2.isOk)(data) ? Maybe.some(data.value) : Maybe.none();
-  Result2.ap = (arg) => (data) => (0, Result2.isOk)(data) && (0, Result2.isOk)(arg) ? (0, Result2.ok)(data.value(arg.value)) : (0, Result2.isErr)(data) ? data : arg;
+  Result2.ap = (arg) => (data) => (0, Result2.isOk)(data) && (0, Result2.isOk)(arg) ? (0, Result2.ok)(data.value(arg.value)) : (0, Result2.isError)(data) ? data : arg;
 })(Result || (Result = {}));
 
 // src/Core/Maybe.ts
@@ -85,9 +85,8 @@ var Maybe;
   Maybe2.fromNullable = (value) => value === null || value === void 0 ? (0, Maybe2.none)() : (0, Maybe2.some)(value);
   Maybe2.toNullable = (data) => (0, Maybe2.isSome)(data) ? data.value : null;
   Maybe2.toUndefined = (data) => (0, Maybe2.isSome)(data) ? data.value : void 0;
-  Maybe2.fromUndefined = (value) => value === void 0 ? (0, Maybe2.none)() : (0, Maybe2.some)(value);
   Maybe2.fromPredicate = (pred) => (a) => pred(a) ? (0, Maybe2.some)(a) : (0, Maybe2.none)();
-  Maybe2.toResult = (onNone) => (data) => (0, Maybe2.isSome)(data) ? Result.ok(data.value) : Result.err(onNone());
+  Maybe2.toResult = (onNone) => (data) => (0, Maybe2.isSome)(data) ? Result.ok(data.value) : Result.error(onNone());
   Maybe2.fromResult = (data) => Result.isOk(data) ? (0, Maybe2.some)(data.value) : (0, Maybe2.none)();
   Maybe2.map = (f) => (data) => (0, Maybe2.isSome)(data) ? (0, Maybe2.some)(f(data.value)) : data;
   Maybe2.chain = (f) => (data) => (0, Maybe2.isSome)(data) ? f(data.value) : data;
@@ -140,21 +139,22 @@ var Task;
     if (times <= 0) return Promise.resolve([]);
     const results = [];
     const wait = () => ms !== void 0 && ms > 0 ? new Promise((r) => setTimeout(r, ms)) : Promise.resolve();
-    const run = (left) => toPromise(task, signal).then((a) => {
+    const run2 = (left) => toPromise(task, signal).then((a) => {
       results.push(a);
       if (left <= 1) return results;
-      return wait().then(() => run(left - 1));
+      return wait().then(() => run2(left - 1));
     });
-    return run(times);
+    return run2(times);
   });
   Task2.repeatUntil = (options) => (task) => (0, Task2.from)((signal) => {
-    const { when: predicate, delay: ms } = options;
+    const { when: predicate, delay: ms, maxAttempts } = options;
     const wait = () => ms !== void 0 && ms > 0 ? new Promise((r) => setTimeout(r, ms)) : Promise.resolve();
-    const run = () => toPromise(task, signal).then((a) => {
+    const run2 = (attempt) => toPromise(task, signal).then((a) => {
       if (predicate(a)) return a;
-      return wait().then(run);
+      if (maxAttempts !== void 0 && attempt >= maxAttempts) return a;
+      return wait().then(() => run2(attempt + 1));
     });
-    return run();
+    return run2(1);
   });
   Task2.race = (tasks) => (0, Task2.from)((signal) => Promise.race(tasks.map((t) => toPromise(t, signal))));
   Task2.sequential = (tasks) => (0, Task2.from)(async (signal) => {
@@ -179,14 +179,18 @@ var Task;
         timerId = setTimeout(() => {
           controller.abort();
           outerSignal?.removeEventListener("abort", onOuterAbort);
-          resolve2(Result.err(onTimeout()));
+          resolve2(Result.error(onTimeout()));
         }, ms);
       })
     ]);
   });
   Task2.abortable = (factory) => {
-    const controller = new AbortController();
+    let currentController = null;
+    const abort = () => currentController?.abort();
     const task = (outerSignal) => {
+      currentController?.abort();
+      currentController = new AbortController();
+      const controller = currentController;
       if (outerSignal) {
         if (outerSignal.aborted) {
           controller.abort(outerSignal.reason);
@@ -196,8 +200,9 @@ var Task;
       }
       return Deferred.fromPromise(factory(controller.signal));
     };
-    return { task, abort: () => controller.abort() };
+    return { task, abort };
   };
+  Task2.run = (signal) => (task) => Deferred.toPromise(task(signal));
 })(Task || (Task = {}));
 
 // src/Types/NonEmptyList.ts
@@ -361,7 +366,7 @@ var Arr;
     const result = [];
     for (const a of data) {
       const r = await Deferred.toPromise(f(a)());
-      if (Result.isErr(r)) return r;
+      if (Result.isError(r)) return r;
       result.push(r.value);
     }
     return Result.ok(result);
@@ -502,6 +507,14 @@ var Dict;
     }
     return result;
   };
+  Dict2.filterMap = (f) => (m) => {
+    const result = new globalThis.Map();
+    for (const [key, value] of m) {
+      const mapped = f(value);
+      if (mapped.kind === "Some") result.set(key, mapped.value);
+    }
+    return result;
+  };
   Dict2.union = (other) => (m) => {
     const result = new globalThis.Map(m);
     for (const [k, v] of other) {
@@ -562,13 +575,13 @@ var Num;
   Num2.add = (b) => (a) => a + b;
   Num2.subtract = (b) => (a) => a - b;
   Num2.multiply = (b) => (a) => a * b;
-  Num2.divide = (b) => (a) => a / b;
+  Num2.divide = (b) => (a) => b === 0 ? Maybe.none() : Maybe.some(a / b);
   Num2.abs = (n) => Math.abs(n);
   Num2.negate = (n) => -n;
   Num2.round = (n) => Math.round(n);
   Num2.floor = (n) => Math.floor(n);
   Num2.ceil = (n) => Math.ceil(n);
-  Num2.remainder = (divisor) => (n) => n % divisor;
+  Num2.remainder = (divisor) => (n) => divisor === 0 ? Maybe.none() : Maybe.some(n % divisor);
 })(Num || (Num = {}));
 
 // src/Utils/Rec.ts

package/dist/utils.mjs

@@ -5,8 +5,8 @@ import {
   Rec,
   Str,
   Uniq
-} from "./chunk-SBTMTAZF.mjs";
-import "./chunk-HHCRWQYN.mjs";
+} from "./chunk-FWYOEWJ2.mjs";
+import "./chunk-SDGDJ7CU.mjs";
 import "./chunk-DBIC62UV.mjs";
 export {
   Arr,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nlozgachev/pipelined",
-	"version": "0.27.0",
+	"version": "0.29.0",
 	"description": "Opinionated functional abstractions for TypeScript",
 	"license": "BSD-3-Clause",
 	"homepage": "https://pipelined.lozgachev.dev",
@@ -49,8 +49,8 @@
 		"test": "vitest run",
 		"bench": "vitest bench",
 		"build": "tsup",
-		"format": "dprint fmt",
-		"format:check": "dprint check",
+		"format": "dprint fmt && dprint fmt --config dprint.md.json docs/**/*.md docs/**/*.mdx README.md",
+		"format:check": "dprint check && dprint check --config dprint.md.json docs/**/*.md docs/**/*.mdx README.md",
 		"typecheck": "tsc --noEmit",
 		"lint": "oxlint src/",
 		"publish:npm": "pnpm build && npm publish --access public"