@thi.ng/transducers-async 0.2.4 → 0.2.6

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-04-26T13:32:20Z
+- **Last updated**: 2024-06-21T19:34:38Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,15 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [0.2.6](https://github.com/thi-ng/umbrella/tree/@thi.ng/transducers-async@0.2.6) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- rename various rest args to be more semantically meaningful ([8088a56](https://github.com/thi-ng/umbrella/commit/8088a56))
+- update merge()/sync() ([ef82528](https://github.com/thi-ng/umbrella/commit/ef82528))
+  - dedupe internal shared functionality
+- dedupe iter removal in merge()/sync() ([abc6a46](https://github.com/thi-ng/umbrella/commit/abc6a46))
+
 ## [0.2.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/transducers-async@0.2.0) (2024-04-20)
 
 #### 🚀 Features

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 193 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >
@@ -116,7 +116,7 @@ For Node.js REPL:
 const txa = await import("@thi.ng/transducers-async");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 3.10 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 3.11 KB
 
 ## Dependencies
 

package/as-async.js

@@ -2,8 +2,7 @@ import { wait } from "./delayed.js";
 async function* asAsyncIterable(src, delay = 0) {
   for (let x of src) {
     yield x;
-    if (delay > 0)
-      await wait(delay);
+    if (delay > 0) await wait(delay);
   }
 }
 export {

package/cat.js

@@ -6,8 +6,7 @@ const cat = () => (rfn) => {
     if (x != null) {
       for await (let y of x) {
         acc = await r(acc, y);
-        if (isReduced(acc))
-          return acc.deref();
+        if (isReduced(acc)) return acc.deref();
       }
     }
     return acc;

package/concat.d.ts

@@ -27,7 +27,7 @@ import type { MaybeAsyncIterable, Nullable } from "@thi.ng/api";
  * // [ 1, 2, 3, undefined, 4, 5 ]
  * ```
  *
- * @param xs -
+ * @param sources -
  */
-export declare function concat<T>(...xs: Nullable<MaybeAsyncIterable<T>>[]): AsyncIterableIterator<T>;
+export declare function concat<T>(...sources: Nullable<MaybeAsyncIterable<T>>[]): AsyncIterableIterator<T>;
 //# sourceMappingURL=concat.d.ts.map

package/concat.js

@@ -1,7 +1,7 @@
 import { ensureIterable } from "./ensure.js";
-async function* concat(...xs) {
-  for (let x of xs) {
-    x != null && (yield* ensureIterable(x));
+async function* concat(...sources) {
+  for (let src of sources) {
+    src != null && (yield* ensureIterable(src));
   }
 }
 export {

package/internal/iter.d.ts

@@ -0,0 +1,21 @@
+/** @internal */
+export declare const __inflightIters: <T extends {
+    iter: AsyncIterator<any>;
+}>(iters: T[]) => Promise<{
+    iter: T;
+    res: IteratorResult<any, any>;
+}>[];
+/** @internal */
+export declare const __iterNext: <T extends {
+    id: number;
+    iter: AsyncIterator<any>;
+}>(promises: Promise<{
+    iter: T;
+    res: IteratorResult<any, any>;
+}>[], iter: T) => void;
+/** @internal */
+export declare const __iterRemove: <T extends {
+    id: number;
+    iter: AsyncIterator<any>;
+}>(iters: T[], id: number) => true | undefined;
+//# sourceMappingURL=iter.d.ts.map

package/internal/iter.js

@@ -0,0 +1,15 @@
+const __inflightIters = (iters) => iters.map((iter) => iter.iter.next().then((res) => ({ iter, res })));
+const __iterNext = (promises, iter) => {
+  promises[iter.id] = iter.iter.next().then((res) => ({ res, iter }));
+};
+const __iterRemove = (iters, id) => {
+  iters.splice(id, 1);
+  const n = iters.length;
+  if (!n) return true;
+  for (let i = id; i < n; i++) iters[i].id--;
+};
+export {
+  __inflightIters,
+  __iterNext,
+  __iterRemove
+};

package/iterator.d.ts

@@ -1,6 +1,6 @@
 import type { FnAny, MaybeAsyncIterable } from "@thi.ng/api";
 import type { AsyncTransducer, AsyncTxLike } from "./api.js";
-export declare function iterator1<A, B>(xform: AsyncTxLike<A, B>, xs: MaybeAsyncIterable<A>): AsyncIterableIterator<B>;
-export declare function iterator<A, B>(xform: AsyncTxLike<A, B>, xs: MaybeAsyncIterable<A>): AsyncIterableIterator<B>;
+export declare function iterator1<A, B>(xform: AsyncTxLike<A, B>, src: MaybeAsyncIterable<A>): AsyncIterableIterator<B>;
+export declare function iterator<A, B>(xform: AsyncTxLike<A, B>, src: MaybeAsyncIterable<A>): AsyncIterableIterator<B>;
 export declare const __iter: (xform: FnAny<AsyncTransducer<any, any>>, args: any[], impl?: typeof iterator1) => AsyncIterableIterator<any> | undefined;
 //# sourceMappingURL=iterator.d.ts.map

package/iterator.js

@@ -4,9 +4,9 @@ import { isIterable } from "@thi.ng/checks/is-iterable";
 import { isReduced } from "@thi.ng/transducers/reduced";
 import { ensureAsyncTransducer } from "./ensure.js";
 import { push } from "./push.js";
-async function* iterator1(xform, xs) {
+async function* iterator1(xform, src) {
   const [_, complete, reduce] = ensureAsyncTransducer(xform)([NO_OP, NO_OP, (_2, x) => x]);
-  for await (let x of xs) {
+  for await (let x of src) {
     let y = await reduce(SEMAPHORE, x);
     if (isReduced(y)) {
       const res = await complete(y.deref());
@@ -20,11 +20,11 @@ async function* iterator1(xform, xs) {
     }
   }
 }
-async function* iterator(xform, xs) {
+async function* iterator(xform, src) {
   const [_, complete, reduce] = ensureAsyncTransducer(
     xform
   )(push());
-  for await (let x of xs) {
+  for await (let x of src) {
     const y = await reduce([], x);
     if (isReduced(y)) {
       yield* await complete(y.deref());

package/merge.js

@@ -1,25 +1,15 @@
+import { __inflightIters, __iterNext, __iterRemove } from "./internal/iter.js";
 async function* merge(src) {
   const iters = src.map((v, id) => ({ id, iter: v[Symbol.asyncIterator]() }));
-  let n = iters.length;
-  const $remove = (id) => {
-    iters.splice(id, 1);
-    if (!--n)
-      return true;
-    for (let i = id; i < n; i++)
-      iters[i].id--;
-  };
-  const promises = iters.map(
-    (iter) => iter.iter.next().then((res) => ({ iter, res }))
-  );
+  const promises = __inflightIters(iters);
   while (true) {
     const { iter, res } = await Promise.race(promises);
     if (res.done) {
       promises.splice(iter.id, 1);
-      if ($remove(iter.id))
-        return;
+      if (__iterRemove(iters, iter.id)) return;
     } else {
       yield res.value;
-      promises[iter.id] = iter.iter.next().then((res2) => ({ res: res2, iter }));
+      __iterNext(promises, iter);
     }
   }
 }

package/mult.js

@@ -18,16 +18,12 @@ class Mult {
       this.isActive = true;
       (async () => {
         for await (let val of this.src) {
-          for (let s of this.subs)
-            s.resolve(val);
-          if (val === void 0)
-            this.subs.length = 0;
-          if (!this.subs.length)
-            break;
+          for (let s of this.subs) s.resolve(val);
+          if (val === void 0) this.subs.length = 0;
+          if (!this.subs.length) break;
           await Promise.all(this.subs.map((x) => x.notifyP));
         }
-        for (let s of this.subs)
-          s.resolve(void 0);
+        for (let s of this.subs) s.resolve(void 0);
         this.subs.length = 0;
         this.isActive = false;
       })();
@@ -60,13 +56,11 @@ class MSub {
     this.$await();
   }
   async *[Symbol.asyncIterator]() {
-    if (this.active)
-      illegalState("multiple consumers unsupported");
+    if (this.active) illegalState("multiple consumers unsupported");
     this.active = true;
     while (true) {
       const res = await this.valueP;
-      if (res === void 0)
-        break;
+      if (res === void 0) break;
       yield res;
       this.notify();
       this.$await();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/transducers-async",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Async versions of various highly composable transducers, reducers and iterators",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/transducers-async#readme",
+  "homepage": "https://thi.ng/transducers-async",
   "funding": [
     {
       "type": "github",
@@ -36,18 +36,18 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.1",
-    "@thi.ng/buffers": "^0.1.2",
-    "@thi.ng/checks": "^3.6.3",
-    "@thi.ng/compose": "^3.0.3",
-    "@thi.ng/errors": "^2.5.6",
-    "@thi.ng/transducers": "^9.0.4"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/buffers": "^0.1.4",
+    "@thi.ng/checks": "^3.6.5",
+    "@thi.ng/compose": "^3.0.5",
+    "@thi.ng/errors": "^2.5.8",
+    "@thi.ng/transducers": "^9.0.6"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.0",
-    "esbuild": "^0.20.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.4.3"
+    "@microsoft/api-extractor": "^7.47.0",
+    "esbuild": "^0.21.5",
+    "typedoc": "^0.25.13",
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "async",
@@ -81,7 +81,8 @@
   },
   "files": [
     "./*.js",
-    "./*.d.ts"
+    "./*.d.ts",
+    "internal"
   ],
   "exports": {
     ".": {
@@ -204,5 +205,5 @@
     "status": "alpha",
     "year": 2018
   },
-  "gitHead": "0bec55821066c18eb977a7eabd42c0bb2b096d98\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }

package/partition.js

@@ -3,8 +3,7 @@ import { unreduced } from "@thi.ng/transducers/reduced";
 import { __iter, iterator } from "./iterator.js";
 function partition(...args) {
   const iter = __iter(partition, args, iterator);
-  if (iter)
-    return iter;
+  if (iter) return iter;
   let size = args[0], all, step;
   if (isNumber(args[1])) {
     step = args[1];

package/pubsub.js

@@ -34,8 +34,7 @@ class PubSub {
    */
   unsubscribeTopic(id, sub) {
     const subs = this.topics.get(id);
-    if (!subs)
-      return false;
+    if (!subs) return false;
     const idx = subs.findIndex((x) => x === sub) ?? -1;
     if (idx >= 0) {
       subs.splice(idx, 1);
@@ -48,15 +47,12 @@ class PubSub {
     for await (let val of this.src) {
       const topic = this.topicFn(val);
       const subs = this.topics.get(topic);
-      if (!(subs && subs.length))
-        continue;
-      for (let s of subs)
-        s.resolve(val);
+      if (!(subs && subs.length)) continue;
+      for (let s of subs) s.resolve(val);
       await Promise.all(subs.map((x) => x.notifyP));
     }
     for (let subs of this.topics.values()) {
-      for (let s of subs)
-        s.resolve(void 0);
+      for (let s of subs) s.resolve(void 0);
     }
     this.topics.clear();
     this.isActive = false;

package/push.d.ts

@@ -1,5 +1,5 @@
 import type { MaybeAsyncIterable } from "@thi.ng/api";
 import type { AsyncReducer } from "./api.js";
 export declare function push<T>(): AsyncReducer<T, T[]>;
-export declare function push<T>(xs: MaybeAsyncIterable<T>): Promise<T[]>;
+export declare function push<T>(src: MaybeAsyncIterable<T>): Promise<T[]>;
 //# sourceMappingURL=push.d.ts.map

package/push.js

@@ -1,9 +1,8 @@
 import { reducer } from "./reduce.js";
-function push(xs) {
-  return xs ? (async () => {
+function push(src) {
+  return src ? (async () => {
     let res = [];
-    for await (let x of xs)
-      res.push(x);
+    for await (let x of src) res.push(x);
     return res;
   })() : reducer(
     () => [],

package/raf.js

@@ -9,13 +9,10 @@ const raf = (opts) => {
     gen.write(void 0);
   };
   const update = (t) => {
-    if (isClosed)
-      return;
+    if (isClosed) return;
     if (opts?.timestamp) {
-      if (t0 === true)
-        t0 = t;
-      if (t0)
-        t -= t0;
+      if (t0 === true) t0 = t;
+      if (t0) t -= t0;
     } else {
       t = frame++;
     }

package/reduce.js

@@ -1,8 +1,8 @@
 import { asyncIdentity } from "@thi.ng/api/async";
 import { isReduced } from "@thi.ng/transducers/reduced";
-async function reduce([init, complete, $reduce], ...xs) {
-  let acc = xs.length < 2 ? await init() : xs.shift();
-  for await (let x of xs[0]) {
+async function reduce([init, complete, $reduce], ...args) {
+  let acc = args.length < 2 ? await init() : args.shift();
+  for await (let x of args[0]) {
     const y = await $reduce(acc, x);
     if (isReduced(y)) {
       acc = y.deref();

package/sidechain.js

@@ -9,12 +9,10 @@ async function* sidechain(src, side, opts) {
   let buf = [];
   while (true) {
     const [res, side2] = await Promise.race(promises);
-    if (res.done)
-      return;
+    if (res.done) return;
     if (side2) {
       promises[1] = $side.next().then((res2) => [res2, true]);
-      if (!buf.length)
-        continue;
+      if (!buf.length) continue;
       if (lastOnly) {
         yield buf[0];
         buf.length = 0;
@@ -24,10 +22,8 @@ async function* sidechain(src, side, opts) {
       }
     } else {
       promises[0] = $iter.next().then((res2) => [res2]);
-      if (lastOnly)
-        buf[0] = res.value;
-      else
-        buf.push(res.value);
+      if (lastOnly) buf[0] = res.value;
+      else buf.push(res.value);
     }
   }
 }

package/source.js

@@ -17,33 +17,27 @@ const source = (initial, buffer = 1) => {
     while (true) {
       const val = await promise;
       last = val;
-      if (val === void 0)
-        break;
+      if (val === void 0) break;
       yield val;
       newPromise();
-      if (queue.readable())
-        resolve(queue.read());
+      if (queue.readable()) resolve(queue.read());
     }
     state = 2;
   }();
   gen.write = (x) => {
-    if (state > 0)
-      return;
+    if (state > 0) return;
     if (resolve) {
       resolve(x);
       resolve = void 0;
     } else if (queue.writable()) {
       queue.write(x);
-      if (x === void 0)
-        state = 1;
-    } else
-      illegalState("buffer overflow");
+      if (x === void 0) state = 1;
+    } else illegalState("buffer overflow");
   };
   gen.update = (fn, ...args) => gen.write(fn(last, ...args));
   gen.close = () => gen.write(void 0);
   gen.deref = () => last;
-  if (initial !== void 0)
-    gen.write(initial);
+  if (initial !== void 0) gen.write(initial);
   return gen;
 };
 export {

package/sync.js

@@ -1,26 +1,18 @@
+import { __inflightIters, __iterNext, __iterRemove } from "./internal/iter.js";
 async function* sync(src, opts) {
   let iters = Object.entries(src).map(([key, v], id) => ({
     key,
     id,
     iter: v[Symbol.asyncIterator]()
   }));
-  let n = iters.length;
-  const $remove = (id) => {
-    iters.splice(id, 1);
-    if (!--n)
-      return true;
-    for (let i = id; i < n; i++)
-      iters[i].id--;
-  };
   const $initial = async () => {
     const res = await Promise.all(iters.map(({ iter }) => iter.next()));
-    for (let i = 0; i < n; ) {
+    for (let i = 0, n = iters.length; i < n; ) {
       if (res[i].done) {
         res.splice(i, 1);
-        if ($remove(i))
-          return;
-      } else
-        i++;
+        if (__iterRemove(iters, i)) return;
+        n--;
+      } else i++;
     }
     return res.reduce(
       (acc, x, i) => (acc[iters[i].key] = x.value, acc),
@@ -40,23 +32,19 @@ async function* sync(src, opts) {
       tuple = {};
     } else {
       tuple = await $initial();
-      if (!tuple)
-        return;
+      if (!tuple) return;
       yield { ...tuple };
     }
-    const promises = iters.map(
-      (iter) => iter.iter.next().then((res) => ({ iter, res }))
-    );
+    const promises = __inflightIters(iters);
     while (true) {
       const { iter, res } = await Promise.race(promises);
       if (res.done) {
         promises.splice(iter.id, 1);
-        if ($remove(iter.id))
-          return;
+        if (__iterRemove(iters, iter.id)) return;
       } else {
         tuple[iter.key] = res.value;
         yield { ...tuple };
-        promises[iter.id] = iter.iter.next().then((res2) => ({ res: res2, iter }));
+        __iterNext(promises, iter);
       }
     }
   }

package/transduce.js

@@ -1,7 +1,7 @@
 import { ensureAsyncTransducer } from "./ensure.js";
 import { reduce } from "./reduce.js";
-function transduce(xform, reducer, ...xs) {
-  return reduce(ensureAsyncTransducer(xform)(reducer), ...xs);
+function transduce(xform, reducer, ...args) {
+  return reduce(ensureAsyncTransducer(xform)(reducer), ...args);
 }
 export {
   transduce

package/zip.js

@@ -6,8 +6,7 @@ async function* zip(...src) {
     const tuple = [];
     for (let i of iters) {
       let v = await i.next();
-      if (v.done)
-        return;
+      if (v.done) return;
       tuple.push(v.value);
     }
     yield tuple;