@omniblack/collections 0.0.4 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@omniblack/collections",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "type": "module",
     "main": "src/index.ts",
     "homepage": "https://gitlab.com/terryp/js-collections",

package/src/fifo.ts

@@ -2,6 +2,9 @@ interface Node<T> {
     next?: Node<T>;
     item: T;
 }
+
+type Value<T> = T extends Fifo<infer V> ? V : never;
+
 export class Fifo<T> {
     max: number | undefined;
     length: number;
@@ -56,11 +59,11 @@ export class Fifo<T> {
         return this.length === 0;
     }
 
-    *zip(...others: Fifo<T>[]) {
-        const all = [this, ...others];
+    *zip<U extends Fifo<any>[]>(...others: U): Generator<[T | undefined, ...{ [K in keyof U]: Value<U[K]> | undefined }]> {
+        const all: [Fifo<T>, ...U]  = [this, ...others];
 
         while (all.every((fifo) => !fifo.empty)) {
-            yield all.map((fifo) => fifo.pop());
+            yield all.map((fifo) => fifo.pop()) as [T | undefined, ...{ [K in keyof U]: Value<U[K]> }];
         }
     }
 }