@verdant-web/store 2.5.8 → 2.7.0

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.
Files changed (145) hide show
  1. package/dist/bundle/index.js +15 -10
  2. package/dist/bundle/index.js.map +4 -4
  3. package/dist/cjs/{entities/FakeWeakRef.d.ts → FakeWeakRef.d.ts} +2 -2
  4. package/dist/cjs/{entities/FakeWeakRef.js → FakeWeakRef.js} +4 -4
  5. package/dist/cjs/FakeWeakRef.js.map +1 -0
  6. package/dist/cjs/IDBService.d.ts +1 -1
  7. package/dist/cjs/IDBService.js +18 -1
  8. package/dist/cjs/IDBService.js.map +1 -1
  9. package/dist/cjs/__tests__/documents.test.js +17 -0
  10. package/dist/cjs/__tests__/documents.test.js.map +1 -1
  11. package/dist/cjs/__tests__/fixtures/testStorage.d.ts +1 -1
  12. package/dist/cjs/__tests__/fixtures/testStorage.js +3 -2
  13. package/dist/cjs/__tests__/fixtures/testStorage.js.map +1 -1
  14. package/dist/cjs/__tests__/mutations.test.d.ts +1 -0
  15. package/dist/cjs/__tests__/mutations.test.js +42 -0
  16. package/dist/cjs/__tests__/mutations.test.js.map +1 -0
  17. package/dist/cjs/__tests__/queries.test.js +2 -0
  18. package/dist/cjs/__tests__/queries.test.js.map +1 -1
  19. package/dist/cjs/client/Client.d.ts +6 -4
  20. package/dist/cjs/client/Client.js +24 -16
  21. package/dist/cjs/client/Client.js.map +1 -1
  22. package/dist/cjs/client/ClientDescriptor.d.ts +15 -4
  23. package/dist/cjs/client/ClientDescriptor.js +117 -36
  24. package/dist/cjs/client/ClientDescriptor.js.map +1 -1
  25. package/dist/cjs/context.d.ts +1 -0
  26. package/dist/cjs/entities/DocumentFamiliyCache.d.ts +22 -2
  27. package/dist/cjs/entities/DocumentFamiliyCache.js +39 -21
  28. package/dist/cjs/entities/DocumentFamiliyCache.js.map +1 -1
  29. package/dist/cjs/entities/Entity.d.ts +7 -2
  30. package/dist/cjs/entities/Entity.js +33 -3
  31. package/dist/cjs/entities/Entity.js.map +1 -1
  32. package/dist/cjs/entities/EntityStore.d.ts +2 -1
  33. package/dist/cjs/entities/EntityStore.js +50 -20
  34. package/dist/cjs/entities/EntityStore.js.map +1 -1
  35. package/dist/cjs/idb.d.ts +2 -0
  36. package/dist/cjs/idb.js +9 -1
  37. package/dist/cjs/idb.js.map +1 -1
  38. package/dist/cjs/index.d.ts +1 -1
  39. package/dist/cjs/index.js +2 -1
  40. package/dist/cjs/index.js.map +1 -1
  41. package/dist/cjs/metadata/BaselinesStore.js +15 -5
  42. package/dist/cjs/metadata/BaselinesStore.js.map +1 -1
  43. package/dist/cjs/metadata/openMetadataDatabase.d.ts +11 -2
  44. package/dist/cjs/metadata/openMetadataDatabase.js +56 -3
  45. package/dist/cjs/metadata/openMetadataDatabase.js.map +1 -1
  46. package/dist/cjs/migration/db.d.ts +1 -1
  47. package/dist/cjs/migration/db.js +5 -2
  48. package/dist/cjs/migration/db.js.map +1 -1
  49. package/dist/cjs/migration/openDatabase.d.ts +8 -0
  50. package/dist/cjs/migration/openDatabase.js +217 -165
  51. package/dist/cjs/migration/openDatabase.js.map +1 -1
  52. package/dist/cjs/queries/BaseQuery.js +12 -1
  53. package/dist/cjs/queries/BaseQuery.js.map +1 -1
  54. package/dist/cjs/sync/Sync.d.ts +6 -5
  55. package/dist/cjs/sync/Sync.js.map +1 -1
  56. package/dist/cjs/sync/WebSocketSync.js +4 -3
  57. package/dist/cjs/sync/WebSocketSync.js.map +1 -1
  58. package/dist/esm/{entities/FakeWeakRef.d.ts → FakeWeakRef.d.ts} +2 -2
  59. package/dist/esm/{entities/FakeWeakRef.js → FakeWeakRef.js} +2 -2
  60. package/dist/esm/FakeWeakRef.js.map +1 -0
  61. package/dist/esm/IDBService.d.ts +1 -1
  62. package/dist/esm/IDBService.js +18 -1
  63. package/dist/esm/IDBService.js.map +1 -1
  64. package/dist/esm/__tests__/documents.test.js +17 -0
  65. package/dist/esm/__tests__/documents.test.js.map +1 -1
  66. package/dist/esm/__tests__/fixtures/testStorage.d.ts +1 -1
  67. package/dist/esm/__tests__/fixtures/testStorage.js +4 -3
  68. package/dist/esm/__tests__/fixtures/testStorage.js.map +1 -1
  69. package/dist/esm/__tests__/mutations.test.d.ts +1 -0
  70. package/dist/esm/__tests__/mutations.test.js +40 -0
  71. package/dist/esm/__tests__/mutations.test.js.map +1 -0
  72. package/dist/esm/__tests__/queries.test.js +2 -0
  73. package/dist/esm/__tests__/queries.test.js.map +1 -1
  74. package/dist/esm/client/Client.d.ts +6 -4
  75. package/dist/esm/client/Client.js +25 -17
  76. package/dist/esm/client/Client.js.map +1 -1
  77. package/dist/esm/client/ClientDescriptor.d.ts +15 -4
  78. package/dist/esm/client/ClientDescriptor.js +121 -40
  79. package/dist/esm/client/ClientDescriptor.js.map +1 -1
  80. package/dist/esm/context.d.ts +1 -0
  81. package/dist/esm/entities/DocumentFamiliyCache.d.ts +22 -2
  82. package/dist/esm/entities/DocumentFamiliyCache.js +39 -21
  83. package/dist/esm/entities/DocumentFamiliyCache.js.map +1 -1
  84. package/dist/esm/entities/Entity.d.ts +7 -2
  85. package/dist/esm/entities/Entity.js +33 -3
  86. package/dist/esm/entities/Entity.js.map +1 -1
  87. package/dist/esm/entities/EntityStore.d.ts +2 -1
  88. package/dist/esm/entities/EntityStore.js +51 -21
  89. package/dist/esm/entities/EntityStore.js.map +1 -1
  90. package/dist/esm/idb.d.ts +2 -0
  91. package/dist/esm/idb.js +6 -0
  92. package/dist/esm/idb.js.map +1 -1
  93. package/dist/esm/index.d.ts +1 -1
  94. package/dist/esm/index.js +1 -1
  95. package/dist/esm/index.js.map +1 -1
  96. package/dist/esm/metadata/BaselinesStore.js +16 -6
  97. package/dist/esm/metadata/BaselinesStore.js.map +1 -1
  98. package/dist/esm/metadata/openMetadataDatabase.d.ts +11 -2
  99. package/dist/esm/metadata/openMetadataDatabase.js +54 -2
  100. package/dist/esm/metadata/openMetadataDatabase.js.map +1 -1
  101. package/dist/esm/migration/db.d.ts +1 -1
  102. package/dist/esm/migration/db.js +5 -2
  103. package/dist/esm/migration/db.js.map +1 -1
  104. package/dist/esm/migration/openDatabase.d.ts +8 -0
  105. package/dist/esm/migration/openDatabase.js +215 -164
  106. package/dist/esm/migration/openDatabase.js.map +1 -1
  107. package/dist/esm/queries/BaseQuery.js +12 -1
  108. package/dist/esm/queries/BaseQuery.js.map +1 -1
  109. package/dist/esm/sync/Sync.d.ts +6 -5
  110. package/dist/esm/sync/Sync.js.map +1 -1
  111. package/dist/esm/sync/WebSocketSync.js +4 -3
  112. package/dist/esm/sync/WebSocketSync.js.map +1 -1
  113. package/dist/tsconfig-cjs.tsbuildinfo +1 -1
  114. package/dist/tsconfig.tsbuildinfo +1 -1
  115. package/package.json +9 -4
  116. package/src/{entities/FakeWeakRef.ts → FakeWeakRef.ts} +2 -2
  117. package/src/IDBService.ts +20 -2
  118. package/src/__tests__/documents.test.ts +19 -0
  119. package/src/__tests__/fixtures/testStorage.ts +4 -7
  120. package/src/__tests__/mutations.test.ts +51 -0
  121. package/src/__tests__/queries.test.ts +3 -0
  122. package/src/client/Client.ts +29 -21
  123. package/src/client/ClientDescriptor.ts +176 -53
  124. package/src/context.ts +1 -0
  125. package/src/entities/DocumentFamiliyCache.ts +66 -21
  126. package/src/entities/Entity.ts +41 -6
  127. package/src/entities/EntityStore.ts +68 -21
  128. package/src/idb.ts +10 -0
  129. package/src/index.ts +1 -0
  130. package/src/metadata/BaselinesStore.ts +17 -6
  131. package/src/metadata/openMetadataDatabase.ts +96 -13
  132. package/src/migration/db.ts +14 -1
  133. package/src/migration/openDatabase.ts +350 -219
  134. package/src/queries/BaseQuery.ts +14 -1
  135. package/src/sync/Sync.ts +13 -9
  136. package/src/sync/WebSocketSync.ts +1 -0
  137. package/dist/cjs/entities/FakeWeakRef.js.map +0 -1
  138. package/dist/cjs/indexes.d.ts +0 -3
  139. package/dist/cjs/indexes.js +0 -20
  140. package/dist/cjs/indexes.js.map +0 -1
  141. package/dist/esm/entities/FakeWeakRef.js.map +0 -1
  142. package/dist/esm/indexes.d.ts +0 -3
  143. package/dist/esm/indexes.js +0 -15
  144. package/dist/esm/indexes.js.map +0 -1
  145. package/src/indexes.ts +0 -31
@@ -9,10 +9,11 @@ var __rest = (this && this.__rest) || function (s, e) {
9
9
  }
10
10
  return t;
11
11
  };
12
+ import { closeDatabase, storeRequestPromise } from '../idb.js';
12
13
  const migrations = [version1, version2, version3, version4];
13
- export function openMetadataDatabase(namespace, { indexedDB = window.indexedDB, databaseName, log, }) {
14
+ export function openMetadataDatabase({ indexedDB = window.indexedDB, namespace, log, }) {
14
15
  return new Promise((resolve, reject) => {
15
- const request = indexedDB.open(databaseName, 4);
16
+ const request = indexedDB.open(`${namespace}_meta`, 4);
16
17
  let wasInitialized = false;
17
18
  request.onupgradeneeded = async (event) => {
18
19
  const db = request.result;
@@ -34,6 +35,57 @@ export function openMetadataDatabase(namespace, { indexedDB = window.indexedDB,
34
35
  };
35
36
  });
36
37
  }
38
+ export async function openWIPMetadataDatabase({ wipNamespace, namespace, indexedDB, log, }) {
39
+ const result = await openMetadataDatabase({
40
+ namespace: wipNamespace,
41
+ indexedDB,
42
+ log,
43
+ });
44
+ // this WIP database was already set up.
45
+ if (!result.wasInitialized) {
46
+ return result;
47
+ }
48
+ log === null || log === void 0 ? void 0 : log('debug', 'Beginning copy of production metadata database to WIP');
49
+ // copy all data from production metadata database
50
+ const { db: prodDb } = await openMetadataDatabase({
51
+ namespace,
52
+ indexedDB,
53
+ log,
54
+ });
55
+ const tx = prodDb.transaction(['baselines', 'operations', 'info'], 'readonly');
56
+ const [baselines, operations, info] = await Promise.all([
57
+ storeRequestPromise(tx.objectStore('baselines').getAll()),
58
+ storeRequestPromise(tx.objectStore('operations').getAll()),
59
+ storeRequestPromise(tx.objectStore('info').getAll()),
60
+ ]);
61
+ const wipTx = result.db.transaction(['baselines', 'operations', 'info'], 'readwrite');
62
+ const wipBaselines = wipTx.objectStore('baselines');
63
+ const wipOperations = wipTx.objectStore('operations');
64
+ const wipInfo = wipTx.objectStore('info');
65
+ for (const baseline of baselines) {
66
+ wipBaselines.put(baseline);
67
+ }
68
+ for (const operation of operations) {
69
+ wipOperations.put(operation);
70
+ }
71
+ for (const infoItem of info) {
72
+ wipInfo.put(infoItem);
73
+ }
74
+ await new Promise((resolve, reject) => {
75
+ wipTx.oncomplete = () => {
76
+ resolve();
77
+ };
78
+ wipTx.onerror = (event) => {
79
+ reject(event);
80
+ };
81
+ wipTx.onabort = (event) => {
82
+ reject(event);
83
+ };
84
+ });
85
+ await closeDatabase(prodDb);
86
+ log === null || log === void 0 ? void 0 : log('debug', 'Finished copy of production metadata database to WIP. Copied:', baselines.length, 'baselines,', operations.length, 'operations');
87
+ return result;
88
+ }
37
89
  async function version1(db, tx) {
38
90
  const baselinesStore = db.createObjectStore('baselines', {
39
91
  keyPath: 'oid',
@@ -1 +1 @@
1
- {"version":3,"file":"openMetadataDatabase.js","sourceRoot":"","sources":["../../../src/metadata/openMetadataDatabase.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"openMetadataDatabase.js","sourceRoot":"","sources":["../../../src/metadata/openMetadataDatabase.ts"],"names":[],"mappings":"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"}
@@ -5,4 +5,4 @@ export declare function closeDatabase(db: IDBDatabase): Promise<void>;
5
5
  */
6
6
  export declare function upgradeDatabase(indexedDb: IDBFactory, namespace: string, version: number, upgrader: (transaction: IDBTransaction, db: IDBDatabase, event: IDBVersionChangeEvent) => void, log?: (...args: any[]) => void): Promise<void>;
7
7
  export declare function acquireLock(namespace: string, procedure: () => Promise<void>): Promise<void>;
8
- export declare function openDatabase(indexedDb: IDBFactory, namespace: string, version: number): Promise<IDBDatabase>;
8
+ export declare function openDatabase(indexedDb: IDBFactory, namespace: string, version: number, log?: (...args: any[]) => void): Promise<IDBDatabase>;
@@ -75,13 +75,16 @@ export async function acquireLock(namespace, procedure) {
75
75
  await procedure();
76
76
  }
77
77
  }
78
- export async function openDatabase(indexedDb, namespace, version) {
78
+ export async function openDatabase(indexedDb, namespace, version, log) {
79
+ log === null || log === void 0 ? void 0 : log('debug', 'Opening database', namespace, 'at version', version);
79
80
  const db = await new Promise((resolve, reject) => {
80
81
  const request = indexedDb.open([namespace, 'collections'].join('_'), version);
81
82
  request.onupgradeneeded = async (event) => {
82
83
  const transaction = request.transaction;
83
84
  transaction.abort();
84
- reject(new Error('Migration error: database version changed while migrating'));
85
+ log === null || log === void 0 ? void 0 : log('error', 'Database upgrade needed, but not expected', 'Expected', version, 'Got', request.result.version);
86
+ reject(request.error ||
87
+ new Error(`Migration error: database version changed unexpectedly when reading current data. Expected ${version}, got ${request.result.version}`));
85
88
  };
86
89
  request.onsuccess = (event) => {
87
90
  resolve(request.result);
@@ -1 +1 @@
1
- {"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/migration/db.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/migration/db.ts"],"names":[],"mappings":"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"}
@@ -9,4 +9,12 @@ export declare function openDocumentDatabase({ version, indexedDB, migrations, m
9
9
  meta: Metadata;
10
10
  context: OpenDocumentDbContext;
11
11
  }): Promise<IDBDatabase>;
12
+ export declare function openWIPDocumentDatabase({ version, indexedDB, migrations, meta, context, wipNamespace, }: {
13
+ version: number;
14
+ migrations: Migration<any>[];
15
+ indexedDB?: IDBFactory;
16
+ meta: Metadata;
17
+ context: OpenDocumentDbContext;
18
+ wipNamespace: string;
19
+ }): Promise<IDBDatabase>;
12
20
  export {};
@@ -1,177 +1,240 @@
1
- import { addFieldDefaults, assert, assignIndexValues, assignOidPropertiesToAllSubObjects, assignOidsToAllSubObjects, cloneDeep, createOid, decomposeOid, diffToPatches, getOidRoot, hasOid, initialToPatches, removeOidPropertiesFromAllSubObjects, } from '@verdant-web/common';
1
+ import { addFieldDefaults, assert, assignOidsToAllSubObjects, cloneDeep, createOid, decomposeOid, diffToPatches, getIndexValues, getOidRoot, hasOid, initialToPatches, removeOidPropertiesFromAllSubObjects, } from '@verdant-web/common';
2
+ import { storeRequestPromise } from '../idb.js';
2
3
  import { findAllOids, findOneOid } from '../queries/dbQueries.js';
3
4
  import { acquireLock, closeDatabase, getDatabaseVersion, openDatabase, upgradeDatabase, } from './db.js';
4
5
  import { getMigrationPath } from './paths.js';
5
6
  const globalIDB = typeof window !== 'undefined' ? window.indexedDB : undefined;
6
7
  export async function openDocumentDatabase({ version, indexedDB = globalIDB, migrations, meta, context, }) {
8
+ if (context.schema.wip) {
9
+ throw new Error('Cannot open a production client with a WIP schema!');
10
+ }
7
11
  const currentVersion = await getDatabaseVersion(indexedDB, context.namespace, version, context.log);
8
- context.log('Current database version:', currentVersion, 'target version:', version);
12
+ context.log('debug', 'Current database version:', currentVersion, 'target version:', version);
9
13
  const toRun = getMigrationPath({
10
14
  currentVersion,
11
15
  targetVersion: version,
12
16
  migrations,
13
17
  });
14
18
  if (toRun.length > 0) {
15
- await acquireLock(context.namespace, async () => {
16
- // now the fun part
17
- for (const migration of toRun) {
18
- // special case: if this is the version 1 migration, we have no pre-existing database
19
- // to use for the migration.
20
- let engine;
21
- // migrations from 0 (i.e. initial migrations) don't attempt to open an existing db
22
- if (migration.oldSchema.version === 0) {
23
- engine = getInitialMigrationEngine({
24
- meta,
25
- migration,
26
- context,
27
- });
19
+ context.log('debug', 'Migrations to run:', toRun.map((m) => m.version));
20
+ await runMigrations({ context, toRun, meta, indexedDB });
21
+ }
22
+ return openDatabase(indexedDB, context.namespace, version, context.log);
23
+ }
24
+ export async function openWIPDocumentDatabase({ version, indexedDB = globalIDB, migrations, meta, context, wipNamespace, }) {
25
+ context.log('debug', 'Opening WIP database', wipNamespace);
26
+ const currentWIPVersion = await getDatabaseVersion(indexedDB, wipNamespace, version, context.log);
27
+ if (currentWIPVersion === version) {
28
+ context.log('info', `WIP schema is up-to-date; not refreshing database`);
29
+ }
30
+ else {
31
+ context.log('info', `WIP schema is out-of-date; refreshing database`);
32
+ // first we need to copy the data from the production database to the WIP database
33
+ // at the current (non-wip) version.
34
+ const initialToRun = getMigrationPath({
35
+ currentVersion: currentWIPVersion,
36
+ targetVersion: version - 1,
37
+ migrations,
38
+ });
39
+ if (initialToRun.length > 0) {
40
+ await runMigrations({
41
+ context,
42
+ toRun: initialToRun,
43
+ meta,
44
+ indexedDB,
45
+ namespace: wipNamespace,
46
+ });
47
+ // now, we copy the data from the main database.
48
+ const mainDatabase = await openDatabase(indexedDB, context.namespace, version - 1, context.log);
49
+ const wipDatabase = await openDatabase(indexedDB, wipNamespace, version - 1, context.log);
50
+ // DOMStringList... doesn't have iterable... why
51
+ const mainDatabaseStoreNames = new Array();
52
+ for (let i = 0; i < mainDatabase.objectStoreNames.length; i++) {
53
+ mainDatabaseStoreNames.push(mainDatabase.objectStoreNames[i]);
54
+ }
55
+ const copyFromTransaction = mainDatabase.transaction(mainDatabaseStoreNames, 'readonly');
56
+ const copyFromStores = mainDatabaseStoreNames.map((name) => copyFromTransaction.objectStore(name));
57
+ const allObjects = await Promise.all(copyFromStores.map((store) => storeRequestPromise(store.getAll())));
58
+ const copyToTransaction = wipDatabase.transaction(mainDatabaseStoreNames, 'readwrite');
59
+ const copyToStores = mainDatabaseStoreNames.map((name) => copyToTransaction.objectStore(name));
60
+ for (let i = 0; i < copyToStores.length; i++) {
61
+ await Promise.all(allObjects[i].map((obj) => {
62
+ return storeRequestPromise(copyToStores[i].put(obj));
63
+ }));
64
+ }
65
+ }
66
+ const toRun = getMigrationPath({
67
+ currentVersion: version - 1,
68
+ targetVersion: version,
69
+ migrations,
70
+ });
71
+ if (toRun.length > 0) {
72
+ await runMigrations({
73
+ context,
74
+ toRun,
75
+ meta,
76
+ indexedDB,
77
+ namespace: wipNamespace,
78
+ });
79
+ }
80
+ }
81
+ return openDatabase(indexedDB, wipNamespace, version, context.log);
82
+ }
83
+ async function runMigrations({ context, toRun, meta, indexedDB = globalIDB, namespace = context.namespace, }) {
84
+ await acquireLock(namespace, async () => {
85
+ // now the fun part
86
+ for (const migration of toRun) {
87
+ // special case: if this is the version 1 migration, we have no pre-existing database
88
+ // to use for the migration.
89
+ let engine;
90
+ // migrations from 0 (i.e. initial migrations) don't attempt to open an existing db
91
+ if (migration.oldSchema.version === 0) {
92
+ engine = getInitialMigrationEngine({
93
+ meta,
94
+ migration,
95
+ context,
96
+ });
97
+ await migration.migrate(engine);
98
+ }
99
+ else {
100
+ // open the database with the current (old) version for this migration. this should
101
+ // align with the database's current version.
102
+ const originalDatabase = await openDatabase(indexedDB, namespace, migration.oldSchema.version, context.log);
103
+ // this will only write to our metadata store via operations!
104
+ engine = getMigrationEngine({
105
+ meta,
106
+ migration,
107
+ context: Object.assign(Object.assign({}, context), { documentDb: originalDatabase }),
108
+ });
109
+ try {
28
110
  await migration.migrate(engine);
111
+ // wait on any out-of-band async operations to complete
112
+ await Promise.all(engine.awaitables);
29
113
  }
30
- else {
31
- // open the database with the current (old) version for this migration. this should
32
- // align with the database's current version.
33
- const originalDatabase = await openDatabase(indexedDB, context.namespace, migration.oldSchema.version);
34
- // this will only write to our metadata store via operations!
35
- engine = getMigrationEngine({
36
- meta,
37
- migration,
38
- context: Object.assign(Object.assign({}, context), { documentDb: originalDatabase }),
114
+ catch (err) {
115
+ context.log('critical', `Migration failed (${migration.oldSchema.version} -> ${migration.newSchema.version})`, err);
116
+ throw err;
117
+ }
118
+ // now we have to open the database again with the next version and
119
+ // make the appropriate schema changes during the upgrade.
120
+ await closeDatabase(originalDatabase);
121
+ }
122
+ context.log('debug', 'Upgrading database', namespace, 'to version', migration.newSchema.version);
123
+ await upgradeDatabase(indexedDB, namespace, migration.newSchema.version, (transaction, db) => {
124
+ for (const newCollection of migration.addedCollections) {
125
+ db.createObjectStore(newCollection, {
126
+ keyPath: migration.newSchema.collections[newCollection].primaryKey,
127
+ autoIncrement: false,
39
128
  });
40
- try {
41
- await migration.migrate(engine);
42
- // wait on any out-of-band async operations to complete
43
- await Promise.all(engine.awaitables);
44
- }
45
- catch (err) {
46
- context.log('critical', `Migration failed (${migration.oldSchema.version} -> ${migration.newSchema.version})`, err);
47
- throw err;
48
- }
49
- // now we have to open the database again with the next version and
50
- // make the appropriate schema changes during the upgrade.
51
- await closeDatabase(originalDatabase);
52
129
  }
53
- await upgradeDatabase(indexedDB, context.namespace, migration.newSchema.version, (transaction, db) => {
54
- for (const newCollection of migration.addedCollections) {
55
- db.createObjectStore(newCollection, {
56
- keyPath: migration.newSchema.collections[newCollection].primaryKey,
57
- autoIncrement: false,
130
+ for (const collection of migration.allCollections) {
131
+ const store = transaction.objectStore(collection);
132
+ // apply new indexes
133
+ for (const newIndex of migration.addedIndexes[collection] || []) {
134
+ store.createIndex(newIndex.name, newIndex.name, {
135
+ multiEntry: newIndex.multiEntry,
58
136
  });
59
137
  }
60
- for (const collection of migration.allCollections) {
61
- const store = transaction.objectStore(collection);
62
- // apply new indexes
63
- for (const newIndex of migration.addedIndexes[collection] || []) {
64
- store.createIndex(newIndex.name, newIndex.name, {
65
- multiEntry: newIndex.multiEntry,
66
- });
67
- }
68
- // remove old indexes
69
- for (const oldIndex of migration.removedIndexes[collection] ||
70
- []) {
71
- store.deleteIndex(oldIndex.name);
72
- }
138
+ // remove old indexes
139
+ for (const oldIndex of migration.removedIndexes[collection] || []) {
140
+ store.deleteIndex(oldIndex.name);
141
+ }
142
+ }
143
+ for (const removedCollection of migration.removedCollections) {
144
+ // !! can't delete the store, because old operations that relate to
145
+ // this store may still exist in history. instead, we can clear it out
146
+ // and leave it in place
147
+ transaction.objectStore(removedCollection).clear();
148
+ }
149
+ }, context.log);
150
+ /**
151
+ * In cases where operations from the future have been
152
+ * received by this client, we may have created entire
153
+ * documents in metadata which were not written to storage
154
+ * because all of their operations were in the future (
155
+ * i.e. in the next version). We have to find those documents
156
+ * and also write their snapshots to storage, because they
157
+ * won't be present in storage already to 'refresh,' so
158
+ * if we don't analyze metadata for 'future' operations like
159
+ * this, we won't know they exist.
160
+ *
161
+ * This led to behavior where the metadata would be properly
162
+ * synced, but after upgrading the app and migrating, items
163
+ * would be missing from findAll and findOne queries.
164
+ */
165
+ const docsWithUnappliedMigrations = await getDocsWithUnappliedMigrations({
166
+ meta,
167
+ currentVersion: migration.oldSchema.version,
168
+ newVersion: migration.newSchema.version,
169
+ });
170
+ // once the schema is ready, we can write back the migrated documents
171
+ const upgradedDatabase = await openDatabase(indexedDB, namespace, migration.newSchema.version, context.log);
172
+ for (const collection of migration.allCollections) {
173
+ // first step is to read in all the keys we need to rewrite
174
+ const documentReadTransaction = upgradedDatabase.transaction(collection, 'readwrite');
175
+ const readStore = documentReadTransaction.objectStore(collection);
176
+ const keys = await getAllKeys(readStore);
177
+ // map the keys to OIDs
178
+ const oids = keys.map((key) => createOid(collection, `${key}`));
179
+ oids.push(...engine.newOids.filter((oid) => {
180
+ return decomposeOid(oid).collection === collection;
181
+ }), ...docsWithUnappliedMigrations.filter((oid) => {
182
+ return decomposeOid(oid).collection === collection;
183
+ }));
184
+ const snapshots = await Promise.all(oids.map(async (oid) => {
185
+ try {
186
+ const snap = await meta.getDocumentSnapshot(oid);
187
+ return [oid, snap];
73
188
  }
74
- for (const removedCollection of migration.removedCollections) {
75
- // !! can't delete the store, because old operations that relate to
76
- // this store may still exist in history. instead, we can clear it out
77
- // and leave it in place
78
- transaction.objectStore(removedCollection).clear();
189
+ catch (e) {
190
+ // this seems to happen with baselines/ops which are not fully
191
+ // cleaned up after deletion?
192
+ context.log('error', 'Could not regenerate snapshot during migration for oid', oid, 'this document will not be preserved', e);
193
+ return null;
79
194
  }
80
- }, context.log);
81
- /**
82
- * In cases where operations from the future have been
83
- * received by this client, we may have created entire
84
- * documents in metadata which were not written to storage
85
- * because all of their operations were in the future (
86
- * i.e. in the next version). We have to find those documents
87
- * and also write their snapshots to storage, because they
88
- * won't be present in storage already to 'refresh,' so
89
- * if we don't analyze metadata for 'future' operations like
90
- * this, we won't know they exist.
91
- *
92
- * This led to behavior where the metadata would be properly
93
- * synced, but after upgrading the app and migrating, items
94
- * would be missing from findAll and findOne queries.
95
- */
96
- const docsWithUnappliedMigrations = await getDocsWithUnappliedMigrations({
97
- meta,
98
- currentVersion: migration.oldSchema.version,
99
- newVersion: migration.newSchema.version,
195
+ }));
196
+ const views = snapshots
197
+ .filter((s) => !!s)
198
+ .map(([oid, snapshot]) => {
199
+ if (!snapshot)
200
+ return [oid, undefined];
201
+ const view = getIndexValues(migration.newSchema.collections[collection], snapshot);
202
+ return [oid, view];
100
203
  });
101
- // once the schema is ready, we can write back the migrated documents
102
- const upgradedDatabase = await openDatabase(indexedDB, context.namespace, migration.newSchema.version);
103
- for (const collection of migration.allCollections) {
104
- // first step is to read in all the keys we need to rewrite
105
- const documentReadTransaction = upgradedDatabase.transaction(collection, 'readwrite');
106
- const readStore = documentReadTransaction.objectStore(collection);
107
- const keys = await getAllKeys(readStore);
108
- // map the keys to OIDs
109
- const oids = keys.map((key) => createOid(collection, `${key}`));
110
- oids.push(...engine.newOids.filter((oid) => {
111
- return decomposeOid(oid).collection === collection;
112
- }), ...docsWithUnappliedMigrations.filter((oid) => {
113
- return decomposeOid(oid).collection === collection;
114
- }));
115
- const snapshots = await Promise.all(oids.map(async (oid) => {
116
- try {
117
- const snap = await meta.getDocumentSnapshot(oid, {
118
- to: meta.time.now(migration.newSchema.version),
119
- });
120
- return [oid, snap];
121
- }
122
- catch (e) {
123
- // this seems to happen with baselines/ops which are not fully
124
- // cleaned up after deletion?
125
- context.log('error', 'Could not regenerate snapshot during migration for oid', oid, 'this document will not be preserved', e);
126
- return null;
127
- }
128
- }));
129
- const views = snapshots
130
- .filter((s) => !!s)
131
- .map(([oid, snapshot]) => {
132
- if (!snapshot)
133
- return [oid, undefined];
134
- const view = assignIndexValues(migration.newSchema.collections[collection], snapshot);
135
- // TODO: remove the need for this by only storing index values!
136
- assignOidPropertiesToAllSubObjects(view);
137
- return [oid, view];
138
- });
139
- // now we can write the documents back
140
- const documentWriteTransaction = upgradedDatabase.transaction(collection, 'readwrite');
141
- const writeStore = documentWriteTransaction.objectStore(collection);
142
- await Promise.all(views.map(([oid, view]) => {
143
- if (view) {
144
- return putView(writeStore, view);
145
- }
146
- else {
147
- const { id } = decomposeOid(oid);
148
- return deleteView(writeStore, id);
149
- }
150
- }));
151
- }
152
- await closeDatabase(upgradedDatabase);
153
- context.log(`
154
- ⬆️ v${migration.newSchema.version} Migration complete. Here's the rundown:
155
- - Added collections: ${migration.addedCollections.join(', ')}
156
- - Removed collections: ${migration.removedCollections.join(', ')}
157
- - Changed collections: ${migration.changedCollections.join(', ')}
158
- - New indexes: ${Object.keys(migration.addedIndexes)
159
- .map((col) => migration.addedIndexes[col].map((i) => `${col}.${i.name}`))
160
- .flatMap((i) => i)
161
- .join(', ')}
162
- - Removed indexes: ${Object.keys(migration.removedIndexes)
163
- .map((col) => migration.removedIndexes[col].map((i) => `${col}.${i.name}`))
164
- .flatMap((i) => i)
165
- .join(', ')}
166
- `);
204
+ // now we can write the documents back
205
+ const documentWriteTransaction = upgradedDatabase.transaction(collection, 'readwrite');
206
+ const writeStore = documentWriteTransaction.objectStore(collection);
207
+ await Promise.all(views.map(([oid, view]) => {
208
+ if (view) {
209
+ return putView(writeStore, view).catch((err) => {
210
+ view;
211
+ throw err;
212
+ });
213
+ }
214
+ else {
215
+ const { id } = decomposeOid(oid);
216
+ return deleteView(writeStore, id);
217
+ }
218
+ }));
167
219
  }
168
- });
169
- return openDatabase(indexedDB, context.namespace, version);
170
- }
171
- else {
172
- // just open the database
173
- return openDatabase(indexedDB, context.namespace, version);
174
- }
220
+ await closeDatabase(upgradedDatabase);
221
+ context.log('debug', `Migration of ${namespace} complete.`);
222
+ context.log(`
223
+ ⬆️ v${migration.newSchema.version} Migration complete. Here's the rundown:
224
+ - Added collections: ${migration.addedCollections.join(', ')}
225
+ - Removed collections: ${migration.removedCollections.join(', ')}
226
+ - Changed collections: ${migration.changedCollections.join(', ')}
227
+ - New indexes: ${Object.keys(migration.addedIndexes)
228
+ .map((col) => migration.addedIndexes[col].map((i) => `${col}.${i.name}`))
229
+ .flatMap((i) => i)
230
+ .join(', ')}
231
+ - Removed indexes: ${Object.keys(migration.removedIndexes)
232
+ .map((col) => migration.removedIndexes[col].map((i) => `${col}.${i.name}`))
233
+ .flatMap((i) => i)
234
+ .join(', ')}
235
+ `);
236
+ }
237
+ });
175
238
  }
176
239
  function getMigrationMutations({ migration, meta, getMigrationNow, newOids, }) {
177
240
  return migration.allCollections.reduce((acc, collectionName) => {
@@ -208,7 +271,6 @@ function getMigrationQueries({ migration, context, meta, }) {
208
271
  // only get the snapshot up to the previous version (newer operations may have synced)
209
272
  to: meta.time.now(migration.oldSchema.version),
210
273
  });
211
- // removeOidsFromAllSubObjects(doc);
212
274
  return doc;
213
275
  },
214
276
  findOne: async (filter) => {
@@ -223,7 +285,6 @@ function getMigrationQueries({ migration, context, meta, }) {
223
285
  // only get the snapshot up to the previous version (newer operations may have synced)
224
286
  to: meta.time.now(migration.oldSchema.version),
225
287
  });
226
- // removeOidsFromAllSubObjects(doc);
227
288
  return doc;
228
289
  },
229
290
  findAll: async (filter) => {
@@ -236,7 +297,6 @@ function getMigrationQueries({ migration, context, meta, }) {
236
297
  // only get the snapshot up to the previous version (newer operations may have synced)
237
298
  to: meta.time.now(migration.oldSchema.version),
238
299
  })));
239
- // docs.forEach((doc) => removeOidsFromAllSubObjects(doc));
240
300
  return docs;
241
301
  },
242
302
  };
@@ -268,15 +328,6 @@ function getMigrationEngine({ meta, migration, context, }) {
268
328
  await Promise.all(docs.filter(Boolean).map(async (doc) => {
269
329
  assert(hasOid(doc), `Document is missing an OID: ${JSON.stringify(doc)}`);
270
330
  const original = cloneDeep(doc);
271
- // remove any indexes before computing the diff
272
- // const collectionSpec = migration.oldSchema.collections[collection];
273
- // const indexKeys = [
274
- // ...Object.keys(collectionSpec.synthetics || {}),
275
- // ...Object.keys(collectionSpec.compounds || {}),
276
- // ];
277
- // indexKeys.forEach((key) => {
278
- // delete doc[key];
279
- // });
280
331
  // @ts-ignore - excessive type resolution
281
332
  const newValue = await strategy(doc);
282
333
  if (newValue) {