@rocicorp/zero 0.21.2025052000 → 0.21.2025052101

package/out/{chunk-QICPWKOW.js → chunk-I4FFQDCA.js}

@@ -7271,17 +7271,18 @@ var MemorySource = class _MemorySource {
     assert(callingConnectionIndex !== -1, "Output not found");
     const conn = this.#connections[callingConnectionIndex];
     const { sort: requestedSort } = conn;
-    const indexSort = [];
-    if (req.constraint) {
-      for (const key of Object.keys(req.constraint)) {
-        indexSort.push([key, "asc"]);
-      }
-    }
     const pkConstraint = primaryKeyConstraintFromFilters(
       conn.filters?.condition,
       this.#primaryKey
     );
-    if (this.#primaryKey.length > 1 || !req.constraint || !constraintMatchesPrimaryKey(req.constraint, this.#primaryKey) && !pkConstraint) {
+    const fetchOrPkConstraint = pkConstraint ?? req.constraint;
+    const indexSort = [];
+    if (fetchOrPkConstraint) {
+      for (const key of Object.keys(fetchOrPkConstraint)) {
+        indexSort.push([key, "asc"]);
+      }
+    }
+    if (this.#primaryKey.length > 1 || !fetchOrPkConstraint || !constraintMatchesPrimaryKey(fetchOrPkConstraint, this.#primaryKey)) {
       indexSort.push(...requestedSort);
     }
     const index = this.#getOrCreateIndex(indexSort, from);
@@ -7289,12 +7290,11 @@ var MemorySource = class _MemorySource {
     const comparator2 = (r1, r2) => compare(r1, r2) * (req.reverse ? -1 : 1);
     const startAt = req.start?.row;
     let scanStart;
-    const constraint = pkConstraint ?? req.constraint;
-    if (constraint) {
+    if (fetchOrPkConstraint) {
       scanStart = {};
       for (const [key, dir] of indexSort) {
-        if (hasOwn(constraint, key)) {
-          scanStart[key] = constraint[key];
+        if (hasOwn(fetchOrPkConstraint, key)) {
+          scanStart[key] = fetchOrPkConstraint[key];
         } else {
           if (req.reverse) {
             scanStart[key] = dir === "asc" ? maxValue : minValue;
@@ -7310,6 +7310,9 @@ var MemorySource = class _MemorySource {
     const withOverlay = generateWithOverlay(
       startAt,
       pkConstraint ? once(rowsIterable) : rowsIterable,
+      // use `req.constraint` here and not `fetchOrPkConstraint` since `fetchOrPkConstraint` could be the
+      // primary key constraint. The primary key constraint comes from filters and is acting as a filter
+      // rather than as the fetch constraint.
       req.constraint,
       this.#overlay,
       this.#splitEditOverlay,
@@ -7319,6 +7322,8 @@ var MemorySource = class _MemorySource {
     );
     const withConstraint = generateWithConstraint(
       generateWithStart(withOverlay, req.start, comparator2),
+      // we use `req.constraint` and not `fetchOrPkConstraint` here because we need to
+      // AND the constraint with what could have been the primary key constraint
       req.constraint
     );
     yield* conn.filters ? generateWithFilter(withConstraint, conn.filters.predicate) : withConstraint;
@@ -8527,7 +8532,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.21.2025052000";
+var version2 = "0.21.2025052101";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -11135,4 +11140,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-QICPWKOW.js.map
+//# sourceMappingURL=chunk-I4FFQDCA.js.map