@verdant-web/store 2.7.6 → 2.7.7
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.
- package/dist/bundle/index.js +9 -9
- package/dist/bundle/index.js.map +4 -4
- package/dist/cjs/__tests__/fixtures/testStorage.d.ts +2 -1
- package/dist/cjs/__tests__/fixtures/testStorage.js +3 -1
- package/dist/cjs/__tests__/fixtures/testStorage.js.map +1 -1
- package/dist/cjs/__tests__/legacyOids.test.js +231 -45
- package/dist/cjs/__tests__/legacyOids.test.js.map +1 -1
- package/dist/cjs/client/ClientDescriptor.d.ts +2 -0
- package/dist/cjs/client/ClientDescriptor.js +3 -0
- package/dist/cjs/client/ClientDescriptor.js.map +1 -1
- package/dist/cjs/client/constants.d.ts +1 -0
- package/dist/cjs/client/constants.js +5 -0
- package/dist/cjs/client/constants.js.map +1 -0
- package/dist/cjs/metadata/openMetadataDatabase.d.ts +4 -2
- package/dist/cjs/metadata/openMetadataDatabase.js +65 -4
- package/dist/cjs/metadata/openMetadataDatabase.js.map +1 -1
- package/dist/cjs/sync/Sync.js.map +1 -1
- package/dist/esm/__tests__/fixtures/testStorage.d.ts +2 -1
- package/dist/esm/__tests__/fixtures/testStorage.js +3 -1
- package/dist/esm/__tests__/fixtures/testStorage.js.map +1 -1
- package/dist/esm/__tests__/legacyOids.test.js +232 -46
- package/dist/esm/__tests__/legacyOids.test.js.map +1 -1
- package/dist/esm/client/ClientDescriptor.d.ts +2 -0
- package/dist/esm/client/ClientDescriptor.js +3 -0
- package/dist/esm/client/ClientDescriptor.js.map +1 -1
- package/dist/esm/client/constants.d.ts +1 -0
- package/dist/esm/client/constants.js +2 -0
- package/dist/esm/client/constants.js.map +1 -0
- package/dist/esm/metadata/openMetadataDatabase.d.ts +4 -2
- package/dist/esm/metadata/openMetadataDatabase.js +65 -4
- package/dist/esm/metadata/openMetadataDatabase.js.map +1 -1
- package/dist/esm/sync/Sync.js.map +1 -1
- package/dist/tsconfig-cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/__tests__/fixtures/testStorage.ts +8 -1
- package/src/__tests__/legacyOids.test.ts +240 -49
- package/src/client/ClientDescriptor.ts +6 -0
- package/src/client/constants.ts +1 -0
- package/src/metadata/openMetadataDatabase.ts +65 -2
- package/src/sync/Sync.ts +1 -0
|
@@ -116,7 +116,8 @@ export declare const weirdCollection: import("@verdant-web/common").StorageColle
|
|
|
116
116
|
};
|
|
117
117
|
};
|
|
118
118
|
}, {}, {}>;
|
|
119
|
-
export declare function createTestStorage({ idb, disableRebasing, }?: {
|
|
119
|
+
export declare function createTestStorage({ idb, disableRebasing, metadataVersion, }?: {
|
|
120
120
|
idb?: IDBFactory;
|
|
121
121
|
disableRebasing?: boolean;
|
|
122
|
+
metadataVersion?: number;
|
|
122
123
|
}): Promise<ClientWithCollections>;
|
|
@@ -5,6 +5,7 @@ const common_1 = require("@verdant-web/common");
|
|
|
5
5
|
// @ts-ignore
|
|
6
6
|
const fake_indexeddb_1 = require("fake-indexeddb");
|
|
7
7
|
const index_js_1 = require("../../index.js");
|
|
8
|
+
const constants_js_1 = require("../../client/constants.js");
|
|
8
9
|
exports.todoCollection = (0, common_1.collection)({
|
|
9
10
|
name: 'todo',
|
|
10
11
|
primaryKey: 'id',
|
|
@@ -102,13 +103,14 @@ const testSchema = (0, common_1.schema)({
|
|
|
102
103
|
weirds: exports.weirdCollection,
|
|
103
104
|
},
|
|
104
105
|
});
|
|
105
|
-
function createTestStorage({ idb = new fake_indexeddb_1.IDBFactory(), disableRebasing = false, } = {}) {
|
|
106
|
+
function createTestStorage({ idb = new fake_indexeddb_1.IDBFactory(), disableRebasing = false, metadataVersion, } = {}) {
|
|
106
107
|
const storage = new index_js_1.ClientDescriptor({
|
|
107
108
|
schema: testSchema,
|
|
108
109
|
migrations: [(0, common_1.createMigration)(testSchema)],
|
|
109
110
|
indexedDb: idb,
|
|
110
111
|
namespace: 'test',
|
|
111
112
|
disableRebasing,
|
|
113
|
+
[constants_js_1.METADATA_VERSION_KEY]: metadataVersion,
|
|
112
114
|
}).open();
|
|
113
115
|
return storage;
|
|
114
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testStorage.js","sourceRoot":"","sources":["../../../../src/__tests__/fixtures/testStorage.ts"],"names":[],"mappings":";;;AAAA,gDAA0E;AAC1E,aAAa;AACb,mDAA4C;AAC5C,6CAAyE;
|
|
1
|
+
{"version":3,"file":"testStorage.js","sourceRoot":"","sources":["../../../../src/__tests__/fixtures/testStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,68 +1,209 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// import { IDBFactory } from 'fake-indexeddb';
|
|
3
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
3
|
const common_1 = require("@verdant-web/common");
|
|
5
4
|
const idb_js_1 = require("../idb.js");
|
|
6
5
|
const openMetadataDatabase_js_1 = require("../metadata/openMetadataDatabase.js");
|
|
7
6
|
const testStorage_js_1 = require("./fixtures/testStorage.js");
|
|
8
7
|
const vitest_1 = require("vitest");
|
|
8
|
+
const OperationsStore_js_1 = require("../metadata/OperationsStore.js");
|
|
9
|
+
const BaselinesStore_js_1 = require("../metadata/BaselinesStore.js");
|
|
9
10
|
const idb = new IDBFactory();
|
|
10
11
|
async function seedDatabaseAndCreateClient() {
|
|
11
|
-
const client1 = await (0, testStorage_js_1.createTestStorage)({ idb });
|
|
12
|
+
const client1 = await (0, testStorage_js_1.createTestStorage)({ idb, metadataVersion: 4 });
|
|
12
13
|
await client1.close();
|
|
13
14
|
const { db } = await (0, openMetadataDatabase_js_1.openMetadataDatabase)({
|
|
14
15
|
indexedDB: idb,
|
|
15
16
|
namespace: 'test',
|
|
17
|
+
metadataVersion: 4,
|
|
16
18
|
});
|
|
19
|
+
(0, vitest_1.expect)(db.version).toBe(4);
|
|
17
20
|
const tx = db.transaction(['baselines', 'operations'], 'readwrite');
|
|
18
21
|
const clock = new common_1.HybridLogicalClockTimestampProvider();
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
22
|
+
const ops = new OperationsStore_js_1.OperationsStore(db);
|
|
23
|
+
const baselines = new BaselinesStore_js_1.BaselinesStore(db);
|
|
24
|
+
await Promise.all([
|
|
25
|
+
baselines.setAll([
|
|
26
|
+
{
|
|
27
|
+
oid: 'weirds/b.objectMap.one:ghi',
|
|
28
|
+
snapshot: { content: 'ghi' },
|
|
29
|
+
timestamp: clock.now(1),
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
oid: 'weirds/b.objectMap.two:jkl',
|
|
33
|
+
snapshot: { content: 'jkl' },
|
|
34
|
+
timestamp: clock.now(1),
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
oid: 'weirds/b.map:abc',
|
|
38
|
+
snapshot: {},
|
|
39
|
+
timestamp: clock.now(1),
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
oid: 'weirds/b.objectMap:def',
|
|
43
|
+
snapshot: {
|
|
44
|
+
one: (0, common_1.makeObjectRef)('weirds/b.objectMap.one:ghi'),
|
|
45
|
+
two: (0, common_1.makeObjectRef)('weirds/b.objectMap.two:jkl'),
|
|
46
|
+
},
|
|
47
|
+
timestamp: clock.now(1),
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
oid: 'weirds/b.weird.ok:opq',
|
|
51
|
+
snapshot: {
|
|
52
|
+
message: 'ok',
|
|
53
|
+
},
|
|
54
|
+
timestamp: clock.now(1),
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
oid: 'weirds/b.weird.cool:rst',
|
|
58
|
+
snapshot: {
|
|
59
|
+
message: 'cool',
|
|
60
|
+
},
|
|
61
|
+
timestamp: clock.now(1),
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
oid: 'weirds/b.weird.list.#:xyz',
|
|
65
|
+
snapshot: {
|
|
66
|
+
name: 'xyz',
|
|
67
|
+
test: 1,
|
|
68
|
+
},
|
|
69
|
+
timestamp: clock.now(1),
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
oid: 'weirds/b.weird.list.#:123',
|
|
73
|
+
snapshot: {
|
|
74
|
+
name: '123',
|
|
75
|
+
test: 2,
|
|
76
|
+
},
|
|
77
|
+
timestamp: clock.now(1),
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
oid: 'weirds/b.weird.list:uvw',
|
|
81
|
+
snapshot: [
|
|
82
|
+
(0, common_1.makeObjectRef)('weirds/b/weird.list.#:xyz'),
|
|
83
|
+
(0, common_1.makeObjectRef)('weirds/b/weird.list.#:123'),
|
|
84
|
+
],
|
|
85
|
+
timestamp: clock.now(1),
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
oid: 'weirds/b.weird:lmn',
|
|
89
|
+
snapshot: {
|
|
90
|
+
ok: (0, common_1.makeObjectRef)('weirds/b.weird.ok:opq'),
|
|
91
|
+
cool: (0, common_1.makeObjectRef)('weirds/b.weird.cool:rst'),
|
|
92
|
+
list: (0, common_1.makeObjectRef)('weirds/b.weird.list:uvw'),
|
|
93
|
+
},
|
|
94
|
+
timestamp: clock.now(1),
|
|
95
|
+
},
|
|
96
|
+
{
|
|
97
|
+
oid: 'weirds/b',
|
|
98
|
+
snapshot: {
|
|
99
|
+
id: 'b',
|
|
100
|
+
map: (0, common_1.makeObjectRef)('weirds/b.map:abc'),
|
|
101
|
+
objectMap: (0, common_1.makeObjectRef)('weirds/b.objectMap:def'),
|
|
102
|
+
weird: (0, common_1.makeObjectRef)('weirds/b.weird:lmn'),
|
|
103
|
+
},
|
|
104
|
+
timestamp: clock.now(1),
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
oid: 'todos/a.attachments.#:baz',
|
|
108
|
+
snapshot: {
|
|
109
|
+
name: 'baz',
|
|
110
|
+
test: 1,
|
|
111
|
+
},
|
|
112
|
+
timestamp: clock.now(1),
|
|
113
|
+
},
|
|
114
|
+
{
|
|
115
|
+
oid: 'todos/a.attachments.#:qux',
|
|
116
|
+
snapshot: {
|
|
117
|
+
name: 'qux',
|
|
118
|
+
test: 2,
|
|
119
|
+
},
|
|
120
|
+
timestamp: clock.now(1),
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
oid: 'todos/a.attachments:bar',
|
|
124
|
+
snapshot: [
|
|
125
|
+
(0, common_1.makeObjectRef)('todos/a.attachments.#:baz'),
|
|
126
|
+
(0, common_1.makeObjectRef)('todos/a.attachments.#:qux'),
|
|
127
|
+
],
|
|
128
|
+
timestamp: clock.now(1),
|
|
129
|
+
},
|
|
130
|
+
{
|
|
131
|
+
oid: 'todos/a.tags:foo',
|
|
132
|
+
snapshot: ['tag1'],
|
|
133
|
+
timestamp: clock.now(1),
|
|
134
|
+
},
|
|
135
|
+
{
|
|
136
|
+
oid: 'todos/a',
|
|
137
|
+
snapshot: {
|
|
138
|
+
id: 'a',
|
|
139
|
+
content: 'item a',
|
|
140
|
+
tags: (0, common_1.makeObjectRef)('todos/a.tags:foo'),
|
|
141
|
+
done: false,
|
|
142
|
+
category: 'default',
|
|
143
|
+
attachments: (0, common_1.makeObjectRef)('todos/a.attachments:bar'),
|
|
144
|
+
},
|
|
145
|
+
timestamp: clock.now(1),
|
|
146
|
+
},
|
|
147
|
+
], { transaction: tx }),
|
|
148
|
+
ops.addOperations([
|
|
149
|
+
// trying to cover all types of operations which use refs here
|
|
150
|
+
{
|
|
53
151
|
oid: 'todos/a.tags:foo',
|
|
54
|
-
timestamp:
|
|
152
|
+
timestamp: clock.now(1),
|
|
55
153
|
data: {
|
|
56
154
|
op: 'list-push',
|
|
57
155
|
value: 'tag2',
|
|
58
156
|
},
|
|
59
157
|
isLocal: true,
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
158
|
+
},
|
|
159
|
+
{
|
|
160
|
+
oid: 'todos/a.attachments.#:bin',
|
|
161
|
+
timestamp: clock.now(1),
|
|
162
|
+
data: {
|
|
163
|
+
op: 'initialize',
|
|
164
|
+
value: {
|
|
165
|
+
name: 'bin',
|
|
166
|
+
test: 2,
|
|
167
|
+
},
|
|
168
|
+
},
|
|
169
|
+
isLocal: true,
|
|
170
|
+
},
|
|
171
|
+
{
|
|
172
|
+
oid: 'todos/a.attachments:bar',
|
|
173
|
+
timestamp: clock.now(1),
|
|
174
|
+
data: {
|
|
175
|
+
op: 'list-push',
|
|
176
|
+
value: (0, common_1.makeObjectRef)('todos/a.attachments.#:bin'),
|
|
177
|
+
},
|
|
178
|
+
isLocal: true,
|
|
179
|
+
},
|
|
180
|
+
{
|
|
181
|
+
oid: 'todos/a.attachments:bar',
|
|
182
|
+
timestamp: clock.now(1),
|
|
183
|
+
isLocal: true,
|
|
184
|
+
data: {
|
|
185
|
+
op: 'list-remove',
|
|
186
|
+
value: (0, common_1.makeObjectRef)('todos/a.attachments.#:baz'),
|
|
187
|
+
},
|
|
188
|
+
},
|
|
189
|
+
{
|
|
190
|
+
oid: 'weirds/b.objectMap:def',
|
|
191
|
+
timestamp: clock.now(1),
|
|
192
|
+
data: {
|
|
193
|
+
op: 'delete',
|
|
194
|
+
},
|
|
195
|
+
isLocal: true,
|
|
196
|
+
},
|
|
197
|
+
{
|
|
198
|
+
oid: 'weirds/b.weird.list:uvw',
|
|
199
|
+
timestamp: clock.now(1),
|
|
200
|
+
data: {
|
|
201
|
+
op: 'delete',
|
|
202
|
+
},
|
|
203
|
+
isLocal: true,
|
|
204
|
+
},
|
|
205
|
+
], { transaction: tx }),
|
|
206
|
+
]);
|
|
66
207
|
db.close();
|
|
67
208
|
// documents are a little trickier.
|
|
68
209
|
const docDbReq = idb.open('test_collections', 1);
|
|
@@ -94,18 +235,39 @@ async function seedDatabaseAndCreateClient() {
|
|
|
94
235
|
(0, vitest_1.it)('can still function', async () => {
|
|
95
236
|
const client = await seedDatabaseAndCreateClient();
|
|
96
237
|
const todo = await client.todos.get('a').resolved;
|
|
238
|
+
const weird = await client.weirds.get('b').resolved;
|
|
239
|
+
// first: does the data look right?
|
|
97
240
|
(0, vitest_1.expect)(todo.getSnapshot()).toMatchObject({
|
|
98
241
|
id: 'a',
|
|
99
242
|
content: 'item a',
|
|
100
243
|
tags: ['tag1', 'tag2'],
|
|
244
|
+
done: false,
|
|
101
245
|
category: 'default',
|
|
102
246
|
attachments: [
|
|
103
247
|
{
|
|
104
|
-
name: '
|
|
105
|
-
test:
|
|
248
|
+
name: 'qux',
|
|
249
|
+
test: 2,
|
|
250
|
+
},
|
|
251
|
+
{
|
|
252
|
+
name: 'bin',
|
|
253
|
+
test: 2,
|
|
106
254
|
},
|
|
107
255
|
],
|
|
108
256
|
});
|
|
257
|
+
(0, vitest_1.expect)(weird.getSnapshot()).toMatchObject({
|
|
258
|
+
id: 'b',
|
|
259
|
+
map: {},
|
|
260
|
+
objectMap: null,
|
|
261
|
+
weird: {
|
|
262
|
+
list: null,
|
|
263
|
+
cool: {
|
|
264
|
+
message: 'cool',
|
|
265
|
+
},
|
|
266
|
+
ok: {
|
|
267
|
+
message: 'ok',
|
|
268
|
+
},
|
|
269
|
+
},
|
|
270
|
+
});
|
|
109
271
|
todo.get('attachments').push({
|
|
110
272
|
name: 'qux',
|
|
111
273
|
});
|
|
@@ -130,6 +292,30 @@ async function seedDatabaseAndCreateClient() {
|
|
|
130
292
|
},
|
|
131
293
|
]
|
|
132
294
|
`);
|
|
295
|
+
weird.get('weird').set('another', 'bar');
|
|
296
|
+
weird.get('weird').set('list', ['a', 'b', 'c']);
|
|
297
|
+
weird.get('weird').delete('cool');
|
|
298
|
+
weird.get('map').set('foo', 'bar');
|
|
299
|
+
(0, vitest_1.expect)(weird.getSnapshot()).toMatchInlineSnapshot(`
|
|
300
|
+
{
|
|
301
|
+
"id": "b",
|
|
302
|
+
"map": {
|
|
303
|
+
"foo": "bar",
|
|
304
|
+
},
|
|
305
|
+
"objectMap": null,
|
|
306
|
+
"weird": {
|
|
307
|
+
"another": "bar",
|
|
308
|
+
"list": [
|
|
309
|
+
"a",
|
|
310
|
+
"b",
|
|
311
|
+
"c",
|
|
312
|
+
],
|
|
313
|
+
"ok": {
|
|
314
|
+
"message": "ok",
|
|
315
|
+
},
|
|
316
|
+
},
|
|
317
|
+
}
|
|
318
|
+
`);
|
|
133
319
|
});
|
|
134
320
|
});
|
|
135
321
|
//# sourceMappingURL=legacyOids.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacyOids.test.js","sourceRoot":"","sources":["../../../src/__tests__/legacyOids.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"legacyOids.test.js","sourceRoot":"","sources":["../../../src/__tests__/legacyOids.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { FileManagerConfig } from '../files/FileManager.js';
|
|
|
3
3
|
import { ServerSyncOptions } from '../sync/Sync.js';
|
|
4
4
|
import { UndoHistory } from '../UndoHistory.js';
|
|
5
5
|
import { Client } from './Client.js';
|
|
6
|
+
import { METADATA_VERSION_KEY } from './constants.js';
|
|
6
7
|
export interface ClientDescriptorOptions<Presence = any, Profile = any> {
|
|
7
8
|
/** The schema used to create this client */
|
|
8
9
|
schema: StorageSchema<any>;
|
|
@@ -45,6 +46,7 @@ export interface ClientDescriptorOptions<Presence = any, Profile = any> {
|
|
|
45
46
|
* before turning it on.
|
|
46
47
|
*/
|
|
47
48
|
EXPERIMENTAL_weakRefs?: boolean;
|
|
49
|
+
[METADATA_VERSION_KEY]?: number;
|
|
48
50
|
}
|
|
49
51
|
/**
|
|
50
52
|
* Since storage initialization is async, this class wraps the core
|
|
@@ -9,6 +9,7 @@ const UndoHistory_js_1 = require("../UndoHistory.js");
|
|
|
9
9
|
const Client_js_1 = require("./Client.js");
|
|
10
10
|
const idb_js_1 = require("../idb.js");
|
|
11
11
|
const FakeWeakRef_js_1 = require("../FakeWeakRef.js");
|
|
12
|
+
const constants_js_1 = require("./constants.js");
|
|
12
13
|
/**
|
|
13
14
|
* Since storage initialization is async, this class wraps the core
|
|
14
15
|
* Storage creation promise and exposes some metadata which can
|
|
@@ -53,10 +54,12 @@ class ClientDescriptor {
|
|
|
53
54
|
}
|
|
54
55
|
};
|
|
55
56
|
this.initializeDatabases = async (init) => {
|
|
57
|
+
const metadataVersion = init[constants_js_1.METADATA_VERSION_KEY];
|
|
56
58
|
const { db: metaDb } = await (0, openMetadataDatabase_js_1.openMetadataDatabase)({
|
|
57
59
|
indexedDB: init.indexedDb,
|
|
58
60
|
log: init.log,
|
|
59
61
|
namespace: init.namespace,
|
|
62
|
+
metadataVersion,
|
|
60
63
|
});
|
|
61
64
|
const context = {
|
|
62
65
|
namespace: this._namespace,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientDescriptor.js","sourceRoot":"","sources":["../../../src/client/ClientDescriptor.ts"],"names":[],"mappings":";;;AAAA,gDAK6B;AAG7B,yDAAmD;AACnD,iFAG6C;AAC7C,kEAGsC;AAEtC,sDAAgD;AAChD,2CAAqC;AACrC,sCAImB;AACnB,sDAAgD;
|
|
1
|
+
{"version":3,"file":"ClientDescriptor.js","sourceRoot":"","sources":["../../../src/client/ClientDescriptor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const METADATA_VERSION_KEY: unique symbol;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/client/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC"}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
export declare function openMetadataDatabase({ indexedDB, namespace, log, }: {
|
|
1
|
+
export declare function openMetadataDatabase({ indexedDB, namespace, log, metadataVersion, }: {
|
|
2
2
|
indexedDB?: IDBFactory;
|
|
3
3
|
namespace: string;
|
|
4
4
|
log?: (...args: any[]) => void;
|
|
5
|
+
metadataVersion?: number;
|
|
5
6
|
}): Promise<{
|
|
6
7
|
wasInitialized: boolean;
|
|
7
8
|
db: IDBDatabase;
|
|
8
9
|
}>;
|
|
9
|
-
export declare function openWIPMetadataDatabase({ wipNamespace, namespace, indexedDB, log, }: {
|
|
10
|
+
export declare function openWIPMetadataDatabase({ wipNamespace, namespace, indexedDB, log, metadataVersion, }: {
|
|
10
11
|
indexedDB?: IDBFactory;
|
|
11
12
|
namespace: string;
|
|
12
13
|
wipNamespace: string;
|
|
13
14
|
log?: (...args: any[]) => void;
|
|
15
|
+
metadataVersion?: number;
|
|
14
16
|
}): Promise<{
|
|
15
17
|
wasInitialized: boolean;
|
|
16
18
|
db: IDBDatabase;
|
|
@@ -12,11 +12,12 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.openWIPMetadataDatabase = exports.openMetadataDatabase = void 0;
|
|
15
|
+
const common_1 = require("@verdant-web/common");
|
|
15
16
|
const idb_js_1 = require("../idb.js");
|
|
16
|
-
const migrations = [version1, version2, version3, version4];
|
|
17
|
-
function openMetadataDatabase({ indexedDB = window.indexedDB, namespace, log, }) {
|
|
17
|
+
const migrations = [version1, version2, version3, version4, version5];
|
|
18
|
+
function openMetadataDatabase({ indexedDB = window.indexedDB, namespace, log, metadataVersion = 5, }) {
|
|
18
19
|
return new Promise((resolve, reject) => {
|
|
19
|
-
const request = indexedDB.open(`${namespace}_meta`,
|
|
20
|
+
const request = indexedDB.open(`${namespace}_meta`, metadataVersion);
|
|
20
21
|
let wasInitialized = false;
|
|
21
22
|
request.onupgradeneeded = async (event) => {
|
|
22
23
|
const db = request.result;
|
|
@@ -25,6 +26,10 @@ function openMetadataDatabase({ indexedDB = window.indexedDB, namespace, log, })
|
|
|
25
26
|
for (const migration of toRun) {
|
|
26
27
|
await migration(db, tx);
|
|
27
28
|
}
|
|
29
|
+
await new Promise((resolve, reject) => {
|
|
30
|
+
tx.addEventListener('complete', resolve);
|
|
31
|
+
tx.addEventListener('error', reject);
|
|
32
|
+
});
|
|
28
33
|
if (!event.oldVersion) {
|
|
29
34
|
wasInitialized = true;
|
|
30
35
|
}
|
|
@@ -39,11 +44,12 @@ function openMetadataDatabase({ indexedDB = window.indexedDB, namespace, log, })
|
|
|
39
44
|
});
|
|
40
45
|
}
|
|
41
46
|
exports.openMetadataDatabase = openMetadataDatabase;
|
|
42
|
-
async function openWIPMetadataDatabase({ wipNamespace, namespace, indexedDB, log, }) {
|
|
47
|
+
async function openWIPMetadataDatabase({ wipNamespace, namespace, indexedDB, log, metadataVersion, }) {
|
|
43
48
|
const result = await openMetadataDatabase({
|
|
44
49
|
namespace: wipNamespace,
|
|
45
50
|
indexedDB,
|
|
46
51
|
log,
|
|
52
|
+
metadataVersion,
|
|
47
53
|
});
|
|
48
54
|
// this WIP database was already set up.
|
|
49
55
|
if (!result.wasInitialized) {
|
|
@@ -55,6 +61,7 @@ async function openWIPMetadataDatabase({ wipNamespace, namespace, indexedDB, log
|
|
|
55
61
|
namespace,
|
|
56
62
|
indexedDB,
|
|
57
63
|
log,
|
|
64
|
+
metadataVersion,
|
|
58
65
|
});
|
|
59
66
|
const tx = prodDb.transaction(['baselines', 'operations', 'info'], 'readonly');
|
|
60
67
|
const [baselines, operations, info] = await Promise.all([
|
|
@@ -156,4 +163,58 @@ async function version4(db, tx) {
|
|
|
156
163
|
files.createIndex('remote', 'remote');
|
|
157
164
|
files.createIndex('deletedAt', 'deletedAt');
|
|
158
165
|
}
|
|
166
|
+
async function version5(db, tx) {
|
|
167
|
+
// rewrites all baselines and operations to replace legacy OIDs
|
|
168
|
+
// with new ones.
|
|
169
|
+
const operations = tx.objectStore('operations');
|
|
170
|
+
await new Promise((resolve, reject) => {
|
|
171
|
+
const cursorReq = operations.openCursor();
|
|
172
|
+
cursorReq.onsuccess = () => {
|
|
173
|
+
const cursor = cursorReq.result;
|
|
174
|
+
if (cursor) {
|
|
175
|
+
const converted = (0, common_1.replaceLegacyOidsInObject)(cursor.value);
|
|
176
|
+
// conversion may change the primary key, so we need to put the
|
|
177
|
+
// object back to the store
|
|
178
|
+
if (converted.oid_timestamp !== cursor.primaryKey) {
|
|
179
|
+
cursor.delete();
|
|
180
|
+
operations.put(converted);
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
cursor.update(converted);
|
|
184
|
+
}
|
|
185
|
+
cursor.continue();
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
resolve();
|
|
189
|
+
}
|
|
190
|
+
};
|
|
191
|
+
cursorReq.onerror = (event) => {
|
|
192
|
+
reject(cursorReq.error);
|
|
193
|
+
};
|
|
194
|
+
});
|
|
195
|
+
const baselines = tx.objectStore('baselines');
|
|
196
|
+
await new Promise((resolve, reject) => {
|
|
197
|
+
const cursorReq = baselines.openCursor();
|
|
198
|
+
cursorReq.onsuccess = () => {
|
|
199
|
+
const cursor = cursorReq.result;
|
|
200
|
+
if (cursor) {
|
|
201
|
+
const converted = (0, common_1.replaceLegacyOidsInObject)(cursor.value);
|
|
202
|
+
if (converted.oid !== cursor.primaryKey) {
|
|
203
|
+
cursor.delete();
|
|
204
|
+
baselines.put(converted);
|
|
205
|
+
}
|
|
206
|
+
else {
|
|
207
|
+
cursor.update(converted);
|
|
208
|
+
}
|
|
209
|
+
cursor.continue();
|
|
210
|
+
}
|
|
211
|
+
else {
|
|
212
|
+
resolve();
|
|
213
|
+
}
|
|
214
|
+
};
|
|
215
|
+
cursorReq.onerror = (event) => {
|
|
216
|
+
reject(cursorReq.error);
|
|
217
|
+
};
|
|
218
|
+
});
|
|
219
|
+
}
|
|
159
220
|
//# sourceMappingURL=openMetadataDatabase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openMetadataDatabase.js","sourceRoot":"","sources":["../../../src/metadata/openMetadataDatabase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sCAA+D;AAE/D,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"openMetadataDatabase.js","sourceRoot":"","sources":["../../../src/metadata/openMetadataDatabase.ts"],"names":[],"mappings":"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"}
|