@rocicorp/zero 0.25.0-canary.13 → 0.25.0-canary.15

package/out/zql/src/ivm/source.d.ts

@@ -3,6 +3,7 @@ import type { Row } from '../../../zero-protocol/src/data.ts';
 import type { TableSchema } from '../../../zero-types/src/schema.ts';
 import type { DebugDelegate } from '../builder/debug-delegate.ts';
 import type { Input } from './operator.ts';
+import type { Stream } from './stream.ts';
 export type SourceChangeAdd = {
     type: 'add';
     row: Row;
@@ -54,18 +55,25 @@ export interface Source {
     connect(sort: Ordering, filters?: Condition, splitEditKeys?: Set<string>, debug?: DebugDelegate): SourceInput;
     /**
      * Pushes a change into the source and into all connected outputs.
+     *
+     * The returned stream can yield 'yield' to yield control to the caller
+     * for purposes of responsiveness.
+     *
+     * Once the stream is exhausted, the change will have been pushed into all
+     * connected inputs and committed to the source.
      */
-    push(change: SourceChange): void;
+    push(change: SourceChange): Stream<'yield'>;
     /**
      * Pushes a change into the source.
-     * Iterating the returned iterator will push the
-     * change into one connected input at a time.
      *
-     * Once the iterator is exhausted, the change will
-     * have been pushed into all connected inputs and
-     * committed to the source.
+     * Iterating the returned stream will push the change into one connected input
+     * at a time, yielding `undefined` between each, and yielding `'yield'` to
+     * yield control to the caller for purposes of responsiveness.
+     *
+     * Once the stream is exhausted, the change will have been pushed
+     * into all connected inputs and committed to the source.
      */
-    genPush(change: SourceChange): Iterable<void>;
+    genPush(change: SourceChange): Stream<'yield' | undefined>;
 }
 export interface SourceInput extends Input {
     readonly fullyAppliedFilters: boolean;

package/out/zql/src/ivm/source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,mCAAmC,CAAC;AAC3E,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,KAAK,CAAC;IACZ,GAAG,EAAE,GAAG,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,GAAG,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,YAAY,GACpB,eAAe,GACf,kBAAkB,GAClB,gBAAgB,CAAC;AAErB;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,MAAM;IACrB,IAAI,WAAW,IAAI,WAAW,CAAC;IAC/B;;;;;;;;;;;OAWG;IACH,OAAO,CACL,IAAI,EAAE,QAAQ,EACd,OAAO,CAAC,EAAE,SAAS,EACnB,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAC3B,KAAK,CAAC,EAAE,aAAa,GACpB,WAAW,CAAC;IAEf;;OAEG;IACH,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAEjC;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,WAAY,SAAQ,KAAK;IACxC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;CACvC"}
+{"version":3,"file":"source.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,mCAAmC,CAAC;AAC3E,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,KAAK,CAAC;IACZ,GAAG,EAAE,GAAG,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,GAAG,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,YAAY,GACpB,eAAe,GACf,kBAAkB,GAClB,gBAAgB,CAAC;AAErB;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,MAAM;IACrB,IAAI,WAAW,IAAI,WAAW,CAAC;IAC/B;;;;;;;;;;;OAWG;IACH,OAAO,CACL,IAAI,EAAE,QAAQ,EACd,OAAO,CAAC,EAAE,SAAS,EACnB,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAC3B,KAAK,CAAC,EAAE,aAAa,GACpB,WAAW,CAAC;IAEf;;;;;;;;OAQG;IACH,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAE5C;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,WAAY,SAAQ,KAAK;IACxC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;CACvC"}

package/out/zql/src/ivm/stream.d.ts

@@ -8,4 +8,6 @@
 export type Stream<T> = Iterable<T>;
 export declare function take<T>(stream: Stream<T>, limit: number): Stream<T>;
 export declare function first<T>(stream: Stream<T>): T | undefined;
+export declare function consume<T>(stream: Stream<T>): void;
+export declare function drainGenerator<Yield, Return>(gen: Generator<Yield, Return, unknown>): Return;
 //# sourceMappingURL=stream.d.ts.map

package/out/zql/src/ivm/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/stream.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;AAEpC,wBAAiB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAWpE;AAED,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAKzD"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/stream.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;AAEpC,wBAAiB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAWpE;AAED,wBAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAKzD;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,QAE3C;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAC1C,GAAG,EAAE,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,GACrC,MAAM,CAMR"}

package/out/zql/src/ivm/stream.js

@@ -1,23 +1,14 @@
-function* take(stream, limit) {
-  if (limit < 1) {
-    return;
-  }
-  let count = 0;
-  for (const v of stream) {
-    yield v;
-    if (++count === limit) {
-      break;
-    }
-  }
-}
 function first(stream) {
   const it = stream[Symbol.iterator]();
   const { value } = it.next();
   it.return?.();
   return value;
 }
+function consume(stream) {
+  [...stream];
+}
 export {
-  first,
-  take
+  consume,
+  first
 };
 //# sourceMappingURL=stream.js.map

package/out/zql/src/ivm/stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream.js","sources":["../../../../../zql/src/ivm/stream.ts"],"sourcesContent":["/**\n * streams are lazy forward-only iterables.\n * Once a stream reaches the end it can't be restarted.\n * They are iterable, not iterator, so that they can be used in for-each,\n * and so that we know when consumer has stopped iterating the stream. This allows us\n * to clean up resources like sql statements.\n */\nexport type Stream<T> = Iterable<T>;\n\nexport function* take<T>(stream: Stream<T>, limit: number): Stream<T> {\n  if (limit < 1) {\n    return;\n  }\n  let count = 0;\n  for (const v of stream) {\n    yield v;\n    if (++count === limit) {\n      break;\n    }\n  }\n}\n\nexport function first<T>(stream: Stream<T>): T | undefined {\n  const it = stream[Symbol.iterator]();\n  const {value} = it.next();\n  it.return?.();\n  return value;\n}\n"],"names":[],"mappings":"AASO,UAAU,KAAQ,QAAmB,OAA0B;AACpE,MAAI,QAAQ,GAAG;AACb;AAAA,EACF;AACA,MAAI,QAAQ;AACZ,aAAW,KAAK,QAAQ;AACtB,UAAM;AACN,QAAI,EAAE,UAAU,OAAO;AACrB;AAAA,IACF;AAAA,EACF;AACF;AAEO,SAAS,MAAS,QAAkC;AACzD,QAAM,KAAK,OAAO,OAAO,QAAQ,EAAA;AACjC,QAAM,EAAC,MAAA,IAAS,GAAG,KAAA;AACnB,KAAG,SAAA;AACH,SAAO;AACT;"}
+{"version":3,"file":"stream.js","sources":["../../../../../zql/src/ivm/stream.ts"],"sourcesContent":["/**\n * streams are lazy forward-only iterables.\n * Once a stream reaches the end it can't be restarted.\n * They are iterable, not iterator, so that they can be used in for-each,\n * and so that we know when consumer has stopped iterating the stream. This allows us\n * to clean up resources like sql statements.\n */\nexport type Stream<T> = Iterable<T>;\n\nexport function* take<T>(stream: Stream<T>, limit: number): Stream<T> {\n  if (limit < 1) {\n    return;\n  }\n  let count = 0;\n  for (const v of stream) {\n    yield v;\n    if (++count === limit) {\n      break;\n    }\n  }\n}\n\nexport function first<T>(stream: Stream<T>): T | undefined {\n  const it = stream[Symbol.iterator]();\n  const {value} = it.next();\n  it.return?.();\n  return value;\n}\n\nexport function consume<T>(stream: Stream<T>) {\n  [...stream];\n}\n\nexport function drainGenerator<Yield, Return>(\n  gen: Generator<Yield, Return, unknown>,\n): Return {\n  let result = gen.next();\n  while (!result.done) {\n    result = gen.next();\n  }\n  return result.value;\n}\n"],"names":[],"mappings":"AAsBO,SAAS,MAAS,QAAkC;AACzD,QAAM,KAAK,OAAO,OAAO,QAAQ,EAAA;AACjC,QAAM,EAAC,MAAA,IAAS,GAAG,KAAA;AACnB,KAAG,SAAA;AACH,SAAO;AACT;AAEO,SAAS,QAAW,QAAmB;AAC5C,GAAC,GAAG,MAAM;AACZ;"}

package/out/zql/src/ivm/take.d.ts

@@ -22,7 +22,7 @@ export declare class Take implements Operator {
     setOutput(output: Output): void;
     getSchema(): SourceSchema;
     fetch(req: FetchRequest): Stream<Node | 'yield'>;
-    push(change: Change): void;
+    push(change: Change): Stream<'yield'>;
     destroy(): void;
 }
 //# sourceMappingURL=take.d.ts.map

package/out/zql/src/ivm/take.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"take.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/take.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAAC,KAAK,MAAM,EAAqC,MAAM,aAAa,CAAC;AAE5E,OAAO,EAAiC,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AACpE,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAc,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAiBrD,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC;AAEtC;;;;;;;;;;GAUG;AACH,qBAAa,IAAK,YAAW,QAAQ;;gBAYjC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,YAAY;IAgB7B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,SAAS,IAAI,YAAY;IAIxB,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;IAyJjD,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAsb1B,OAAO,IAAI,IAAI;CAGhB"}
+{"version":3,"file":"take.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/take.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAAC,KAAK,MAAM,EAAqC,MAAM,aAAa,CAAC;AAE5E,OAAO,EAAiC,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AACpE,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAiBxC,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC;AAEtC;;;;;;;;;;GAUG;AACH,qBAAa,IAAK,YAAW,QAAQ;;gBAYjC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,YAAY;IAgB7B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,SAAS,IAAI,YAAY;IAIxB,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;IAyJhD,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;IA0ctC,OAAO,IAAI,IAAI;CAGhB"}

package/out/zql/src/ivm/take.js

@@ -1,10 +1,8 @@
 import { assert, unreachable } from "../../../shared/src/asserts.js";
 import { hasOwn } from "../../../shared/src/has-own.js";
-import { must } from "../../../shared/src/must.js";
 import { assertOrderingIncludesPK } from "../query/complete-ordering.js";
 import { compareValues } from "./data.js";
-import { throwOutput, skipYields } from "./operator.js";
-import { first, take } from "./stream.js";
+import { throwOutput } from "./operator.js";
 const MAX_BOUND_KEY = "maxBound";
 class Take {
   #input;
@@ -146,9 +144,9 @@ class Take {
     }
     return { takeState, takeStateKey, maxBound, constraint };
   }
-  push(change) {
+  *push(change) {
     if (change.type === "edit") {
-      this.#pushEditChange(change);
+      yield* this.#pushEditChange(change);
       return;
     }
     const { takeState, takeStateKey, maxBound, constraint } = this.#getStateAndConstraint(change.node.row);
@@ -164,7 +162,7 @@ class Take {
           takeState.bound === void 0 || compareRows(takeState.bound, change.node.row) < 0 ? change.node.row : takeState.bound,
           maxBound
         );
-        this.#output.push(change, this);
+        yield* this.#output.push(change, this);
         return;
       }
       if (takeState.bound === void 0 || compareRows(change.node.row, takeState.bound) >= 0) {
@@ -173,34 +171,41 @@ class Take {
       let beforeBoundNode;
       let boundNode;
       if (this.#limit === 1) {
-        boundNode = must(
-          first(
-            skipYields(
-              this.#input.fetch({
-                start: {
-                  row: takeState.bound,
-                  basis: "at"
-                },
-                constraint
-              })
-            )
-          )
-        );
+        for (const node of this.#input.fetch({
+          start: {
+            row: takeState.bound,
+            basis: "at"
+          },
+          constraint
+        })) {
+          if (node === "yield") {
+            yield node;
+            continue;
+          }
+          boundNode = node;
+          break;
+        }
       } else {
-        [boundNode, beforeBoundNode] = take(
-          skipYields(
-            this.#input.fetch({
-              start: {
-                row: takeState.bound,
-                basis: "at"
-              },
-              constraint,
-              reverse: true
-            })
-          ),
-          2
-        );
+        for (const node of this.#input.fetch({
+          start: {
+            row: takeState.bound,
+            basis: "at"
+          },
+          constraint,
+          reverse: true
+        })) {
+          if (node === "yield") {
+            yield node;
+            continue;
+          } else if (boundNode === void 0) {
+            boundNode = node;
+          } else {
+            beforeBoundNode = node;
+            break;
+          }
+        }
       }
+      assert(boundNode !== void 0);
       const removeChange = {
         type: "remove",
         node: boundNode
@@ -211,10 +216,8 @@ class Take {
         beforeBoundNode === void 0 || compareRows(change.node.row, beforeBoundNode.row) > 0 ? change.node.row : beforeBoundNode.row,
         maxBound
       );
-      this.#withRowHiddenFromFetch(change.node.row, () => {
-        this.#output.push(removeChange, this);
-      });
-      this.#output.push(change, this);
+      yield* this.#pushWithRowHiddenFromFetch(change.node.row, removeChange);
+      yield* this.#output.push(change, this);
     } else if (change.type === "remove") {
       if (takeState.bound === void 0) {
         return;
@@ -223,19 +226,22 @@ class Take {
       if (compToBound > 0) {
         return;
       }
-      const [beforeBoundNode] = take(
-        skipYields(
-          this.#input.fetch({
-            start: {
-              row: takeState.bound,
-              basis: "after"
-            },
-            constraint,
-            reverse: true
-          })
-        ),
-        1
-      );
+      let beforeBoundNode;
+      for (const node of this.#input.fetch({
+        start: {
+          row: takeState.bound,
+          basis: "after"
+        },
+        constraint,
+        reverse: true
+      })) {
+        if (node === "yield") {
+          yield node;
+          continue;
+        }
+        beforeBoundNode = node;
+        break;
+      }
       let newBound;
       if (beforeBoundNode) {
         const push = compareRows(beforeBoundNode.row, takeState.bound) > 0;
@@ -245,15 +251,17 @@ class Take {
         };
       }
       if (!newBound?.push) {
-        for (const node of skipYields(
-          this.#input.fetch({
-            start: {
-              row: takeState.bound,
-              basis: "at"
-            },
-            constraint
-          })
-        )) {
+        for (const node of this.#input.fetch({
+          start: {
+            row: takeState.bound,
+            basis: "at"
+          },
+          constraint
+        })) {
+          if (node === "yield") {
+            yield node;
+            continue;
+          }
           const push = compareRows(node.row, takeState.bound) > 0;
           newBound = {
             node,
@@ -265,14 +273,14 @@ class Take {
         }
       }
       if (newBound?.push) {
-        this.#output.push(change, this);
+        yield* this.#output.push(change, this);
         this.#setTakeState(
           takeStateKey,
           takeState.size,
           newBound.node.row,
           maxBound
         );
-        this.#output.push(
+        yield* this.#output.push(
           {
             type: "add",
             node: newBound.node
@@ -287,14 +295,14 @@ class Take {
         newBound?.node.row,
         maxBound
       );
-      this.#output.push(change, this);
+      yield* this.#output.push(change, this);
     } else if (change.type === "child") {
       if (takeState.bound && compareRows(change.node.row, takeState.bound) <= 0) {
-        this.#output.push(change, this);
+        yield* this.#output.push(change, this);
       }
     }
   }
-  #pushEditChange(change) {
+  *#pushEditChange(change) {
     assert(
       !this.#partitionKeyComparator || this.#partitionKeyComparator(change.oldNode.row, change.node.row) === 0,
       "Unexpected change of partition key"
@@ -307,64 +315,71 @@ class Take {
     const { compareRows } = this.getSchema();
     const oldCmp = compareRows(change.oldNode.row, takeState.bound);
     const newCmp = compareRows(change.node.row, takeState.bound);
-    const replaceBoundAndForwardChange = () => {
-      this.#setTakeState(
+    const that = this;
+    const replaceBoundAndForwardChange = function* () {
+      that.#setTakeState(
         takeStateKey,
         takeState.size,
         change.node.row,
         maxBound
       );
-      this.#output.push(change, this);
+      yield* that.#output.push(change, that);
     };
     if (oldCmp === 0) {
       if (newCmp === 0) {
-        this.#output.push(change, this);
+        yield* this.#output.push(change, this);
         return;
       }
       if (newCmp < 0) {
         if (this.#limit === 1) {
-          replaceBoundAndForwardChange();
+          yield* replaceBoundAndForwardChange();
           return;
         }
-        const beforeBoundNode = must(
-          first(
-            skipYields(
-              this.#input.fetch({
-                start: {
-                  row: takeState.bound,
-                  basis: "after"
-                },
-                constraint,
-                reverse: true
-              })
-            )
-          )
-        );
+        let beforeBoundNode;
+        for (const node of this.#input.fetch({
+          start: {
+            row: takeState.bound,
+            basis: "after"
+          },
+          constraint,
+          reverse: true
+        })) {
+          if (node === "yield") {
+            yield node;
+            continue;
+          }
+          beforeBoundNode = node;
+          break;
+        }
+        assert(beforeBoundNode !== void 0);
         this.#setTakeState(
           takeStateKey,
           takeState.size,
           beforeBoundNode.row,
           maxBound
         );
-        this.#output.push(change, this);
+        yield* this.#output.push(change, this);
         return;
       }
       assert(newCmp > 0, "New comparison must be greater than 0");
-      const newBoundNode = must(
-        first(
-          skipYields(
-            this.#input.fetch({
-              start: {
-                row: takeState.bound,
-                basis: "at"
-              },
-              constraint
-            })
-          )
-        )
-      );
+      let newBoundNode;
+      for (const node of this.#input.fetch({
+        start: {
+          row: takeState.bound,
+          basis: "at"
+        },
+        constraint
+      })) {
+        if (node === "yield") {
+          yield node;
+          continue;
+        }
+        newBoundNode = node;
+        break;
+      }
+      assert(newBoundNode !== void 0);
       if (compareRows(newBoundNode.row, change.node.row) === 0) {
-        replaceBoundAndForwardChange();
+        yield* replaceBoundAndForwardChange();
         return;
       }
       this.#setTakeState(
@@ -373,16 +388,11 @@ class Take {
         newBoundNode.row,
         maxBound
       );
-      this.#withRowHiddenFromFetch(newBoundNode.row, () => {
-        this.#output.push(
-          {
-            type: "remove",
-            node: change.oldNode
-          },
-          this
-        );
+      yield* this.#pushWithRowHiddenFromFetch(newBoundNode.row, {
+        type: "remove",
+        node: change.oldNode
       });
-      this.#output.push(
+      yield* this.#output.push(
         {
           type: "add",
           node: newBoundNode
@@ -397,35 +407,39 @@ class Take {
         return;
       }
       assert(newCmp < 0, "New comparison must be less than 0");
-      const [oldBoundNode, newBoundNode] = take(
-        skipYields(
-          this.#input.fetch({
-            start: {
-              row: takeState.bound,
-              basis: "at"
-            },
-            constraint,
-            reverse: true
-          })
-        ),
-        2
-      );
+      let oldBoundNode;
+      let newBoundNode;
+      for (const node of this.#input.fetch({
+        start: {
+          row: takeState.bound,
+          basis: "at"
+        },
+        constraint,
+        reverse: true
+      })) {
+        if (node === "yield") {
+          yield node;
+          continue;
+        } else if (oldBoundNode === void 0) {
+          oldBoundNode = node;
+        } else {
+          newBoundNode = node;
+          break;
+        }
+      }
+      assert(oldBoundNode !== void 0);
+      assert(newBoundNode !== void 0);
       this.#setTakeState(
         takeStateKey,
         takeState.size,
         newBoundNode.row,
         maxBound
       );
-      this.#withRowHiddenFromFetch(change.node.row, () => {
-        this.#output.push(
-          {
-            type: "remove",
-            node: oldBoundNode
-          },
-          this
-        );
+      yield* this.#pushWithRowHiddenFromFetch(change.node.row, {
+        type: "remove",
+        node: oldBoundNode
       });
-      this.#output.push(
+      yield* this.#output.push(
         {
           type: "add",
           node: change.node
@@ -437,28 +451,31 @@ class Take {
     if (oldCmp < 0) {
       assert(newCmp !== 0, "Invalid state. Row has duplicate primary key");
       if (newCmp < 0) {
-        this.#output.push(change, this);
+        yield* this.#output.push(change, this);
         return;
       }
       assert(newCmp > 0, "New comparison must be greater than 0");
-      const afterBoundNode = must(
-        first(
-          skipYields(
-            this.#input.fetch({
-              start: {
-                row: takeState.bound,
-                basis: "after"
-              },
-              constraint
-            })
-          )
-        )
-      );
+      let afterBoundNode;
+      for (const node of this.#input.fetch({
+        start: {
+          row: takeState.bound,
+          basis: "after"
+        },
+        constraint
+      })) {
+        if (node === "yield") {
+          yield node;
+          continue;
+        }
+        afterBoundNode = node;
+        break;
+      }
+      assert(afterBoundNode !== void 0);
       if (compareRows(afterBoundNode.row, change.node.row) === 0) {
-        replaceBoundAndForwardChange();
+        yield* replaceBoundAndForwardChange();
         return;
       }
-      this.#output.push(
+      yield* this.#output.push(
         {
           type: "remove",
           node: change.oldNode
@@ -471,7 +488,7 @@ class Take {
         afterBoundNode.row,
         maxBound
       );
-      this.#output.push(
+      yield* this.#output.push(
         {
           type: "add",
           node: afterBoundNode
@@ -482,10 +499,10 @@ class Take {
     }
     unreachable();
   }
-  #withRowHiddenFromFetch(row, fn) {
+  *#pushWithRowHiddenFromFetch(row, change) {
     this.#rowHiddenFromFetch = row;
     try {
-      fn();
+      yield* this.#output.push(change, this);
     } finally {
       this.#rowHiddenFromFetch = void 0;
     }