@thi.ng/fibers 1.0.88 → 1.1.0

package/README.md

@@ -406,7 +406,7 @@ For Node.js REPL:
 const fib = await import("@thi.ng/fibers");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 2.44 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 2.46 KB
 
 ## Dependencies
 

package/api.d.ts

@@ -9,11 +9,14 @@ export interface FiberOpts {
      */
     id: string;
     /**
-     * ID generator instance for fiber ID (instead of {@link FiberOpts.id})
+     * ID generator instance for fiber ID (instead of {@link FiberOpts.id}). If
+     * not given, uses {@link DEFAULT_ID_GEN} (use {@link setDefaultIDGen} to
+     * configure).
      */
     idgen: IIDGen<string>;
     /**
-     * Logger instance.
+     * Logger instance. If not given, uses {@link DEFAULT_LOGGER} (use
+     * {@link setDefaultLogger} to configure).
      */
     logger: ILogger;
     /**

package/fiber.d.ts

@@ -2,6 +2,7 @@ import type { Event as $Event, Fn, Fn0, IDeref, IID, IIDGen, INotify, Listener,
 import type { ILogger } from "@thi.ng/logger";
 import { type FiberEventType, type FiberFactory, type FiberOpts, type MaybeFiber, type State } from "./api.js";
 export declare const setDefaultIDGen: (gen: IIDGen<string>) => IIDGen<string>;
+export declare const setDefaultLogger: (logger: ILogger) => ILogger;
 export declare class Fiber<T = any> implements IDeref<Maybe<T>>, IID<string>, INotify<FiberEventType> {
     /**
      * This fiber's user provided or generated ID.

package/fiber.js

@@ -24,7 +24,9 @@ import {
   STATE_NEW
 } from "./api.js";
 let DEFAULT_ID_GEN = prefixed("fib-", monotonic());
+let DEFAULT_LOGGER;
 const setDefaultIDGen = (gen) => DEFAULT_ID_GEN = gen;
+const setDefaultLogger = (logger) => DEFAULT_LOGGER = logger;
 const NO_RESULT = { done: false, value: void 0 };
 let Fiber = class {
   /**
@@ -48,7 +50,7 @@ let Fiber = class {
   constructor(gen, opts) {
     if (opts) {
       this.autoTerminate = !!opts.terminate;
-      this.logger = opts.logger;
+      this.logger = opts.logger ?? DEFAULT_LOGGER;
       this.parent = opts.parent;
       this.user = {
         init: opts.init,
@@ -62,6 +64,7 @@ let Fiber = class {
       }
     } else {
       this.idgen = DEFAULT_ID_GEN;
+      this.logger = DEFAULT_LOGGER;
     }
     if (this.idgen) this.id = this.idgen.next();
     this.gen = isFunction(gen) ? gen(this) : gen;
@@ -397,5 +400,6 @@ const fiber = (fiber2, opts) => fiber2 != null && fiber2 instanceof Fiber ? fibe
 export {
   Fiber,
   fiber,
-  setDefaultIDGen
+  setDefaultIDGen,
+  setDefaultLogger
 };

package/ops.d.ts

@@ -81,13 +81,16 @@ export declare const withTimeout: (body: MaybeFiber, timeout: number, opts?: Par
 /**
  * Higher-order fiber which repeatedly executes given `fiber` until its
  * completion, but does so in a time-sliced manner, such that the fiber never
- * consumes more than `maxTime` milliseconds per update cycle.
+ * consumes more than `maxTime` milliseconds per update cycle. The returned
+ * fiber produces the same result (if any) as the wrapped fiber. If the wrapped
+ * fiber goes into an error state, the returned time-sliced fiber will do so
+ * too (with the same error).
  *
  * @param fiber
  * @param maxTime
  * @param opts
  */
-export declare const timeSlice: (body: MaybeFiber, maxTime: number, opts?: Partial<FiberOpts>) => Fiber<void>;
+export declare const timeSlice: <T = any>(body: MaybeFiber<T>, maxTime: number, opts?: Partial<FiberOpts>) => Fiber<T>;
 /**
  * Similar to {@link timeSlice}, but for consuming the given iterable in a
  * time-sliced manner. With each fiber update consumes & buffers values from

package/ops.js

@@ -39,17 +39,22 @@ const all = (fibers, opts) => fiber((ctx) => {
   return ctx.join();
 }, opts);
 const withTimeout = (body, timeout, opts) => first([body, wait(timeout)], opts);
-const timeSlice = (body, maxTime, opts) => fiber(function* () {
-  const $fiber = fiber(body);
-  while (true) {
-    let t0 = now();
-    do {
-      if ($fiber.state > STATE_ACTIVE || $fiber.next() > STATE_ACTIVE)
-        return;
-    } while (timeDiff(t0) < maxTime);
-    yield;
-  }
-}, opts);
+const timeSlice = (body, maxTime, opts) => fiber(
+  function* () {
+    const $fiber = fiber(body);
+    while (true) {
+      let t0 = now();
+      do {
+        if ($fiber.next() > STATE_ACTIVE) {
+          if ($fiber.state === STATE_ERROR) throw $fiber.error;
+          return $fiber.value;
+        }
+      } while (timeDiff(t0) < maxTime);
+      yield;
+    }
+  },
+  opts
+);
 const timeSliceIterable = (src, consume, maxTime, opts) => fiber(function* () {
   const iter = src[Symbol.iterator]();
   while (true) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@thi.ng/fibers",
-	"version": "1.0.88",
+	"version": "1.1.0",
 	"description": "Process hierarchies & operators for cooperative multitasking",
 	"type": "module",
 	"module": "./index.js",
@@ -116,5 +116,5 @@
 		"status": "alpha",
 		"year": 2023
 	},
-	"gitHead": "febee81fd8b59e5e330a6e6521a2667ed5401a3d"
+	"gitHead": "bc535a90970f96564cae15f1732b5fb8562135c4"
 }