@rocicorp/zero 0.8.2024121203 → 0.9.2024121900

package/out/advanced.js

@@ -1,7 +1,7 @@
 import "./chunk-ULOTOBTC.js";
 import {
   applyChange
-} from "./chunk-6HXO6VMP.js";
+} from "./chunk-Y6OVFUGE.js";
 import "./chunk-F5QR3K72.js";
 export {
   applyChange

package/out/{chunk-5CHRDZZ4.js → chunk-3L5FRWGX.js}

@@ -14,7 +14,7 @@ import {
   must,
   throwInvalidType,
   unreachable
-} from "./chunk-6HXO6VMP.js";
+} from "./chunk-Y6OVFUGE.js";
 import {
   __export,
   __reExport
@@ -1036,6 +1036,10 @@ import { resolver as resolver3 } from "@rocicorp/resolver";
 var promiseVoid2 = Promise.resolve();
 var promiseNever = new Promise(() => void 0);
 function sleep(ms, signal) {
+  const newAbortError = () => new AbortError("Aborted");
+  if (signal?.aborted) {
+    return Promise.reject(newAbortError());
+  }
   if (ms === 0) {
     return promiseVoid2;
   }
@@ -1044,7 +1048,7 @@ function sleep(ms, signal) {
     if (signal) {
       handleAbort = () => {
         clearTimeout(id);
-        reject(new AbortError("Aborted"));
+        reject(newAbortError());
       };
       signal.addEventListener("abort", handleAbort, { once: true });
     }
@@ -7748,10 +7752,12 @@ async function throttle(timeMs, abortSignal) {
 
 // ../replicache/src/set-interval-with-signal.ts
 function setIntervalWithSignal(fn, ms, signal) {
-  const interval = setInterval(fn, ms);
-  signal.addEventListener("abort", () => {
-    clearInterval(interval);
-  });
+  if (!signal.aborted) {
+    const interval = setInterval(fn, ms);
+    signal.addEventListener("abort", () => {
+      clearInterval(interval);
+    });
+  }
 }
 
 // ../replicache/src/subscriptions.ts
@@ -9291,46 +9297,53 @@ function getKVStoreProvider(lc, kvStore) {
 // ../replicache/src/mod.ts
 import { consoleLogSink as consoleLogSink3 } from "@rocicorp/logger";
 
+// ../zero-schema/src/column.ts
+var column_exports = {};
+__export(column_exports, {
+  boolean: () => boolean3,
+  enumeration: () => enumeration,
+  json: () => json,
+  number: () => number4,
+  string: () => string7
+});
+function string7(optional = false) {
+  return {
+    type: "string",
+    optional,
+    customType: null
+  };
+}
+function number4(optional = false) {
+  return {
+    type: "number",
+    optional,
+    customType: null
+  };
+}
+function boolean3(optional = false) {
+  return {
+    type: "boolean",
+    optional,
+    customType: null
+  };
+}
+function json(optional = false) {
+  return {
+    type: "json",
+    optional,
+    customType: null
+  };
+}
+function enumeration(optional = false) {
+  return {
+    type: "string",
+    kind: "enum",
+    customType: null,
+    optional
+  };
+}
+
 // ../zero-schema/src/table-schema.ts
-var column = {
-  string(optional = false) {
-    return {
-      type: "string",
-      optional,
-      customType: null
-    };
-  },
-  number(optional = false) {
-    return {
-      type: "number",
-      optional,
-      customType: null
-    };
-  },
-  boolean(optional = false) {
-    return {
-      type: "boolean",
-      optional,
-      customType: null
-    };
-  },
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  json(optional = false) {
-    return {
-      type: "json",
-      optional,
-      customType: null
-    };
-  },
-  enumeration(optional = false) {
-    return {
-      type: "string",
-      kind: "enum",
-      customType: null,
-      optional
-    };
-  }
-};
 function createTableSchema(schema) {
   return schema;
 }
@@ -9416,8 +9429,8 @@ function normalizeColumns(columns, primaryKey) {
       );
     }
   }
-  for (const [name, column2] of sortedEntries(columns)) {
-    rv[name] = normalizeColumn(column2);
+  for (const [name, column] of sortedEntries(columns)) {
+    rv[name] = normalizeColumn(column);
   }
   return rv;
 }
@@ -9698,7 +9711,7 @@ function areEqual(arr1, arr2) {
 
 // ../zero-protocol/src/data.ts
 var valueSchema = valita_exports.union(jsonSchema, valita_exports.undefined());
-var rowSchema = valita_exports.record(valueSchema);
+var rowSchema = readonlyRecord(valueSchema);
 
 // ../zero-protocol/src/ast.ts
 var selectorSchema = valita_exports.string();
@@ -10008,9 +10021,7 @@ function makeComparator(order, reverse) {
   };
 }
 function valuesEqual(a, b) {
-  a = normalizeUndefined(a);
-  b = normalizeUndefined(b);
-  if (a === null || b === null) {
+  if (a == null || b == null) {
     return false;
   }
   return a === b;
@@ -10131,7 +10142,9 @@ var Exists = class {
           case "remove": {
             let size = this.#getSize(change.row);
             if (size !== void 0) {
-              assert(size > 0);
+              if (size === 0) {
+                return;
+              }
               size--;
               this.#setCachedSize(change.row, size);
               this.#setSize(change.row, size);
@@ -10665,8 +10678,8 @@ var Join = class {
   }
 };
 function makeStorageKeyForValues(values) {
-  const json = JSON.stringify(["pKeySet", ...values]);
-  return json.substring(1, json.length - 1) + ",";
+  const json2 = JSON.stringify(["pKeySet", ...values]);
+  return json2.substring(1, json2.length - 1) + ",";
 }
 function makeStorageKeyPrefix(row, key) {
   return makeStorageKeyForValues(key.map((k) => row[k]));
@@ -14365,8 +14378,8 @@ var EmptyBTree = (() => {
 
 // ../zql/src/ivm/constraint.ts
 function constraintMatchesRow(constraint, row) {
-  for (const [key, value] of Object.entries(constraint)) {
-    if (!valuesEqual(row[key], value)) {
+  for (const key in constraint) {
+    if (!valuesEqual(row[key], constraint[key])) {
       return false;
     }
   }
@@ -15441,7 +15454,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.8.2024121203+dd79de";
+var version2 = "0.9.2024121900+535718";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -15732,9 +15745,12 @@ var QueryManager = class {
   #clientID;
   #send;
   #queries = /* @__PURE__ */ new Map();
+  #recentQueriesMaxSize;
+  #recentQueries = /* @__PURE__ */ new Set();
   #gotQueries = /* @__PURE__ */ new Set();
-  constructor(clientID, send2, experimentalWatch) {
+  constructor(clientID, send2, experimentalWatch, recentQueriesMaxSize) {
     this.#clientID = clientID;
+    this.#recentQueriesMaxSize = recentQueriesMaxSize;
     this.#send = send2;
     experimentalWatch(
       (diff2) => {
@@ -15815,6 +15831,7 @@ var QueryManager = class {
     const normalized = normalizeAST(ast);
     const astHash = hashOfAST(normalized);
     let entry = this.#queries.get(astHash);
+    this.#recentQueries.delete(astHash);
     if (!entry) {
       entry = {
         normalized,
@@ -15843,22 +15860,31 @@ var QueryManager = class {
         return;
       }
       removed = true;
-      this.#remove(astHash);
+      this.#remove(astHash, gotCallback);
     };
   }
-  #remove(astHash) {
+  #remove(astHash, gotCallback) {
     const entry = must(this.#queries.get(astHash));
+    if (gotCallback) {
+      const index = entry.gotCallbacks.indexOf(gotCallback);
+      entry.gotCallbacks.splice(index, 1);
+    }
     --entry.count;
     if (entry.count === 0) {
-      this.#queries.delete(astHash);
-      this.#send([
-        "changeDesiredQueries",
-        {
-          desiredQueriesPatch: [{ op: "del", hash: astHash }]
-        }
-      ]);
+      this.#recentQueries.add(astHash);
+      if (this.#recentQueries.size > this.#recentQueriesMaxSize) {
+        const lruAstHash = this.#recentQueries.values().next().value;
+        assert(lruAstHash);
+        this.#queries.delete(lruAstHash);
+        this.#recentQueries.delete(lruAstHash);
+        this.#send([
+          "changeDesiredQueries",
+          {
+            desiredQueriesPatch: [{ op: "del", hash: lruAstHash }]
+          }
+        ]);
+      }
     }
-    return true;
   }
 };
 
@@ -16440,7 +16466,8 @@ var Zero = class {
       hiddenTabDisconnectDelay = DEFAULT_DISCONNECT_HIDDEN_DELAY_MS,
       kvStore = "idb",
       schema,
-      batchViewUpdates = (applyViewUpdates) => applyViewUpdates()
+      batchViewUpdates = (applyViewUpdates) => applyViewUpdates(),
+      maxRecentQueries = 0
     } = options;
     if (!userID) {
       throw new Error("ZeroOptions.userID must not be empty.");
@@ -16532,7 +16559,8 @@ var Zero = class {
     this.#queryManager = new QueryManager(
       rep.clientID,
       (msg) => this.#sendChangeDesiredQueries(msg),
-      rep.experimentalWatch.bind(rep)
+      rep.experimentalWatch.bind(rep),
+      maxRecentQueries
     );
     this.#zeroContext = new ZeroContext(
       normalizedSchema.tables,
@@ -17435,7 +17463,7 @@ export {
   makeIDBName,
   dropDatabase,
   dropAllDatabases,
-  column,
+  column_exports,
   createTableSchema,
   ANYONE_CAN,
   NOBODY_CAN,
@@ -17444,4 +17472,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-5CHRDZZ4.js.map
+//# sourceMappingURL=chunk-3L5FRWGX.js.map