chore(zero-cache): review feedback on rocicorp#2337 (rocicorp#2345)

Author: grgbkr

packages/replicache/src/cookies.ts

@@ -1,6 +1,6 @@
 import {assertJSONObject, ReadonlyJSONValue} from 'shared/src/json.js';
 import type {FrozenJSONValue} from './frozen-json.js';
-import {stringCompare} from './string-compare.js';
+import {stringCompare} from 'shared/src/string-compare.js';
 
 /**
  * A cookie is a value that is used to determine the order of snapshots. It

packages/replicache/src/dag/test-store.ts

@@ -6,7 +6,7 @@ import {
   parse as parseHash,
 } from '../hash.js';
 import {TestMemStore} from '../kv/test-mem-store.js';
-import {stringCompare} from '../string-compare.js';
+import {stringCompare} from 'shared/src/string-compare.js';
 import {Chunk, ChunkHasher, Refs, toRefs as chunkToRefs} from './chunk.js';
 import {KeyType, chunkMetaKey, parse as parseKey} from './key.js';
 import {StoreImpl} from './store-impl.js';

packages/replicache/src/db/index.test.ts

@@ -6,7 +6,7 @@ import {BTreeWrite} from '../btree/write.js';
 import {TestStore} from '../dag/test-store.js';
 import {FormatVersion} from '../format-version.js';
 import {deepFreeze} from '../frozen-json.js';
-import {stringCompare} from '../string-compare.js';
+import {stringCompare} from 'shared/src/string-compare.js';
 import {withWrite} from '../with-transactions.js';
 import {
   IndexKey,

packages/replicache/src/kv/test-mem-store.ts

@@ -1,7 +1,7 @@
 import {RWLock} from '@rocicorp/lock';
 import {promiseVoid} from 'shared/src/resolved-promises.js';
 import type {FrozenJSONValue} from '../frozen-json.js';
-import {stringCompare} from '../string-compare.js';
+import {stringCompare} from 'shared/src/string-compare.js';
 import {ReadImpl} from './read-impl.js';
 import type {Read, Store, Write} from './store.js';
 import {WriteImpl} from './write-impl.js';

packages/replicache/src/merge-async-iterables.test.ts

@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import {asyncIterableToArray} from './async-iterable-to-array.js';
 import {mergeAsyncIterables} from './merge-async-iterables.js';
-import {stringCompare} from './string-compare.js';
+import {stringCompare} from 'shared/src/string-compare.js';
 
 export async function* makeAsyncIterable<V>(
   values: Iterable<V>,

packages/replicache/src/replicache-mutation-recovery-dd31.test.ts

@@ -26,7 +26,7 @@ import {
 } from './persist/clients.js';
 import type {PullResponseV0, PullResponseV1} from './puller.js';
 import type {PushResponse} from './pusher.js';
-import {stringCompare} from './string-compare.js';
+import {stringCompare} from 'shared/src/string-compare.js';
 import type {ClientID} from './sync/ids.js';
 import {
   PULL_VERSION_DD31,

packages/replicache/src/sync/pull.test.ts

@@ -46,7 +46,7 @@ import type {
   PullerResultV0,
   PullerResultV1,
 } from '../puller.js';
-import {stringCompare} from '../string-compare.js';
+import {stringCompare} from 'shared/src/string-compare.js';
 import {testSubscriptionsManagerOptions} from '../test-util.js';
 import {
   withRead,

packages/replicache/src/string-compare.ts packages/shared/src/string-compare.tspackages/replicache/src/string-compare.ts renamed to packages/shared/src/string-compare.ts

@@ -498,11 +498,11 @@ export class CVRStore {
       row => {
         const existing = existingRowRecords.get(row.id);
         return (
+          (existing !== undefined || row.refCounts !== null) &&
           !deepEqual(
             row as ReadonlyJSONValue,
             existing as ReadonlyJSONValue | undefined,
-          ) &&
-          (existing !== undefined || row.refCounts !== null)
+          )
         );
       },
     );

packages/zero-cache/src/services/view-syncer/cvr-store.ts

@@ -1,12 +1,18 @@
 import type {LogContext} from '@rocicorp/logger';
 import type postgres from 'postgres';
-import type {JSONValue, JSONObject} from '../../../types/bigint-json.js';
+import {
+  type JSONValue,
+  type JSONObject,
+  stringify,
+} from '../../../types/bigint-json.js';
 import {
   RowID,
   versionFromString,
   versionString,
   type RowRecord,
 } from './types.js';
+import {normalizedKeyOrder, RowKey} from 'zero-cache/src/types/row-key.js';
+import {stringCompare} from 'shared/src/string-compare.js';
 
 export const PG_SCHEMA = 'cvr';
 
@@ -27,7 +33,7 @@ CREATE TABLE cvr.instances (
 `;
 
 export function compareInstancesRows(a: InstancesRow, b: InstancesRow) {
-  return a.clientGroupID.localeCompare(b.clientGroupID);
+  return stringCompare(a.clientGroupID, b.clientGroupID);
 }
 
 export type ClientsRow = {
@@ -56,11 +62,11 @@ CREATE INDEX client_patch_version ON cvr.clients ("patchVersion");
 `;
 
 export function compareClientsRows(a: ClientsRow, b: ClientsRow) {
-  const clientGroupIDComp = a.clientGroupID.localeCompare(b.clientGroupID);
+  const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
   if (clientGroupIDComp !== 0) {
     return clientGroupIDComp;
   }
-  return a.clientID.localeCompare(b.clientID);
+  return stringCompare(a.clientID, b.clientID);
 }
 
 export type QueriesRow = {
@@ -97,11 +103,11 @@ CREATE INDEX queries_patch_version ON cvr.queries ("patchVersion" NULLS FIRST);
 `;
 
 export function compareQueriesRows(a: QueriesRow, b: QueriesRow) {
-  const clientGroupIDComp = a.clientGroupID.localeCompare(b.clientGroupID);
+  const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
   if (clientGroupIDComp !== 0) {
     return clientGroupIDComp;
   }
-  return a.queryHash.localeCompare(b.queryHash);
+  return stringCompare(a.queryHash, b.queryHash);
 }
 
 export type DesiresRow = {
@@ -137,15 +143,15 @@ CREATE INDEX desires_patch_version ON cvr.desires ("patchVersion");
 `;
 
 export function compareDesiresRows(a: DesiresRow, b: DesiresRow) {
-  const clientGroupIDComp = a.clientGroupID.localeCompare(b.clientGroupID);
+  const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
   if (clientGroupIDComp !== 0) {
     return clientGroupIDComp;
   }
-  const clientIDComp = a.clientID.localeCompare(b.clientID);
+  const clientIDComp = stringCompare(a.clientID, b.clientID);
   if (clientIDComp !== 0) {
     return clientIDComp;
   }
-  return a.queryHash.localeCompare(b.queryHash);
+  return stringCompare(a.queryHash, b.queryHash);
 }
 
 export type RowsRow = {
@@ -191,19 +197,22 @@ export function rowRecordToRowsRow(
 }
 
 export function compareRowsRows(a: RowsRow, b: RowsRow) {
-  const clientGroupIDComp = a.clientGroupID.localeCompare(b.clientGroupID);
+  const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
   if (clientGroupIDComp !== 0) {
     return clientGroupIDComp;
   }
-  const schemaComp = a.schema.localeCompare(b.schema);
+  const schemaComp = stringCompare(a.schema, b.schema);
   if (schemaComp !== 0) {
     return schemaComp;
   }
-  const tableComp = b.table.localeCompare(b.table);
+  const tableComp = stringCompare(b.table, b.table);
   if (tableComp !== 0) {
     return tableComp;
   }
-  return stringifySorted(a.rowKey).localeCompare(stringifySorted(b.rowKey));
+  return stringCompare(
+    stringifySorted(a.rowKey as RowKey),
+    stringifySorted(b.rowKey as RowKey),
+  );
 }
 
 const CREATE_CVR_ROWS_TABLE = `
@@ -247,6 +256,6 @@ export async function setupCVRTables(
   await db.unsafe(CREATE_CVR_TABLES);
 }
 
-function stringifySorted(o: JSONObject) {
-  return JSON.stringify(o, Object.keys(o).sort());
+function stringifySorted(r: RowKey) {
+  return stringify(normalizedKeyOrder(r));
 }