@rocicorp/zero 0.7.2024120704 → 0.8.2024121001

package/out/{chunk-O2GO2VH4.js → chunk-AXKEBKDH.js}

@@ -9641,6 +9641,9 @@ function defined(arr) {
   }
   return defined2;
 }
+function areEqual(arr1, arr2) {
+  return arr1.length === arr2.length && arr1.every((e, i) => e === arr2[i]);
+}
 
 // ../zero-protocol/src/data.ts
 var valueSchema = valita_exports.union(jsonSchema, valita_exports.undefined());
@@ -9988,14 +9991,21 @@ var Exists = class {
   #relationshipName;
   #storage;
   #not;
+  #parentJoinKey;
+  #skipCache;
   #output;
-  constructor(input, storage, relationshipName, type) {
+  constructor(input, storage, relationshipName, parentJoinKey, type) {
     this.#input = input;
     this.#relationshipName = relationshipName;
     this.#input.setOutput(this);
     this.#storage = storage;
     assert(this.#input.getSchema().relationships[relationshipName]);
     this.#not = type === "NOT EXISTS";
+    this.#parentJoinKey = parentJoinKey;
+    this.#skipCache = areEqual(
+      parentJoinKey,
+      this.#input.getSchema().primaryKey
+    );
   }
   setOutput(output) {
     this.#output = output;
@@ -10048,6 +10058,7 @@ var Exists = class {
             let size = this.#getSize(change.row);
             if (size !== void 0) {
               size++;
+              this.#setCachedSize(change.row, size);
               this.#setSize(change.row, size);
             } else {
               size = this.#fetchSize(change.row);
@@ -10071,6 +10082,7 @@ var Exists = class {
             if (size !== void 0) {
               assert(size > 0);
               size--;
+              this.#setCachedSize(change.row, size);
               this.#setSize(change.row, size);
             } else {
               size = this.#fetchSize(change.row);
@@ -10122,8 +10134,26 @@ var Exists = class {
   #setSize(row, size) {
     this.#storage.set(this.#makeSizeStorageKey(row), size);
   }
+  #setCachedSize(row, size) {
+    if (this.#skipCache) {
+      return;
+    }
+    this.#storage.set(this.#makeCacheStorageKey(row), size);
+  }
+  #getCachedSize(row) {
+    if (this.#skipCache) {
+      return void 0;
+    }
+    return this.#storage.get(this.#makeCacheStorageKey(row));
+  }
   #delSize(row) {
     this.#storage.del(this.#makeSizeStorageKey(row));
+    if (!this.#skipCache) {
+      const cacheKey = this.#makeCacheStorageKey(row);
+      if (first(this.#storage.scan({ prefix: `${cacheKey}/` })) === void 0) {
+        this.#storage.del(cacheKey);
+      }
+    }
   }
   #getOrFetchSize(row) {
     const size = this.#getSize(row);
@@ -10133,12 +10163,18 @@ var Exists = class {
     return this.#fetchSize(row);
   }
   #fetchSize(row) {
+    const cachedSize = this.#getCachedSize(row);
+    if (cachedSize !== void 0) {
+      this.#setSize(row, cachedSize);
+      return cachedSize;
+    }
     const relationship = this.#fetchNodeForRow(row).relationships[this.#relationshipName];
     assert(relationship);
     let size = 0;
     for (const _relatedNode of relationship) {
       size++;
     }
+    this.#setCachedSize(row, size);
     this.#setSize(row, size);
     return size;
   }
@@ -10158,12 +10194,22 @@ var Exists = class {
     );
     return fetched;
   }
+  #makeCacheStorageKey(row) {
+    return `row/${JSON.stringify(
+      this.#getKeyValues(row, this.#parentJoinKey)
+    )}`;
+  }
   #makeSizeStorageKey(row) {
-    const primaryKey = [];
-    for (const key of this.#input.getSchema().primaryKey) {
-      primaryKey.push(normalizeUndefined(row[key]));
+    return `row/${this.#skipCache ? "" : JSON.stringify(this.#getKeyValues(row, this.#parentJoinKey))}/${JSON.stringify(
+      this.#getKeyValues(row, this.#input.getSchema().primaryKey)
+    )}`;
+  }
+  #getKeyValues(row, def) {
+    const values = [];
+    for (const key of def) {
+      values.push(normalizeUndefined(row[key]));
     }
-    return JSON.stringify(["size", primaryKey]);
+    return values;
   }
 };
 
@@ -11430,12 +11476,56 @@ function applyAnd(input, condition, appliedFilters, delegate) {
   return input;
 }
 function applyOr(input, condition, appliedFilters, delegate) {
+  const [subqueryConditions, otherConditions] = groupSubqueryConditions(condition);
+  if (subqueryConditions.length === 0) {
+    return otherConditions.length > 0 ? new Filter(
+      input,
+      appliedFilters ? "push-only" : "all",
+      createPredicate({
+        type: "or",
+        conditions: otherConditions
+      })
+    ) : new FanIn(new FanOut(input), []);
+  }
   const fanOut = new FanOut(input);
-  const branches = condition.conditions.map(
+  const branches = subqueryConditions.map(
     (subCondition) => applyWhere(fanOut, subCondition, appliedFilters, delegate)
   );
+  if (otherConditions.length > 0) {
+    branches.push(
+      new Filter(
+        fanOut,
+        appliedFilters ? "push-only" : "all",
+        createPredicate({
+          type: "or",
+          conditions: otherConditions
+        })
+      )
+    );
+  }
   return new FanIn(fanOut, branches);
 }
+function groupSubqueryConditions(condition) {
+  const partitioned = [[], []];
+  for (const subCondition of condition.conditions) {
+    if (isNotAndDoesNotContainSubquery(subCondition)) {
+      partitioned[1].push(subCondition);
+    } else {
+      partitioned[0].push(subCondition);
+    }
+  }
+  return partitioned;
+}
+function isNotAndDoesNotContainSubquery(condition) {
+  if (condition.type === "correlatedSubquery") {
+    return false;
+  }
+  if (condition.type === "and") {
+    return condition.conditions.every(isNotAndDoesNotContainSubquery);
+  }
+  assert(condition.type !== "or", "where conditions are expected to be in DNF");
+  return true;
+}
 function applySimpleCondition(input, condition, appliedFilters) {
   return new Filter(
     input,
@@ -11468,6 +11558,7 @@ function applyCorrelatedSubqueryCondition(input, condition, delegate) {
     input,
     delegate.createStorage(),
     must(condition.related.subquery.alias),
+    condition.related.correlation.parentField,
     condition.op
   );
 }
@@ -11478,7 +11569,10 @@ function gatherCorrelatedSubqueryQueriesFromCondition(condition) {
       assert(condition2.op === "EXISTS" || condition2.op === "NOT EXISTS");
       csqs.push({
         ...condition2.related,
-        subquery: { ...condition2.related.subquery, limit: EXISTS_LIMIT }
+        subquery: {
+          ...condition2.related.subquery,
+          limit: condition2.related.system === "permissions" ? PERMISSIONS_EXISTS_LIMIT : EXISTS_LIMIT
+        }
       });
       return;
     }
@@ -11495,6 +11589,7 @@ function gatherCorrelatedSubqueryQueriesFromCondition(condition) {
   return csqs;
 }
 var EXISTS_LIMIT = 3;
+var PERMISSIONS_EXISTS_LIMIT = 1;
 function assertOrderingIncludesPK(ordering, pk) {
   const orderingFields = ordering.map(([field]) => field);
   const missingFields = pk.filter((pkField) => !orderingFields.includes(pkField));
@@ -14373,14 +14468,7 @@ var MemorySource = class {
         overlay = this.#overlay;
       }
     }
-    const { constraint } = req;
-    const matchesConstraint = constraint ? (row) => constraintMatchesRow(constraint, row) : (_) => true;
     const startAt = req.start?.row;
-    if (startAt) {
-      if (req.constraint) {
-        assert(matchesConstraint(startAt), "Start row must match constraint");
-      }
-    }
     let scanStart;
     if (req.constraint) {
       scanStart = {};
@@ -15300,7 +15388,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.7.2024120704+564733";
+var version2 = "0.8.2024121001+ae95b1";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -17299,4 +17387,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-O2GO2VH4.js.map
+//# sourceMappingURL=chunk-AXKEBKDH.js.map