@rocicorp/zero 0.17.2025030300 → 0.17.2025030600

package/out/{chunk-BBNRRMOA.js → chunk-XXZWDMNW.js}

@@ -11053,13 +11053,16 @@ function unwrap(c) {
   return { type: c.type, conditions: flatten(c.type, c.conditions.map(unwrap)) };
 }
 
+// ../zql/src/query/query.ts
+var DEFAULT_TTL = 1e4;
+
 // ../zql/src/query/query-impl.ts
 var astForTestingSymbol = Symbol();
 function newQuery(delegate, schema, table2) {
   return new QueryImpl(delegate, schema, table2);
 }
-function newQueryWithDetails(delegate, schema, tableName, ast, ttl, format) {
-  return new QueryImpl(delegate, schema, tableName, ast, ttl, format);
+function newQueryWithDetails(delegate, schema, tableName, ast, format) {
+  return new QueryImpl(delegate, schema, tableName, ast, format);
 }
 function staticParam(anchorClass, field) {
   return {
@@ -11074,14 +11077,12 @@ var AbstractQuery = class {
   #schema;
   #tableName;
   #ast;
-  #ttl;
   #format;
   #hash = "";
-  constructor(schema, tableName, ast = { table: tableName }, ttl, format) {
+  constructor(schema, tableName, ast = { table: tableName }, format) {
     this.#schema = schema;
     this.#tableName = tableName;
     this.#ast = ast;
-    this.#ttl = ttl;
     this.#format = format ?? { singular: false, relationships: {} };
   }
   get format() {
@@ -11107,7 +11108,6 @@ var AbstractQuery = class {
         ...this.#ast,
         limit: 1
       },
-      this.#ttl,
       {
         ...this.#format,
         singular: true
@@ -11136,7 +11136,6 @@ var AbstractQuery = class {
             table: destSchema,
             alias: relationship
           },
-          this.#ttl,
           {
             relationships: {},
             singular: cardinality === "one"
@@ -11175,7 +11174,6 @@ var AbstractQuery = class {
             }
           ]
         },
-        this.#ttl,
         {
           ...this.#format,
           relationships: {
@@ -11198,7 +11196,6 @@ var AbstractQuery = class {
             table: destSchema,
             alias: relationship
           },
-          this.#ttl,
           {
             relationships: {},
             singular: secondRelation.cardinality === "one"
@@ -11247,7 +11244,6 @@ var AbstractQuery = class {
             }
           ]
         },
-        this.#ttl,
         {
           ...this.#format,
           relationships: {
@@ -11280,7 +11276,6 @@ var AbstractQuery = class {
         ...this.#ast,
         where: dnf(cond)
       },
-      this.#ttl,
       this.#format
     );
   }
@@ -11295,7 +11290,6 @@ var AbstractQuery = class {
           exclusive: !opts?.inclusive
         }
       },
-      this.#ttl,
       this.#format
     );
   }
@@ -11313,7 +11307,6 @@ var AbstractQuery = class {
         ...this.#ast,
         limit
       },
-      this.#ttl,
       this.#format
     );
   }
@@ -11325,7 +11318,6 @@ var AbstractQuery = class {
         ...this.#ast,
         orderBy: [...this.#ast.orderBy ?? [], [field, direction]]
       },
-      this.#ttl,
       this.#format
     );
   }
@@ -11344,7 +11336,6 @@ var AbstractQuery = class {
             table: destSchema,
             alias: `${SUBQ_PREFIX}${relationship}`
           },
-          this.#ttl,
           void 0
         )
       );
@@ -11381,7 +11372,6 @@ var AbstractQuery = class {
             table: destSchema,
             alias: `${SUBQ_PREFIX}${relationship}`
           },
-          this.#ttl,
           void 0
         )
       );
@@ -11459,29 +11449,27 @@ var AbstractQuery = class {
 var completedAstSymbol = Symbol();
 var QueryImpl = class extends AbstractQuery {
   #delegate;
-  constructor(delegate, schema, tableName, ast, ttl, format) {
-    super(schema, tableName, ast, ttl, format);
+  constructor(delegate, schema, tableName, ast, format) {
+    super(schema, tableName, ast, format);
     this.#delegate = delegate;
   }
   _system = "client";
   get [completedAstSymbol]() {
     return this._completeAst();
   }
-  _newQuery(schema, tableName, ast, ttl, format) {
-    return newQueryWithDetails(
-      this.#delegate,
-      schema,
-      tableName,
-      ast,
-      ttl,
-      format
-    );
+  _newQuery(schema, tableName, ast, format) {
+    return newQueryWithDetails(this.#delegate, schema, tableName, ast, format);
   }
-  materialize(factory) {
+  materialize(factoryOrTTL, ttl = DEFAULT_TTL) {
+    let factory;
+    if (typeof factoryOrTTL === "function") {
+      factory = factoryOrTTL;
+    } else {
+      ttl = factoryOrTTL ?? DEFAULT_TTL;
+    }
     const ast = this._completeAst();
     const queryCompleteResolver = resolver7();
     let queryGot = false;
-    const ttl = void 0;
     const removeServerQuery = this.#delegate.addServerQuery(ast, ttl, (got) => {
       if (got) {
         queryGot = true;
@@ -11515,15 +11503,18 @@ var QueryImpl = class extends AbstractQuery {
     v2.destroy();
     return Promise.resolve(ret);
   }
-  preload() {
+  preload(options) {
     const { resolve, promise: complete } = resolver7();
     const ast = this._completeAst();
-    const ttl = void 0;
-    const unsub = this.#delegate.addServerQuery(ast, ttl, (got) => {
-      if (got) {
-        resolve();
+    const unsub = this.#delegate.addServerQuery(
+      ast,
+      options?.ttl ?? DEFAULT_TTL,
+      (got) => {
+        if (got) {
+          resolve();
+        }
       }
-    });
+    );
     return {
       cleanup: unsub,
       complete
@@ -11569,8 +11560,8 @@ var StaticQuery = class _StaticQuery extends AbstractQuery {
     return new ExpressionBuilder(this._exists);
   }
   _system = "permissions";
-  _newQuery(schema, tableName, ast, ttl, format) {
-    return new _StaticQuery(schema, tableName, ast, ttl, format);
+  _newQuery(schema, tableName, ast, format) {
+    return new _StaticQuery(schema, tableName, ast, format);
   }
   get ast() {
     return this._completeAst();
@@ -14103,7 +14094,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.17.2025030300";
+var version2 = "0.17.2025030600";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -15056,6 +15047,7 @@ function onClientStateNotFoundServerReason(serverErrMsg) {
   return `Server could not find state needed to synchronize this client. ${serverErrMsg}`;
 }
 var ON_CLIENT_STATE_NOT_FOUND_REASON_CLIENT = "The local persistent state needed to synchronize this client has been garbage collected.";
+var CLOSE_CODE_NORMAL = 1e3;
 var Zero = class {
   version = version2;
   #rep;
@@ -15449,16 +15441,39 @@ var Zero = class {
    */
   close() {
     const lc = this.#lc.withContext("close");
+    lc.debug?.("Closing Zero instance. Stack:", new Error().stack);
     if (this.#connectionState !== Disconnected) {
-      this.#disconnect(lc, {
-        client: "ClientClosed"
-      });
+      let closeReason = JSON.stringify([
+        "closeConnection",
+        []
+      ]);
+      if (closeReason.length > 123) {
+        lc.warn?.("Close reason is too long. Removing it.");
+        closeReason = "";
+      }
+      this.#disconnect(
+        lc,
+        {
+          client: "ClientClosed"
+        },
+        CLOSE_CODE_NORMAL,
+        closeReason
+      );
     }
     lc.debug?.("Aborting closeAbortController due to close()");
     this.#closeAbortController.abort();
     this.#metrics.stop();
     return this.#rep.close();
   }
+  #onPageHide = (e) => {
+    if (e.persisted) {
+      this.#lc.debug?.("Ignoring pagehide event because it was persisted");
+    } else {
+      this.#lc.debug?.("Closing client because we got a clean close");
+      this.close().catch(() => {
+      });
+    }
+  };
   #onMessage = (e) => {
     const lc = this.#lc;
     lc.debug?.("received message", e.data);
@@ -15716,6 +15731,7 @@ var Zero = class {
     ws.addEventListener("close", this.#onClose);
     this.#socket = ws;
     this.#socketResolver.resolve(ws);
+    getBrowserGlobal("window")?.addEventListener("pagehide", this.#onPageHide);
     try {
       l.debug?.("Waiting for connection to be acknowledged");
       await this.#connectResolver.promise;
@@ -15727,7 +15743,7 @@ var Zero = class {
       );
     }
   }
-  #disconnect(l, reason) {
+  #disconnect(l, reason, closeCode, closeReason) {
     if (this.#connectionState === Connecting) {
       this.#connectErrorCount++;
     }
@@ -15781,10 +15797,14 @@ var Zero = class {
     this.#socket?.removeEventListener("message", this.#onMessage);
     this.#socket?.removeEventListener("open", this.#onOpen);
     this.#socket?.removeEventListener("close", this.#onClose);
-    this.#socket?.close();
+    this.#socket?.close(closeCode, closeReason);
     this.#socket = void 0;
     this.#lastMutationIDSent = NULL_LAST_MUTATION_ID_SENT;
     this.#pokeHandler.handleDisconnect();
+    getBrowserGlobal("window")?.removeEventListener(
+      "pagehide",
+      this.#onPageHide
+    );
   }
   #handlePokeStart(_lc, pokeMessage) {
     resetBackoff();
@@ -16278,4 +16298,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-BBNRRMOA.js.map
+//# sourceMappingURL=chunk-XXZWDMNW.js.map