@rocicorp/zero 0.4.2024103000 → 0.5.2024103100

package/out/{chunk-4UHYW2B5.js → chunk-TBA526RR.js}

@@ -1351,10 +1351,6 @@ function* mergeIterables(iterables, comparator, distinct = false) {
       lastYielded = min[0];
       yield min[0];
     }
-  } catch (e) {
-    for (const it of iterators) {
-      it.throw?.(e);
-    }
   } finally {
     for (const it of iterators) {
       it.return?.();
@@ -9364,6 +9360,10 @@ function defined(arr) {
   return defined2;
 }
 
+// ../zero-protocol/src/data.ts
+var valueSchema = valita_exports.union(jsonSchema, valita_exports.undefined());
+var rowSchema = valita_exports.record(valueSchema);
+
 // ../zero-protocol/src/ast.ts
 var selectorSchema = valita_exports.string();
 var orderingElementSchema = readonly(
@@ -9445,9 +9445,7 @@ var astSchema = valita_exports.object({
   limit: valita_exports.number().optional(),
   orderBy: orderingSchema.optional(),
   start: valita_exports.object({
-    row: valita_exports.record(
-      valita_exports.union(valita_exports.string(), valita_exports.number(), valita_exports.boolean(), valita_exports.null(), valita_exports.undefined())
-    ),
+    row: rowSchema,
     exclusive: valita_exports.boolean()
   }).optional()
 });
@@ -9605,8 +9603,14 @@ var FanIn = class {
   getSchema() {
     return this.#inputs[0].getSchema();
   }
-  *fetch(req) {
-    const iterables = this.#inputs.map((input) => input.fetch(req));
+  fetch(req) {
+    return this.#fetchOrCleanup((input) => input.fetch(req));
+  }
+  cleanup(req) {
+    return this.#fetchOrCleanup((input) => input.cleanup(req));
+  }
+  *#fetchOrCleanup(streamProvider) {
+    const iterables = this.#inputs.map((input) => streamProvider(input));
     for (const node of mergeIterables(
       iterables,
       (l, r) => must(this.#schema).compareRows(l.row, r.row),
@@ -9615,9 +9619,6 @@ var FanIn = class {
       yield node;
     }
   }
-  cleanup(req) {
-    return this.fetch(req);
-  }
   push(change) {
     this.#fanOut.onFanInReceivedPush();
     this.#output?.push(change);
@@ -9653,13 +9654,11 @@ var FanOut = class {
   getSchema() {
     return this.#input.getSchema();
   }
-  *fetch(req) {
-    for (const node of this.#input.fetch(req)) {
-      yield node;
-    }
+  fetch(req) {
+    return this.#input.fetch(req);
   }
   cleanup(req) {
-    return this.fetch(req);
+    return this.#input.cleanup(req);
   }
   onFanInReceivedPush() {
     this.#fanInReceivedPush = true;
@@ -9721,16 +9720,19 @@ var Filter = class {
   getSchema() {
     return this.#input.getSchema();
   }
-  *fetch(req) {
-    for (const node of this.#input.fetch(req)) {
+  fetch(req) {
+    return this.#filter(this.#input.fetch(req));
+  }
+  cleanup(req) {
+    return this.#filter(this.#input.cleanup(req));
+  }
+  *#filter(stream) {
+    for (const node of stream) {
       if (this.#mode === "push-only" || this.#predicate(node.row)) {
         yield node;
       }
     }
   }
-  cleanup(req) {
-    return this.fetch(req);
-  }
   push(change) {
     assert(this.#output, "Output not set");
     switch (change.type) {
@@ -11511,16 +11513,6 @@ var errorMessageSchema = valita_exports.tuple([
   valita_exports.string()
 ]);
 
-// ../zero-protocol/src/data.ts
-var valueSchema = valita_exports.union(
-  valita_exports.null(),
-  valita_exports.boolean(),
-  valita_exports.number(),
-  valita_exports.string(),
-  valita_exports.undefined()
-);
-var rowSchema = valita_exports.record(valueSchema);
-
 // ../zero-protocol/src/primary-key.ts
 var primaryKeySchema = readonly(
   valita_exports.tuple([valita_exports.string()]).concat(valita_exports.array(valita_exports.string()))
@@ -14486,7 +14478,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.4.2024103000+b2617e";
+var version2 = "0.5.2024103100+3e74e2";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -16480,4 +16472,4 @@ export {
   createSchema,
   Zero
 };
-//# sourceMappingURL=chunk-4UHYW2B5.js.map
+//# sourceMappingURL=chunk-TBA526RR.js.map