@rocicorp/zero 0.23.2025090100 → 0.23.2025090400

package/out/{chunk-FMWNU2YJ.js → chunk-6QYVZALS.js}

@@ -1,6 +1,6 @@
 import {
   clientToServer
-} from "./chunk-6USDOK3X.js";
+} from "./chunk-LCK57CQL.js";
 import {
   AbstractQuery,
   ExpressionBuilder,
@@ -346,4 +346,4 @@ export {
   withValidation,
   createBuilder
 };
-//# sourceMappingURL=chunk-FMWNU2YJ.js.map
+//# sourceMappingURL=chunk-6QYVZALS.js.map

package/out/{chunk-6USDOK3X.js → chunk-LCK57CQL.js}

@@ -1415,8 +1415,7 @@ async function dropAllDatabases(opts) {
   const store = new IDBDatabasesStore(kvStoreProvider.create);
   const databases = await store.getDatabases();
   const dbNames = Object.values(databases).map((db) => db.name);
-  const result = await dropDatabases(store, dbNames, kvStoreProvider.drop);
-  return result;
+  return dropDatabases(store, dbNames, kvStoreProvider.drop);
 }
 function canDatabaseBeCollectedAndGetDeletedClientIDs(enableMutationRecovery, perdag) {
   return withRead(perdag, async (read) => {
@@ -1679,7 +1678,10 @@ var columnSchemaSchema = valita_exports.object({
   type: valueTypeSchema
 });
 var tableSchemaSchema = valita_exports.object({
-  columns: valita_exports.record(columnSchemaSchema)
+  columns: valita_exports.record(columnSchemaSchema),
+  // TODO: Make this non-optional when bumping the
+  //       MIN_SERVER_SUPPORTED_SYNC_PROTOCOL to 30+.
+  primaryKey: valita_exports.array(valita_exports.string()).optional()
 });
 var clientSchemaSchema = valita_exports.object({
   tables: valita_exports.record(tableSchemaSchema)
@@ -1691,7 +1693,13 @@ function normalizeClientSchema(schema) {
       schema.tables,
       (tables) => tables.sort(keyCmp).map(([name, table2]) => [
         name,
-        { columns: mapAllEntries(table2.columns, (e) => e.sort(keyCmp)) }
+        {
+          columns: mapAllEntries(table2.columns, (e) => e.sort(keyCmp)),
+          primaryKey: must(
+            table2.primaryKey,
+            `new clients always specify a primaryKey`
+          ).sort()
+        }
       ])
     )
   };
@@ -1760,15 +1768,19 @@ function checkRelationship(relationships, tableName, tables) {
 }
 function clientSchemaFrom(schema) {
   const client = {
-    tables: mapEntries(schema.tables, (name, { serverName, columns }) => [
-      serverName ?? name,
-      {
-        columns: mapEntries(columns, (name2, { serverName: serverName2, type }) => [
-          serverName2 ?? name2,
-          { type }
-        ])
-      }
-    ])
+    tables: mapEntries(
+      schema.tables,
+      (name, { serverName, columns, primaryKey }) => [
+        serverName ?? name,
+        {
+          columns: mapEntries(columns, (name2, { serverName: serverName2, type }) => [
+            serverName2 ?? name2,
+            { type }
+          ]),
+          primaryKey: [...primaryKey]
+        }
+      ]
+    )
   };
   const clientSchema = normalizeClientSchema(client);
   const hash = h64(JSON.stringify(clientSchema)).toString(36);
@@ -5970,29 +5982,14 @@ var connectedMessageSchema = valita_exports.tuple([
   valita_exports.literal("connected"),
   connectedBodySchema
 ]);
-var userQueryMutateParamsSchema = valita_exports.object({
-  /**
-   * A client driven URL to send queries or mutations to.
-   * This URL must match one of the URLs set in the zero config.
-   *
-   * E.g., Given the following environment variable:
-   * ZERO_GET_QUERIES_URL=[https://*.example.com/query]
-   *
-   * Then this URL could be:
-   * https://myapp.example.com/query
-   */
-  url: valita_exports.string().optional(),
-  // The query string to use for query or mutation calls.
-  queryParams: valita_exports.record(valita_exports.string()).optional()
-});
 var initConnectionBodySchema = valita_exports.object({
   desiredQueriesPatch: upQueriesPatchSchema,
   clientSchema: clientSchemaSchema.optional(),
   deleted: deleteClientsBodySchema.optional(),
   // parameters to configure the mutate endpoint
-  userPushParams: userQueryMutateParamsSchema.optional(),
+  userPushURL: valita_exports.string().optional(),
   // parameters to configure the query endpoint
-  userQueryParams: userQueryMutateParamsSchema.optional(),
+  userQueryURL: valita_exports.string().optional(),
   /**
    * `activeClients` is an optional array of client IDs that are currently active
    * in the client group. This is used to inform the server about the clients
@@ -6364,7 +6361,7 @@ var downstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 29;
+var PROTOCOL_VERSION = 30;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 18;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -8668,7 +8665,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.23.2025090100";
+var version2 = "0.23.2025090400";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -10359,6 +10356,12 @@ var Zero = class _Zero {
     this.#schema = schema;
     const { clientSchema, hash } = clientSchemaFrom(schema);
     this.#clientSchema = clientSchema;
+    const nameKey = JSON.stringify({
+      storageKey: this.storageKey,
+      mutateUrl: options.mutateURL ?? "",
+      queryUrl: options.getQueriesURL ?? ""
+    });
+    const hashedKey = h64(nameKey).toString(36);
     const replicacheOptions = {
       // The schema stored in IDB is dependent upon both the ClientSchema
       // and the AST schema (i.e. PROTOCOL_VERSION).
@@ -10366,7 +10369,7 @@ var Zero = class _Zero {
       logLevel: logOptions.logLevel,
       logSinks: [logOptions.logSink],
       mutators: replicacheMutators,
-      name: `zero-${userID}-${this.storageKey}`,
+      name: `zero-${userID}-${hashedKey}`,
       pusher: (req, reqID) => this.#pusher(req, reqID),
       puller: (req, reqID) => this.#puller(req, reqID),
       pushDelay: 0,
@@ -10883,8 +10886,8 @@ var Zero = class _Zero {
           // The clientSchema only needs to be sent for the very first request.
           // Henceforth it is stored with the CVR and verified automatically.
           ...this.#connectCookie === null ? { clientSchema } : {},
-          userPushParams: this.#options.mutate ?? this.#options.push,
-          userQueryParams: this.#options.query
+          userPushURL: this.#options.mutateURL,
+          userQueryURL: this.#options.getQueriesURL
         }
       ]);
       this.#deletedClients = void 0;
@@ -10960,8 +10963,8 @@ var Zero = class _Zero {
       wsid,
       this.#options.logLevel === "debug",
       lc,
-      this.#options.mutate ?? this.#options.push,
-      this.#options.query,
+      this.#options.mutateURL,
+      this.#options.getQueriesURL,
       this.#options.maxHeaderLength,
       additionalConnectParams,
       await this.#activeClientsManager
@@ -11476,7 +11479,7 @@ var OnlineManager = class extends Subscribable {
     return this.#online;
   }
 };
-async function createSocket(rep, queryManager, deleteClientsManager, socketOrigin, baseCookie, clientID, clientGroupID, clientSchema, userID, auth, lmid, wsid, debugPerf, lc, userPushParams, userQueryParams, maxHeaderLength = 1024 * 8, additionalConnectParams, activeClientsManager) {
+async function createSocket(rep, queryManager, deleteClientsManager, socketOrigin, baseCookie, clientID, clientGroupID, clientSchema, userID, auth, lmid, wsid, debugPerf, lc, userPushURL, userQueryURL, maxHeaderLength = 1024 * 8, additionalConnectParams, activeClientsManager) {
   const url = new URL(
     appendPath(socketOrigin, `/sync/v${PROTOCOL_VERSION}/connect`)
   );
@@ -11515,8 +11518,8 @@ async function createSocket(rep, queryManager, deleteClientsManager, socketOrigi
         // The clientSchema only needs to be sent for the very first request.
         // Henceforth it is stored with the CVR and verified automatically.
         ...baseCookie === null ? { clientSchema } : {},
-        userPushParams,
-        userQueryParams,
+        userPushURL,
+        userQueryURL,
         activeClients: [...activeClients]
       }
     ],
@@ -11609,4 +11612,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-6USDOK3X.js.map
+//# sourceMappingURL=chunk-LCK57CQL.js.map