@dxos/migrations 0.8.4-main.72ec0f3 → 0.8.4-main.74a063c4e0
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/README.md +2 -2
- package/dist/lib/browser/index.mjs +70 -33
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node-esm/index.mjs +70 -33
- package/dist/lib/node-esm/index.mjs.map +3 -3
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/types/src/migration-builder.d.ts +3 -3
- package/dist/types/src/migration-builder.d.ts.map +1 -1
- package/dist/types/src/migrations.d.ts +2 -1
- package/dist/types/src/migrations.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +18 -13
- package/src/migration-builder.ts +28 -27
- package/src/migrations.test.ts +24 -17
- package/src/migrations.ts +14 -6
|
@@ -3,10 +3,11 @@ import { createRequire } from 'node:module';const require = createRequire(import
|
|
|
3
3
|
// src/migration-builder.ts
|
|
4
4
|
import { next as A } from "@automerge/automerge";
|
|
5
5
|
import { CreateEpochRequest } from "@dxos/client/halo";
|
|
6
|
-
import { requireTypeReference } from "@dxos/echo/internal";
|
|
7
6
|
import { ObjectCore, migrateDocument } from "@dxos/echo-db";
|
|
8
|
-
import {
|
|
7
|
+
import { EncodedReference, SpaceDocVersion } from "@dxos/echo-protocol";
|
|
8
|
+
import { getSchemaDXN } from "@dxos/echo/internal";
|
|
9
9
|
import { invariant } from "@dxos/invariant";
|
|
10
|
+
import { DXN } from "@dxos/keys";
|
|
10
11
|
var __dxlog_file = "/__w/dxos/dxos/packages/sdk/migrations/src/migration-builder.ts";
|
|
11
12
|
var MigrationBuilder = class {
|
|
12
13
|
_space;
|
|
@@ -19,8 +20,8 @@ var MigrationBuilder = class {
|
|
|
19
20
|
_newRoot = void 0;
|
|
20
21
|
constructor(_space) {
|
|
21
22
|
this._space = _space;
|
|
22
|
-
this._repo = this._space.db.coreDatabase._repo;
|
|
23
|
-
this._rootDoc = this._space.db.coreDatabase._automergeDocLoader.getSpaceRootDocHandle().doc();
|
|
23
|
+
this._repo = this._space.internal.db.coreDatabase._repo;
|
|
24
|
+
this._rootDoc = this._space.internal.db.coreDatabase._automergeDocLoader.getSpaceRootDocHandle().doc();
|
|
24
25
|
}
|
|
25
26
|
async findObject(id) {
|
|
26
27
|
const documentId = (this._rootDoc.links?.[id] || this._newLinks[id])?.toString();
|
|
@@ -41,7 +42,7 @@ var MigrationBuilder = class {
|
|
|
41
42
|
const oldHandle = await this._findObjectContainingHandle(id);
|
|
42
43
|
invariant(oldHandle, void 0, {
|
|
43
44
|
F: __dxlog_file,
|
|
44
|
-
L:
|
|
45
|
+
L: 79,
|
|
45
46
|
S: this,
|
|
46
47
|
A: [
|
|
47
48
|
"oldHandle",
|
|
@@ -56,7 +57,7 @@ var MigrationBuilder = class {
|
|
|
56
57
|
objects: {
|
|
57
58
|
[id]: {
|
|
58
59
|
system: {
|
|
59
|
-
type:
|
|
60
|
+
type: EncodedReference.fromDXN(getSchemaDXN(schema))
|
|
60
61
|
},
|
|
61
62
|
data: props,
|
|
62
63
|
meta: {
|
|
@@ -67,29 +68,39 @@ var MigrationBuilder = class {
|
|
|
67
68
|
};
|
|
68
69
|
const migratedDoc = migrateDocument(oldHandle.doc(), newState);
|
|
69
70
|
const newHandle = this._repo.import(A.save(migratedDoc));
|
|
71
|
+
await newHandle.whenReady();
|
|
72
|
+
invariant(newHandle.url, "Migrated document URL not available after whenReady", {
|
|
73
|
+
F: __dxlog_file,
|
|
74
|
+
L: 101,
|
|
75
|
+
S: this,
|
|
76
|
+
A: [
|
|
77
|
+
"newHandle.url",
|
|
78
|
+
"'Migrated document URL not available after whenReady'"
|
|
79
|
+
]
|
|
80
|
+
});
|
|
70
81
|
this._newLinks[id] = newHandle.url;
|
|
71
|
-
this._addHandleToFlushList(newHandle);
|
|
82
|
+
this._addHandleToFlushList(newHandle.documentId);
|
|
72
83
|
}
|
|
73
84
|
async addObject(schema, props) {
|
|
74
|
-
const core = this._createObject({
|
|
85
|
+
const core = await this._createObject({
|
|
75
86
|
schema,
|
|
76
87
|
props
|
|
77
88
|
});
|
|
78
89
|
return core.id;
|
|
79
90
|
}
|
|
80
91
|
createReference(id) {
|
|
81
|
-
return
|
|
92
|
+
return EncodedReference.fromDXN(DXN.fromLocalObjectId(id));
|
|
82
93
|
}
|
|
83
94
|
deleteObject(id) {
|
|
84
95
|
this._deleteObjects.push(id);
|
|
85
96
|
}
|
|
86
|
-
changeProperties(changeFn) {
|
|
97
|
+
async changeProperties(changeFn) {
|
|
87
98
|
if (!this._newRoot) {
|
|
88
|
-
this._buildNewRoot();
|
|
99
|
+
await this._buildNewRoot();
|
|
89
100
|
}
|
|
90
101
|
invariant(this._newRoot, "New root not created", {
|
|
91
102
|
F: __dxlog_file,
|
|
92
|
-
L:
|
|
103
|
+
L: 123,
|
|
93
104
|
S: this,
|
|
94
105
|
A: [
|
|
95
106
|
"this._newRoot",
|
|
@@ -100,18 +111,19 @@ var MigrationBuilder = class {
|
|
|
100
111
|
const propertiesStructure = doc.objects?.[this._space.properties.id];
|
|
101
112
|
propertiesStructure && changeFn(propertiesStructure);
|
|
102
113
|
});
|
|
103
|
-
this.
|
|
114
|
+
await this._newRoot.whenReady();
|
|
115
|
+
this._addHandleToFlushList(this._newRoot.documentId);
|
|
104
116
|
}
|
|
105
117
|
/**
|
|
106
118
|
* @internal
|
|
107
119
|
*/
|
|
108
120
|
async _commit() {
|
|
109
121
|
if (!this._newRoot) {
|
|
110
|
-
this._buildNewRoot();
|
|
122
|
+
await this._buildNewRoot();
|
|
111
123
|
}
|
|
112
124
|
invariant(this._newRoot, "New root not created", {
|
|
113
125
|
F: __dxlog_file,
|
|
114
|
-
L:
|
|
126
|
+
L: 140,
|
|
115
127
|
S: this,
|
|
116
128
|
A: [
|
|
117
129
|
"this._newRoot",
|
|
@@ -119,6 +131,15 @@ var MigrationBuilder = class {
|
|
|
119
131
|
]
|
|
120
132
|
});
|
|
121
133
|
await this._space.db.flush();
|
|
134
|
+
invariant(this._newRoot.url, "New root URL not available", {
|
|
135
|
+
F: __dxlog_file,
|
|
136
|
+
L: 145,
|
|
137
|
+
S: this,
|
|
138
|
+
A: [
|
|
139
|
+
"this._newRoot.url",
|
|
140
|
+
"'New root URL not available'"
|
|
141
|
+
]
|
|
142
|
+
});
|
|
122
143
|
await this._space.internal.createEpoch({
|
|
123
144
|
migration: CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT,
|
|
124
145
|
automergeRootUrl: this._newRoot.url
|
|
@@ -133,7 +154,7 @@ var MigrationBuilder = class {
|
|
|
133
154
|
await docHandle.whenReady();
|
|
134
155
|
return docHandle;
|
|
135
156
|
}
|
|
136
|
-
_buildNewRoot() {
|
|
157
|
+
async _buildNewRoot() {
|
|
137
158
|
const links = {
|
|
138
159
|
...this._rootDoc.links ?? {}
|
|
139
160
|
};
|
|
@@ -151,15 +172,16 @@ var MigrationBuilder = class {
|
|
|
151
172
|
objects: this._rootDoc.objects,
|
|
152
173
|
links
|
|
153
174
|
});
|
|
154
|
-
this.
|
|
175
|
+
await this._newRoot.whenReady();
|
|
176
|
+
this._addHandleToFlushList(this._newRoot.documentId);
|
|
155
177
|
}
|
|
156
|
-
_createObject({ id, schema, props }) {
|
|
178
|
+
async _createObject({ id, schema, props }) {
|
|
157
179
|
const core = new ObjectCore();
|
|
158
180
|
if (id) {
|
|
159
181
|
core.id = id;
|
|
160
182
|
}
|
|
161
183
|
core.initNewObject(props);
|
|
162
|
-
core.setType(
|
|
184
|
+
core.setType(EncodedReference.fromDXN(getSchemaDXN(schema)));
|
|
163
185
|
const newHandle = this._repo.create({
|
|
164
186
|
version: SpaceDocVersion.CURRENT,
|
|
165
187
|
access: {
|
|
@@ -169,25 +191,29 @@ var MigrationBuilder = class {
|
|
|
169
191
|
[core.id]: core.getDoc()
|
|
170
192
|
}
|
|
171
193
|
});
|
|
194
|
+
await newHandle.whenReady();
|
|
172
195
|
this._newLinks[core.id] = newHandle.url;
|
|
173
|
-
this._addHandleToFlushList(newHandle);
|
|
196
|
+
this._addHandleToFlushList(newHandle.documentId);
|
|
174
197
|
return core;
|
|
175
198
|
}
|
|
176
|
-
_addHandleToFlushList(
|
|
177
|
-
this._flushIds.push(
|
|
199
|
+
_addHandleToFlushList(id) {
|
|
200
|
+
this._flushIds.push(id);
|
|
178
201
|
}
|
|
179
202
|
};
|
|
180
203
|
|
|
181
204
|
// src/migrations.ts
|
|
182
|
-
import {
|
|
205
|
+
import { Atom } from "@effect-atom/atom";
|
|
206
|
+
import * as Registry from "@effect-atom/atom/Registry";
|
|
207
|
+
import { SpaceState } from "@dxos/client/echo";
|
|
183
208
|
import { invariant as invariant2 } from "@dxos/invariant";
|
|
184
209
|
var __dxlog_file2 = "/__w/dxos/dxos/packages/sdk/migrations/src/migrations.ts";
|
|
185
210
|
var Migrations = class {
|
|
186
211
|
static namespace;
|
|
187
212
|
static migrations = [];
|
|
188
|
-
static
|
|
213
|
+
static _registry = Registry.make();
|
|
214
|
+
static _stateAtom = Atom.make({
|
|
189
215
|
running: []
|
|
190
|
-
});
|
|
216
|
+
}).pipe(Atom.keepAlive);
|
|
191
217
|
static get versionProperty() {
|
|
192
218
|
return this.namespace && `${this.namespace}.version`;
|
|
193
219
|
}
|
|
@@ -195,7 +221,8 @@ var Migrations = class {
|
|
|
195
221
|
return this.migrations[this.migrations.length - 1]?.version;
|
|
196
222
|
}
|
|
197
223
|
static running(space) {
|
|
198
|
-
|
|
224
|
+
const state = this._registry.get(this._stateAtom);
|
|
225
|
+
return state.running.includes(space.key.toHex());
|
|
199
226
|
}
|
|
200
227
|
static define(namespace, migrations) {
|
|
201
228
|
this.namespace = namespace;
|
|
@@ -204,7 +231,7 @@ var Migrations = class {
|
|
|
204
231
|
static async migrate(space, targetVersion) {
|
|
205
232
|
invariant2(!this.running(space), "Migration already running", {
|
|
206
233
|
F: __dxlog_file2,
|
|
207
|
-
L:
|
|
234
|
+
L: 49,
|
|
208
235
|
S: this,
|
|
209
236
|
A: [
|
|
210
237
|
"!this.running(space)",
|
|
@@ -213,7 +240,7 @@ var Migrations = class {
|
|
|
213
240
|
});
|
|
214
241
|
invariant2(this.versionProperty, "Migrations namespace not set", {
|
|
215
242
|
F: __dxlog_file2,
|
|
216
|
-
L:
|
|
243
|
+
L: 50,
|
|
217
244
|
S: this,
|
|
218
245
|
A: [
|
|
219
246
|
"this.versionProperty",
|
|
@@ -222,7 +249,7 @@ var Migrations = class {
|
|
|
222
249
|
});
|
|
223
250
|
invariant2(space.state.get() === SpaceState.SPACE_READY, "Space not ready", {
|
|
224
251
|
F: __dxlog_file2,
|
|
225
|
-
L:
|
|
252
|
+
L: 51,
|
|
226
253
|
S: this,
|
|
227
254
|
A: [
|
|
228
255
|
"space.state.get() === SpaceState.SPACE_READY",
|
|
@@ -236,7 +263,14 @@ var Migrations = class {
|
|
|
236
263
|
if (currentIndex === targetIndex) {
|
|
237
264
|
return false;
|
|
238
265
|
}
|
|
239
|
-
|
|
266
|
+
const spaceKey = space.key.toHex();
|
|
267
|
+
const currentState = this._registry.get(this._stateAtom);
|
|
268
|
+
this._registry.set(this._stateAtom, {
|
|
269
|
+
running: [
|
|
270
|
+
...currentState.running,
|
|
271
|
+
spaceKey
|
|
272
|
+
]
|
|
273
|
+
});
|
|
240
274
|
if (targetIndex > currentIndex) {
|
|
241
275
|
const migrations = this.migrations.slice(currentIndex, targetIndex);
|
|
242
276
|
for (const migration of migrations) {
|
|
@@ -245,10 +279,10 @@ var Migrations = class {
|
|
|
245
279
|
space,
|
|
246
280
|
builder
|
|
247
281
|
});
|
|
248
|
-
builder.changeProperties((propertiesStructure) => {
|
|
282
|
+
await builder.changeProperties((propertiesStructure) => {
|
|
249
283
|
invariant2(this.versionProperty, "Migrations namespace not set", {
|
|
250
284
|
F: __dxlog_file2,
|
|
251
|
-
L:
|
|
285
|
+
L: 69,
|
|
252
286
|
S: this,
|
|
253
287
|
A: [
|
|
254
288
|
"this.versionProperty",
|
|
@@ -260,7 +294,10 @@ var Migrations = class {
|
|
|
260
294
|
await builder._commit();
|
|
261
295
|
}
|
|
262
296
|
}
|
|
263
|
-
this.
|
|
297
|
+
const finalState = this._registry.get(this._stateAtom);
|
|
298
|
+
this._registry.set(this._stateAtom, {
|
|
299
|
+
running: finalState.running.filter((key) => key !== spaceKey)
|
|
300
|
+
});
|
|
264
301
|
return true;
|
|
265
302
|
}
|
|
266
303
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/migration-builder.ts", "../../../src/migrations.ts"],
|
|
4
|
-
"sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { next as A, type Doc } from '@automerge/automerge';\nimport { type AnyDocumentId, type DocumentId } from '@automerge/automerge-repo';\nimport type * as Schema from 'effect/Schema';\n\nimport { type Space } from '@dxos/client/echo';\nimport { CreateEpochRequest } from '@dxos/client/halo';\nimport {
|
|
5
|
-
"mappings": ";;;AAIA,SAASA,QAAQC,SAAmB;AAKpC,SAASC,0BAA0B;AACnC,
|
|
6
|
-
"names": ["next", "A", "CreateEpochRequest", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { next as A, type Doc } from '@automerge/automerge';\nimport { type AnyDocumentId, type DocumentId } from '@automerge/automerge-repo';\nimport type * as Schema from 'effect/Schema';\n\nimport { type Space } from '@dxos/client/echo';\nimport { CreateEpochRequest } from '@dxos/client/halo';\nimport { type DocHandleProxy, ObjectCore, type RepoProxy, migrateDocument } from '@dxos/echo-db';\nimport { type DatabaseDirectory, EncodedReference, type ObjectStructure, SpaceDocVersion } from '@dxos/echo-protocol';\nimport { getSchemaDXN } from '@dxos/echo/internal';\nimport { invariant } from '@dxos/invariant';\nimport { DXN } from '@dxos/keys';\nimport { type MaybePromise } from '@dxos/util';\n\n/*\n\nConsidering a better API for this:\n\n```ts\nconst migration = space.db.beginMigration(); // all actions are not visible to queries and are only applied once you call `apply`\n\nmigration.applyObjectMigration(defineMigration(From, To, { ... }));\n\nmigration.delete(id);\nmigration.add(obj);\n\nawait migration.apply(); // Will create new epoch.\n```\n\n*/\n\n// TODO(dmaretskyi): We no longer need to hook into ECHO internals, with the changes to echo APIs.\nexport class MigrationBuilder {\n private readonly _repo: RepoProxy;\n private readonly _rootDoc: Doc<DatabaseDirectory>;\n\n // echoId -> automergeUrl\n private readonly _newLinks: Record<string, string> = {};\n private readonly _flushIds: DocumentId[] = [];\n private readonly _deleteObjects: string[] = [];\n\n private _newRoot?: DocHandleProxy<DatabaseDirectory> = undefined;\n\n constructor(private readonly _space: Space) {\n this._repo = this._space.internal.db.coreDatabase._repo;\n // TODO(wittjosiah): Accessing private API.\n this._rootDoc = (this._space.internal.db.coreDatabase as any)._automergeDocLoader\n .getSpaceRootDocHandle()\n .doc() as Doc<DatabaseDirectory>;\n }\n\n async findObject(id: string): Promise<ObjectStructure | undefined> {\n const documentId = (this._rootDoc.links?.[id] || this._newLinks[id])?.toString() as AnyDocumentId | undefined;\n const docHandle = documentId && this._repo.find(documentId);\n if (!docHandle) {\n return undefined;\n }\n\n await docHandle.whenReady();\n const doc = docHandle.doc() as Doc<DatabaseDirectory>;\n return doc.objects?.[id];\n }\n\n async migrateObject(\n id: string,\n migrate: (objectStructure: ObjectStructure) => MaybePromise<{ schema: Schema.Schema.AnyNoContext; props: any }>,\n ): Promise<void> {\n const objectStructure = await this.findObject(id);\n if (!objectStructure) {\n return;\n }\n\n const { schema, props } = await migrate(objectStructure);\n\n const oldHandle = await this._findObjectContainingHandle(id);\n invariant(oldHandle);\n\n const newState: DatabaseDirectory = {\n version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [id]: {\n system: {\n type: EncodedReference.fromDXN(getSchemaDXN(schema)!),\n },\n data: props,\n meta: {\n keys: [],\n },\n },\n },\n };\n const migratedDoc = migrateDocument(oldHandle.doc() as Doc<DatabaseDirectory>, newState);\n const newHandle = this._repo.import<DatabaseDirectory>(A.save(migratedDoc));\n await newHandle.whenReady();\n invariant(newHandle.url, 'Migrated document URL not available after whenReady');\n this._newLinks[id] = newHandle.url;\n this._addHandleToFlushList(newHandle.documentId!);\n }\n\n async addObject(schema: Schema.Schema.AnyNoContext, props: any): Promise<string> {\n const core = await this._createObject({ schema, props });\n return core.id;\n }\n\n createReference(id: string) {\n return EncodedReference.fromDXN(DXN.fromLocalObjectId(id));\n }\n\n deleteObject(id: string): void {\n this._deleteObjects.push(id);\n }\n\n async changeProperties(changeFn: (properties: ObjectStructure) => void): Promise<void> {\n if (!this._newRoot) {\n await this._buildNewRoot();\n }\n invariant(this._newRoot, 'New root not created');\n\n this._newRoot.change((doc: DatabaseDirectory) => {\n const propertiesStructure = doc.objects?.[this._space.properties.id];\n propertiesStructure && changeFn(propertiesStructure);\n });\n await this._newRoot.whenReady();\n this._addHandleToFlushList(this._newRoot.documentId!);\n }\n\n /**\n * @internal\n */\n async _commit(): Promise<void> {\n if (!this._newRoot) {\n await this._buildNewRoot();\n }\n invariant(this._newRoot, 'New root not created');\n\n await this._space.db.flush();\n\n // Create new epoch.\n invariant(this._newRoot.url, 'New root URL not available');\n await this._space.internal.createEpoch({\n migration: CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT,\n automergeRootUrl: this._newRoot.url,\n });\n }\n\n private async _findObjectContainingHandle(id: string): Promise<DocHandleProxy<DatabaseDirectory> | undefined> {\n const documentId = (this._rootDoc.links?.[id] || this._newLinks[id])?.toString() as AnyDocumentId | undefined;\n const docHandle = documentId && this._repo.find(documentId);\n if (!docHandle) {\n return undefined;\n }\n\n await docHandle.whenReady();\n return docHandle;\n }\n\n private async _buildNewRoot(): Promise<void> {\n const links = { ...(this._rootDoc.links ?? {}) };\n for (const id of this._deleteObjects) {\n delete links[id];\n }\n\n for (const [id, url] of Object.entries(this._newLinks)) {\n links[id] = new A.RawString(url);\n }\n\n this._newRoot = this._repo.create<DatabaseDirectory>({\n version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: this._rootDoc.objects,\n links,\n });\n await this._newRoot.whenReady();\n this._addHandleToFlushList(this._newRoot.documentId!);\n }\n\n private async _createObject({\n id,\n schema,\n props,\n }: {\n id?: string;\n schema: Schema.Schema.AnyNoContext;\n props: any;\n }): Promise<ObjectCore> {\n const core = new ObjectCore();\n if (id) {\n core.id = id;\n }\n\n core.initNewObject(props);\n core.setType(EncodedReference.fromDXN(getSchemaDXN(schema)!));\n const newHandle = this._repo.create<DatabaseDirectory>({\n version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [core.id]: core.getDoc() as ObjectStructure,\n },\n });\n await newHandle.whenReady();\n this._newLinks[core.id] = newHandle.url!;\n this._addHandleToFlushList(newHandle.documentId!);\n\n return core;\n }\n\n private _addHandleToFlushList(id: DocumentId): void {\n this._flushIds.push(id);\n }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { Atom } from '@effect-atom/atom';\nimport * as Registry from '@effect-atom/atom/Registry';\n\nimport { type Space, SpaceState } from '@dxos/client/echo';\nimport { invariant } from '@dxos/invariant';\nimport { type MaybePromise } from '@dxos/util';\n\nimport { MigrationBuilder } from './migration-builder';\n\nexport type MigrationContext = {\n space: Space;\n builder: MigrationBuilder;\n};\n\nexport type Migration = {\n version: string;\n next: (context: MigrationContext) => MaybePromise<void>;\n};\n\nexport class Migrations {\n static namespace?: string;\n static migrations: Migration[] = [];\n private static _registry = Registry.make();\n private static _stateAtom = Atom.make<{ running: string[] }>({ running: [] }).pipe(Atom.keepAlive);\n\n static get versionProperty() {\n return this.namespace && `${this.namespace}.version`;\n }\n\n static get targetVersion() {\n return this.migrations[this.migrations.length - 1]?.version;\n }\n\n static running(space: Space): boolean {\n const state = this._registry.get(this._stateAtom);\n return state.running.includes(space.key.toHex());\n }\n\n static define(namespace: string, migrations: Migration[]): void {\n this.namespace = namespace;\n this.migrations = migrations;\n }\n\n static async migrate(space: Space, targetVersion?: string | number): Promise<boolean> {\n invariant(!this.running(space), 'Migration already running');\n invariant(this.versionProperty, 'Migrations namespace not set');\n invariant(space.state.get() === SpaceState.SPACE_READY, 'Space not ready');\n const currentVersion = space.properties[this.versionProperty];\n const currentIndex = this.migrations.findIndex((m) => m.version === currentVersion) + 1;\n const i = this.migrations.findIndex((m) => m.version === targetVersion);\n const targetIndex = i === -1 ? this.migrations.length : i + 1;\n if (currentIndex === targetIndex) {\n return false;\n }\n\n const spaceKey = space.key.toHex();\n const currentState = this._registry.get(this._stateAtom);\n this._registry.set(this._stateAtom, { running: [...currentState.running, spaceKey] });\n if (targetIndex > currentIndex) {\n const migrations = this.migrations.slice(currentIndex, targetIndex);\n for (const migration of migrations) {\n const builder = new MigrationBuilder(space);\n await migration.next({ space, builder });\n await builder.changeProperties((propertiesStructure) => {\n invariant(this.versionProperty, 'Migrations namespace not set');\n propertiesStructure.data[this.versionProperty] = migration.version;\n });\n await builder._commit();\n }\n }\n const finalState = this._registry.get(this._stateAtom);\n this._registry.set(this._stateAtom, { running: finalState.running.filter((key) => key !== spaceKey) });\n\n return true;\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["next", "A", "CreateEpochRequest", "ObjectCore", "migrateDocument", "EncodedReference", "SpaceDocVersion", "getSchemaDXN", "invariant", "DXN", "MigrationBuilder", "_repo", "_rootDoc", "_newLinks", "_flushIds", "_deleteObjects", "_newRoot", "undefined", "_space", "internal", "db", "coreDatabase", "_automergeDocLoader", "getSpaceRootDocHandle", "doc", "findObject", "id", "documentId", "links", "toString", "docHandle", "find", "whenReady", "objects", "migrateObject", "migrate", "objectStructure", "schema", "props", "oldHandle", "_findObjectContainingHandle", "newState", "version", "CURRENT", "access", "spaceKey", "key", "toHex", "system", "type", "fromDXN", "data", "meta", "keys", "migratedDoc", "newHandle", "import", "save", "url", "_addHandleToFlushList", "addObject", "core", "_createObject", "createReference", "fromLocalObjectId", "deleteObject", "push", "changeProperties", "changeFn", "_buildNewRoot", "change", "propertiesStructure", "properties", "_commit", "flush", "createEpoch", "migration", "Migration", "REPLACE_AUTOMERGE_ROOT", "automergeRootUrl", "Object", "entries", "RawString", "create", "initNewObject", "setType", "getDoc", "Atom", "Registry", "SpaceState", "invariant", "Migrations", "namespace", "migrations", "_registry", "make", "_stateAtom", "Atom", "running", "pipe", "keepAlive", "versionProperty", "targetVersion", "length", "version", "space", "state", "get", "includes", "key", "toHex", "define", "migrate", "invariant", "SpaceState", "SPACE_READY", "currentVersion", "properties", "currentIndex", "findIndex", "m", "i", "targetIndex", "spaceKey", "currentState", "set", "slice", "migration", "builder", "MigrationBuilder", "next", "changeProperties", "propertiesStructure", "data", "_commit", "finalState", "filter"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"src/migration-builder.ts":{"bytes":
|
|
1
|
+
{"inputs":{"src/migration-builder.ts":{"bytes":23919,"imports":[{"path":"@automerge/automerge","kind":"import-statement","external":true},{"path":"@dxos/client/halo","kind":"import-statement","external":true},{"path":"@dxos/echo-db","kind":"import-statement","external":true},{"path":"@dxos/echo-protocol","kind":"import-statement","external":true},{"path":"@dxos/echo/internal","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true}],"format":"esm"},"src/migrations.ts":{"bytes":11487,"imports":[{"path":"@effect-atom/atom","kind":"import-statement","external":true},{"path":"@effect-atom/atom/Registry","kind":"import-statement","external":true},{"path":"@dxos/client/echo","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"src/migration-builder.ts","kind":"import-statement","original":"./migration-builder"}],"format":"esm"},"src/index.ts":{"bytes":653,"imports":[{"path":"src/migration-builder.ts","kind":"import-statement","original":"./migration-builder"},{"path":"src/migrations.ts","kind":"import-statement","original":"./migrations"}],"format":"esm"}},"outputs":{"dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":17171},"dist/lib/node-esm/index.mjs":{"imports":[{"path":"@automerge/automerge","kind":"import-statement","external":true},{"path":"@dxos/client/halo","kind":"import-statement","external":true},{"path":"@dxos/echo-db","kind":"import-statement","external":true},{"path":"@dxos/echo-protocol","kind":"import-statement","external":true},{"path":"@dxos/echo/internal","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@effect-atom/atom","kind":"import-statement","external":true},{"path":"@effect-atom/atom/Registry","kind":"import-statement","external":true},{"path":"@dxos/client/echo","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true}],"exports":["MigrationBuilder","Migrations"],"entryPoint":"src/index.ts","inputs":{"src/migration-builder.ts":{"bytesInOutput":5571},"src/index.ts":{"bytesInOutput":0},"src/migrations.ts":{"bytesInOutput":3215}},"bytes":9009}}}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type * as Schema from 'effect/Schema';
|
|
2
2
|
import { type Space } from '@dxos/client/echo';
|
|
3
|
-
import { type ObjectStructure } from '@dxos/echo-protocol';
|
|
3
|
+
import { EncodedReference, type ObjectStructure } from '@dxos/echo-protocol';
|
|
4
4
|
import { type MaybePromise } from '@dxos/util';
|
|
5
5
|
export declare class MigrationBuilder {
|
|
6
6
|
private readonly _space;
|
|
@@ -17,9 +17,9 @@ export declare class MigrationBuilder {
|
|
|
17
17
|
props: any;
|
|
18
18
|
}>): Promise<void>;
|
|
19
19
|
addObject(schema: Schema.Schema.AnyNoContext, props: any): Promise<string>;
|
|
20
|
-
createReference(id: string):
|
|
20
|
+
createReference(id: string): EncodedReference;
|
|
21
21
|
deleteObject(id: string): void;
|
|
22
|
-
changeProperties(changeFn: (properties: ObjectStructure) => void): void
|
|
22
|
+
changeProperties(changeFn: (properties: ObjectStructure) => void): Promise<void>;
|
|
23
23
|
private _findObjectContainingHandle;
|
|
24
24
|
private _buildNewRoot;
|
|
25
25
|
private _createObject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration-builder.d.ts","sourceRoot":"","sources":["../../../src/migration-builder.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"migration-builder.d.ts","sourceRoot":"","sources":["../../../src/migration-builder.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG/C,OAAO,EAA0B,gBAAgB,EAAE,KAAK,eAAe,EAAmB,MAAM,qBAAqB,CAAC;AAItH,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAoB/C,qBAAa,gBAAgB;IAWf,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAY;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAGlD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;IACxD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAE/C,OAAO,CAAC,QAAQ,CAAC,CAAgD;gBAEpC,MAAM,EAAE,KAAK;IAQpC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAY5D,aAAa,CACjB,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,YAAY,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC,GAC9G,OAAO,CAAC,IAAI,CAAC;IAoCV,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAKhF,eAAe,CAAC,EAAE,EAAE,MAAM;IAI1B,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAIxB,gBAAgB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAiCxE,2BAA2B;YAW3B,aAAa;YAsBb,aAAa;IAgC3B,OAAO,CAAC,qBAAqB;CAG9B"}
|
|
@@ -12,7 +12,8 @@ export type Migration = {
|
|
|
12
12
|
export declare class Migrations {
|
|
13
13
|
static namespace?: string;
|
|
14
14
|
static migrations: Migration[];
|
|
15
|
-
private static
|
|
15
|
+
private static _registry;
|
|
16
|
+
private static _stateAtom;
|
|
16
17
|
static get versionProperty(): string | undefined;
|
|
17
18
|
static get targetVersion(): string;
|
|
18
19
|
static running(space: Space): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../src/migrations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../src/migrations.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,KAAK,EAAc,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,gBAAgB,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACzD,CAAC;AAEF,qBAAa,UAAU;IACrB,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,CAAM;IACpC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAmB;IAC3C,OAAO,CAAC,MAAM,CAAC,UAAU,CAA0E;IAEnG,MAAM,KAAK,eAAe,uBAEzB;IAED,MAAM,KAAK,aAAa,WAEvB;IAED,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAKrC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;WAKlD,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAgCtF"}
|