@rocicorp/zero 1.6.0-canary.3 → 1.6.0-canary.4

package/out/replicache/src/dag/store-impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store-impl.d.ts","sourceRoot":"","sources":["../../../../../replicache/src/dag/store-impl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,KAAK,IAAI,EAAa,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EACV,IAAI,IAAI,MAAM,EACd,KAAK,IAAI,OAAO,EAChB,KAAK,IAAI,OAAO,EACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,KAAK,EACL,KAAK,WAAW,EAChB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAC,KAAK,uBAAuB,EAAyB,MAAM,SAAS,CAAC;AAE7E,OAAO,EAAC,KAAK,IAAI,EAAE,KAAK,KAAK,EAAE,KAAK,KAAK,EAAe,MAAM,YAAY,CAAC;AAE3E,qBAAa,SAAU,YAAW,KAAK;;gBAMnC,EAAE,EAAE,OAAO,EACX,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;IAOjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;IAQ7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvB;AAED,qBAAa,QAAS,YAAW,IAAI;IACnC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;gBAEnC,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;IAK7D,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiBtD,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC;IAIlC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAStD,OAAO,IAAI,IAAI;IAIf,IAAI,MAAM,IAAI,OAAO,CAEpB;CACF;AAOD,qBAAa,SACX,SAAQ,QACR,YAAW,KAAK,EAAE,uBAAuB;;IAEzC,mBAA2B,GAAG,EAAE,OAAO,CAAC;gBAOtC,GAAG,EAAE,OAAO,EACZ,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;IAMvC,WAAW,GAAI,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,IAAI,KAAG,KAAK,CAAC,CAAC,CAAC,CACH;IAE7C,IAAI,OAAO,IAAI,OAAO,CAErB;IAEK,QAAQ,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAUvB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAcpD,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;IAgCnD,OAAO,IAAI,IAAI;CAGhB"}
+{"version":3,"file":"store-impl.d.ts","sourceRoot":"","sources":["../../../../../replicache/src/dag/store-impl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,KAAK,IAAI,EAAa,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EACV,IAAI,IAAI,MAAM,EACd,KAAK,IAAI,OAAO,EAChB,KAAK,IAAI,OAAO,EACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,KAAK,EACL,KAAK,WAAW,EAChB,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAC,KAAK,uBAAuB,EAAyB,MAAM,SAAS,CAAC;AAE7E,OAAO,EAAC,KAAK,IAAI,EAAE,KAAK,KAAK,EAAE,KAAK,KAAK,EAAe,MAAM,YAAY,CAAC;AAE3E,qBAAa,SAAU,YAAW,KAAK;;gBAMnC,EAAE,EAAE,OAAO,EACX,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;IAOjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrB,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;IAQ7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvB;AAED,qBAAa,QAAS,YAAW,IAAI;IACnC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;gBAEnC,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;IAK7D,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAsBtD,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC;IAIlC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAStD,OAAO,IAAI,IAAI;IAIf,IAAI,MAAM,IAAI,OAAO,CAEpB;CACF;AAOD,qBAAa,SACX,SAAQ,QACR,YAAW,KAAK,EAAE,uBAAuB;;IAEzC,mBAA2B,GAAG,EAAE,OAAO,CAAC;gBAOtC,GAAG,EAAE,OAAO,EACZ,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI;IAMvC,WAAW,GAAI,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,IAAI,KAAG,KAAK,CAAC,CAAC,CAAC,CACH;IAE7C,IAAI,OAAO,IAAI,OAAO,CAErB;IAEK,QAAQ,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAUvB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAcpD,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;IAgCnD,OAAO,IAAI,IAAI;CAGhB"}

package/out/replicache/src/dag/store-impl.js

@@ -35,9 +35,14 @@ var ReadImpl = class {
 		return this._tx.has(chunkDataKey(hash));
 	}
 	async getChunk(hash) {
-		const data = await this._tx.get(chunkDataKey(hash));
-		if (data === void 0) return;
-		const refsVal = await this._tx.get(chunkMetaKey(hash));
+		const dataPromise = this._tx.get(chunkDataKey(hash));
+		const refsPromise = this._tx.get(chunkMetaKey(hash));
+		const data = await dataPromise;
+		if (data === void 0) {
+			refsPromise.catch(() => {});
+			return;
+		}
+		const refsVal = await refsPromise;
 		let refs;
 		if (refsVal !== void 0) {
 			assertRefs(refsVal);

package/out/replicache/src/dag/store-impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"store-impl.js","names":["#kv","#chunkHasher","#assertValidHash","#putChunks","#changedHeads","#setHead","#applyRefCountUpdates","#removeAllRelatedKeys"],"sources":["../../../../../replicache/src/dag/store-impl.ts"],"sourcesContent":["import {assertNumber} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {type Hash, assertHash} from '../hash.ts';\nimport type {\n  Read as KVRead,\n  Store as KVStore,\n  Write as KVWrite,\n} from '../kv/store.ts';\nimport {\n  Chunk,\n  type ChunkHasher,\n  type Refs,\n  assertRefs,\n  createChunk,\n} from './chunk.ts';\nimport {type RefCountUpdatesDelegate, computeRefCountUpdates} from './gc.ts';\nimport {chunkDataKey, chunkMetaKey, chunkRefCountKey, headKey} from './key.ts';\nimport {type Read, type Store, type Write, mustGetChunk} from './store.ts';\n\nexport class StoreImpl implements Store {\n  readonly #kv: KVStore;\n  readonly #chunkHasher: ChunkHasher;\n  readonly #assertValidHash: (hash: Hash) => void;\n\n  constructor(\n    kv: KVStore,\n    chunkHasher: ChunkHasher,\n    assertValidHash: (hash: Hash) => void,\n  ) {\n    this.#kv = kv;\n    this.#chunkHasher = chunkHasher;\n    this.#assertValidHash = assertValidHash;\n  }\n\n  async read(): Promise<Read> {\n    return new ReadImpl(await this.#kv.read(), this.#assertValidHash);\n  }\n\n  async write(): Promise<Write> {\n    return new WriteImpl(\n      await this.#kv.write(),\n      this.#chunkHasher,\n      this.#assertValidHash,\n    );\n  }\n\n  close(): Promise<void> {\n    return this.#kv.close();\n  }\n}\n\nexport class ReadImpl implements Read {\n  protected readonly _tx: KVRead;\n  readonly assertValidHash: (hash: Hash) => void;\n\n  constructor(kv: KVRead, assertValidHash: (hash: Hash) => void) {\n    this._tx = kv;\n    this.assertValidHash = assertValidHash;\n  }\n\n  hasChunk(hash: Hash): Promise<boolean> {\n    return this._tx.has(chunkDataKey(hash));\n  }\n\n  async getChunk(hash: Hash): Promise<Chunk | undefined> {\n    const data = await this._tx.get(chunkDataKey(hash));\n    if (data === undefined) {\n      return undefined;\n    }\n\n    const refsVal = await this._tx.get(chunkMetaKey(hash));\n    let refs: Refs;\n    if (refsVal !== undefined) {\n      assertRefs(refsVal);\n      refs = refsVal;\n    } else {\n      refs = [];\n    }\n    return new Chunk(hash, data, refs);\n  }\n\n  mustGetChunk(hash: Hash): Promise<Chunk> {\n    return mustGetChunk(this, hash);\n  }\n\n  async getHead(name: string): Promise<Hash | undefined> {\n    const data = await this._tx.get(headKey(name));\n    if (data === undefined) {\n      return undefined;\n    }\n    assertHash(data);\n    return data;\n  }\n\n  release(): void {\n    this._tx.release();\n  }\n\n  get closed(): boolean {\n    return this._tx.closed;\n  }\n}\n\ntype HeadChange = {\n  new: Hash | undefined;\n  old: Hash | undefined;\n};\n\nexport class WriteImpl\n  extends ReadImpl\n  implements Write, RefCountUpdatesDelegate\n{\n  declare protected readonly _tx: KVWrite;\n  readonly #chunkHasher: ChunkHasher;\n\n  readonly #putChunks = new Set<Hash>();\n  readonly #changedHeads = new Map<string, HeadChange>();\n\n  constructor(\n    kvw: KVWrite,\n    chunkHasher: ChunkHasher,\n    assertValidHash: (hash: Hash) => void,\n  ) {\n    super(kvw, assertValidHash);\n    this.#chunkHasher = chunkHasher;\n  }\n\n  createChunk = <V>(data: V, refs: Refs): Chunk<V> =>\n    createChunk(data, refs, this.#chunkHasher);\n\n  get kvWrite(): KVWrite {\n    return this._tx;\n  }\n\n  async putChunk(c: Chunk): Promise<void> {\n    const {hash, data, meta} = c;\n    // We never want to write temp hashes to the underlying store.\n    this.assertValidHash(hash);\n    const key = chunkDataKey(hash);\n    // Commit contains InternalValue and Hash which are opaque types.\n    const p1 = this._tx.put(key, data as ReadonlyJSONValue);\n    let p2;\n    if (meta.length > 0) {\n      for (const h of meta) {\n        this.assertValidHash(h);\n      }\n      p2 = this._tx.put(chunkMetaKey(hash), meta);\n    }\n    this.#putChunks.add(hash);\n    await p1;\n    await p2;\n  }\n\n  setHead(name: string, hash: Hash): Promise<void> {\n    return this.#setHead(name, hash);\n  }\n\n  removeHead(name: string): Promise<void> {\n    return this.#setHead(name, undefined);\n  }\n\n  async #setHead(name: string, hash: Hash | undefined): Promise<void> {\n    const oldHash = await this.getHead(name);\n    const hk = headKey(name);\n\n    let p1: Promise<void>;\n    if (hash === undefined) {\n      p1 = this._tx.del(hk);\n    } else {\n      p1 = this._tx.put(hk, hash);\n    }\n\n    const v = this.#changedHeads.get(name);\n    if (v === undefined) {\n      this.#changedHeads.set(name, {new: hash, old: oldHash});\n    } else {\n      // Keep old if existing\n      v.new = hash;\n    }\n\n    await p1;\n  }\n\n  async commit(): Promise<void> {\n    const refCountUpdates = await computeRefCountUpdates(\n      this.#changedHeads.values(),\n      this.#putChunks,\n      this,\n    );\n    await this.#applyRefCountUpdates(refCountUpdates);\n    await this._tx.commit();\n  }\n\n  async getRefCount(hash: Hash): Promise<number | undefined> {\n    const value = await this._tx.get(chunkRefCountKey(hash));\n    if (value === undefined) {\n      return undefined;\n    }\n    assertNumber(value);\n    if (value < 0 || value > 0xffff || value !== (value | 0)) {\n      throw new Error(\n        `Invalid ref count ${value}. We expect the value to be a Uint16`,\n      );\n    }\n    return value;\n  }\n\n  async getRefs(hash: Hash): Promise<readonly Hash[]> {\n    const meta = await this._tx.get(chunkMetaKey(hash));\n    if (meta === undefined) {\n      return [];\n    }\n    assertRefs(meta);\n    return meta;\n  }\n\n  async #applyRefCountUpdates(refCountCache: Map<Hash, number>): Promise<void> {\n    const ps: Promise<void>[] = [];\n    for (const [hash, count] of refCountCache) {\n      if (count === 0) {\n        ps.push(this.#removeAllRelatedKeys(hash));\n      } else {\n        const refCountKey = chunkRefCountKey(hash);\n        ps.push(this._tx.put(refCountKey, count));\n      }\n    }\n    await Promise.all(ps);\n  }\n\n  async #removeAllRelatedKeys(hash: Hash): Promise<void> {\n    await Promise.all([\n      this._tx.del(chunkDataKey(hash)),\n      this._tx.del(chunkMetaKey(hash)),\n      this._tx.del(chunkRefCountKey(hash)),\n    ]);\n\n    this.#putChunks.delete(hash);\n  }\n\n  release(): void {\n    this._tx.release();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"store-impl.js","names":["#kv","#chunkHasher","#assertValidHash","#putChunks","#changedHeads","#setHead","#applyRefCountUpdates","#removeAllRelatedKeys"],"sources":["../../../../../replicache/src/dag/store-impl.ts"],"sourcesContent":["import {assertNumber} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {type Hash, assertHash} from '../hash.ts';\nimport type {\n  Read as KVRead,\n  Store as KVStore,\n  Write as KVWrite,\n} from '../kv/store.ts';\nimport {\n  Chunk,\n  type ChunkHasher,\n  type Refs,\n  assertRefs,\n  createChunk,\n} from './chunk.ts';\nimport {type RefCountUpdatesDelegate, computeRefCountUpdates} from './gc.ts';\nimport {chunkDataKey, chunkMetaKey, chunkRefCountKey, headKey} from './key.ts';\nimport {type Read, type Store, type Write, mustGetChunk} from './store.ts';\n\nexport class StoreImpl implements Store {\n  readonly #kv: KVStore;\n  readonly #chunkHasher: ChunkHasher;\n  readonly #assertValidHash: (hash: Hash) => void;\n\n  constructor(\n    kv: KVStore,\n    chunkHasher: ChunkHasher,\n    assertValidHash: (hash: Hash) => void,\n  ) {\n    this.#kv = kv;\n    this.#chunkHasher = chunkHasher;\n    this.#assertValidHash = assertValidHash;\n  }\n\n  async read(): Promise<Read> {\n    return new ReadImpl(await this.#kv.read(), this.#assertValidHash);\n  }\n\n  async write(): Promise<Write> {\n    return new WriteImpl(\n      await this.#kv.write(),\n      this.#chunkHasher,\n      this.#assertValidHash,\n    );\n  }\n\n  close(): Promise<void> {\n    return this.#kv.close();\n  }\n}\n\nexport class ReadImpl implements Read {\n  protected readonly _tx: KVRead;\n  readonly assertValidHash: (hash: Hash) => void;\n\n  constructor(kv: KVRead, assertValidHash: (hash: Hash) => void) {\n    this._tx = kv;\n    this.assertValidHash = assertValidHash;\n  }\n\n  hasChunk(hash: Hash): Promise<boolean> {\n    return this._tx.has(chunkDataKey(hash));\n  }\n\n  async getChunk(hash: Hash): Promise<Chunk | undefined> {\n    const dataPromise = this._tx.get(chunkDataKey(hash));\n    const refsPromise = this._tx.get(chunkMetaKey(hash));\n    const data = await dataPromise;\n    if (data === undefined) {\n      refsPromise.catch(() => {\n        // Ignore error since we will return undefined anyway.\n      });\n      return undefined;\n    }\n\n    const refsVal = await refsPromise;\n    let refs: Refs;\n    if (refsVal !== undefined) {\n      assertRefs(refsVal);\n      refs = refsVal;\n    } else {\n      refs = [];\n    }\n    return new Chunk(hash, data, refs);\n  }\n\n  mustGetChunk(hash: Hash): Promise<Chunk> {\n    return mustGetChunk(this, hash);\n  }\n\n  async getHead(name: string): Promise<Hash | undefined> {\n    const data = await this._tx.get(headKey(name));\n    if (data === undefined) {\n      return undefined;\n    }\n    assertHash(data);\n    return data;\n  }\n\n  release(): void {\n    this._tx.release();\n  }\n\n  get closed(): boolean {\n    return this._tx.closed;\n  }\n}\n\ntype HeadChange = {\n  new: Hash | undefined;\n  old: Hash | undefined;\n};\n\nexport class WriteImpl\n  extends ReadImpl\n  implements Write, RefCountUpdatesDelegate\n{\n  declare protected readonly _tx: KVWrite;\n  readonly #chunkHasher: ChunkHasher;\n\n  readonly #putChunks = new Set<Hash>();\n  readonly #changedHeads = new Map<string, HeadChange>();\n\n  constructor(\n    kvw: KVWrite,\n    chunkHasher: ChunkHasher,\n    assertValidHash: (hash: Hash) => void,\n  ) {\n    super(kvw, assertValidHash);\n    this.#chunkHasher = chunkHasher;\n  }\n\n  createChunk = <V>(data: V, refs: Refs): Chunk<V> =>\n    createChunk(data, refs, this.#chunkHasher);\n\n  get kvWrite(): KVWrite {\n    return this._tx;\n  }\n\n  async putChunk(c: Chunk): Promise<void> {\n    const {hash, data, meta} = c;\n    // We never want to write temp hashes to the underlying store.\n    this.assertValidHash(hash);\n    const key = chunkDataKey(hash);\n    // Commit contains InternalValue and Hash which are opaque types.\n    const p1 = this._tx.put(key, data as ReadonlyJSONValue);\n    let p2;\n    if (meta.length > 0) {\n      for (const h of meta) {\n        this.assertValidHash(h);\n      }\n      p2 = this._tx.put(chunkMetaKey(hash), meta);\n    }\n    this.#putChunks.add(hash);\n    await p1;\n    await p2;\n  }\n\n  setHead(name: string, hash: Hash): Promise<void> {\n    return this.#setHead(name, hash);\n  }\n\n  removeHead(name: string): Promise<void> {\n    return this.#setHead(name, undefined);\n  }\n\n  async #setHead(name: string, hash: Hash | undefined): Promise<void> {\n    const oldHash = await this.getHead(name);\n    const hk = headKey(name);\n\n    let p1: Promise<void>;\n    if (hash === undefined) {\n      p1 = this._tx.del(hk);\n    } else {\n      p1 = this._tx.put(hk, hash);\n    }\n\n    const v = this.#changedHeads.get(name);\n    if (v === undefined) {\n      this.#changedHeads.set(name, {new: hash, old: oldHash});\n    } else {\n      // Keep old if existing\n      v.new = hash;\n    }\n\n    await p1;\n  }\n\n  async commit(): Promise<void> {\n    const refCountUpdates = await computeRefCountUpdates(\n      this.#changedHeads.values(),\n      this.#putChunks,\n      this,\n    );\n    await this.#applyRefCountUpdates(refCountUpdates);\n    await this._tx.commit();\n  }\n\n  async getRefCount(hash: Hash): Promise<number | undefined> {\n    const value = await this._tx.get(chunkRefCountKey(hash));\n    if (value === undefined) {\n      return undefined;\n    }\n    assertNumber(value);\n    if (value < 0 || value > 0xffff || value !== (value | 0)) {\n      throw new Error(\n        `Invalid ref count ${value}. We expect the value to be a Uint16`,\n      );\n    }\n    return value;\n  }\n\n  async getRefs(hash: Hash): Promise<readonly Hash[]> {\n    const meta = await this._tx.get(chunkMetaKey(hash));\n    if (meta === undefined) {\n      return [];\n    }\n    assertRefs(meta);\n    return meta;\n  }\n\n  async #applyRefCountUpdates(refCountCache: Map<Hash, number>): Promise<void> {\n    const ps: Promise<void>[] = [];\n    for (const [hash, count] of refCountCache) {\n      if (count === 0) {\n        ps.push(this.#removeAllRelatedKeys(hash));\n      } else {\n        const refCountKey = chunkRefCountKey(hash);\n        ps.push(this._tx.put(refCountKey, count));\n      }\n    }\n    await Promise.all(ps);\n  }\n\n  async #removeAllRelatedKeys(hash: Hash): Promise<void> {\n    await Promise.all([\n      this._tx.del(chunkDataKey(hash)),\n      this._tx.del(chunkMetaKey(hash)),\n      this._tx.del(chunkRefCountKey(hash)),\n    ]);\n\n    this.#putChunks.delete(hash);\n  }\n\n  release(): void {\n    this._tx.release();\n  }\n}\n"],"mappings":"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"}

package/out/replicache/src/persist/persist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"persist.d.ts","sourceRoot":"","sources":["../../../../../replicache/src/persist/persist.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AAEtD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAO,KAAK,EAAQ,MAAM,iBAAiB,CAAC;AAexD,OAAO,KAAK,KAAK,aAAa,MAAM,2BAA2B,CAAC;AAEhE,OAAO,KAAK,EAAC,UAAU,EAAa,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAgB,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAC5D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAgB7C,KAAK,aAAa,GAAG,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAEhD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,KAAK,EACb,QAAQ,EAAE,WAAW,EACrB,MAAM,EAAE,MAAM,OAAO,EACrB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,SAAS,EAChD,4BAA4B,sBAA0B,GACrD,OAAO,CAAC,IAAI,CAAC,CA2Lf"}
+{"version":3,"file":"persist.d.ts","sourceRoot":"","sources":["../../../../../replicache/src/persist/persist.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AAGtD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAO,KAAK,EAAQ,MAAM,iBAAiB,CAAC;AAexD,OAAO,KAAK,KAAK,aAAa,MAAM,2BAA2B,CAAC;AAEhE,OAAO,KAAK,EAAC,UAAU,EAAa,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAgB,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAC5D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAgB7C,KAAK,aAAa,GAAG,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAEhD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,UAAU,EACd,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,KAAK,EACb,QAAQ,EAAE,WAAW,EACrB,MAAM,EAAE,MAAM,OAAO,EACrB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,SAAS,EAChD,4BAA4B,sBAA0B,GACrD,OAAO,CAAC,IAAI,CAAC,CA2Lf"}

package/out/replicache/src/persist/persist.js

@@ -4,6 +4,7 @@ import { withRead, withWrite } from "../with-transactions.js";
 import { getClientGroup, setClientGroup } from "./client-groups.js";
 import { assertClientV6, assertHasClientState, getClientGroupIDForClient, mustGetClient, setClient } from "./clients.js";
 import { rebaseMutationAndPutCommit } from "../db/rebase.js";
+import { getOrInsert, getOrInsertComputed } from "../../../shared/src/map.js";
 import { GatherMemoryOnlyVisitor } from "./gather-mem-only-visitor.js";
 //#region ../replicache/src/persist/persist.ts
 /**
@@ -105,11 +106,12 @@ async function getClientGroupInfo(perdagRead, clientGroupID) {
 	return [clientGroup, await commitFromHash(clientGroup.headHash, perdagRead)];
 }
 async function rebase(mutations, basis, write, mutators, mutationIDs, lc, formatVersion, zeroData) {
+	const basisMutationIDs = /* @__PURE__ */ new Map();
+	const getBasisMutationID = (basisHash, clientID) => getOrInsertComputed(getOrInsert(basisMutationIDs, basisHash, /* @__PURE__ */ new Map()), clientID, () => commitFromHash(basisHash, write).then((commit) => commit.getMutationID(clientID, write)));
 	for (let i = mutations.length - 1; i >= 0; i--) {
 		const mutationCommit = mutations[i];
 		const { meta } = mutationCommit;
-		const newMainHead = await commitFromHash(basis, write);
-		if (await mutationCommit.getMutationID(meta.clientID, write) > await newMainHead.getMutationID(meta.clientID, write)) {
+		if (meta.mutationID > await getBasisMutationID(basis, meta.clientID)) {
 			mutationIDs[meta.clientID] = meta.mutationID;
 			basis = (await rebaseMutationAndPutCommit(mutationCommit, write, basis, mutators, lc, meta.clientID, formatVersion, zeroData)).chunk.hash;
 		}

package/out/replicache/src/persist/persist.js.map

@@ -1 +1 @@
-{"version":3,"file":"persist.js","names":[],"sources":["../../../../../replicache/src/persist/persist.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {Enum} from '../../../shared/src/enum.ts';\nimport type {Chunk} from '../dag/chunk.ts';\nimport type {LazyStore} from '../dag/lazy-store.ts';\nimport type {Read, Store, Write} from '../dag/store.ts';\nimport type {Commit} from '../db/commit.ts';\nimport {\n  DEFAULT_HEAD_NAME,\n  type LocalMetaDD31,\n  type Meta,\n  assertSnapshotCommitDD31,\n  baseSnapshotFromCommit,\n  commitFromHash,\n  commitFromHead,\n  compareCookiesForSnapshots,\n  localMutationsDD31,\n  localMutationsGreaterThan,\n} from '../db/commit.ts';\nimport {rebaseMutationAndPutCommit} from '../db/rebase.ts';\nimport type * as FormatVersion from '../format-version-enum.ts';\nimport type {Hash} from '../hash.ts';\nimport type {ZeroOption, ZeroTxData} from '../replicache-options.ts';\nimport type {ClientGroupID, ClientID} from '../sync/ids.ts';\nimport type {MutatorDefs} from '../types.ts';\nimport {withRead, withWrite} from '../with-transactions.ts';\nimport {\n  type ClientGroup,\n  getClientGroup,\n  setClientGroup,\n} from './client-groups.ts';\nimport {\n  assertClientV6,\n  assertHasClientState,\n  getClientGroupIDForClient,\n  mustGetClient,\n  setClient,\n} from './clients.ts';\nimport {GatherMemoryOnlyVisitor} from './gather-mem-only-visitor.ts';\n\ntype FormatVersion = Enum<typeof FormatVersion>;\n\n/**\n * Persists the client's memdag state to the client's perdag client group.\n *\n * Persists the base snapshot from memdag to the client's perdag client group,\n * but only if it’s newer than the client's perdag client group’s base snapshot.\n * The base snapshot is persisted by gathering all memory-only chunks in the dag\n * subgraph rooted at the base snapshot's commit and writing them to the perdag.\n * Once the base snapshot is persisted, rebases onto this new base snapshot all\n * local commits from the client's perdag client group that are not already\n * reflected in the base snapshot.\n *\n * Whether or not the base snapshot is persisted, rebases onto the client's\n * perdag client group all memdag local commits not already in the client's\n * perdag client group's history.\n *\n * Also updates the `lastMutationIDs` and `lastServerAckdMutationIDs` properties\n * of the client's client group's entry in the `ClientGroupMap`.\n */\nexport async function persistDD31(\n  lc: LogContext,\n  clientID: ClientID,\n  memdag: LazyStore,\n  perdag: Store,\n  mutators: MutatorDefs,\n  closed: () => boolean,\n  formatVersion: FormatVersion,\n  getZeroData: ZeroOption['getTxData'] | undefined,\n  onGatherMemOnlyChunksForTest = () => Promise.resolve(),\n): Promise<void> {\n  if (closed()) {\n    return;\n  }\n\n  const [perdagLMID, perdagBaseSnapshot, mainClientGroupID] = await withRead(\n    perdag,\n    async perdagRead => {\n      await assertHasClientState(clientID, perdagRead);\n      const mainClientGroupID = await getClientGroupIDForClient(\n        clientID,\n        perdagRead,\n      );\n      assert(\n        mainClientGroupID,\n        `No main client group for clientID: ${clientID}`,\n      );\n      const [, perdagMainClientGroupHeadCommit] = await getClientGroupInfo(\n        perdagRead,\n        mainClientGroupID,\n      );\n      const perdagLMID = await perdagMainClientGroupHeadCommit.getMutationID(\n        clientID,\n        perdagRead,\n      );\n      const perdagBaseSnapshot = await baseSnapshotFromCommit(\n        perdagMainClientGroupHeadCommit,\n        perdagRead,\n      );\n      assertSnapshotCommitDD31(perdagBaseSnapshot);\n      return [perdagLMID, perdagBaseSnapshot, mainClientGroupID];\n    },\n  );\n\n  if (closed()) {\n    return;\n  }\n  const [newMemdagMutations, memdagBaseSnapshot, gatheredChunks] =\n    await withRead(memdag, async memdagRead => {\n      const memdagHeadCommit = await commitFromHead(\n        DEFAULT_HEAD_NAME,\n        memdagRead,\n      );\n      const newMutations = await localMutationsGreaterThan(\n        memdagHeadCommit,\n        {[clientID]: perdagLMID || 0},\n        memdagRead,\n      );\n      const memdagBaseSnapshot = await baseSnapshotFromCommit(\n        memdagHeadCommit,\n        memdagRead,\n      );\n      assertSnapshotCommitDD31(memdagBaseSnapshot);\n\n      let gatheredChunks: ReadonlyMap<Hash, Chunk> | undefined;\n      if (\n        compareCookiesForSnapshots(memdagBaseSnapshot, perdagBaseSnapshot) > 0\n      ) {\n        await onGatherMemOnlyChunksForTest();\n        // Might need to persist snapshot, we will have to double check\n        // after gathering the snapshot chunks from memdag\n        const memdagBaseSnapshotHash = memdagBaseSnapshot.chunk.hash;\n        // Gather all memory only chunks from base snapshot on the memdag.\n        const visitor = new GatherMemoryOnlyVisitor(memdagRead);\n        await visitor.visit(memdagBaseSnapshotHash);\n        gatheredChunks = visitor.gatheredChunks;\n      }\n\n      return [newMutations, memdagBaseSnapshot, gatheredChunks];\n    });\n\n  if (closed()) {\n    return;\n  }\n\n  let memdagBaseSnapshotPersisted = false;\n  const zeroDataForMemdagBaseSnapshot =\n    getZeroData && (await getZeroData(memdagBaseSnapshot.chunk.hash));\n\n  await withWrite(perdag, async perdagWrite => {\n    const [mainClientGroup, latestPerdagMainClientGroupHeadCommit] =\n      await getClientGroupInfo(perdagWrite, mainClientGroupID);\n\n    // These initial values for newMainClientGroupHeadHash, mutationIDs,\n    // lastServerAckdMutationIDs are correct for the case where the memdag\n    // snapshot is *not* persisted.  If the memdag snapshot is persisted\n    // these values are overwritten appropriately.\n    let newMainClientGroupHeadHash: Hash =\n      latestPerdagMainClientGroupHeadCommit.chunk.hash;\n    let mutationIDs: Record<ClientID, number> = {\n      ...mainClientGroup.mutationIDs,\n    };\n    let {lastServerAckdMutationIDs} = mainClientGroup;\n\n    if (gatheredChunks) {\n      // check if memdag snapshot still newer than perdag snapshot\n\n      const client = await mustGetClient(clientID, perdagWrite);\n      assertClientV6(client);\n\n      const latestPerdagBaseSnapshot = await baseSnapshotFromCommit(\n        latestPerdagMainClientGroupHeadCommit,\n        perdagWrite,\n      );\n      assertSnapshotCommitDD31(latestPerdagBaseSnapshot);\n\n      // check if memdag snapshot still newer than perdag snapshot\n      if (\n        compareCookiesForSnapshots(\n          memdagBaseSnapshot,\n          latestPerdagBaseSnapshot,\n        ) > 0\n      ) {\n        // still newer, persist memdag snapshot by writing chunks\n        memdagBaseSnapshotPersisted = true;\n        await Promise.all(\n          Array.from(gatheredChunks.values(), c => perdagWrite.putChunk(c)),\n        );\n\n        await setClient(\n          clientID,\n          {\n            ...client,\n            persistHash: memdagBaseSnapshot.chunk.hash,\n          },\n          perdagWrite,\n        );\n        // Rebase local mutations from perdag main client group onto new\n        // snapshot\n        newMainClientGroupHeadHash = memdagBaseSnapshot.chunk.hash;\n        const mainClientGroupLocalMutations = await localMutationsDD31(\n          mainClientGroup.headHash,\n          perdagWrite,\n        );\n\n        lastServerAckdMutationIDs = memdagBaseSnapshot.meta.lastMutationIDs;\n        mutationIDs = {...lastServerAckdMutationIDs};\n\n        newMainClientGroupHeadHash = await rebase(\n          mainClientGroupLocalMutations,\n          newMainClientGroupHeadHash,\n          perdagWrite,\n          mutators,\n          mutationIDs,\n          lc,\n          formatVersion,\n          zeroDataForMemdagBaseSnapshot,\n        );\n      }\n    }\n\n    let zeroDataForPerdagHeadCommit: ZeroTxData | undefined;\n    if (!memdagBaseSnapshotPersisted) {\n      zeroDataForPerdagHeadCommit =\n        getZeroData &&\n        (await getZeroData(newMainClientGroupHeadHash, {\n          openLazySourceRead: perdagWrite,\n        }));\n    }\n\n    // rebase new memdag mutations onto perdag\n    newMainClientGroupHeadHash = await rebase(\n      newMemdagMutations,\n      newMainClientGroupHeadHash,\n      perdagWrite,\n      mutators,\n      mutationIDs,\n      lc,\n      formatVersion,\n      zeroDataForPerdagHeadCommit ?? zeroDataForMemdagBaseSnapshot,\n    );\n\n    const newMainClientGroup = {\n      ...mainClientGroup,\n      headHash: newMainClientGroupHeadHash,\n      mutationIDs,\n      lastServerAckdMutationIDs,\n    };\n\n    await setClientGroup(mainClientGroupID, newMainClientGroup, perdagWrite);\n  });\n\n  if (gatheredChunks && memdagBaseSnapshotPersisted) {\n    await withWrite(memdag, memdagWrite =>\n      memdagWrite.chunksPersisted([...gatheredChunks.keys()]),\n    );\n  }\n}\n\nasync function getClientGroupInfo(\n  perdagRead: Read,\n  clientGroupID: ClientGroupID,\n): Promise<[ClientGroup, Commit<Meta>]> {\n  const clientGroup = await getClientGroup(clientGroupID, perdagRead);\n  assert(clientGroup, `No client group for clientGroupID: ${clientGroupID}`);\n  return [clientGroup, await commitFromHash(clientGroup.headHash, perdagRead)];\n}\n\nasync function rebase(\n  mutations: Commit<LocalMetaDD31>[],\n  basis: Hash,\n  write: Write,\n  mutators: MutatorDefs,\n  mutationIDs: Record<ClientID, number>,\n  lc: LogContext,\n  formatVersion: FormatVersion,\n  zeroData: ZeroTxData | undefined,\n): Promise<Hash> {\n  for (let i = mutations.length - 1; i >= 0; i--) {\n    const mutationCommit = mutations[i];\n    const {meta} = mutationCommit;\n    const newMainHead = await commitFromHash(basis, write);\n    if (\n      (await mutationCommit.getMutationID(meta.clientID, write)) >\n      (await newMainHead.getMutationID(meta.clientID, write))\n    ) {\n      mutationIDs[meta.clientID] = meta.mutationID;\n      basis = (\n        await rebaseMutationAndPutCommit(\n          mutationCommit,\n          write,\n          basis,\n          mutators,\n          lc,\n          meta.clientID,\n          formatVersion,\n          zeroData,\n        )\n      ).chunk.hash;\n    }\n  }\n  return basis;\n}\n"],"mappings":"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"}
+{"version":3,"file":"persist.js","names":[],"sources":["../../../../../replicache/src/persist/persist.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {Enum} from '../../../shared/src/enum.ts';\nimport {getOrInsert, getOrInsertComputed} from '../../../shared/src/map.ts';\nimport type {Chunk} from '../dag/chunk.ts';\nimport type {LazyStore} from '../dag/lazy-store.ts';\nimport type {Read, Store, Write} from '../dag/store.ts';\nimport type {Commit} from '../db/commit.ts';\nimport {\n  DEFAULT_HEAD_NAME,\n  type LocalMetaDD31,\n  type Meta,\n  assertSnapshotCommitDD31,\n  baseSnapshotFromCommit,\n  commitFromHash,\n  commitFromHead,\n  compareCookiesForSnapshots,\n  localMutationsDD31,\n  localMutationsGreaterThan,\n} from '../db/commit.ts';\nimport {rebaseMutationAndPutCommit} from '../db/rebase.ts';\nimport type * as FormatVersion from '../format-version-enum.ts';\nimport type {Hash} from '../hash.ts';\nimport type {ZeroOption, ZeroTxData} from '../replicache-options.ts';\nimport type {ClientGroupID, ClientID} from '../sync/ids.ts';\nimport type {MutatorDefs} from '../types.ts';\nimport {withRead, withWrite} from '../with-transactions.ts';\nimport {\n  type ClientGroup,\n  getClientGroup,\n  setClientGroup,\n} from './client-groups.ts';\nimport {\n  assertClientV6,\n  assertHasClientState,\n  getClientGroupIDForClient,\n  mustGetClient,\n  setClient,\n} from './clients.ts';\nimport {GatherMemoryOnlyVisitor} from './gather-mem-only-visitor.ts';\n\ntype FormatVersion = Enum<typeof FormatVersion>;\n\n/**\n * Persists the client's memdag state to the client's perdag client group.\n *\n * Persists the base snapshot from memdag to the client's perdag client group,\n * but only if it’s newer than the client's perdag client group’s base snapshot.\n * The base snapshot is persisted by gathering all memory-only chunks in the dag\n * subgraph rooted at the base snapshot's commit and writing them to the perdag.\n * Once the base snapshot is persisted, rebases onto this new base snapshot all\n * local commits from the client's perdag client group that are not already\n * reflected in the base snapshot.\n *\n * Whether or not the base snapshot is persisted, rebases onto the client's\n * perdag client group all memdag local commits not already in the client's\n * perdag client group's history.\n *\n * Also updates the `lastMutationIDs` and `lastServerAckdMutationIDs` properties\n * of the client's client group's entry in the `ClientGroupMap`.\n */\nexport async function persistDD31(\n  lc: LogContext,\n  clientID: ClientID,\n  memdag: LazyStore,\n  perdag: Store,\n  mutators: MutatorDefs,\n  closed: () => boolean,\n  formatVersion: FormatVersion,\n  getZeroData: ZeroOption['getTxData'] | undefined,\n  onGatherMemOnlyChunksForTest = () => Promise.resolve(),\n): Promise<void> {\n  if (closed()) {\n    return;\n  }\n\n  const [perdagLMID, perdagBaseSnapshot, mainClientGroupID] = await withRead(\n    perdag,\n    async perdagRead => {\n      await assertHasClientState(clientID, perdagRead);\n      const mainClientGroupID = await getClientGroupIDForClient(\n        clientID,\n        perdagRead,\n      );\n      assert(\n        mainClientGroupID,\n        `No main client group for clientID: ${clientID}`,\n      );\n      const [, perdagMainClientGroupHeadCommit] = await getClientGroupInfo(\n        perdagRead,\n        mainClientGroupID,\n      );\n      const perdagLMID = await perdagMainClientGroupHeadCommit.getMutationID(\n        clientID,\n        perdagRead,\n      );\n      const perdagBaseSnapshot = await baseSnapshotFromCommit(\n        perdagMainClientGroupHeadCommit,\n        perdagRead,\n      );\n      assertSnapshotCommitDD31(perdagBaseSnapshot);\n      return [perdagLMID, perdagBaseSnapshot, mainClientGroupID];\n    },\n  );\n\n  if (closed()) {\n    return;\n  }\n  const [newMemdagMutations, memdagBaseSnapshot, gatheredChunks] =\n    await withRead(memdag, async memdagRead => {\n      const memdagHeadCommit = await commitFromHead(\n        DEFAULT_HEAD_NAME,\n        memdagRead,\n      );\n      const newMutations = await localMutationsGreaterThan(\n        memdagHeadCommit,\n        {[clientID]: perdagLMID || 0},\n        memdagRead,\n      );\n      const memdagBaseSnapshot = await baseSnapshotFromCommit(\n        memdagHeadCommit,\n        memdagRead,\n      );\n      assertSnapshotCommitDD31(memdagBaseSnapshot);\n\n      let gatheredChunks: ReadonlyMap<Hash, Chunk> | undefined;\n      if (\n        compareCookiesForSnapshots(memdagBaseSnapshot, perdagBaseSnapshot) > 0\n      ) {\n        await onGatherMemOnlyChunksForTest();\n        // Might need to persist snapshot, we will have to double check\n        // after gathering the snapshot chunks from memdag\n        const memdagBaseSnapshotHash = memdagBaseSnapshot.chunk.hash;\n        // Gather all memory only chunks from base snapshot on the memdag.\n        const visitor = new GatherMemoryOnlyVisitor(memdagRead);\n        await visitor.visit(memdagBaseSnapshotHash);\n        gatheredChunks = visitor.gatheredChunks;\n      }\n\n      return [newMutations, memdagBaseSnapshot, gatheredChunks];\n    });\n\n  if (closed()) {\n    return;\n  }\n\n  let memdagBaseSnapshotPersisted = false;\n  const zeroDataForMemdagBaseSnapshot =\n    getZeroData && (await getZeroData(memdagBaseSnapshot.chunk.hash));\n\n  await withWrite(perdag, async perdagWrite => {\n    const [mainClientGroup, latestPerdagMainClientGroupHeadCommit] =\n      await getClientGroupInfo(perdagWrite, mainClientGroupID);\n\n    // These initial values for newMainClientGroupHeadHash, mutationIDs,\n    // lastServerAckdMutationIDs are correct for the case where the memdag\n    // snapshot is *not* persisted.  If the memdag snapshot is persisted\n    // these values are overwritten appropriately.\n    let newMainClientGroupHeadHash: Hash =\n      latestPerdagMainClientGroupHeadCommit.chunk.hash;\n    let mutationIDs: Record<ClientID, number> = {\n      ...mainClientGroup.mutationIDs,\n    };\n    let {lastServerAckdMutationIDs} = mainClientGroup;\n\n    if (gatheredChunks) {\n      // check if memdag snapshot still newer than perdag snapshot\n\n      const client = await mustGetClient(clientID, perdagWrite);\n      assertClientV6(client);\n\n      const latestPerdagBaseSnapshot = await baseSnapshotFromCommit(\n        latestPerdagMainClientGroupHeadCommit,\n        perdagWrite,\n      );\n      assertSnapshotCommitDD31(latestPerdagBaseSnapshot);\n\n      // check if memdag snapshot still newer than perdag snapshot\n      if (\n        compareCookiesForSnapshots(\n          memdagBaseSnapshot,\n          latestPerdagBaseSnapshot,\n        ) > 0\n      ) {\n        // still newer, persist memdag snapshot by writing chunks\n        memdagBaseSnapshotPersisted = true;\n        await Promise.all(\n          Array.from(gatheredChunks.values(), c => perdagWrite.putChunk(c)),\n        );\n\n        await setClient(\n          clientID,\n          {\n            ...client,\n            persistHash: memdagBaseSnapshot.chunk.hash,\n          },\n          perdagWrite,\n        );\n        // Rebase local mutations from perdag main client group onto new\n        // snapshot\n        newMainClientGroupHeadHash = memdagBaseSnapshot.chunk.hash;\n        const mainClientGroupLocalMutations = await localMutationsDD31(\n          mainClientGroup.headHash,\n          perdagWrite,\n        );\n\n        lastServerAckdMutationIDs = memdagBaseSnapshot.meta.lastMutationIDs;\n        mutationIDs = {...lastServerAckdMutationIDs};\n\n        newMainClientGroupHeadHash = await rebase(\n          mainClientGroupLocalMutations,\n          newMainClientGroupHeadHash,\n          perdagWrite,\n          mutators,\n          mutationIDs,\n          lc,\n          formatVersion,\n          zeroDataForMemdagBaseSnapshot,\n        );\n      }\n    }\n\n    let zeroDataForPerdagHeadCommit: ZeroTxData | undefined;\n    if (!memdagBaseSnapshotPersisted) {\n      zeroDataForPerdagHeadCommit =\n        getZeroData &&\n        (await getZeroData(newMainClientGroupHeadHash, {\n          openLazySourceRead: perdagWrite,\n        }));\n    }\n\n    // rebase new memdag mutations onto perdag\n    newMainClientGroupHeadHash = await rebase(\n      newMemdagMutations,\n      newMainClientGroupHeadHash,\n      perdagWrite,\n      mutators,\n      mutationIDs,\n      lc,\n      formatVersion,\n      zeroDataForPerdagHeadCommit ?? zeroDataForMemdagBaseSnapshot,\n    );\n\n    const newMainClientGroup = {\n      ...mainClientGroup,\n      headHash: newMainClientGroupHeadHash,\n      mutationIDs,\n      lastServerAckdMutationIDs,\n    };\n\n    await setClientGroup(mainClientGroupID, newMainClientGroup, perdagWrite);\n  });\n\n  if (gatheredChunks && memdagBaseSnapshotPersisted) {\n    await withWrite(memdag, memdagWrite =>\n      memdagWrite.chunksPersisted([...gatheredChunks.keys()]),\n    );\n  }\n}\n\nasync function getClientGroupInfo(\n  perdagRead: Read,\n  clientGroupID: ClientGroupID,\n): Promise<[ClientGroup, Commit<Meta>]> {\n  const clientGroup = await getClientGroup(clientGroupID, perdagRead);\n  assert(clientGroup, `No client group for clientGroupID: ${clientGroupID}`);\n  return [clientGroup, await commitFromHash(clientGroup.headHash, perdagRead)];\n}\n\nasync function rebase(\n  mutations: Commit<LocalMetaDD31>[],\n  basis: Hash,\n  write: Write,\n  mutators: MutatorDefs,\n  mutationIDs: Record<ClientID, number>,\n  lc: LogContext,\n  formatVersion: FormatVersion,\n  zeroData: ZeroTxData | undefined,\n): Promise<Hash> {\n  const basisMutationIDs = new Map<Hash, Map<ClientID, Promise<number>>>();\n  const getBasisMutationID = (\n    basisHash: Hash,\n    clientID: ClientID,\n  ): Promise<number> =>\n    getOrInsertComputed(\n      getOrInsert(basisMutationIDs, basisHash, new Map()),\n      clientID,\n      () =>\n        commitFromHash(basisHash, write).then(commit =>\n          commit.getMutationID(clientID, write),\n        ),\n    );\n  for (let i = mutations.length - 1; i >= 0; i--) {\n    const mutationCommit = mutations[i];\n    const {meta} = mutationCommit;\n    if (meta.mutationID > (await getBasisMutationID(basis, meta.clientID))) {\n      mutationIDs[meta.clientID] = meta.mutationID;\n      basis = (\n        await rebaseMutationAndPutCommit(\n          mutationCommit,\n          write,\n          basis,\n          mutators,\n          lc,\n          meta.clientID,\n          formatVersion,\n          zeroData,\n        )\n      ).chunk.hash;\n    }\n  }\n  return basis;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AA6DA,eAAsB,YACpB,IACA,UACA,QACA,QACA,UACA,QACA,eACA,aACA,qCAAqC,QAAQ,SAAS,EACvC;AACf,KAAI,QAAQ,CACV;CAGF,MAAM,CAAC,YAAY,oBAAoB,qBAAqB,MAAM,SAChE,QACA,OAAM,eAAc;AAClB,QAAM,qBAAqB,UAAU,WAAW;EAChD,MAAM,oBAAoB,MAAM,0BAC9B,UACA,WACD;AACD,SACE,mBACA,sCAAsC,WACvC;EACD,MAAM,GAAG,mCAAmC,MAAM,mBAChD,YACA,kBACD;EACD,MAAM,aAAa,MAAM,gCAAgC,cACvD,UACA,WACD;EACD,MAAM,qBAAqB,MAAM,uBAC/B,iCACA,WACD;AACD,2BAAyB,mBAAmB;AAC5C,SAAO;GAAC;GAAY;GAAoB;GAAkB;GAE7D;AAED,KAAI,QAAQ,CACV;CAEF,MAAM,CAAC,oBAAoB,oBAAoB,kBAC7C,MAAM,SAAS,QAAQ,OAAM,eAAc;EACzC,MAAM,mBAAmB,MAAM,eAC7B,mBACA,WACD;EACD,MAAM,eAAe,MAAM,0BACzB,kBACA,GAAE,WAAW,cAAc,GAAE,EAC7B,WACD;EACD,MAAM,qBAAqB,MAAM,uBAC/B,kBACA,WACD;AACD,2BAAyB,mBAAmB;EAE5C,IAAI;AACJ,MACE,2BAA2B,oBAAoB,mBAAmB,GAAG,GACrE;AACA,SAAM,8BAA8B;GAGpC,MAAM,yBAAyB,mBAAmB,MAAM;GAExD,MAAM,UAAU,IAAI,wBAAwB,WAAW;AACvD,SAAM,QAAQ,MAAM,uBAAuB;AAC3C,oBAAiB,QAAQ;;AAG3B,SAAO;GAAC;GAAc;GAAoB;GAAe;GACzD;AAEJ,KAAI,QAAQ,CACV;CAGF,IAAI,8BAA8B;CAClC,MAAM,gCACJ,eAAgB,MAAM,YAAY,mBAAmB,MAAM,KAAK;AAElE,OAAM,UAAU,QAAQ,OAAM,gBAAe;EAC3C,MAAM,CAAC,iBAAiB,yCACtB,MAAM,mBAAmB,aAAa,kBAAkB;EAM1D,IAAI,6BACF,sCAAsC,MAAM;EAC9C,IAAI,cAAwC,EAC1C,GAAG,gBAAgB,aACpB;EACD,IAAI,EAAC,8BAA6B;AAElC,MAAI,gBAAgB;GAGlB,MAAM,SAAS,MAAM,cAAc,UAAU,YAAY;AACzD,kBAAe,OAAO;GAEtB,MAAM,2BAA2B,MAAM,uBACrC,uCACA,YACD;AACD,4BAAyB,yBAAyB;AAGlD,OACE,2BACE,oBACA,yBACD,GAAG,GACJ;AAEA,kCAA8B;AAC9B,UAAM,QAAQ,IACZ,MAAM,KAAK,eAAe,QAAQ,GAAE,MAAK,YAAY,SAAS,EAAE,CAAC,CAClE;AAED,UAAM,UACJ,UACA;KACE,GAAG;KACH,aAAa,mBAAmB,MAAM;KACvC,EACD,YACD;AAGD,iCAA6B,mBAAmB,MAAM;IACtD,MAAM,gCAAgC,MAAM,mBAC1C,gBAAgB,UAChB,YACD;AAED,gCAA4B,mBAAmB,KAAK;AACpD,kBAAc,EAAC,GAAG,2BAA0B;AAE5C,iCAA6B,MAAM,OACjC,+BACA,4BACA,aACA,UACA,aACA,IACA,eACA,8BACD;;;EAIL,IAAI;AACJ,MAAI,CAAC,4BACH,+BACE,eACC,MAAM,YAAY,4BAA4B,EAC7C,oBAAoB,aACrB,CAAC;AAIN,+BAA6B,MAAM,OACjC,oBACA,4BACA,aACA,UACA,aACA,IACA,eACA,+BAA+B,8BAChC;AASD,QAAM,eAAe,mBAPM;GACzB,GAAG;GACH,UAAU;GACV;GACA;GACD,EAE2D,YAAY;GACxE;AAEF,KAAI,kBAAkB,4BACpB,OAAM,UAAU,SAAQ,gBACtB,YAAY,gBAAgB,CAAC,GAAG,eAAe,MAAM,CAAC,CAAC,CACxD;;AAIL,eAAe,mBACb,YACA,eACsC;CACtC,MAAM,cAAc,MAAM,eAAe,eAAe,WAAW;AACnE,QAAO,aAAa,sCAAsC,gBAAgB;AAC1E,QAAO,CAAC,aAAa,MAAM,eAAe,YAAY,UAAU,WAAW,CAAC;;AAG9E,eAAe,OACb,WACA,OACA,OACA,UACA,aACA,IACA,eACA,UACe;CACf,MAAM,mCAAmB,IAAI,KAA2C;CACxE,MAAM,sBACJ,WACA,aAEA,oBACE,YAAY,kBAAkB,2BAAW,IAAI,KAAK,CAAC,EACnD,gBAEE,eAAe,WAAW,MAAM,CAAC,MAAK,WACpC,OAAO,cAAc,UAAU,MAAM,CACtC,CACJ;AACH,MAAK,IAAI,IAAI,UAAU,SAAS,GAAG,KAAK,GAAG,KAAK;EAC9C,MAAM,iBAAiB,UAAU;EACjC,MAAM,EAAC,SAAQ;AACf,MAAI,KAAK,aAAc,MAAM,mBAAmB,OAAO,KAAK,SAAS,EAAG;AACtE,eAAY,KAAK,YAAY,KAAK;AAClC,YACE,MAAM,2BACJ,gBACA,OACA,OACA,UACA,IACA,KAAK,UACL,eACA,SACD,EACD,MAAM;;;AAGZ,QAAO"}

package/out/replicache/src/sync/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../../../replicache/src/sync/pull.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../../../replicache/src/sync/pull.ts"],"names":[],"mappings":"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"}

package/out/replicache/src/sync/pull.js

@@ -119,14 +119,17 @@ function maybeEndPull(store, lc, expectedSyncHead, clientID, diffConfig, formatV
 		const syncSnapshotBasis = meta.basisHash;
 		if (syncSnapshot === null) throw new Error("Sync snapshot with no basis");
 		if (syncSnapshotBasis !== mainSnapshot.chunk.hash) throw new Error("Overlapping syncs");
-		const syncHead = await commitFromHash(syncHeadHash, dagRead);
+		const [syncHead, commits] = await Promise.all([commitFromHash(syncHeadHash, dagRead), localMutations(mainHeadHash, dagRead)]);
+		const syncHeadMutationIDs = /* @__PURE__ */ new Map();
 		const pending = [];
-		const localMutations$1 = await localMutations(mainHeadHash, dagRead);
-		for (const commit of localMutations$1) {
-			let cid = clientID;
+		for (const commit of commits) {
 			assert(commitIsLocalDD31(commit), "Expected commit to be a local DD31 commit");
-			cid = commit.meta.clientID;
-			if (await commit.getMutationID(cid, dagRead) > await syncHead.getMutationID(cid, dagRead)) pending.push(commit);
+			const cid = commit.meta.clientID;
+			if (!syncHeadMutationIDs.has(cid)) syncHeadMutationIDs.set(cid, syncHead.getMutationID(cid, dagRead));
+		}
+		for (const commit of commits) {
+			const cid = commit.meta.clientID;
+			if (commit.meta.mutationID > await syncHeadMutationIDs.get(cid)) pending.push(commit);
 		}
 		pending.reverse();
 		const diffsMap = new DiffsMap();

package/out/replicache/src/sync/pull.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull.js","names":[],"sources":["../../../../../replicache/src/sync/pull.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {deepEqual} from '../../../shared/src/json.ts';\nimport {diff} from '../btree/diff.ts';\nimport {BTreeRead} from '../btree/read.ts';\nimport {compareCookies, type Cookie} from '../cookies.ts';\nimport type {Store} from '../dag/store.ts';\nimport type {Commit} from '../db/commit.ts';\nimport {\n  assertSnapshotMetaDD31,\n  baseSnapshotFromHash,\n  commitFromHash,\n  commitIsLocalDD31,\n  DEFAULT_HEAD_NAME,\n  type LocalMeta,\n  localMutations as localMutations_1,\n  snapshotMetaParts,\n} from '../db/commit.ts';\nimport {newWriteSnapshotDD31} from '../db/write.ts';\nimport {isErrorResponse} from '../error-responses.ts';\nimport type * as FormatVersion from '../format-version-enum.ts';\nimport {deepFreeze, type FrozenJSONValue} from '../frozen-json.ts';\nimport {assertPullerResultV1} from '../get-default-puller.ts';\nimport {emptyHash, type Hash} from '../hash.ts';\nimport type {HTTPRequestInfo} from '../http-request-info.ts';\nimport type {\n  Puller,\n  PullerResult,\n  PullResponseOKV1Internal,\n  PullResponseV1,\n} from '../puller.ts';\nimport {ReportError} from '../report-error.ts';\nimport {toError} from '../to-error.ts';\nimport {withRead, withWriteNoImplicitCommit} from '../with-transactions.ts';\nimport {\n  addDiffsForIndexes,\n  type DiffComputationConfig,\n  DiffsMap,\n} from './diff.ts';\nimport * as HandlePullResponseResultType from './handle-pull-response-result-type-enum.ts';\nimport type {ClientGroupID, ClientID} from './ids.ts';\nimport * as patch from './patch.ts';\nimport {PullError} from './pull-error.ts';\nimport {SYNC_HEAD_NAME} from './sync-head-name.ts';\n\ntype FormatVersion = (typeof FormatVersion)[keyof typeof FormatVersion];\n\nexport const PULL_VERSION_SDD = 0;\nexport const PULL_VERSION_DD31 = 1;\n\n/**\n * The JSON value used as the body when doing a POST to the [pull\n * endpoint](/reference/server-pull).\n */\nexport type PullRequest = PullRequestV1;\n\n/**\n * The JSON value used as the body when doing a POST to the [pull\n * endpoint](/reference/server-pull).\n */\nexport type PullRequestV1 = {\n  pullVersion: 1;\n  // schemaVersion can optionally be used by the customer's app\n  // to indicate to the data layer what format of Client View the\n  // app understands.\n  schemaVersion: string;\n  profileID: string;\n  cookie: Cookie;\n\n  clientGroupID: ClientGroupID;\n};\n\nexport function isPullRequestV1(pr: PullRequest): pr is PullRequestV1 {\n  return pr.pullVersion === PULL_VERSION_DD31;\n}\n\nexport type BeginPullResponseV1 = {\n  httpRequestInfo: HTTPRequestInfo;\n  pullResponse?: PullResponseV1;\n  syncHead: Hash;\n};\n\nexport async function beginPullV1(\n  profileID: string,\n  clientID: ClientID,\n  clientGroupID: ClientGroupID,\n  schemaVersion: string,\n  puller: Puller,\n  requestID: string,\n  store: Store,\n  formatVersion: FormatVersion,\n  lc: LogContext,\n  createSyncBranch = true,\n): Promise<BeginPullResponseV1> {\n  const baseCookie = await withRead(store, async dagRead => {\n    const mainHeadHash = await dagRead.getHead(DEFAULT_HEAD_NAME);\n    if (!mainHeadHash) {\n      throw new Error('Internal no main head found');\n    }\n    const baseSnapshot = await baseSnapshotFromHash(mainHeadHash, dagRead);\n    const baseSnapshotMeta = baseSnapshot.meta;\n    assertSnapshotMetaDD31(baseSnapshotMeta);\n    return baseSnapshotMeta.cookieJSON;\n  });\n\n  const pullReq: PullRequestV1 = {\n    profileID,\n    clientGroupID,\n    cookie: baseCookie,\n    pullVersion: PULL_VERSION_DD31,\n    schemaVersion,\n  };\n\n  const {response, httpRequestInfo} = await callPuller(\n    lc,\n    puller,\n    pullReq,\n    requestID,\n  );\n\n  // If Puller did not get a pull response we still want to return the HTTP\n  // request info.\n  if (!response) {\n    return {\n      httpRequestInfo,\n      syncHead: emptyHash,\n    };\n  }\n\n  if (!createSyncBranch || isErrorResponse(response)) {\n    return {\n      httpRequestInfo,\n      pullResponse: response,\n      syncHead: emptyHash,\n    };\n  }\n\n  const result = await handlePullResponseV1(\n    lc,\n    store,\n    baseCookie,\n    response,\n    clientID,\n    formatVersion,\n  );\n\n  return {\n    httpRequestInfo,\n    pullResponse: response,\n    syncHead:\n      result.type === HandlePullResponseResultType.Applied\n        ? result.syncHead\n        : emptyHash,\n  };\n}\n\nasync function callPuller(\n  lc: LogContext,\n  puller: Puller,\n  pullReq: PullRequest,\n  requestID: string,\n): Promise<PullerResult> {\n  lc.debug?.('Starting pull...');\n  const pullStart = Date.now();\n  let pullerResult: PullerResult;\n  try {\n    pullerResult = await puller(pullReq, requestID);\n    lc.debug?.(\n      `...Pull ${pullerResult.response ? 'complete' : 'failed'} in `,\n      Date.now() - pullStart,\n      'ms',\n    );\n  } catch (e) {\n    throw new PullError(toError(e));\n  }\n  try {\n    assertPullerResultV1(pullerResult);\n    return pullerResult;\n  } catch (e) {\n    throw new ReportError('Invalid puller result', toError(e));\n  }\n}\n\ntype HandlePullResponseResult =\n  | {\n      type: HandlePullResponseResultType.Applied;\n      syncHead: Hash;\n    }\n  | {\n      type:\n        | HandlePullResponseResultType.NoOp\n        | HandlePullResponseResultType.CookieMismatch;\n    };\n\nfunction badOrderMessage(\n  name: string,\n  receivedValue: string,\n  lastSnapshotValue: string,\n) {\n  return `Received ${name} ${receivedValue} is < than last snapshot ${name} ${lastSnapshotValue}; ignoring client view`;\n}\n\nexport function handlePullResponseV1(\n  lc: LogContext,\n  store: Store,\n  expectedBaseCookie: FrozenJSONValue,\n  response: PullResponseOKV1Internal,\n  clientID: ClientID,\n  formatVersion: FormatVersion,\n): Promise<HandlePullResponseResult> {\n  // It is possible that another sync completed while we were pulling. Ensure\n  // that is not the case by re-checking the base snapshot.\n  return withWriteNoImplicitCommit(store, async dagWrite => {\n    const dagRead = dagWrite;\n    const mainHead = await dagRead.getHead(DEFAULT_HEAD_NAME);\n    if (mainHead === undefined) {\n      throw new Error('Main head disappeared');\n    }\n    const baseSnapshot = await baseSnapshotFromHash(mainHead, dagRead);\n    const baseSnapshotMeta = baseSnapshot.meta;\n    assertSnapshotMetaDD31(baseSnapshotMeta);\n    const baseCookie = baseSnapshotMeta.cookieJSON;\n\n    // TODO(MP) Here we are using whether the cookie has changed as a proxy for whether\n    // the base snapshot changed, which is the check we used to do. I don't think this\n    // is quite right. We need to firm up under what conditions we will/not accept an\n    // update from the server: https://github.com/rocicorp/replicache/issues/713.\n    // In DD31 this is expected to happen if a refresh occurs during a pull.\n    if (!deepEqual(expectedBaseCookie, baseCookie)) {\n      lc.debug?.(\n        'handlePullResponse: cookie mismatch, response is not applicable',\n      );\n      return {\n        type: HandlePullResponseResultType.CookieMismatch,\n      };\n    }\n\n    // Check that the lastMutationIDs are not going backwards.\n    for (const [clientID, lmidChange] of Object.entries(\n      response.lastMutationIDChanges,\n    )) {\n      const lastMutationID = baseSnapshotMeta.lastMutationIDs[clientID];\n      if (lastMutationID !== undefined && lmidChange < lastMutationID) {\n        throw new Error(\n          badOrderMessage(\n            `${clientID} lastMutationID`,\n            String(lmidChange),\n            String(lastMutationID),\n          ),\n        );\n      }\n    }\n\n    const frozenResponseCookie = deepFreeze(response.cookie);\n    if (compareCookies(frozenResponseCookie, baseCookie) < 0) {\n      throw new Error(\n        badOrderMessage(\n          'cookie',\n          JSON.stringify(frozenResponseCookie),\n          JSON.stringify(baseCookie),\n        ),\n      );\n    }\n\n    if (deepEqual(frozenResponseCookie, baseCookie)) {\n      if (response.patch.length > 0) {\n        lc.error?.(\n          `handlePullResponse: cookie ${JSON.stringify(\n            baseCookie,\n          )} did not change, but patch is not empty`,\n        );\n      }\n      if (Object.keys(response.lastMutationIDChanges).length > 0) {\n        lc.error?.(\n          `handlePullResponse: cookie ${JSON.stringify(\n            baseCookie,\n          )} did not change, but lastMutationIDChanges is not empty`,\n        );\n      }\n      // If the cookie doesn't change, it's a nop.\n      return {\n        type: HandlePullResponseResultType.NoOp,\n      };\n    }\n\n    const dbWrite = await newWriteSnapshotDD31(\n      baseSnapshot.chunk.hash,\n      {...baseSnapshotMeta.lastMutationIDs, ...response.lastMutationIDChanges},\n      frozenResponseCookie,\n      dagWrite,\n      clientID,\n      formatVersion,\n    );\n\n    await patch.apply(lc, dbWrite, response.patch);\n\n    return {\n      type: HandlePullResponseResultType.Applied,\n      syncHead: await dbWrite.commit(SYNC_HEAD_NAME),\n    };\n  });\n}\n\nexport function maybeEndPull<M extends LocalMeta>(\n  store: Store,\n  lc: LogContext,\n  expectedSyncHead: Hash,\n  clientID: ClientID,\n  diffConfig: DiffComputationConfig,\n  formatVersion: FormatVersion,\n): Promise<{\n  syncHead: Hash;\n  mainHead: Hash;\n  oldMainHead: Hash;\n  replayMutations: Commit<M>[];\n  diffs: DiffsMap;\n}> {\n  return withWriteNoImplicitCommit(store, async dagWrite => {\n    const dagRead = dagWrite;\n    // Ensure sync head is what the caller thinks it is.\n    const syncHeadHash = await dagRead.getHead(SYNC_HEAD_NAME);\n    if (syncHeadHash === undefined) {\n      throw new Error('Missing sync head');\n    }\n    if (syncHeadHash !== expectedSyncHead) {\n      lc.error?.(\n        'maybeEndPull, Wrong sync head. Expecting:',\n        expectedSyncHead,\n        'got:',\n        syncHeadHash,\n      );\n      throw new Error('Wrong sync head');\n    }\n\n    // Ensure another sync has not landed a new snapshot on the main chain.\n    // TODO: In DD31, it is expected that a newer snapshot might have appeared\n    // on the main chain. In that case, we just abort this pull.\n    const syncSnapshot = await baseSnapshotFromHash(syncHeadHash, dagRead);\n    const mainHeadHash = await dagRead.getHead(DEFAULT_HEAD_NAME);\n    if (mainHeadHash === undefined) {\n      throw new Error('Missing main head');\n    }\n    const mainSnapshot = await baseSnapshotFromHash(mainHeadHash, dagRead);\n\n    const {meta} = syncSnapshot;\n    const syncSnapshotBasis = meta.basisHash;\n    if (syncSnapshot === null) {\n      throw new Error('Sync snapshot with no basis');\n    }\n    if (syncSnapshotBasis !== mainSnapshot.chunk.hash) {\n      throw new Error('Overlapping syncs');\n    }\n\n    // Collect pending commits from the main chain and determine which\n    // of them if any need to be replayed.\n    const syncHead = await commitFromHash(syncHeadHash, dagRead);\n    const pending: Commit<M>[] = [];\n    const localMutations = await localMutations_1(mainHeadHash, dagRead);\n    for (const commit of localMutations) {\n      let cid = clientID;\n      assert(\n        commitIsLocalDD31(commit),\n        'Expected commit to be a local DD31 commit',\n      );\n      cid = commit.meta.clientID;\n\n      if (\n        (await commit.getMutationID(cid, dagRead)) >\n        (await syncHead.getMutationID(cid, dagRead))\n      ) {\n        // We know that the dag can only contain either LocalMetaSDD or LocalMetaDD31\n        pending.push(commit as Commit<M>);\n      }\n    }\n    // pending() gave us the pending mutations in sync-head-first order whereas\n    // caller wants them in the order to replay (lower mutation ids first).\n    pending.reverse();\n\n    // We return the keys that changed due to this pull. This is used by\n    // subscriptions in the JS API when there are no more pending mutations.\n    const diffsMap = new DiffsMap();\n\n    // Return replay commits if any.\n    if (pending.length > 0) {\n      return {\n        syncHead: syncHeadHash,\n        oldMainHead: mainHeadHash,\n        mainHead: mainHeadHash,\n        replayMutations: pending,\n        // The changed keys are not reported when further replays are\n        // needed. The diffs will be reported at the end when there\n        // are no more mutations to be replay and then it will be reported\n        // relative to DEFAULT_HEAD_NAME.\n        diffs: diffsMap,\n      };\n    }\n\n    // TODO check invariants\n\n    // Compute diffs (changed keys) for value map and index maps.\n    const mainHead = await commitFromHash(mainHeadHash, dagRead);\n    if (diffConfig.shouldComputeDiffs()) {\n      const mainHeadMap = new BTreeRead(\n        dagRead,\n        formatVersion,\n        mainHead.valueHash,\n      );\n      const syncHeadMap = new BTreeRead(\n        dagRead,\n        formatVersion,\n        syncHead.valueHash,\n      );\n      const valueDiff = await diff(mainHeadMap, syncHeadMap);\n      diffsMap.set('', valueDiff);\n      await addDiffsForIndexes(\n        mainHead,\n        syncHead,\n        dagRead,\n        diffsMap,\n        diffConfig,\n        formatVersion,\n      );\n    }\n\n    // No mutations to replay so set the main head to the sync head and sync complete!\n    await Promise.all([\n      dagWrite.setHead(DEFAULT_HEAD_NAME, syncHeadHash),\n      dagWrite.removeHead(SYNC_HEAD_NAME),\n    ]);\n    await dagWrite.commit();\n    // main head was set to sync head\n    const newMainHeadHash = syncHeadHash;\n\n    if (lc.debug) {\n      const [oldLastMutationID, oldCookie] = snapshotMetaParts(\n        mainSnapshot,\n        clientID,\n      );\n      const [newLastMutationID, newCookie] = snapshotMetaParts(\n        syncSnapshot,\n        clientID,\n      );\n      lc.debug(\n        `Successfully pulled new snapshot with lastMutationID:`,\n        newLastMutationID,\n        `(prev:`,\n        oldLastMutationID,\n        `), cookie: `,\n        newCookie,\n        `(prev:`,\n        oldCookie,\n        `), sync head hash:`,\n        syncHeadHash,\n        ', main head hash:',\n        mainHeadHash,\n        `, valueHash:`,\n        syncHead.valueHash,\n        `(prev:`,\n        mainSnapshot.valueHash,\n      );\n    }\n\n    return {\n      syncHead: syncHeadHash,\n      oldMainHead: mainHeadHash,\n      mainHead: newMainHeadHash,\n      replayMutations: [],\n      diffs: diffsMap,\n    };\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"pull.js","names":[],"sources":["../../../../../replicache/src/sync/pull.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {deepEqual} from '../../../shared/src/json.ts';\nimport {diff} from '../btree/diff.ts';\nimport {BTreeRead} from '../btree/read.ts';\nimport {compareCookies, type Cookie} from '../cookies.ts';\nimport type {Store} from '../dag/store.ts';\nimport type {Commit} from '../db/commit.ts';\nimport {\n  assertSnapshotMetaDD31,\n  baseSnapshotFromHash,\n  commitFromHash,\n  commitIsLocalDD31,\n  DEFAULT_HEAD_NAME,\n  type LocalMeta,\n  localMutations,\n  snapshotMetaParts,\n} from '../db/commit.ts';\nimport {newWriteSnapshotDD31} from '../db/write.ts';\nimport {isErrorResponse} from '../error-responses.ts';\nimport type * as FormatVersion from '../format-version-enum.ts';\nimport {deepFreeze, type FrozenJSONValue} from '../frozen-json.ts';\nimport {assertPullerResultV1} from '../get-default-puller.ts';\nimport {emptyHash, type Hash} from '../hash.ts';\nimport type {HTTPRequestInfo} from '../http-request-info.ts';\nimport type {\n  Puller,\n  PullerResult,\n  PullResponseOKV1Internal,\n  PullResponseV1,\n} from '../puller.ts';\nimport {ReportError} from '../report-error.ts';\nimport {toError} from '../to-error.ts';\nimport {withRead, withWriteNoImplicitCommit} from '../with-transactions.ts';\nimport {\n  addDiffsForIndexes,\n  type DiffComputationConfig,\n  DiffsMap,\n} from './diff.ts';\nimport * as HandlePullResponseResultType from './handle-pull-response-result-type-enum.ts';\nimport type {ClientGroupID, ClientID} from './ids.ts';\nimport * as patch from './patch.ts';\nimport {PullError} from './pull-error.ts';\nimport {SYNC_HEAD_NAME} from './sync-head-name.ts';\n\ntype FormatVersion = (typeof FormatVersion)[keyof typeof FormatVersion];\n\nexport const PULL_VERSION_SDD = 0;\nexport const PULL_VERSION_DD31 = 1;\n\n/**\n * The JSON value used as the body when doing a POST to the [pull\n * endpoint](/reference/server-pull).\n */\nexport type PullRequest = PullRequestV1;\n\n/**\n * The JSON value used as the body when doing a POST to the [pull\n * endpoint](/reference/server-pull).\n */\nexport type PullRequestV1 = {\n  pullVersion: 1;\n  // schemaVersion can optionally be used by the customer's app\n  // to indicate to the data layer what format of Client View the\n  // app understands.\n  schemaVersion: string;\n  profileID: string;\n  cookie: Cookie;\n\n  clientGroupID: ClientGroupID;\n};\n\nexport function isPullRequestV1(pr: PullRequest): pr is PullRequestV1 {\n  return pr.pullVersion === PULL_VERSION_DD31;\n}\n\nexport type BeginPullResponseV1 = {\n  httpRequestInfo: HTTPRequestInfo;\n  pullResponse?: PullResponseV1;\n  syncHead: Hash;\n};\n\nexport async function beginPullV1(\n  profileID: string,\n  clientID: ClientID,\n  clientGroupID: ClientGroupID,\n  schemaVersion: string,\n  puller: Puller,\n  requestID: string,\n  store: Store,\n  formatVersion: FormatVersion,\n  lc: LogContext,\n  createSyncBranch = true,\n): Promise<BeginPullResponseV1> {\n  const baseCookie = await withRead(store, async dagRead => {\n    const mainHeadHash = await dagRead.getHead(DEFAULT_HEAD_NAME);\n    if (!mainHeadHash) {\n      throw new Error('Internal no main head found');\n    }\n    const baseSnapshot = await baseSnapshotFromHash(mainHeadHash, dagRead);\n    const baseSnapshotMeta = baseSnapshot.meta;\n    assertSnapshotMetaDD31(baseSnapshotMeta);\n    return baseSnapshotMeta.cookieJSON;\n  });\n\n  const pullReq: PullRequestV1 = {\n    profileID,\n    clientGroupID,\n    cookie: baseCookie,\n    pullVersion: PULL_VERSION_DD31,\n    schemaVersion,\n  };\n\n  const {response, httpRequestInfo} = await callPuller(\n    lc,\n    puller,\n    pullReq,\n    requestID,\n  );\n\n  // If Puller did not get a pull response we still want to return the HTTP\n  // request info.\n  if (!response) {\n    return {\n      httpRequestInfo,\n      syncHead: emptyHash,\n    };\n  }\n\n  if (!createSyncBranch || isErrorResponse(response)) {\n    return {\n      httpRequestInfo,\n      pullResponse: response,\n      syncHead: emptyHash,\n    };\n  }\n\n  const result = await handlePullResponseV1(\n    lc,\n    store,\n    baseCookie,\n    response,\n    clientID,\n    formatVersion,\n  );\n\n  return {\n    httpRequestInfo,\n    pullResponse: response,\n    syncHead:\n      result.type === HandlePullResponseResultType.Applied\n        ? result.syncHead\n        : emptyHash,\n  };\n}\n\nasync function callPuller(\n  lc: LogContext,\n  puller: Puller,\n  pullReq: PullRequest,\n  requestID: string,\n): Promise<PullerResult> {\n  lc.debug?.('Starting pull...');\n  const pullStart = Date.now();\n  let pullerResult: PullerResult;\n  try {\n    pullerResult = await puller(pullReq, requestID);\n    lc.debug?.(\n      `...Pull ${pullerResult.response ? 'complete' : 'failed'} in `,\n      Date.now() - pullStart,\n      'ms',\n    );\n  } catch (e) {\n    throw new PullError(toError(e));\n  }\n  try {\n    assertPullerResultV1(pullerResult);\n    return pullerResult;\n  } catch (e) {\n    throw new ReportError('Invalid puller result', toError(e));\n  }\n}\n\ntype HandlePullResponseResult =\n  | {\n      type: HandlePullResponseResultType.Applied;\n      syncHead: Hash;\n    }\n  | {\n      type:\n        | HandlePullResponseResultType.NoOp\n        | HandlePullResponseResultType.CookieMismatch;\n    };\n\nfunction badOrderMessage(\n  name: string,\n  receivedValue: string,\n  lastSnapshotValue: string,\n) {\n  return `Received ${name} ${receivedValue} is < than last snapshot ${name} ${lastSnapshotValue}; ignoring client view`;\n}\n\nexport function handlePullResponseV1(\n  lc: LogContext,\n  store: Store,\n  expectedBaseCookie: FrozenJSONValue,\n  response: PullResponseOKV1Internal,\n  clientID: ClientID,\n  formatVersion: FormatVersion,\n): Promise<HandlePullResponseResult> {\n  // It is possible that another sync completed while we were pulling. Ensure\n  // that is not the case by re-checking the base snapshot.\n  return withWriteNoImplicitCommit(store, async dagWrite => {\n    const dagRead = dagWrite;\n    const mainHead = await dagRead.getHead(DEFAULT_HEAD_NAME);\n    if (mainHead === undefined) {\n      throw new Error('Main head disappeared');\n    }\n    const baseSnapshot = await baseSnapshotFromHash(mainHead, dagRead);\n    const baseSnapshotMeta = baseSnapshot.meta;\n    assertSnapshotMetaDD31(baseSnapshotMeta);\n    const baseCookie = baseSnapshotMeta.cookieJSON;\n\n    // TODO(MP) Here we are using whether the cookie has changed as a proxy for whether\n    // the base snapshot changed, which is the check we used to do. I don't think this\n    // is quite right. We need to firm up under what conditions we will/not accept an\n    // update from the server: https://github.com/rocicorp/replicache/issues/713.\n    // In DD31 this is expected to happen if a refresh occurs during a pull.\n    if (!deepEqual(expectedBaseCookie, baseCookie)) {\n      lc.debug?.(\n        'handlePullResponse: cookie mismatch, response is not applicable',\n      );\n      return {\n        type: HandlePullResponseResultType.CookieMismatch,\n      };\n    }\n\n    // Check that the lastMutationIDs are not going backwards.\n    for (const [clientID, lmidChange] of Object.entries(\n      response.lastMutationIDChanges,\n    )) {\n      const lastMutationID = baseSnapshotMeta.lastMutationIDs[clientID];\n      if (lastMutationID !== undefined && lmidChange < lastMutationID) {\n        throw new Error(\n          badOrderMessage(\n            `${clientID} lastMutationID`,\n            String(lmidChange),\n            String(lastMutationID),\n          ),\n        );\n      }\n    }\n\n    const frozenResponseCookie = deepFreeze(response.cookie);\n    if (compareCookies(frozenResponseCookie, baseCookie) < 0) {\n      throw new Error(\n        badOrderMessage(\n          'cookie',\n          JSON.stringify(frozenResponseCookie),\n          JSON.stringify(baseCookie),\n        ),\n      );\n    }\n\n    if (deepEqual(frozenResponseCookie, baseCookie)) {\n      if (response.patch.length > 0) {\n        lc.error?.(\n          `handlePullResponse: cookie ${JSON.stringify(\n            baseCookie,\n          )} did not change, but patch is not empty`,\n        );\n      }\n      if (Object.keys(response.lastMutationIDChanges).length > 0) {\n        lc.error?.(\n          `handlePullResponse: cookie ${JSON.stringify(\n            baseCookie,\n          )} did not change, but lastMutationIDChanges is not empty`,\n        );\n      }\n      // If the cookie doesn't change, it's a nop.\n      return {\n        type: HandlePullResponseResultType.NoOp,\n      };\n    }\n\n    const dbWrite = await newWriteSnapshotDD31(\n      baseSnapshot.chunk.hash,\n      {...baseSnapshotMeta.lastMutationIDs, ...response.lastMutationIDChanges},\n      frozenResponseCookie,\n      dagWrite,\n      clientID,\n      formatVersion,\n    );\n\n    await patch.apply(lc, dbWrite, response.patch);\n\n    return {\n      type: HandlePullResponseResultType.Applied,\n      syncHead: await dbWrite.commit(SYNC_HEAD_NAME),\n    };\n  });\n}\n\nexport function maybeEndPull<M extends LocalMeta>(\n  store: Store,\n  lc: LogContext,\n  expectedSyncHead: Hash,\n  clientID: ClientID,\n  diffConfig: DiffComputationConfig,\n  formatVersion: FormatVersion,\n): Promise<{\n  syncHead: Hash;\n  mainHead: Hash;\n  oldMainHead: Hash;\n  replayMutations: Commit<M>[];\n  diffs: DiffsMap;\n}> {\n  return withWriteNoImplicitCommit(store, async dagWrite => {\n    const dagRead = dagWrite;\n    // Ensure sync head is what the caller thinks it is.\n    const syncHeadHash = await dagRead.getHead(SYNC_HEAD_NAME);\n    if (syncHeadHash === undefined) {\n      throw new Error('Missing sync head');\n    }\n    if (syncHeadHash !== expectedSyncHead) {\n      lc.error?.(\n        'maybeEndPull, Wrong sync head. Expecting:',\n        expectedSyncHead,\n        'got:',\n        syncHeadHash,\n      );\n      throw new Error('Wrong sync head');\n    }\n\n    // Ensure another sync has not landed a new snapshot on the main chain.\n    // TODO: In DD31, it is expected that a newer snapshot might have appeared\n    // on the main chain. In that case, we just abort this pull.\n    const syncSnapshot = await baseSnapshotFromHash(syncHeadHash, dagRead);\n    const mainHeadHash = await dagRead.getHead(DEFAULT_HEAD_NAME);\n    if (mainHeadHash === undefined) {\n      throw new Error('Missing main head');\n    }\n    const mainSnapshot = await baseSnapshotFromHash(mainHeadHash, dagRead);\n\n    const {meta} = syncSnapshot;\n    const syncSnapshotBasis = meta.basisHash;\n    if (syncSnapshot === null) {\n      throw new Error('Sync snapshot with no basis');\n    }\n    if (syncSnapshotBasis !== mainSnapshot.chunk.hash) {\n      throw new Error('Overlapping syncs');\n    }\n\n    // Collect pending commits from the main chain and determine which\n    // of them if any need to be replayed.\n    const [syncHead, commits] = await Promise.all([\n      commitFromHash(syncHeadHash, dagRead),\n      localMutations(mainHeadHash, dagRead),\n    ]);\n    const syncHeadMutationIDs = new Map<ClientID, Promise<number>>();\n    const pending: Commit<M>[] = [];\n    // Kick off all mutation ID loads before awaiting.\n    for (const commit of commits) {\n      assert(\n        commitIsLocalDD31(commit),\n        'Expected commit to be a local DD31 commit',\n      );\n      const cid = commit.meta.clientID;\n      if (!syncHeadMutationIDs.has(cid)) {\n        syncHeadMutationIDs.set(cid, syncHead.getMutationID(cid, dagRead));\n      }\n    }\n    for (const commit of commits) {\n      const cid = commit.meta.clientID;\n      if (commit.meta.mutationID > (await syncHeadMutationIDs.get(cid)!)) {\n        // We know that the dag can only contain either LocalMetaSDD or LocalMetaDD31\n        pending.push(commit as Commit<M>);\n      }\n    }\n    // pending() gave us the pending mutations in sync-head-first order whereas\n    // caller wants them in the order to replay (lower mutation ids first).\n    pending.reverse();\n\n    // We return the keys that changed due to this pull. This is used by\n    // subscriptions in the JS API when there are no more pending mutations.\n    const diffsMap = new DiffsMap();\n\n    // Return replay commits if any.\n    if (pending.length > 0) {\n      return {\n        syncHead: syncHeadHash,\n        oldMainHead: mainHeadHash,\n        mainHead: mainHeadHash,\n        replayMutations: pending,\n        // The changed keys are not reported when further replays are\n        // needed. The diffs will be reported at the end when there\n        // are no more mutations to be replay and then it will be reported\n        // relative to DEFAULT_HEAD_NAME.\n        diffs: diffsMap,\n      };\n    }\n\n    // TODO check invariants\n\n    // Compute diffs (changed keys) for value map and index maps.\n    const mainHead = await commitFromHash(mainHeadHash, dagRead);\n    if (diffConfig.shouldComputeDiffs()) {\n      const mainHeadMap = new BTreeRead(\n        dagRead,\n        formatVersion,\n        mainHead.valueHash,\n      );\n      const syncHeadMap = new BTreeRead(\n        dagRead,\n        formatVersion,\n        syncHead.valueHash,\n      );\n      const valueDiff = await diff(mainHeadMap, syncHeadMap);\n      diffsMap.set('', valueDiff);\n      await addDiffsForIndexes(\n        mainHead,\n        syncHead,\n        dagRead,\n        diffsMap,\n        diffConfig,\n        formatVersion,\n      );\n    }\n\n    // No mutations to replay so set the main head to the sync head and sync complete!\n    await Promise.all([\n      dagWrite.setHead(DEFAULT_HEAD_NAME, syncHeadHash),\n      dagWrite.removeHead(SYNC_HEAD_NAME),\n    ]);\n    await dagWrite.commit();\n    // main head was set to sync head\n    const newMainHeadHash = syncHeadHash;\n\n    if (lc.debug) {\n      const [oldLastMutationID, oldCookie] = snapshotMetaParts(\n        mainSnapshot,\n        clientID,\n      );\n      const [newLastMutationID, newCookie] = snapshotMetaParts(\n        syncSnapshot,\n        clientID,\n      );\n      lc.debug(\n        `Successfully pulled new snapshot with lastMutationID:`,\n        newLastMutationID,\n        `(prev:`,\n        oldLastMutationID,\n        `), cookie: `,\n        newCookie,\n        `(prev:`,\n        oldCookie,\n        `), sync head hash:`,\n        syncHeadHash,\n        ', main head hash:',\n        mainHeadHash,\n        `, valueHash:`,\n        syncHead.valueHash,\n        `(prev:`,\n        mainSnapshot.valueHash,\n      );\n    }\n\n    return {\n      syncHead: syncHeadHash,\n      oldMainHead: mainHeadHash,\n      mainHead: newMainHeadHash,\n      replayMutations: [],\n      diffs: diffsMap,\n    };\n  });\n}\n"],"mappings":"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"}

package/out/shared/src/map.d.ts

@@ -0,0 +1,6 @@
+declare function getOrInsertNative<K, V>(map: Map<K, V>, key: K, defaultValue: V): V;
+declare function getOrInsertComputedNative<K, V>(map: Map<K, V>, key: K, compute: (key: K) => V): V;
+export declare const getOrInsert: typeof getOrInsertNative;
+export declare const getOrInsertComputed: typeof getOrInsertComputedNative;
+export {};
+//# sourceMappingURL=map.d.ts.map

package/out/shared/src/map.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../../../shared/src/map.ts"],"names":[],"mappings":"AA4CA,iBAAS,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,GAAG,CAAC,CAE3E;AAED,iBAAS,yBAAyB,CAAC,CAAC,EAAE,CAAC,EACrC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EACd,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GACrB,CAAC,CAEH;AAED,eAAO,MAAM,WAAW,0BAED,CAAC;AAExB,eAAO,MAAM,mBAAmB,kCAED,CAAC"}

package/out/shared/src/map.js

@@ -0,0 +1,39 @@
+//#region ../shared/src/map.ts
+var nativeSupport = typeof Map.prototype.getOrInsert === "function";
+/**
+* Returns the value for {@link key} in {@link map}.  If no mapping exists,
+* inserts {@link defaultValue} and returns it.
+*
+* Mirrors the ES2026 `Map.prototype.getOrInsert` proposal.
+*/
+function getOrInsertPolyfill(map, key, defaultValue) {
+	const existing = map.get(key);
+	if (existing !== void 0) return existing;
+	map.set(key, defaultValue);
+	return defaultValue;
+}
+/**
+* Returns the value for {@link key} in {@link map}.  If no mapping exists,
+* calls {@link compute} with the key, inserts the result, and returns it.
+*
+* Mirrors the ES2026 `Map.prototype.getOrInsertComputed` proposal.
+*/
+function getOrInsertComputedPolyfill(map, key, compute) {
+	const existing = map.get(key);
+	if (existing !== void 0) return existing;
+	const value = compute(key);
+	map.set(key, value);
+	return value;
+}
+function getOrInsertNative(map, key, defaultValue) {
+	return map.getOrInsert(key, defaultValue);
+}
+function getOrInsertComputedNative(map, key, compute) {
+	return map.getOrInsertComputed(key, compute);
+}
+var getOrInsert = nativeSupport ? getOrInsertNative : getOrInsertPolyfill;
+var getOrInsertComputed = nativeSupport ? getOrInsertComputedNative : getOrInsertComputedPolyfill;
+//#endregion
+export { getOrInsert, getOrInsertComputed };
+
+//# sourceMappingURL=map.js.map

package/out/shared/src/map.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"map.js","names":[],"sources":["../../../../shared/src/map.ts"],"sourcesContent":["const nativeSupport =\n  typeof (Map.prototype as unknown as MapES2026<unknown, unknown>)\n    .getOrInsert === 'function';\n\ninterface MapES2026<K, V> {\n  getOrInsert(key: K, defaultValue: V): V;\n  getOrInsertComputed(key: K, compute: (key: K) => V): V;\n}\n\n/**\n * Returns the value for {@link key} in {@link map}.  If no mapping exists,\n * inserts {@link defaultValue} and returns it.\n *\n * Mirrors the ES2026 `Map.prototype.getOrInsert` proposal.\n */\nfunction getOrInsertPolyfill<K, V>(map: Map<K, V>, key: K, defaultValue: V): V {\n  const existing = map.get(key);\n  if (existing !== undefined) {\n    return existing;\n  }\n  map.set(key, defaultValue);\n  return defaultValue;\n}\n\n/**\n * Returns the value for {@link key} in {@link map}.  If no mapping exists,\n * calls {@link compute} with the key, inserts the result, and returns it.\n *\n * Mirrors the ES2026 `Map.prototype.getOrInsertComputed` proposal.\n */\nfunction getOrInsertComputedPolyfill<K, V>(\n  map: Map<K, V>,\n  key: K,\n  compute: (key: K) => V,\n): V {\n  const existing = map.get(key);\n  if (existing !== undefined) {\n    return existing;\n  }\n  const value = compute(key);\n  map.set(key, value);\n  return value;\n}\n\nfunction getOrInsertNative<K, V>(map: Map<K, V>, key: K, defaultValue: V): V {\n  return (map as unknown as MapES2026<K, V>).getOrInsert(key, defaultValue);\n}\n\nfunction getOrInsertComputedNative<K, V>(\n  map: Map<K, V>,\n  key: K,\n  compute: (key: K) => V,\n): V {\n  return (map as unknown as MapES2026<K, V>).getOrInsertComputed(key, compute);\n}\n\nexport const getOrInsert = nativeSupport\n  ? getOrInsertNative\n  : getOrInsertPolyfill;\n\nexport const getOrInsertComputed = nativeSupport\n  ? getOrInsertComputedNative\n  : getOrInsertComputedPolyfill;\n"],"mappings":";AAAA,IAAM,gBACJ,OAAQ,IAAI,UACT,gBAAgB;;;;;;;AAarB,SAAS,oBAA0B,KAAgB,KAAQ,cAAoB;CAC7E,MAAM,WAAW,IAAI,IAAI,IAAI;AAC7B,KAAI,aAAa,KAAA,EACf,QAAO;AAET,KAAI,IAAI,KAAK,aAAa;AAC1B,QAAO;;;;;;;;AAST,SAAS,4BACP,KACA,KACA,SACG;CACH,MAAM,WAAW,IAAI,IAAI,IAAI;AAC7B,KAAI,aAAa,KAAA,EACf,QAAO;CAET,MAAM,QAAQ,QAAQ,IAAI;AAC1B,KAAI,IAAI,KAAK,MAAM;AACnB,QAAO;;AAGT,SAAS,kBAAwB,KAAgB,KAAQ,cAAoB;AAC3E,QAAQ,IAAmC,YAAY,KAAK,aAAa;;AAG3E,SAAS,0BACP,KACA,KACA,SACG;AACH,QAAQ,IAAmC,oBAAoB,KAAK,QAAQ;;AAG9E,IAAa,cAAc,gBACvB,oBACA;AAEJ,IAAa,sBAAsB,gBAC/B,4BACA"}

package/out/zero/package.js

@@ -1,6 +1,6 @@
 var package_default = {
 	name: "@rocicorp/zero",
-	version: "1.6.0-canary.3",
+	version: "1.6.0-canary.4",
 	description: "Zero is a web framework for serverless web development.",
 	homepage: "https://zero.rocicorp.dev",
 	bugs: { "url": "https://bugs.rocicorp.dev" },

package/out/zero/package.js.map

@@ -1 +1 @@
-{"version":3,"file":"package.js","names":[],"sources":["../../package.json"],"sourcesContent":["{\n  \"name\": \"@rocicorp/zero\",\n  \"version\": \"1.6.0-canary.3\",\n  \"description\": \"Zero is a web framework for serverless web development.\",\n  \"homepage\": \"https://zero.rocicorp.dev\",\n  \"bugs\": {\n    \"url\": \"https://bugs.rocicorp.dev\"\n  },\n  \"license\": \"Apache-2.0\",\n  \"author\": \"Rocicorp, Inc.\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"git+https://github.com/rocicorp/mono.git\",\n    \"directory\": \"packages/zero\"\n  },\n  \"bin\": {\n    \"analyze-query\": \"./out/zero/src/analyze-query.js\",\n    \"ast-to-zql\": \"./out/zero/src/ast-to-zql.js\",\n    \"transform-query\": \"./out/zero/src/transform-query.js\",\n    \"zero-build-schema\": \"./out/zero/src/build-schema.js\",\n    \"zero-cache\": \"./out/zero/src/cli.js\",\n    \"zero-cache-dev\": \"./out/zero/src/zero-cache-dev.js\",\n    \"zero-deploy-permissions\": \"./out/zero/src/deploy-permissions.js\",\n    \"zero-out\": \"./out/zero/src/zero-out.js\"\n  },\n  \"files\": [\n    \"out\",\n    \"!*.tsbuildinfo\"\n  ],\n  \"type\": \"module\",\n  \"main\": \"out/zero/src/zero.js\",\n  \"module\": \"out/zero/src/zero.js\",\n  \"types\": \"out/zero/src/zero.d.ts\",\n  \"exports\": {\n    \".\": {\n      \"types\": \"./out/zero/src/zero.d.ts\",\n      \"default\": \"./out/zero/src/zero.js\"\n    },\n    \"./analyze\": {\n      \"types\": \"./out/zero/src/analyze.d.ts\",\n      \"default\": \"./out/zero/src/analyze.js\"\n    },\n    \"./bindings\": {\n      \"types\": \"./out/zero/src/bindings.d.ts\",\n      \"default\": \"./out/zero/src/bindings.js\"\n    },\n    \"./change-protocol/v0\": {\n      \"types\": \"./out/zero/src/change-protocol/v0.d.ts\",\n      \"default\": \"./out/zero/src/change-protocol/v0.js\"\n    },\n    \"./expo-sqlite\": {\n      \"types\": \"./out/zero/src/expo-sqlite.d.ts\",\n      \"default\": \"./out/zero/src/expo-sqlite.js\"\n    },\n    \"./op-sqlite\": {\n      \"types\": \"./out/zero/src/op-sqlite.d.ts\",\n      \"default\": \"./out/zero/src/op-sqlite.js\"\n    },\n    \"./pg\": {\n      \"types\": \"./out/zero/src/pg.d.ts\",\n      \"default\": \"./out/zero/src/pg.js\"\n    },\n    \"./react\": {\n      \"types\": \"./out/zero/src/react.d.ts\",\n      \"default\": \"./out/zero/src/react.js\"\n    },\n    \"./react-native\": {\n      \"types\": \"./out/zero/src/react-native.d.ts\",\n      \"default\": \"./out/zero/src/react-native.js\"\n    },\n    \"./server\": {\n      \"types\": \"./out/zero/src/server.d.ts\",\n      \"default\": \"./out/zero/src/server.js\"\n    },\n    \"./server/adapters/drizzle\": {\n      \"types\": \"./out/zero/src/adapters/drizzle.d.ts\",\n      \"default\": \"./out/zero/src/adapters/drizzle.js\"\n    },\n    \"./server/adapters/kysely\": {\n      \"types\": \"./out/zero/src/adapters/kysely.d.ts\",\n      \"default\": \"./out/zero/src/adapters/kysely.js\"\n    },\n    \"./server/adapters/prisma\": {\n      \"types\": \"./out/zero/src/adapters/prisma.d.ts\",\n      \"default\": \"./out/zero/src/adapters/prisma.js\"\n    },\n    \"./server/adapters/pg\": {\n      \"types\": \"./out/zero/src/adapters/pg.d.ts\",\n      \"default\": \"./out/zero/src/adapters/pg.js\"\n    },\n    \"./server/adapters/postgresjs\": {\n      \"types\": \"./out/zero/src/adapters/postgresjs.d.ts\",\n      \"default\": \"./out/zero/src/adapters/postgresjs.js\"\n    },\n    \"./solid\": {\n      \"types\": \"./out/zero/src/solid.d.ts\",\n      \"default\": \"./out/zero/src/solid.js\"\n    },\n    \"./sqlite\": {\n      \"types\": \"./out/zero/src/sqlite.d.ts\",\n      \"default\": \"./out/zero/src/sqlite.js\"\n    },\n    \"./zqlite\": {\n      \"types\": \"./out/zero/src/zqlite.d.ts\",\n      \"default\": \"./out/zero/src/zqlite.js\"\n    }\n  },\n  \"scripts\": {\n    \"build\": \"node --experimental-strip-types --no-warnings tool/build.ts\",\n    \"build:watch\": \"node --experimental-strip-types --no-warnings tool/build.ts --watch\",\n    \"check-types\": \"tsc -p tsconfig.client.json && tsc -p tsconfig.server.json\",\n    \"check-types:client:watch\": \"tsc -p tsconfig.client.json --watch\",\n    \"check-types:server:watch\": \"tsc -p tsconfig.server.json --watch\",\n    \"format\": \"oxfmt .\",\n    \"check-format\": \"oxfmt --check .\",\n    \"lint\": \"oxlint --quiet --config ../../oxlint.config.ts src/\",\n    \"docs\": \"node --experimental-strip-types --no-warnings tool/generate-docs.ts\",\n    \"docs:server\": \"node --watch --experimental-strip-types --no-warnings tool/generate-docs.ts --server\",\n    \"fmt\": \"oxfmt .\",\n    \"check-fmt\": \"oxfmt --check .\"\n  },\n  \"dependencies\": {\n    \"@badrap/valita\": \"0.3.11\",\n    \"@databases/escape-identifier\": \"^1.0.3\",\n    \"@databases/sql\": \"^3.3.0\",\n    \"@dotenvx/dotenvx\": \"^1.39.0\",\n    \"@drdgvhbh/postgres-error-codes\": \"^0.0.6\",\n    \"@fastify/cors\": \"^10.0.0\",\n    \"@fastify/websocket\": \"^11.0.0\",\n    \"@google-cloud/precise-date\": \"^4.0.0\",\n    \"@opentelemetry/api\": \"^1.9.0\",\n    \"@opentelemetry/api-logs\": \"^0.203.0\",\n    \"@opentelemetry/auto-instrumentations-node\": \"^0.62.0\",\n    \"@opentelemetry/exporter-metrics-otlp-http\": \"^0.203.0\",\n    \"@opentelemetry/resources\": \"^2.0.1\",\n    \"@opentelemetry/sdk-metrics\": \"^2.0.1\",\n    \"@opentelemetry/sdk-node\": \"^0.203.0\",\n    \"@opentelemetry/sdk-trace-node\": \"^2.0.1\",\n    \"@postgresql-typed/oids\": \"^0.2.0\",\n    \"@rocicorp/lock\": \"^1.0.4\",\n    \"@rocicorp/logger\": \"^5.4.0\",\n    \"@rocicorp/resolver\": \"^1.0.2\",\n    \"@rocicorp/zero-sqlite3\": \"^1.0.18\",\n    \"@standard-schema/spec\": \"^1.0.0\",\n    \"@types/basic-auth\": \"^1.1.8\",\n    \"@types/ws\": \"^8.5.12\",\n    \"basic-auth\": \"^2.0.1\",\n    \"chalk-template\": \"^1.1.0\",\n    \"chokidar\": \"^4.0.1\",\n    \"cloudevents\": \"^10.0.0\",\n    \"command-line-args\": \"^6.0.1\",\n    \"command-line-usage\": \"^7.0.3\",\n    \"compare-utf8\": \"^0.2.0\",\n    \"defu\": \"^6.1.4\",\n    \"eventemitter3\": \"^5.0.1\",\n    \"fastify\": \"^5.0.0\",\n    \"is-in-subnet\": \"^4.0.1\",\n    \"jose\": \"^5.9.3\",\n    \"js-xxhash\": \"^4.0.0\",\n    \"json-custom-numbers\": \"^3.1.1\",\n    \"kasi\": \"^1.1.0\",\n    \"nanoid\": \"^5.1.2\",\n    \"oxfmt\": \"^0.45.0\",\n    \"parse-prometheus-text-format\": \"^1.1.1\",\n    \"pg-format\": \"npm:pg-format-fix@^1.0.5\",\n    \"postgres\": \"3.4.7\",\n    \"semver\": \"^7.5.4\",\n    \"tsx\": \"^4.21.0\",\n    \"url-pattern\": \"^1.0.3\",\n    \"urlpattern-polyfill\": \"^10.1.0\",\n    \"ws\": \"^8.18.1\"\n  },\n  \"devDependencies\": {\n    \"@op-engineering/op-sqlite\": \">=15\",\n    \"@vitest/runner\": \"^4.1.5\",\n    \"analyze-query\": \"0.0.0\",\n    \"ast-to-zql\": \"0.0.0\",\n    \"expo-sqlite\": \">=15\",\n    \"replicache\": \"15.2.1\",\n    \"shared\": \"0.0.0\",\n    \"syncpack\": \"^14.3.0\",\n    \"typedoc\": \"^0.28.17\",\n    \"typedoc-plugin-markdown\": \"^4.10.0\",\n    \"typescript\": \"~6.0.2\",\n    \"vite\": \"8.0.3\",\n    \"vitest\": \"^4.1.5\",\n    \"zero-cache\": \"0.0.0\",\n    \"zero-client\": \"0.0.0\",\n    \"zero-pg\": \"0.0.0\",\n    \"zero-react\": \"0.0.0\",\n    \"zero-server\": \"0.0.0\",\n    \"zero-solid\": \"0.0.0\",\n    \"zqlite\": \"0.0.0\"\n  },\n  \"peerDependencies\": {\n    \"@op-engineering/op-sqlite\": \">=15\",\n    \"expo-sqlite\": \">=15\",\n    \"kysely\": \"^0.28.16\"\n  },\n  \"peerDependenciesMeta\": {\n    \"kysely\": {\n      \"optional\": true\n    },\n    \"expo-sqlite\": {\n      \"optional\": true\n    },\n    \"@op-engineering/op-sqlite\": {\n      \"optional\": true\n    }\n  },\n  \"engines\": {\n    \"node\": \">=22\"\n  }\n}"],"mappings":""}
+{"version":3,"file":"package.js","names":[],"sources":["../../package.json"],"sourcesContent":["{\n  \"name\": \"@rocicorp/zero\",\n  \"version\": \"1.6.0-canary.4\",\n  \"description\": \"Zero is a web framework for serverless web development.\",\n  \"homepage\": \"https://zero.rocicorp.dev\",\n  \"bugs\": {\n    \"url\": \"https://bugs.rocicorp.dev\"\n  },\n  \"license\": \"Apache-2.0\",\n  \"author\": \"Rocicorp, Inc.\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"git+https://github.com/rocicorp/mono.git\",\n    \"directory\": \"packages/zero\"\n  },\n  \"bin\": {\n    \"analyze-query\": \"./out/zero/src/analyze-query.js\",\n    \"ast-to-zql\": \"./out/zero/src/ast-to-zql.js\",\n    \"transform-query\": \"./out/zero/src/transform-query.js\",\n    \"zero-build-schema\": \"./out/zero/src/build-schema.js\",\n    \"zero-cache\": \"./out/zero/src/cli.js\",\n    \"zero-cache-dev\": \"./out/zero/src/zero-cache-dev.js\",\n    \"zero-deploy-permissions\": \"./out/zero/src/deploy-permissions.js\",\n    \"zero-out\": \"./out/zero/src/zero-out.js\"\n  },\n  \"files\": [\n    \"out\",\n    \"!*.tsbuildinfo\"\n  ],\n  \"type\": \"module\",\n  \"main\": \"out/zero/src/zero.js\",\n  \"module\": \"out/zero/src/zero.js\",\n  \"types\": \"out/zero/src/zero.d.ts\",\n  \"exports\": {\n    \".\": {\n      \"types\": \"./out/zero/src/zero.d.ts\",\n      \"default\": \"./out/zero/src/zero.js\"\n    },\n    \"./analyze\": {\n      \"types\": \"./out/zero/src/analyze.d.ts\",\n      \"default\": \"./out/zero/src/analyze.js\"\n    },\n    \"./bindings\": {\n      \"types\": \"./out/zero/src/bindings.d.ts\",\n      \"default\": \"./out/zero/src/bindings.js\"\n    },\n    \"./change-protocol/v0\": {\n      \"types\": \"./out/zero/src/change-protocol/v0.d.ts\",\n      \"default\": \"./out/zero/src/change-protocol/v0.js\"\n    },\n    \"./expo-sqlite\": {\n      \"types\": \"./out/zero/src/expo-sqlite.d.ts\",\n      \"default\": \"./out/zero/src/expo-sqlite.js\"\n    },\n    \"./op-sqlite\": {\n      \"types\": \"./out/zero/src/op-sqlite.d.ts\",\n      \"default\": \"./out/zero/src/op-sqlite.js\"\n    },\n    \"./pg\": {\n      \"types\": \"./out/zero/src/pg.d.ts\",\n      \"default\": \"./out/zero/src/pg.js\"\n    },\n    \"./react\": {\n      \"types\": \"./out/zero/src/react.d.ts\",\n      \"default\": \"./out/zero/src/react.js\"\n    },\n    \"./react-native\": {\n      \"types\": \"./out/zero/src/react-native.d.ts\",\n      \"default\": \"./out/zero/src/react-native.js\"\n    },\n    \"./server\": {\n      \"types\": \"./out/zero/src/server.d.ts\",\n      \"default\": \"./out/zero/src/server.js\"\n    },\n    \"./server/adapters/drizzle\": {\n      \"types\": \"./out/zero/src/adapters/drizzle.d.ts\",\n      \"default\": \"./out/zero/src/adapters/drizzle.js\"\n    },\n    \"./server/adapters/kysely\": {\n      \"types\": \"./out/zero/src/adapters/kysely.d.ts\",\n      \"default\": \"./out/zero/src/adapters/kysely.js\"\n    },\n    \"./server/adapters/prisma\": {\n      \"types\": \"./out/zero/src/adapters/prisma.d.ts\",\n      \"default\": \"./out/zero/src/adapters/prisma.js\"\n    },\n    \"./server/adapters/pg\": {\n      \"types\": \"./out/zero/src/adapters/pg.d.ts\",\n      \"default\": \"./out/zero/src/adapters/pg.js\"\n    },\n    \"./server/adapters/postgresjs\": {\n      \"types\": \"./out/zero/src/adapters/postgresjs.d.ts\",\n      \"default\": \"./out/zero/src/adapters/postgresjs.js\"\n    },\n    \"./solid\": {\n      \"types\": \"./out/zero/src/solid.d.ts\",\n      \"default\": \"./out/zero/src/solid.js\"\n    },\n    \"./sqlite\": {\n      \"types\": \"./out/zero/src/sqlite.d.ts\",\n      \"default\": \"./out/zero/src/sqlite.js\"\n    },\n    \"./zqlite\": {\n      \"types\": \"./out/zero/src/zqlite.d.ts\",\n      \"default\": \"./out/zero/src/zqlite.js\"\n    }\n  },\n  \"scripts\": {\n    \"build\": \"node --experimental-strip-types --no-warnings tool/build.ts\",\n    \"build:watch\": \"node --experimental-strip-types --no-warnings tool/build.ts --watch\",\n    \"check-types\": \"tsc -p tsconfig.client.json && tsc -p tsconfig.server.json\",\n    \"check-types:client:watch\": \"tsc -p tsconfig.client.json --watch\",\n    \"check-types:server:watch\": \"tsc -p tsconfig.server.json --watch\",\n    \"format\": \"oxfmt .\",\n    \"check-format\": \"oxfmt --check .\",\n    \"lint\": \"oxlint --quiet --config ../../oxlint.config.ts src/\",\n    \"docs\": \"node --experimental-strip-types --no-warnings tool/generate-docs.ts\",\n    \"docs:server\": \"node --watch --experimental-strip-types --no-warnings tool/generate-docs.ts --server\",\n    \"fmt\": \"oxfmt .\",\n    \"check-fmt\": \"oxfmt --check .\"\n  },\n  \"dependencies\": {\n    \"@badrap/valita\": \"0.3.11\",\n    \"@databases/escape-identifier\": \"^1.0.3\",\n    \"@databases/sql\": \"^3.3.0\",\n    \"@dotenvx/dotenvx\": \"^1.39.0\",\n    \"@drdgvhbh/postgres-error-codes\": \"^0.0.6\",\n    \"@fastify/cors\": \"^10.0.0\",\n    \"@fastify/websocket\": \"^11.0.0\",\n    \"@google-cloud/precise-date\": \"^4.0.0\",\n    \"@opentelemetry/api\": \"^1.9.0\",\n    \"@opentelemetry/api-logs\": \"^0.203.0\",\n    \"@opentelemetry/auto-instrumentations-node\": \"^0.62.0\",\n    \"@opentelemetry/exporter-metrics-otlp-http\": \"^0.203.0\",\n    \"@opentelemetry/resources\": \"^2.0.1\",\n    \"@opentelemetry/sdk-metrics\": \"^2.0.1\",\n    \"@opentelemetry/sdk-node\": \"^0.203.0\",\n    \"@opentelemetry/sdk-trace-node\": \"^2.0.1\",\n    \"@postgresql-typed/oids\": \"^0.2.0\",\n    \"@rocicorp/lock\": \"^1.0.4\",\n    \"@rocicorp/logger\": \"^5.4.0\",\n    \"@rocicorp/resolver\": \"^1.0.2\",\n    \"@rocicorp/zero-sqlite3\": \"^1.0.18\",\n    \"@standard-schema/spec\": \"^1.0.0\",\n    \"@types/basic-auth\": \"^1.1.8\",\n    \"@types/ws\": \"^8.5.12\",\n    \"basic-auth\": \"^2.0.1\",\n    \"chalk-template\": \"^1.1.0\",\n    \"chokidar\": \"^4.0.1\",\n    \"cloudevents\": \"^10.0.0\",\n    \"command-line-args\": \"^6.0.1\",\n    \"command-line-usage\": \"^7.0.3\",\n    \"compare-utf8\": \"^0.2.0\",\n    \"defu\": \"^6.1.4\",\n    \"eventemitter3\": \"^5.0.1\",\n    \"fastify\": \"^5.0.0\",\n    \"is-in-subnet\": \"^4.0.1\",\n    \"jose\": \"^5.9.3\",\n    \"js-xxhash\": \"^4.0.0\",\n    \"json-custom-numbers\": \"^3.1.1\",\n    \"kasi\": \"^1.1.0\",\n    \"nanoid\": \"^5.1.2\",\n    \"oxfmt\": \"^0.45.0\",\n    \"parse-prometheus-text-format\": \"^1.1.1\",\n    \"pg-format\": \"npm:pg-format-fix@^1.0.5\",\n    \"postgres\": \"3.4.7\",\n    \"semver\": \"^7.5.4\",\n    \"tsx\": \"^4.21.0\",\n    \"url-pattern\": \"^1.0.3\",\n    \"urlpattern-polyfill\": \"^10.1.0\",\n    \"ws\": \"^8.18.1\"\n  },\n  \"devDependencies\": {\n    \"@op-engineering/op-sqlite\": \">=15\",\n    \"@vitest/runner\": \"^4.1.5\",\n    \"analyze-query\": \"0.0.0\",\n    \"ast-to-zql\": \"0.0.0\",\n    \"expo-sqlite\": \">=15\",\n    \"replicache\": \"15.2.1\",\n    \"shared\": \"0.0.0\",\n    \"syncpack\": \"^14.3.0\",\n    \"typedoc\": \"^0.28.17\",\n    \"typedoc-plugin-markdown\": \"^4.10.0\",\n    \"typescript\": \"~6.0.2\",\n    \"vite\": \"8.0.3\",\n    \"vitest\": \"^4.1.5\",\n    \"zero-cache\": \"0.0.0\",\n    \"zero-client\": \"0.0.0\",\n    \"zero-pg\": \"0.0.0\",\n    \"zero-react\": \"0.0.0\",\n    \"zero-server\": \"0.0.0\",\n    \"zero-solid\": \"0.0.0\",\n    \"zqlite\": \"0.0.0\"\n  },\n  \"peerDependencies\": {\n    \"@op-engineering/op-sqlite\": \">=15\",\n    \"expo-sqlite\": \">=15\",\n    \"kysely\": \"^0.28.16\"\n  },\n  \"peerDependenciesMeta\": {\n    \"kysely\": {\n      \"optional\": true\n    },\n    \"expo-sqlite\": {\n      \"optional\": true\n    },\n    \"@op-engineering/op-sqlite\": {\n      \"optional\": true\n    }\n  },\n  \"engines\": {\n    \"node\": \">=22\"\n  }\n}"],"mappings":""}

package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts

@@ -53,8 +53,14 @@ export declare function shadowInitialSync(lc: LogContext, shard: ShardConfig, up
 /**
  * Runs structural assertions over a just-synced replica and throws if any
  * fail. Only called in shadow mode — a successful return means the replica
- * is schema-complete, row-count consistent, ZQL-queryable, and its column
- * metadata is in sync with its lite schema.
+ * is schema-complete, row-count consistent, and its column metadata is in
+ * sync with its lite schema.
+ *
+ * Note: this intentionally does NOT verify ZQL-queryability. Tables that
+ * `computeZqlSpecs` drops (no PK / no all-NOT-NULL unique index, unsupported
+ * column types, etc.) are silently skipped in production too — there's
+ * nothing shadow-specific about them, so failing here would diverge from
+ * prod over an upstream-schema condition prod accepts.
  *
  * Exported for testing.
  */

package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initial-sync.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/initial-sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"initial-sync.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/initial-sync.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/change-source/pg/initial-sync.js

@@ -7,7 +7,7 @@ import { liteValue } from "../../../types/lite.js";
 import { liteTableName } from "../../../types/names.js";
 import { mapPostgresToLite, mapPostgresToLiteIndex } from "../../../db/pg-to-lite.js";
 import { ColumnMetadataStore } from "../../replicator/schema/column-metadata.js";
-import { computeZqlSpecs, listIndexes, listTables } from "../../../db/lite-tables.js";
+import { listIndexes, listTables } from "../../../db/lite-tables.js";
 import { initReplicationState } from "../../replicator/schema/replication-state.js";
 import { id } from "../../../types/sql.js";
 import { pgClient } from "../../../types/pg.js";
@@ -264,8 +264,14 @@ function createLiteIndices(tx, indices) {
 /**
 * Runs structural assertions over a just-synced replica and throws if any
 * fail. Only called in shadow mode — a successful return means the replica
-* is schema-complete, row-count consistent, ZQL-queryable, and its column
-* metadata is in sync with its lite schema.
+* is schema-complete, row-count consistent, and its column metadata is in
+* sync with its lite schema.
+*
+* Note: this intentionally does NOT verify ZQL-queryability. Tables that
+* `computeZqlSpecs` drops (no PK / no all-NOT-NULL unique index, unsupported
+* column types, etc.) are silently skipped in production too — there's
+* nothing shadow-specific about them, so failing here would diverge from
+* prod over an upstream-schema condition prod accepts.
 *
 * Exported for testing.
 */
@@ -299,11 +305,6 @@ function verifyShadowReplica(lc, db, published, rowsByTable) {
 	} catch (e) {
 		issues.push(`could not count rows in table ${table}: ${String(e)}`);
 	}
-	const tableSpecs = computeZqlSpecs(lc, db, { includeBackfillingColumns: false });
-	for (const pt of published.tables) {
-		const name = liteTableName(pt);
-		if (!tableSpecs.has(name)) issues.push(`table not queryable via ZQL (dropped by computeZqlSpecs): ${name}`);
-	}
 	const meta = must(ColumnMetadataStore.getInstance(db));
 	for (const pt of published.tables) {
 		const name = liteTableName(pt);