loro-repo 0.18.3 → 0.18.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -81,6 +81,25 @@ function mergeMetaSnapshot(flock, bytes) {
81
81
  };
82
82
  }
83
83
 
84
+ //#endregion
85
+ //#region src/internal/flock-snapshot.ts
86
+ const DEFAULT_FLOCK_FILE_EXPORT_BUDGET_MS = 8;
87
+ async function exportFlockFileSnapshot(flock, options = {}) {
88
+ const exportIncremental = flock.exportFileV2Incremental;
89
+ if (typeof exportIncremental === "function") return exportIncremental.call(flock, {
90
+ budgetMs: options.budgetMs ?? DEFAULT_FLOCK_FILE_EXPORT_BUDGET_MS,
91
+ signal: options.signal
92
+ });
93
+ return flock.exportFile();
94
+ }
95
+ function hasVisibleRows(flock) {
96
+ const isEmpty = flock.isEmpty;
97
+ if (typeof isEmpty === "function") return !isEmpty.call(flock);
98
+ const rows = flock.scan({});
99
+ for (const row of rows) if (row.value !== void 0) return true;
100
+ return false;
101
+ }
102
+
84
103
  //#endregion
85
104
  Object.defineProperty(exports, 'encodeMetaJsonUpdate', {
86
105
  enumerable: true,
@@ -88,6 +107,18 @@ Object.defineProperty(exports, 'encodeMetaJsonUpdate', {
88
107
  return encodeMetaJsonUpdate;
89
108
  }
90
109
  });
110
+ Object.defineProperty(exports, 'exportFlockFileSnapshot', {
111
+ enumerable: true,
112
+ get: function () {
113
+ return exportFlockFileSnapshot;
114
+ }
115
+ });
116
+ Object.defineProperty(exports, 'hasVisibleRows', {
117
+ enumerable: true,
118
+ get: function () {
119
+ return hasVisibleRows;
120
+ }
121
+ });
91
122
  Object.defineProperty(exports, 'hydrateMetaSnapshots', {
92
123
  enumerable: true,
93
124
  get: function () {
@@ -100,4 +131,4 @@ Object.defineProperty(exports, 'isFlockFile', {
100
131
  return isFlockFile;
101
132
  }
102
133
  });
103
- //# sourceMappingURL=meta-snapshot.cjs.map
134
+ //# sourceMappingURL=flock-snapshot.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"flock-snapshot.cjs","names":["flock: Flock | undefined","Flock"],"sources":["../src/storage/meta-snapshot.ts","../src/internal/flock-snapshot.ts"],"sourcesContent":["import { Flock, type ExportBundle } from \"@loro-dev/flock-wasm\";\n\nconst textEncoder = new TextEncoder();\nconst textDecoder = new TextDecoder();\nconst FLOCK_FILE_MAGIC_LENGTH = 4;\n// Flock file snapshots are prefixed with a 4-byte magic header. The legacy v1\n// B+Tree page format uses \"FLOK\"; flock-wasm >=0.4.0 writes the canonical v2\n// format with \"FLK2\". `Flock.fromFile`/`importFile` read both, so we just need\n// to recognize either magic to distinguish a binary snapshot from a JSON bundle.\nconst FLOCK_FILE_MAGIC_V1 = [0x46, 0x4c, 0x4f, 0x4b]; // \"FLOK\"\nconst FLOCK_FILE_MAGIC_V2 = [0x46, 0x4c, 0x4b, 0x32]; // \"FLK2\"\n\ntype SnapshotFormat = \"file\" | \"json\";\n\ninterface MergeResult {\n flock: Flock;\n format: SnapshotFormat;\n}\n\nexport interface HydrateMetaSnapshotResult {\n flock: Flock | undefined;\n loadedJsonUpdate: boolean;\n}\n\nfunction matchesMagic(bytes: Uint8Array, magic: readonly number[]): boolean {\n for (let i = 0; i < magic.length; i += 1) {\n if (bytes[i] !== magic[i]) return false;\n }\n return true;\n}\n\nexport function isFlockFile(bytes: Uint8Array): boolean {\n return (\n bytes.length >= FLOCK_FILE_MAGIC_LENGTH &&\n (matchesMagic(bytes, FLOCK_FILE_MAGIC_V1) ||\n matchesMagic(bytes, FLOCK_FILE_MAGIC_V2))\n );\n}\n\nexport function encodeMetaJsonUpdate(bundle: ExportBundle): Uint8Array {\n return textEncoder.encode(JSON.stringify(bundle));\n}\n\nexport function hydrateMetaSnapshots(\n legacy: Uint8Array | undefined,\n updates: readonly Uint8Array[],\n): HydrateMetaSnapshotResult {\n let loadedJsonUpdate = false;\n let baseUpdateIndex = -1;\n let flock: Flock | undefined;\n\n if (legacy) {\n const merged = mergeMetaSnapshot(flock, legacy);\n flock = merged.flock;\n if (merged.format === \"json\") {\n loadedJsonUpdate = true;\n }\n } else {\n baseUpdateIndex = updates.findIndex((bytes) => isFlockFile(bytes));\n if (baseUpdateIndex >= 0) {\n flock = Flock.fromFile(updates[baseUpdateIndex] as Uint8Array);\n }\n }\n\n for (let index = 0; index < updates.length; index += 1) {\n if (index === baseUpdateIndex) continue;\n const merged = mergeMetaSnapshot(flock, updates[index] as Uint8Array);\n flock = merged.flock;\n if (merged.format === \"json\") {\n loadedJsonUpdate = true;\n }\n }\n\n return { flock, loadedJsonUpdate };\n}\n\nfunction mergeMetaSnapshot(\n flock: Flock | undefined,\n bytes: Uint8Array,\n): MergeResult {\n if (isFlockFile(bytes)) {\n if (flock) {\n flock.importFile(bytes);\n return { flock, format: \"file\" };\n }\n return { flock: Flock.fromFile(bytes), format: \"file\" };\n }\n\n const bundle = JSON.parse(textDecoder.decode(bytes)) as ExportBundle;\n if (flock) {\n flock.importJson(bundle);\n return { flock, format: \"json\" };\n }\n const hydrated = new Flock();\n hydrated.importJson(bundle);\n return { flock: hydrated, format: \"json\" };\n}\n","import type { Flock } from \"@loro-dev/flock-wasm\";\n\nexport const DEFAULT_FLOCK_FILE_EXPORT_BUDGET_MS = 8;\n\nexport interface ExportFlockFileSnapshotOptions {\n readonly budgetMs?: number;\n readonly signal?: AbortSignal;\n}\n\ntype FlockWithIncrementalFileExport = Flock & {\n exportFileV2Incremental?: (\n options?: ExportFlockFileSnapshotOptions,\n ) => Promise<Uint8Array>;\n};\n\ntype FlockWithIsEmpty = Flock & {\n isEmpty?: () => boolean;\n};\n\nexport async function exportFlockFileSnapshot(\n flock: Flock,\n options: ExportFlockFileSnapshotOptions = {},\n): Promise<Uint8Array> {\n const exportIncremental = (flock as FlockWithIncrementalFileExport)\n .exportFileV2Incremental;\n if (typeof exportIncremental === \"function\") {\n return exportIncremental.call(flock, {\n budgetMs: options.budgetMs ?? DEFAULT_FLOCK_FILE_EXPORT_BUDGET_MS,\n signal: options.signal,\n });\n }\n return flock.exportFile();\n}\n\nexport function hasVisibleRows(flock: Flock): boolean {\n const isEmpty = (flock as FlockWithIsEmpty).isEmpty;\n if (typeof isEmpty === \"function\") {\n return !isEmpty.call(flock);\n }\n\n const rows = flock.scan({});\n for (const row of rows) {\n if (row.value !== undefined) return true;\n }\n return false;\n}\n"],"mappings":";;;;;AAEA,MAAM,cAAc,IAAI,aAAa;AACrC,MAAM,cAAc,IAAI,aAAa;AACrC,MAAM,0BAA0B;AAKhC,MAAM,sBAAsB;CAAC;CAAM;CAAM;CAAM;CAAK;AACpD,MAAM,sBAAsB;CAAC;CAAM;CAAM;CAAM;CAAK;AAcpD,SAAS,aAAa,OAAmB,OAAmC;AAC1E,MAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK,EACrC,KAAI,MAAM,OAAO,MAAM,GAAI,QAAO;AAEpC,QAAO;;AAGT,SAAgB,YAAY,OAA4B;AACtD,QACE,MAAM,UAAU,4BACf,aAAa,OAAO,oBAAoB,IACvC,aAAa,OAAO,oBAAoB;;AAI9C,SAAgB,qBAAqB,QAAkC;AACrE,QAAO,YAAY,OAAO,KAAK,UAAU,OAAO,CAAC;;AAGnD,SAAgB,qBACd,QACA,SAC2B;CAC3B,IAAI,mBAAmB;CACvB,IAAI,kBAAkB;CACtB,IAAIA;AAEJ,KAAI,QAAQ;EACV,MAAM,SAAS,kBAAkB,OAAO,OAAO;AAC/C,UAAQ,OAAO;AACf,MAAI,OAAO,WAAW,OACpB,oBAAmB;QAEhB;AACL,oBAAkB,QAAQ,WAAW,UAAU,YAAY,MAAM,CAAC;AAClE,MAAI,mBAAmB,EACrB,SAAQC,4BAAM,SAAS,QAAQ,iBAA+B;;AAIlE,MAAK,IAAI,QAAQ,GAAG,QAAQ,QAAQ,QAAQ,SAAS,GAAG;AACtD,MAAI,UAAU,gBAAiB;EAC/B,MAAM,SAAS,kBAAkB,OAAO,QAAQ,OAAqB;AACrE,UAAQ,OAAO;AACf,MAAI,OAAO,WAAW,OACpB,oBAAmB;;AAIvB,QAAO;EAAE;EAAO;EAAkB;;AAGpC,SAAS,kBACP,OACA,OACa;AACb,KAAI,YAAY,MAAM,EAAE;AACtB,MAAI,OAAO;AACT,SAAM,WAAW,MAAM;AACvB,UAAO;IAAE;IAAO,QAAQ;IAAQ;;AAElC,SAAO;GAAE,OAAOA,4BAAM,SAAS,MAAM;GAAE,QAAQ;GAAQ;;CAGzD,MAAM,SAAS,KAAK,MAAM,YAAY,OAAO,MAAM,CAAC;AACpD,KAAI,OAAO;AACT,QAAM,WAAW,OAAO;AACxB,SAAO;GAAE;GAAO,QAAQ;GAAQ;;CAElC,MAAM,WAAW,IAAIA,6BAAO;AAC5B,UAAS,WAAW,OAAO;AAC3B,QAAO;EAAE,OAAO;EAAU,QAAQ;EAAQ;;;;;AC7F5C,MAAa,sCAAsC;AAiBnD,eAAsB,wBACpB,OACA,UAA0C,EAAE,EACvB;CACrB,MAAM,oBAAqB,MACxB;AACH,KAAI,OAAO,sBAAsB,WAC/B,QAAO,kBAAkB,KAAK,OAAO;EACnC,UAAU,QAAQ,YAAY;EAC9B,QAAQ,QAAQ;EACjB,CAAC;AAEJ,QAAO,MAAM,YAAY;;AAG3B,SAAgB,eAAe,OAAuB;CACpD,MAAM,UAAW,MAA2B;AAC5C,KAAI,OAAO,YAAY,WACrB,QAAO,CAAC,QAAQ,KAAK,MAAM;CAG7B,MAAM,OAAO,MAAM,KAAK,EAAE,CAAC;AAC3B,MAAK,MAAM,OAAO,KAChB,KAAI,IAAI,UAAU,OAAW,QAAO;AAEtC,QAAO"}
@@ -80,5 +80,24 @@ function mergeMetaSnapshot(flock, bytes) {
80
80
  }
81
81
 
82
82
  //#endregion
83
- export { hydrateMetaSnapshots as n, isFlockFile as r, encodeMetaJsonUpdate as t };
84
- //# sourceMappingURL=meta-snapshot.js.map
83
+ //#region src/internal/flock-snapshot.ts
84
+ const DEFAULT_FLOCK_FILE_EXPORT_BUDGET_MS = 8;
85
+ async function exportFlockFileSnapshot(flock, options = {}) {
86
+ const exportIncremental = flock.exportFileV2Incremental;
87
+ if (typeof exportIncremental === "function") return exportIncremental.call(flock, {
88
+ budgetMs: options.budgetMs ?? DEFAULT_FLOCK_FILE_EXPORT_BUDGET_MS,
89
+ signal: options.signal
90
+ });
91
+ return flock.exportFile();
92
+ }
93
+ function hasVisibleRows(flock) {
94
+ const isEmpty = flock.isEmpty;
95
+ if (typeof isEmpty === "function") return !isEmpty.call(flock);
96
+ const rows = flock.scan({});
97
+ for (const row of rows) if (row.value !== void 0) return true;
98
+ return false;
99
+ }
100
+
101
+ //#endregion
102
+ export { isFlockFile as a, hydrateMetaSnapshots as i, hasVisibleRows as n, encodeMetaJsonUpdate as r, exportFlockFileSnapshot as t };
103
+ //# sourceMappingURL=flock-snapshot.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"flock-snapshot.js","names":["flock: Flock | undefined"],"sources":["../src/storage/meta-snapshot.ts","../src/internal/flock-snapshot.ts"],"sourcesContent":["import { Flock, type ExportBundle } from \"@loro-dev/flock-wasm\";\n\nconst textEncoder = new TextEncoder();\nconst textDecoder = new TextDecoder();\nconst FLOCK_FILE_MAGIC_LENGTH = 4;\n// Flock file snapshots are prefixed with a 4-byte magic header. The legacy v1\n// B+Tree page format uses \"FLOK\"; flock-wasm >=0.4.0 writes the canonical v2\n// format with \"FLK2\". `Flock.fromFile`/`importFile` read both, so we just need\n// to recognize either magic to distinguish a binary snapshot from a JSON bundle.\nconst FLOCK_FILE_MAGIC_V1 = [0x46, 0x4c, 0x4f, 0x4b]; // \"FLOK\"\nconst FLOCK_FILE_MAGIC_V2 = [0x46, 0x4c, 0x4b, 0x32]; // \"FLK2\"\n\ntype SnapshotFormat = \"file\" | \"json\";\n\ninterface MergeResult {\n flock: Flock;\n format: SnapshotFormat;\n}\n\nexport interface HydrateMetaSnapshotResult {\n flock: Flock | undefined;\n loadedJsonUpdate: boolean;\n}\n\nfunction matchesMagic(bytes: Uint8Array, magic: readonly number[]): boolean {\n for (let i = 0; i < magic.length; i += 1) {\n if (bytes[i] !== magic[i]) return false;\n }\n return true;\n}\n\nexport function isFlockFile(bytes: Uint8Array): boolean {\n return (\n bytes.length >= FLOCK_FILE_MAGIC_LENGTH &&\n (matchesMagic(bytes, FLOCK_FILE_MAGIC_V1) ||\n matchesMagic(bytes, FLOCK_FILE_MAGIC_V2))\n );\n}\n\nexport function encodeMetaJsonUpdate(bundle: ExportBundle): Uint8Array {\n return textEncoder.encode(JSON.stringify(bundle));\n}\n\nexport function hydrateMetaSnapshots(\n legacy: Uint8Array | undefined,\n updates: readonly Uint8Array[],\n): HydrateMetaSnapshotResult {\n let loadedJsonUpdate = false;\n let baseUpdateIndex = -1;\n let flock: Flock | undefined;\n\n if (legacy) {\n const merged = mergeMetaSnapshot(flock, legacy);\n flock = merged.flock;\n if (merged.format === \"json\") {\n loadedJsonUpdate = true;\n }\n } else {\n baseUpdateIndex = updates.findIndex((bytes) => isFlockFile(bytes));\n if (baseUpdateIndex >= 0) {\n flock = Flock.fromFile(updates[baseUpdateIndex] as Uint8Array);\n }\n }\n\n for (let index = 0; index < updates.length; index += 1) {\n if (index === baseUpdateIndex) continue;\n const merged = mergeMetaSnapshot(flock, updates[index] as Uint8Array);\n flock = merged.flock;\n if (merged.format === \"json\") {\n loadedJsonUpdate = true;\n }\n }\n\n return { flock, loadedJsonUpdate };\n}\n\nfunction mergeMetaSnapshot(\n flock: Flock | undefined,\n bytes: Uint8Array,\n): MergeResult {\n if (isFlockFile(bytes)) {\n if (flock) {\n flock.importFile(bytes);\n return { flock, format: \"file\" };\n }\n return { flock: Flock.fromFile(bytes), format: \"file\" };\n }\n\n const bundle = JSON.parse(textDecoder.decode(bytes)) as ExportBundle;\n if (flock) {\n flock.importJson(bundle);\n return { flock, format: \"json\" };\n }\n const hydrated = new Flock();\n hydrated.importJson(bundle);\n return { flock: hydrated, format: \"json\" };\n}\n","import type { Flock } from \"@loro-dev/flock-wasm\";\n\nexport const DEFAULT_FLOCK_FILE_EXPORT_BUDGET_MS = 8;\n\nexport interface ExportFlockFileSnapshotOptions {\n readonly budgetMs?: number;\n readonly signal?: AbortSignal;\n}\n\ntype FlockWithIncrementalFileExport = Flock & {\n exportFileV2Incremental?: (\n options?: ExportFlockFileSnapshotOptions,\n ) => Promise<Uint8Array>;\n};\n\ntype FlockWithIsEmpty = Flock & {\n isEmpty?: () => boolean;\n};\n\nexport async function exportFlockFileSnapshot(\n flock: Flock,\n options: ExportFlockFileSnapshotOptions = {},\n): Promise<Uint8Array> {\n const exportIncremental = (flock as FlockWithIncrementalFileExport)\n .exportFileV2Incremental;\n if (typeof exportIncremental === \"function\") {\n return exportIncremental.call(flock, {\n budgetMs: options.budgetMs ?? DEFAULT_FLOCK_FILE_EXPORT_BUDGET_MS,\n signal: options.signal,\n });\n }\n return flock.exportFile();\n}\n\nexport function hasVisibleRows(flock: Flock): boolean {\n const isEmpty = (flock as FlockWithIsEmpty).isEmpty;\n if (typeof isEmpty === \"function\") {\n return !isEmpty.call(flock);\n }\n\n const rows = flock.scan({});\n for (const row of rows) {\n if (row.value !== undefined) return true;\n }\n return false;\n}\n"],"mappings":";;;AAEA,MAAM,cAAc,IAAI,aAAa;AACrC,MAAM,cAAc,IAAI,aAAa;AACrC,MAAM,0BAA0B;AAKhC,MAAM,sBAAsB;CAAC;CAAM;CAAM;CAAM;CAAK;AACpD,MAAM,sBAAsB;CAAC;CAAM;CAAM;CAAM;CAAK;AAcpD,SAAS,aAAa,OAAmB,OAAmC;AAC1E,MAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK,EACrC,KAAI,MAAM,OAAO,MAAM,GAAI,QAAO;AAEpC,QAAO;;AAGT,SAAgB,YAAY,OAA4B;AACtD,QACE,MAAM,UAAU,4BACf,aAAa,OAAO,oBAAoB,IACvC,aAAa,OAAO,oBAAoB;;AAI9C,SAAgB,qBAAqB,QAAkC;AACrE,QAAO,YAAY,OAAO,KAAK,UAAU,OAAO,CAAC;;AAGnD,SAAgB,qBACd,QACA,SAC2B;CAC3B,IAAI,mBAAmB;CACvB,IAAI,kBAAkB;CACtB,IAAIA;AAEJ,KAAI,QAAQ;EACV,MAAM,SAAS,kBAAkB,OAAO,OAAO;AAC/C,UAAQ,OAAO;AACf,MAAI,OAAO,WAAW,OACpB,oBAAmB;QAEhB;AACL,oBAAkB,QAAQ,WAAW,UAAU,YAAY,MAAM,CAAC;AAClE,MAAI,mBAAmB,EACrB,SAAQ,MAAM,SAAS,QAAQ,iBAA+B;;AAIlE,MAAK,IAAI,QAAQ,GAAG,QAAQ,QAAQ,QAAQ,SAAS,GAAG;AACtD,MAAI,UAAU,gBAAiB;EAC/B,MAAM,SAAS,kBAAkB,OAAO,QAAQ,OAAqB;AACrE,UAAQ,OAAO;AACf,MAAI,OAAO,WAAW,OACpB,oBAAmB;;AAIvB,QAAO;EAAE;EAAO;EAAkB;;AAGpC,SAAS,kBACP,OACA,OACa;AACb,KAAI,YAAY,MAAM,EAAE;AACtB,MAAI,OAAO;AACT,SAAM,WAAW,MAAM;AACvB,UAAO;IAAE;IAAO,QAAQ;IAAQ;;AAElC,SAAO;GAAE,OAAO,MAAM,SAAS,MAAM;GAAE,QAAQ;GAAQ;;CAGzD,MAAM,SAAS,KAAK,MAAM,YAAY,OAAO,MAAM,CAAC;AACpD,KAAI,OAAO;AACT,QAAM,WAAW,OAAO;AACxB,SAAO;GAAE;GAAO,QAAQ;GAAQ;;CAElC,MAAM,WAAW,IAAI,OAAO;AAC5B,UAAS,WAAW,OAAO;AAC3B,QAAO;EAAE,OAAO;EAAU,QAAQ;EAAQ;;;;;AC7F5C,MAAa,sCAAsC;AAiBnD,eAAsB,wBACpB,OACA,UAA0C,EAAE,EACvB;CACrB,MAAM,oBAAqB,MACxB;AACH,KAAI,OAAO,sBAAsB,WAC/B,QAAO,kBAAkB,KAAK,OAAO;EACnC,UAAU,QAAQ,YAAY;EAC9B,QAAQ,QAAQ;EACjB,CAAC;AAEJ,QAAO,MAAM,YAAY;;AAG3B,SAAgB,eAAe,OAAuB;CACpD,MAAM,UAAW,MAA2B;AAC5C,KAAI,OAAO,YAAY,WACrB,QAAO,CAAC,QAAQ,KAAK,MAAM;CAG7B,MAAM,OAAO,MAAM,KAAK,EAAE,CAAC;AAC3B,MAAK,MAAM,OAAO,KAChB,KAAI,IAAI,UAAU,OAAW,QAAO;AAEtC,QAAO"}
package/dist/index.cjs CHANGED
@@ -1,6 +1,6 @@
1
1
  const require_chunk = require('./chunk.cjs');
2
2
  const require_logging = require('./logging.cjs');
3
- const require_meta_snapshot = require('./meta-snapshot.cjs');
3
+ const require_flock_snapshot = require('./flock-snapshot.cjs');
4
4
  let __loro_dev_flock_wasm = require("@loro-dev/flock-wasm");
5
5
  __loro_dev_flock_wasm = require_chunk.__toESM(__loro_dev_flock_wasm);
6
6
  let loro_crdt = require("loro-crdt");
@@ -377,11 +377,6 @@ function versionEquals(a, b) {
377
377
  function hasEmptyVersion(vector) {
378
378
  return Object.keys(vector).length === 0;
379
379
  }
380
- function hasVisibleRows(flock) {
381
- const rows = flock.scan({});
382
- for (const row of rows) if (row.value !== void 0) return true;
383
- return false;
384
- }
385
380
  async function exportJsonUpdate(flock, from) {
386
381
  if (hasEmptyVersion(from)) return flock.exportJson();
387
382
  return flock.exportJson({ from });
@@ -417,9 +412,9 @@ var FlockDocManager = class {
417
412
  }
418
413
  async openDetachedFlockDoc(flockDocId) {
419
414
  const cached = this.flocks.get(flockDocId);
420
- if (cached) return __loro_dev_flock_wasm.Flock.fromFile(cached.exportFile());
415
+ if (cached) return __loro_dev_flock_wasm.Flock.fromFile(await require_flock_snapshot.exportFlockFileSnapshot(cached));
421
416
  const stored = await this.storage?.loadFlockDoc?.(flockDocId);
422
- if (stored) return __loro_dev_flock_wasm.Flock.fromFile(stored.exportFile());
417
+ if (stored) return __loro_dev_flock_wasm.Flock.fromFile(await require_flock_snapshot.exportFlockFileSnapshot(stored));
423
418
  return new __loro_dev_flock_wasm.Flock();
424
419
  }
425
420
  async ensureFlockDoc(flockDocId) {
@@ -441,16 +436,15 @@ var FlockDocManager = class {
441
436
  }
442
437
  async persistFlockDoc(flockDocId, flock) {
443
438
  const previousVersion = this.persistedVersions.get(flockDocId);
444
- const snapshot = flock.exportFile();
445
- const nextVersion = flock.version();
446
439
  const versionAtCapture = flock.version();
447
440
  if (!this.storage) {
448
- this.persistedVersions.set(flockDocId, nextVersion);
441
+ this.persistedVersions.set(flockDocId, versionAtCapture);
449
442
  await this.materializeExistence(flockDocId, flock);
450
443
  this.clearDirtyIfStable(flockDocId, versionAtCapture, flock);
451
444
  return;
452
445
  }
453
- this.persistedVersions.set(flockDocId, nextVersion);
446
+ const snapshot = await require_flock_snapshot.exportFlockFileSnapshot(flock);
447
+ this.persistedVersions.set(flockDocId, versionAtCapture);
454
448
  try {
455
449
  await this.storage.save({
456
450
  type: "flock-doc-snapshot",
@@ -530,7 +524,7 @@ var FlockDocManager = class {
530
524
  registerFlockDoc(flockDocId, flock) {
531
525
  this.flocks.set(flockDocId, flock);
532
526
  this.persistedVersions.set(flockDocId, flock.version());
533
- if (hasVisibleRows(flock)) this.docsWithVisibleContent.add(flockDocId);
527
+ if (require_flock_snapshot.hasVisibleRows(flock)) this.docsWithVisibleContent.add(flockDocId);
534
528
  this.ensureSubscription(flockDocId, flock);
535
529
  }
536
530
  ensureSubscription(flockDocId, flock) {
@@ -557,8 +551,6 @@ var FlockDocManager = class {
557
551
  }
558
552
  if (!previousVersion) {
559
553
  await this.persistFlockDoc(flockDocId, flock);
560
- this.persistedVersions.set(flockDocId, nextVersion);
561
- this.clearDirtyIfStable(flockDocId, nextVersion, flock);
562
554
  return;
563
555
  }
564
556
  if (versionEquals(previousVersion, nextVersion)) {
@@ -578,7 +570,7 @@ var FlockDocManager = class {
578
570
  await this.storage.save({
579
571
  type: "flock-doc-update",
580
572
  flockDocId,
581
- update: require_meta_snapshot.encodeMetaJsonUpdate(bundle)
573
+ update: require_flock_snapshot.encodeMetaJsonUpdate(bundle)
582
574
  });
583
575
  await this.materializeExistence(flockDocId, flock);
584
576
  this.clearDirtyIfStable(flockDocId, nextVersion, flock);
@@ -590,7 +582,7 @@ var FlockDocManager = class {
590
582
  async materializeExistence(flockDocId, flock) {
591
583
  if (this.existenceMaterialized.has(flockDocId)) return;
592
584
  if (!this.docsWithVisibleContent.has(flockDocId)) {
593
- if (!hasVisibleRows(flock)) return;
585
+ if (!require_flock_snapshot.hasVisibleRows(flock)) return;
594
586
  this.docsWithVisibleContent.add(flockDocId);
595
587
  }
596
588
  await this.ensureFlockDocExists(flockDocId, this.computeExpiresAtMs(flockDocId));
@@ -607,7 +599,7 @@ var FlockDocManager = class {
607
599
  onFlockDocEvent(flockDocId) {
608
600
  const flock = this.flocks.get(flockDocId);
609
601
  if (!flock) return;
610
- if (!this.docsWithVisibleContent.has(flockDocId) && hasVisibleRows(flock)) this.docsWithVisibleContent.add(flockDocId);
602
+ if (!this.docsWithVisibleContent.has(flockDocId) && require_flock_snapshot.hasVisibleRows(flock)) this.docsWithVisibleContent.add(flockDocId);
611
603
  this.dirtyFlockDocs.add(flockDocId);
612
604
  this.scheduleDirtyFlush();
613
605
  }
@@ -1855,7 +1847,7 @@ var MetaPersister = class {
1855
1847
  return;
1856
1848
  }
1857
1849
  if (!previousVersion || this.isEmptyVersion(previousVersion)) {
1858
- const snapshot = flock.exportFile();
1850
+ const snapshot = await require_flock_snapshot.exportFlockFileSnapshot(flock);
1859
1851
  await this.storage.save({
1860
1852
  type: "meta-snapshot",
1861
1853
  snapshot
@@ -1863,7 +1855,7 @@ var MetaPersister = class {
1863
1855
  this.incrementalUpdatesSinceCompaction = 0;
1864
1856
  this.incrementalUpdateBytesSinceCompaction = 0;
1865
1857
  } else {
1866
- const update = require_meta_snapshot.encodeMetaJsonUpdate(flock.exportJson(previousVersion));
1858
+ const update = require_flock_snapshot.encodeMetaJsonUpdate(flock.exportJson(previousVersion));
1867
1859
  await this.storage.save({
1868
1860
  type: "meta-update",
1869
1861
  update