@dxos/migrations 0.5.9-main.44fe51d → 0.5.9-main.5d72625
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/lib/browser/index.mjs +20 -54
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node/index.cjs +17 -51
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/types/src/migration-builder.d.ts +0 -2
- package/dist/types/src/migration-builder.d.ts.map +1 -1
- package/package.json +10 -10
- package/src/migration-builder.ts +16 -51
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// packages/sdk/migrations/src/migration-builder.ts
|
|
2
|
-
import {
|
|
2
|
+
import { getHeads } from "@dxos/automerge/automerge";
|
|
3
3
|
import { CreateEpochRequest } from "@dxos/client/halo";
|
|
4
|
-
import { ObjectCore
|
|
5
|
-
import {
|
|
4
|
+
import { ObjectCore } from "@dxos/echo-db";
|
|
5
|
+
import { encodeReference, Reference } from "@dxos/echo-protocol";
|
|
6
6
|
import { requireTypeReference } from "@dxos/echo-schema";
|
|
7
7
|
import { invariant } from "@dxos/invariant";
|
|
8
8
|
var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/migrations/src/migration-builder.ts";
|
|
@@ -33,37 +33,11 @@ var MigrationBuilder = class {
|
|
|
33
33
|
return;
|
|
34
34
|
}
|
|
35
35
|
const { schema, props } = await migrate(objectStructure);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
S: this,
|
|
41
|
-
A: [
|
|
42
|
-
"oldHandle",
|
|
43
|
-
""
|
|
44
|
-
]
|
|
36
|
+
this._createObject({
|
|
37
|
+
id,
|
|
38
|
+
schema,
|
|
39
|
+
props
|
|
45
40
|
});
|
|
46
|
-
const newState = {
|
|
47
|
-
version: SpaceDocVersion.CURRENT,
|
|
48
|
-
access: {
|
|
49
|
-
spaceKey: this._space.key.toHex()
|
|
50
|
-
},
|
|
51
|
-
objects: {
|
|
52
|
-
[id]: {
|
|
53
|
-
system: {
|
|
54
|
-
type: encodeReference(requireTypeReference(schema))
|
|
55
|
-
},
|
|
56
|
-
data: props,
|
|
57
|
-
meta: {
|
|
58
|
-
keys: []
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
};
|
|
63
|
-
const migratedDoc = migrateDocument(oldHandle.docSync(), newState);
|
|
64
|
-
const newHandle = this._repo.import(am.save(migratedDoc));
|
|
65
|
-
this._newLinks[id] = newHandle.url;
|
|
66
|
-
this._addHandleToFlushList(newHandle);
|
|
67
41
|
}
|
|
68
42
|
async addObject(schema, props) {
|
|
69
43
|
const core = this._createObject({
|
|
@@ -84,7 +58,7 @@ var MigrationBuilder = class {
|
|
|
84
58
|
}
|
|
85
59
|
invariant(this._newRoot, "New root not created", {
|
|
86
60
|
F: __dxlog_file,
|
|
87
|
-
L:
|
|
61
|
+
L: 79,
|
|
88
62
|
S: this,
|
|
89
63
|
A: [
|
|
90
64
|
"this._newRoot",
|
|
@@ -95,7 +69,10 @@ var MigrationBuilder = class {
|
|
|
95
69
|
const propertiesStructure = doc.objects?.[this._space.properties.id];
|
|
96
70
|
propertiesStructure && changeFn(propertiesStructure);
|
|
97
71
|
});
|
|
98
|
-
this.
|
|
72
|
+
this._flushStates.push({
|
|
73
|
+
documentId: this._newRoot.documentId,
|
|
74
|
+
heads: getHeads(this._newRoot.docSync())
|
|
75
|
+
});
|
|
99
76
|
}
|
|
100
77
|
/**
|
|
101
78
|
* @internal
|
|
@@ -106,7 +83,7 @@ var MigrationBuilder = class {
|
|
|
106
83
|
}
|
|
107
84
|
invariant(this._newRoot, "New root not created", {
|
|
108
85
|
F: __dxlog_file,
|
|
109
|
-
L:
|
|
86
|
+
L: 98,
|
|
110
87
|
S: this,
|
|
111
88
|
A: [
|
|
112
89
|
"this._newRoot",
|
|
@@ -121,15 +98,6 @@ var MigrationBuilder = class {
|
|
|
121
98
|
automergeRootUrl: this._newRoot.url
|
|
122
99
|
});
|
|
123
100
|
}
|
|
124
|
-
async _findObjectContainingHandle(id) {
|
|
125
|
-
const documentId = this._rootDoc.links?.[id] || this._newLinks[id];
|
|
126
|
-
const docHandle = documentId && this._repo.find(documentId);
|
|
127
|
-
if (!docHandle) {
|
|
128
|
-
return void 0;
|
|
129
|
-
}
|
|
130
|
-
await docHandle.whenReady();
|
|
131
|
-
return docHandle;
|
|
132
|
-
}
|
|
133
101
|
_buildNewRoot() {
|
|
134
102
|
const previousLinks = {
|
|
135
103
|
...this._rootDoc.links ?? {}
|
|
@@ -138,7 +106,6 @@ var MigrationBuilder = class {
|
|
|
138
106
|
delete previousLinks[id];
|
|
139
107
|
}
|
|
140
108
|
this._newRoot = this._repo.create({
|
|
141
|
-
version: SpaceDocVersion.CURRENT,
|
|
142
109
|
access: {
|
|
143
110
|
spaceKey: this._space.key.toHex()
|
|
144
111
|
},
|
|
@@ -148,7 +115,10 @@ var MigrationBuilder = class {
|
|
|
148
115
|
...this._newLinks
|
|
149
116
|
}
|
|
150
117
|
});
|
|
151
|
-
this.
|
|
118
|
+
this._flushStates.push({
|
|
119
|
+
documentId: this._newRoot.documentId,
|
|
120
|
+
heads: getHeads(this._newRoot.docSync())
|
|
121
|
+
});
|
|
152
122
|
}
|
|
153
123
|
_createObject({ id, schema, props }) {
|
|
154
124
|
const core = new ObjectCore();
|
|
@@ -158,7 +128,6 @@ var MigrationBuilder = class {
|
|
|
158
128
|
core.initNewObject(props);
|
|
159
129
|
core.setType(requireTypeReference(schema));
|
|
160
130
|
const newHandle = this._repo.create({
|
|
161
|
-
version: SpaceDocVersion.CURRENT,
|
|
162
131
|
access: {
|
|
163
132
|
spaceKey: this._space.key.toHex()
|
|
164
133
|
},
|
|
@@ -167,14 +136,11 @@ var MigrationBuilder = class {
|
|
|
167
136
|
}
|
|
168
137
|
});
|
|
169
138
|
this._newLinks[core.id] = newHandle.url;
|
|
170
|
-
this._addHandleToFlushList(newHandle);
|
|
171
|
-
return core;
|
|
172
|
-
}
|
|
173
|
-
_addHandleToFlushList(handle) {
|
|
174
139
|
this._flushStates.push({
|
|
175
|
-
documentId:
|
|
176
|
-
heads:
|
|
140
|
+
documentId: newHandle.documentId,
|
|
141
|
+
heads: getHeads(newHandle.docSync())
|
|
177
142
|
});
|
|
143
|
+
return core;
|
|
178
144
|
}
|
|
179
145
|
};
|
|
180
146
|
|
|
@@ -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 { type Doc,
|
|
5
|
-
"mappings": ";AAIA,SAAmBA,
|
|
6
|
-
"names": ["
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Doc, getHeads } from '@dxos/automerge/automerge';\nimport { type AnyDocumentId, type DocHandle, type Repo } from '@dxos/automerge/automerge-repo';\nimport { type Space } from '@dxos/client/echo';\nimport { CreateEpochRequest } from '@dxos/client/halo';\nimport { type AutomergeContext, ObjectCore } from '@dxos/echo-db';\nimport { encodeReference, type ObjectStructure, Reference, type SpaceDoc } from '@dxos/echo-protocol';\nimport { requireTypeReference, type S } from '@dxos/echo-schema';\nimport { invariant } from '@dxos/invariant';\nimport { type FlushRequest } from '@dxos/protocols/proto/dxos/echo/service';\nimport { type MaybePromise } from '@dxos/util';\n\nexport class MigrationBuilder {\n private readonly _repo: Repo;\n private readonly _automergeContext: AutomergeContext;\n private readonly _rootDoc: Doc<SpaceDoc>;\n\n // echoId -> automergeUrl\n private readonly _newLinks: Record<string, string> = {};\n private readonly _flushStates: FlushRequest.DocState[] = [];\n private readonly _deleteObjects: string[] = [];\n\n private _newRoot?: DocHandle<SpaceDoc> = undefined;\n\n constructor(private readonly _space: Space) {\n this._repo = this._space.db.coreDatabase.automerge.repo;\n this._automergeContext = this._space.db.coreDatabase.automerge;\n // TODO(wittjosiah): Accessing private API.\n this._rootDoc = (this._space.db.coreDatabase as any)._automergeDocLoader\n .getSpaceRootDocHandle()\n .docSync() as Doc<SpaceDoc>;\n }\n\n async findObject(id: string): Promise<ObjectStructure | undefined> {\n const documentId = (this._rootDoc.links?.[id] || this._newLinks[id]) 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.docSync() as Doc<SpaceDoc>;\n return doc.objects?.[id];\n }\n\n async migrateObject(\n id: string,\n migrate: (objectStructure: ObjectStructure) => MaybePromise<{ schema: S.Schema<any>; props: any }>,\n ) {\n const objectStructure = await this.findObject(id);\n if (!objectStructure) {\n return;\n }\n\n const { schema, props } = await migrate(objectStructure);\n this._createObject({ id, schema, props });\n }\n\n async addObject(schema: S.Schema<any>, props: any) {\n const core = this._createObject({ schema, props });\n return core.id;\n }\n\n createReference(id: string) {\n return encodeReference(new Reference(id));\n }\n\n deleteObject(id: string) {\n this._deleteObjects.push(id);\n }\n\n changeProperties(changeFn: (properties: ObjectStructure) => void) {\n if (!this._newRoot) {\n this._buildNewRoot();\n }\n invariant(this._newRoot, 'New root not created');\n\n this._newRoot.change((doc: SpaceDoc) => {\n const propertiesStructure = doc.objects?.[this._space.properties.id];\n propertiesStructure && changeFn(propertiesStructure);\n });\n this._flushStates.push({\n documentId: this._newRoot.documentId,\n heads: getHeads(this._newRoot.docSync()),\n });\n }\n\n /**\n * @internal\n */\n async _commit() {\n if (!this._newRoot) {\n this._buildNewRoot();\n }\n invariant(this._newRoot, 'New root not created');\n\n await this._automergeContext.flush({\n states: this._flushStates,\n });\n\n // Create new epoch.\n await this._space.internal.createEpoch({\n migration: CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT,\n automergeRootUrl: this._newRoot.url,\n });\n }\n\n private _buildNewRoot() {\n const previousLinks = { ...(this._rootDoc.links ?? {}) };\n for (const id of this._deleteObjects) {\n delete previousLinks[id];\n }\n\n this._newRoot = this._repo.create<SpaceDoc>({\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: this._rootDoc.objects,\n links: {\n ...previousLinks,\n ...this._newLinks,\n },\n });\n this._flushStates.push({\n documentId: this._newRoot.documentId,\n heads: getHeads(this._newRoot.docSync()),\n });\n }\n\n private _createObject({ id, schema, props }: { id?: string; schema: S.Schema<any>; props: any }) {\n const core = new ObjectCore();\n if (id) {\n core.id = id;\n }\n\n core.initNewObject(props);\n core.setType(requireTypeReference(schema));\n const newHandle = this._repo.create<SpaceDoc>({\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [core.id]: core.getDoc(),\n },\n });\n this._newLinks[core.id] = newHandle.url;\n this._flushStates.push({\n documentId: newHandle.documentId,\n heads: getHeads(newHandle.docSync()),\n });\n\n return core;\n }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { type Space, create, 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 _state = create<{ running: string[] }>({ running: [] });\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) {\n return this._state.running.includes(space.key.toHex());\n }\n\n static define(namespace: string, migrations: Migration[]) {\n this.namespace = namespace;\n this.migrations = migrations;\n }\n\n static async migrate(space: Space, targetVersion?: string | number) {\n invariant(!this.running(space), 'Migration already running');\n invariant(this.versionProperty, 'Migrations namespace not set');\n invariant(space.state.get() === SpaceState.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 this._state.running.push(space.key.toHex());\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 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 this._state.running.splice(this._state.running.indexOf(space.key.toHex()), 1);\n\n return true;\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["getHeads", "CreateEpochRequest", "ObjectCore", "encodeReference", "Reference", "requireTypeReference", "invariant", "MigrationBuilder", "constructor", "_space", "_newLinks", "_flushStates", "_deleteObjects", "_newRoot", "undefined", "_repo", "db", "coreDatabase", "automerge", "repo", "_automergeContext", "_rootDoc", "_automergeDocLoader", "getSpaceRootDocHandle", "docSync", "findObject", "id", "documentId", "links", "docHandle", "find", "whenReady", "doc", "objects", "migrateObject", "migrate", "objectStructure", "schema", "props", "_createObject", "addObject", "core", "createReference", "deleteObject", "push", "changeProperties", "changeFn", "_buildNewRoot", "change", "propertiesStructure", "properties", "heads", "_commit", "flush", "states", "internal", "createEpoch", "migration", "Migration", "REPLACE_AUTOMERGE_ROOT", "automergeRootUrl", "url", "previousLinks", "create", "access", "spaceKey", "key", "toHex", "initNewObject", "setType", "newHandle", "getDoc", "create", "SpaceState", "invariant", "Migrations", "migrations", "_state", "create", "running", "versionProperty", "namespace", "targetVersion", "length", "version", "space", "includes", "key", "toHex", "define", "migrate", "invariant", "state", "get", "SpaceState", "READY", "currentVersion", "properties", "currentIndex", "findIndex", "m", "i", "targetIndex", "push", "slice", "migration", "builder", "MigrationBuilder", "next", "changeProperties", "propertiesStructure", "data", "_commit", "splice", "indexOf"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"packages/sdk/migrations/src/migration-builder.ts":{"bytes":
|
|
1
|
+
{"inputs":{"packages/sdk/migrations/src/migration-builder.ts":{"bytes":17544,"imports":[{"path":"@dxos/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-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true}],"format":"esm"},"packages/sdk/migrations/src/migrations.ts":{"bytes":9817,"imports":[{"path":"@dxos/client/echo","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"packages/sdk/migrations/src/migration-builder.ts","kind":"import-statement","original":"./migration-builder"}],"format":"esm"},"packages/sdk/migrations/src/index.ts":{"bytes":698,"imports":[{"path":"packages/sdk/migrations/src/migration-builder.ts","kind":"import-statement","original":"./migration-builder"},{"path":"packages/sdk/migrations/src/migrations.ts","kind":"import-statement","original":"./migrations"}],"format":"esm"}},"outputs":{"packages/sdk/migrations/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":13051},"packages/sdk/migrations/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/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-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","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":"packages/sdk/migrations/src/index.ts","inputs":{"packages/sdk/migrations/src/migration-builder.ts":{"bytesInOutput":3936},"packages/sdk/migrations/src/index.ts":{"bytesInOutput":0},"packages/sdk/migrations/src/migrations.ts":{"bytesInOutput":2745}},"bytes":6859}}}
|
package/dist/lib/node/index.cjs
CHANGED
|
@@ -58,37 +58,11 @@ var MigrationBuilder = class {
|
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
60
|
const { schema, props } = await migrate(objectStructure);
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
S: this,
|
|
66
|
-
A: [
|
|
67
|
-
"oldHandle",
|
|
68
|
-
""
|
|
69
|
-
]
|
|
61
|
+
this._createObject({
|
|
62
|
+
id,
|
|
63
|
+
schema,
|
|
64
|
+
props
|
|
70
65
|
});
|
|
71
|
-
const newState = {
|
|
72
|
-
version: import_echo_protocol.SpaceDocVersion.CURRENT,
|
|
73
|
-
access: {
|
|
74
|
-
spaceKey: this._space.key.toHex()
|
|
75
|
-
},
|
|
76
|
-
objects: {
|
|
77
|
-
[id]: {
|
|
78
|
-
system: {
|
|
79
|
-
type: (0, import_echo_protocol.encodeReference)((0, import_echo_schema.requireTypeReference)(schema))
|
|
80
|
-
},
|
|
81
|
-
data: props,
|
|
82
|
-
meta: {
|
|
83
|
-
keys: []
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
};
|
|
88
|
-
const migratedDoc = (0, import_echo_db.migrateDocument)(oldHandle.docSync(), newState);
|
|
89
|
-
const newHandle = this._repo.import(import_automerge.next.save(migratedDoc));
|
|
90
|
-
this._newLinks[id] = newHandle.url;
|
|
91
|
-
this._addHandleToFlushList(newHandle);
|
|
92
66
|
}
|
|
93
67
|
async addObject(schema, props) {
|
|
94
68
|
const core = this._createObject({
|
|
@@ -109,7 +83,7 @@ var MigrationBuilder = class {
|
|
|
109
83
|
}
|
|
110
84
|
(0, import_invariant.invariant)(this._newRoot, "New root not created", {
|
|
111
85
|
F: __dxlog_file,
|
|
112
|
-
L:
|
|
86
|
+
L: 79,
|
|
113
87
|
S: this,
|
|
114
88
|
A: [
|
|
115
89
|
"this._newRoot",
|
|
@@ -120,7 +94,10 @@ var MigrationBuilder = class {
|
|
|
120
94
|
const propertiesStructure = doc.objects?.[this._space.properties.id];
|
|
121
95
|
propertiesStructure && changeFn(propertiesStructure);
|
|
122
96
|
});
|
|
123
|
-
this.
|
|
97
|
+
this._flushStates.push({
|
|
98
|
+
documentId: this._newRoot.documentId,
|
|
99
|
+
heads: (0, import_automerge.getHeads)(this._newRoot.docSync())
|
|
100
|
+
});
|
|
124
101
|
}
|
|
125
102
|
/**
|
|
126
103
|
* @internal
|
|
@@ -131,7 +108,7 @@ var MigrationBuilder = class {
|
|
|
131
108
|
}
|
|
132
109
|
(0, import_invariant.invariant)(this._newRoot, "New root not created", {
|
|
133
110
|
F: __dxlog_file,
|
|
134
|
-
L:
|
|
111
|
+
L: 98,
|
|
135
112
|
S: this,
|
|
136
113
|
A: [
|
|
137
114
|
"this._newRoot",
|
|
@@ -146,15 +123,6 @@ var MigrationBuilder = class {
|
|
|
146
123
|
automergeRootUrl: this._newRoot.url
|
|
147
124
|
});
|
|
148
125
|
}
|
|
149
|
-
async _findObjectContainingHandle(id) {
|
|
150
|
-
const documentId = this._rootDoc.links?.[id] || this._newLinks[id];
|
|
151
|
-
const docHandle = documentId && this._repo.find(documentId);
|
|
152
|
-
if (!docHandle) {
|
|
153
|
-
return void 0;
|
|
154
|
-
}
|
|
155
|
-
await docHandle.whenReady();
|
|
156
|
-
return docHandle;
|
|
157
|
-
}
|
|
158
126
|
_buildNewRoot() {
|
|
159
127
|
const previousLinks = {
|
|
160
128
|
...this._rootDoc.links ?? {}
|
|
@@ -163,7 +131,6 @@ var MigrationBuilder = class {
|
|
|
163
131
|
delete previousLinks[id];
|
|
164
132
|
}
|
|
165
133
|
this._newRoot = this._repo.create({
|
|
166
|
-
version: import_echo_protocol.SpaceDocVersion.CURRENT,
|
|
167
134
|
access: {
|
|
168
135
|
spaceKey: this._space.key.toHex()
|
|
169
136
|
},
|
|
@@ -173,7 +140,10 @@ var MigrationBuilder = class {
|
|
|
173
140
|
...this._newLinks
|
|
174
141
|
}
|
|
175
142
|
});
|
|
176
|
-
this.
|
|
143
|
+
this._flushStates.push({
|
|
144
|
+
documentId: this._newRoot.documentId,
|
|
145
|
+
heads: (0, import_automerge.getHeads)(this._newRoot.docSync())
|
|
146
|
+
});
|
|
177
147
|
}
|
|
178
148
|
_createObject({ id, schema, props }) {
|
|
179
149
|
const core = new import_echo_db.ObjectCore();
|
|
@@ -183,7 +153,6 @@ var MigrationBuilder = class {
|
|
|
183
153
|
core.initNewObject(props);
|
|
184
154
|
core.setType((0, import_echo_schema.requireTypeReference)(schema));
|
|
185
155
|
const newHandle = this._repo.create({
|
|
186
|
-
version: import_echo_protocol.SpaceDocVersion.CURRENT,
|
|
187
156
|
access: {
|
|
188
157
|
spaceKey: this._space.key.toHex()
|
|
189
158
|
},
|
|
@@ -192,14 +161,11 @@ var MigrationBuilder = class {
|
|
|
192
161
|
}
|
|
193
162
|
});
|
|
194
163
|
this._newLinks[core.id] = newHandle.url;
|
|
195
|
-
this._addHandleToFlushList(newHandle);
|
|
196
|
-
return core;
|
|
197
|
-
}
|
|
198
|
-
_addHandleToFlushList(handle) {
|
|
199
164
|
this._flushStates.push({
|
|
200
|
-
documentId:
|
|
201
|
-
heads: import_automerge.
|
|
165
|
+
documentId: newHandle.documentId,
|
|
166
|
+
heads: (0, import_automerge.getHeads)(newHandle.docSync())
|
|
202
167
|
});
|
|
168
|
+
return core;
|
|
203
169
|
}
|
|
204
170
|
};
|
|
205
171
|
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/migrations/src/migrations.ts";
|
|
@@ -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 { type Doc,
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAIA,
|
|
6
|
-
"names": ["import_invariant", "MigrationBuilder", "constructor", "_space", "_newLinks", "_flushStates", "_deleteObjects", "_newRoot", "undefined", "_repo", "db", "coreDatabase", "automerge", "repo", "_automergeContext", "_rootDoc", "_automergeDocLoader", "getSpaceRootDocHandle", "docSync", "findObject", "id", "documentId", "links", "docHandle", "find", "whenReady", "doc", "objects", "migrateObject", "migrate", "objectStructure", "schema", "props", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Doc, getHeads } from '@dxos/automerge/automerge';\nimport { type AnyDocumentId, type DocHandle, type Repo } from '@dxos/automerge/automerge-repo';\nimport { type Space } from '@dxos/client/echo';\nimport { CreateEpochRequest } from '@dxos/client/halo';\nimport { type AutomergeContext, ObjectCore } from '@dxos/echo-db';\nimport { encodeReference, type ObjectStructure, Reference, type SpaceDoc } from '@dxos/echo-protocol';\nimport { requireTypeReference, type S } from '@dxos/echo-schema';\nimport { invariant } from '@dxos/invariant';\nimport { type FlushRequest } from '@dxos/protocols/proto/dxos/echo/service';\nimport { type MaybePromise } from '@dxos/util';\n\nexport class MigrationBuilder {\n private readonly _repo: Repo;\n private readonly _automergeContext: AutomergeContext;\n private readonly _rootDoc: Doc<SpaceDoc>;\n\n // echoId -> automergeUrl\n private readonly _newLinks: Record<string, string> = {};\n private readonly _flushStates: FlushRequest.DocState[] = [];\n private readonly _deleteObjects: string[] = [];\n\n private _newRoot?: DocHandle<SpaceDoc> = undefined;\n\n constructor(private readonly _space: Space) {\n this._repo = this._space.db.coreDatabase.automerge.repo;\n this._automergeContext = this._space.db.coreDatabase.automerge;\n // TODO(wittjosiah): Accessing private API.\n this._rootDoc = (this._space.db.coreDatabase as any)._automergeDocLoader\n .getSpaceRootDocHandle()\n .docSync() as Doc<SpaceDoc>;\n }\n\n async findObject(id: string): Promise<ObjectStructure | undefined> {\n const documentId = (this._rootDoc.links?.[id] || this._newLinks[id]) 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.docSync() as Doc<SpaceDoc>;\n return doc.objects?.[id];\n }\n\n async migrateObject(\n id: string,\n migrate: (objectStructure: ObjectStructure) => MaybePromise<{ schema: S.Schema<any>; props: any }>,\n ) {\n const objectStructure = await this.findObject(id);\n if (!objectStructure) {\n return;\n }\n\n const { schema, props } = await migrate(objectStructure);\n this._createObject({ id, schema, props });\n }\n\n async addObject(schema: S.Schema<any>, props: any) {\n const core = this._createObject({ schema, props });\n return core.id;\n }\n\n createReference(id: string) {\n return encodeReference(new Reference(id));\n }\n\n deleteObject(id: string) {\n this._deleteObjects.push(id);\n }\n\n changeProperties(changeFn: (properties: ObjectStructure) => void) {\n if (!this._newRoot) {\n this._buildNewRoot();\n }\n invariant(this._newRoot, 'New root not created');\n\n this._newRoot.change((doc: SpaceDoc) => {\n const propertiesStructure = doc.objects?.[this._space.properties.id];\n propertiesStructure && changeFn(propertiesStructure);\n });\n this._flushStates.push({\n documentId: this._newRoot.documentId,\n heads: getHeads(this._newRoot.docSync()),\n });\n }\n\n /**\n * @internal\n */\n async _commit() {\n if (!this._newRoot) {\n this._buildNewRoot();\n }\n invariant(this._newRoot, 'New root not created');\n\n await this._automergeContext.flush({\n states: this._flushStates,\n });\n\n // Create new epoch.\n await this._space.internal.createEpoch({\n migration: CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT,\n automergeRootUrl: this._newRoot.url,\n });\n }\n\n private _buildNewRoot() {\n const previousLinks = { ...(this._rootDoc.links ?? {}) };\n for (const id of this._deleteObjects) {\n delete previousLinks[id];\n }\n\n this._newRoot = this._repo.create<SpaceDoc>({\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: this._rootDoc.objects,\n links: {\n ...previousLinks,\n ...this._newLinks,\n },\n });\n this._flushStates.push({\n documentId: this._newRoot.documentId,\n heads: getHeads(this._newRoot.docSync()),\n });\n }\n\n private _createObject({ id, schema, props }: { id?: string; schema: S.Schema<any>; props: any }) {\n const core = new ObjectCore();\n if (id) {\n core.id = id;\n }\n\n core.initNewObject(props);\n core.setType(requireTypeReference(schema));\n const newHandle = this._repo.create<SpaceDoc>({\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [core.id]: core.getDoc(),\n },\n });\n this._newLinks[core.id] = newHandle.url;\n this._flushStates.push({\n documentId: newHandle.documentId,\n heads: getHeads(newHandle.docSync()),\n });\n\n return core;\n }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { type Space, create, 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 _state = create<{ running: string[] }>({ running: [] });\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) {\n return this._state.running.includes(space.key.toHex());\n }\n\n static define(namespace: string, migrations: Migration[]) {\n this.namespace = namespace;\n this.migrations = migrations;\n }\n\n static async migrate(space: Space, targetVersion?: string | number) {\n invariant(!this.running(space), 'Migration already running');\n invariant(this.versionProperty, 'Migrations namespace not set');\n invariant(space.state.get() === SpaceState.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 this._state.running.push(space.key.toHex());\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 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 this._state.running.splice(this._state.running.indexOf(space.key.toHex()), 1);\n\n return true;\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["import_invariant", "MigrationBuilder", "constructor", "_space", "_newLinks", "_flushStates", "_deleteObjects", "_newRoot", "undefined", "_repo", "db", "coreDatabase", "automerge", "repo", "_automergeContext", "_rootDoc", "_automergeDocLoader", "getSpaceRootDocHandle", "docSync", "findObject", "id", "documentId", "links", "docHandle", "find", "whenReady", "doc", "objects", "migrateObject", "migrate", "objectStructure", "schema", "props", "_createObject", "addObject", "core", "createReference", "encodeReference", "Reference", "deleteObject", "push", "changeProperties", "changeFn", "_buildNewRoot", "invariant", "change", "propertiesStructure", "properties", "heads", "getHeads", "_commit", "flush", "states", "internal", "createEpoch", "migration", "CreateEpochRequest", "Migration", "REPLACE_AUTOMERGE_ROOT", "automergeRootUrl", "url", "previousLinks", "create", "access", "spaceKey", "key", "toHex", "ObjectCore", "initNewObject", "setType", "requireTypeReference", "newHandle", "getDoc", "Migrations", "migrations", "_state", "running", "versionProperty", "namespace", "targetVersion", "length", "version", "space", "includes", "define", "state", "get", "SpaceState", "READY", "currentVersion", "currentIndex", "findIndex", "m", "i", "targetIndex", "slice", "builder", "next", "data", "splice", "indexOf"]
|
|
7
7
|
}
|
package/dist/lib/node/meta.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"packages/sdk/migrations/src/migration-builder.ts":{"bytes":
|
|
1
|
+
{"inputs":{"packages/sdk/migrations/src/migration-builder.ts":{"bytes":17544,"imports":[{"path":"@dxos/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-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true}],"format":"esm"},"packages/sdk/migrations/src/migrations.ts":{"bytes":9817,"imports":[{"path":"@dxos/client/echo","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"packages/sdk/migrations/src/migration-builder.ts","kind":"import-statement","original":"./migration-builder"}],"format":"esm"},"packages/sdk/migrations/src/index.ts":{"bytes":698,"imports":[{"path":"packages/sdk/migrations/src/migration-builder.ts","kind":"import-statement","original":"./migration-builder"},{"path":"packages/sdk/migrations/src/migrations.ts","kind":"import-statement","original":"./migrations"}],"format":"esm"}},"outputs":{"packages/sdk/migrations/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":13051},"packages/sdk/migrations/dist/lib/node/index.cjs":{"imports":[{"path":"@dxos/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-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","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":"packages/sdk/migrations/src/index.ts","inputs":{"packages/sdk/migrations/src/migration-builder.ts":{"bytesInOutput":3936},"packages/sdk/migrations/src/index.ts":{"bytesInOutput":0},"packages/sdk/migrations/src/migrations.ts":{"bytesInOutput":2745}},"bytes":6859}}}
|
|
@@ -21,9 +21,7 @@ export declare class MigrationBuilder {
|
|
|
21
21
|
createReference(id: string): import("@dxos/echo-protocol").EncodedReferenceObject;
|
|
22
22
|
deleteObject(id: string): void;
|
|
23
23
|
changeProperties(changeFn: (properties: ObjectStructure) => void): void;
|
|
24
|
-
private _findObjectContainingHandle;
|
|
25
24
|
private _buildNewRoot;
|
|
26
25
|
private _createObject;
|
|
27
|
-
private _addHandleToFlushList;
|
|
28
26
|
}
|
|
29
27
|
//# sourceMappingURL=migration-builder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration-builder.d.ts","sourceRoot":"","sources":["../../../src/migration-builder.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG/C,OAAO,
|
|
1
|
+
{"version":3,"file":"migration-builder.d.ts","sourceRoot":"","sources":["../../../src/migration-builder.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG/C,OAAO,EAAmB,KAAK,eAAe,EAA4B,MAAM,qBAAqB,CAAC;AACtG,OAAO,EAAwB,KAAK,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAGjE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,qBAAa,gBAAgB;IAYf,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAO;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAGzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;IACxD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA+B;IAC5D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAE/C,OAAO,CAAC,QAAQ,CAAC,CAAkC;gBAEtB,MAAM,EAAE,KAAK;IASpC,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,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC;IAW9F,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG;IAKjD,eAAe,CAAC,EAAE,EAAE,MAAM;IAI1B,YAAY,CAAC,EAAE,EAAE,MAAM;IAIvB,gBAAgB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,IAAI;IAoChE,OAAO,CAAC,aAAa;IAsBrB,OAAO,CAAC,aAAa;CAwBtB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/migrations",
|
|
3
|
-
"version": "0.5.9-main.
|
|
3
|
+
"version": "0.5.9-main.5d72625",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -20,15 +20,15 @@
|
|
|
20
20
|
"src"
|
|
21
21
|
],
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@dxos/
|
|
24
|
-
"@dxos/
|
|
25
|
-
"@dxos/echo-
|
|
26
|
-
"@dxos/echo-
|
|
27
|
-
"@dxos/
|
|
28
|
-
"@dxos/
|
|
29
|
-
"@dxos/
|
|
30
|
-
"@dxos/protocols": "0.5.9-main.
|
|
31
|
-
"@dxos/
|
|
23
|
+
"@dxos/client": "0.5.9-main.5d72625",
|
|
24
|
+
"@dxos/automerge": "0.5.9-main.5d72625",
|
|
25
|
+
"@dxos/echo-db": "0.5.9-main.5d72625",
|
|
26
|
+
"@dxos/echo-protocol": "0.5.9-main.5d72625",
|
|
27
|
+
"@dxos/echo-schema": "0.5.9-main.5d72625",
|
|
28
|
+
"@dxos/invariant": "0.5.9-main.5d72625",
|
|
29
|
+
"@dxos/util": "0.5.9-main.5d72625",
|
|
30
|
+
"@dxos/protocols": "0.5.9-main.5d72625",
|
|
31
|
+
"@dxos/log": "0.5.9-main.5d72625"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {},
|
|
34
34
|
"publishConfig": {
|
package/src/migration-builder.ts
CHANGED
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { type Doc,
|
|
5
|
+
import { type Doc, getHeads } from '@dxos/automerge/automerge';
|
|
6
6
|
import { type AnyDocumentId, type DocHandle, type Repo } from '@dxos/automerge/automerge-repo';
|
|
7
7
|
import { type Space } from '@dxos/client/echo';
|
|
8
8
|
import { CreateEpochRequest } from '@dxos/client/halo';
|
|
9
|
-
import { type AutomergeContext, ObjectCore
|
|
10
|
-
import {
|
|
9
|
+
import { type AutomergeContext, ObjectCore } from '@dxos/echo-db';
|
|
10
|
+
import { encodeReference, type ObjectStructure, Reference, type SpaceDoc } from '@dxos/echo-protocol';
|
|
11
11
|
import { requireTypeReference, type S } from '@dxos/echo-schema';
|
|
12
12
|
import { invariant } from '@dxos/invariant';
|
|
13
13
|
import { type FlushRequest } from '@dxos/protocols/proto/dxos/echo/service';
|
|
@@ -56,31 +56,7 @@ export class MigrationBuilder {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
const { schema, props } = await migrate(objectStructure);
|
|
59
|
-
|
|
60
|
-
const oldHandle = await this._findObjectContainingHandle(id);
|
|
61
|
-
invariant(oldHandle);
|
|
62
|
-
|
|
63
|
-
const newState: SpaceDoc = {
|
|
64
|
-
version: SpaceDocVersion.CURRENT,
|
|
65
|
-
access: {
|
|
66
|
-
spaceKey: this._space.key.toHex(),
|
|
67
|
-
},
|
|
68
|
-
objects: {
|
|
69
|
-
[id]: {
|
|
70
|
-
system: {
|
|
71
|
-
type: encodeReference(requireTypeReference(schema)),
|
|
72
|
-
},
|
|
73
|
-
data: props,
|
|
74
|
-
meta: {
|
|
75
|
-
keys: [],
|
|
76
|
-
},
|
|
77
|
-
},
|
|
78
|
-
},
|
|
79
|
-
};
|
|
80
|
-
const migratedDoc = migrateDocument(oldHandle.docSync() as Doc<SpaceDoc>, newState);
|
|
81
|
-
const newHandle = this._repo.import<SpaceDoc>(am.save(migratedDoc));
|
|
82
|
-
this._newLinks[id] = newHandle.url;
|
|
83
|
-
this._addHandleToFlushList(newHandle);
|
|
59
|
+
this._createObject({ id, schema, props });
|
|
84
60
|
}
|
|
85
61
|
|
|
86
62
|
async addObject(schema: S.Schema<any>, props: any) {
|
|
@@ -106,7 +82,10 @@ export class MigrationBuilder {
|
|
|
106
82
|
const propertiesStructure = doc.objects?.[this._space.properties.id];
|
|
107
83
|
propertiesStructure && changeFn(propertiesStructure);
|
|
108
84
|
});
|
|
109
|
-
this.
|
|
85
|
+
this._flushStates.push({
|
|
86
|
+
documentId: this._newRoot.documentId,
|
|
87
|
+
heads: getHeads(this._newRoot.docSync()),
|
|
88
|
+
});
|
|
110
89
|
}
|
|
111
90
|
|
|
112
91
|
/**
|
|
@@ -129,17 +108,6 @@ export class MigrationBuilder {
|
|
|
129
108
|
});
|
|
130
109
|
}
|
|
131
110
|
|
|
132
|
-
private async _findObjectContainingHandle(id: string): Promise<DocHandle<SpaceDoc> | undefined> {
|
|
133
|
-
const documentId = (this._rootDoc.links?.[id] || this._newLinks[id]) as AnyDocumentId | undefined;
|
|
134
|
-
const docHandle = documentId && this._repo.find(documentId);
|
|
135
|
-
if (!docHandle) {
|
|
136
|
-
return undefined;
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
await docHandle.whenReady();
|
|
140
|
-
return docHandle;
|
|
141
|
-
}
|
|
142
|
-
|
|
143
111
|
private _buildNewRoot() {
|
|
144
112
|
const previousLinks = { ...(this._rootDoc.links ?? {}) };
|
|
145
113
|
for (const id of this._deleteObjects) {
|
|
@@ -147,7 +115,6 @@ export class MigrationBuilder {
|
|
|
147
115
|
}
|
|
148
116
|
|
|
149
117
|
this._newRoot = this._repo.create<SpaceDoc>({
|
|
150
|
-
version: SpaceDocVersion.CURRENT,
|
|
151
118
|
access: {
|
|
152
119
|
spaceKey: this._space.key.toHex(),
|
|
153
120
|
},
|
|
@@ -157,7 +124,10 @@ export class MigrationBuilder {
|
|
|
157
124
|
...this._newLinks,
|
|
158
125
|
},
|
|
159
126
|
});
|
|
160
|
-
this.
|
|
127
|
+
this._flushStates.push({
|
|
128
|
+
documentId: this._newRoot.documentId,
|
|
129
|
+
heads: getHeads(this._newRoot.docSync()),
|
|
130
|
+
});
|
|
161
131
|
}
|
|
162
132
|
|
|
163
133
|
private _createObject({ id, schema, props }: { id?: string; schema: S.Schema<any>; props: any }) {
|
|
@@ -169,7 +139,6 @@ export class MigrationBuilder {
|
|
|
169
139
|
core.initNewObject(props);
|
|
170
140
|
core.setType(requireTypeReference(schema));
|
|
171
141
|
const newHandle = this._repo.create<SpaceDoc>({
|
|
172
|
-
version: SpaceDocVersion.CURRENT,
|
|
173
142
|
access: {
|
|
174
143
|
spaceKey: this._space.key.toHex(),
|
|
175
144
|
},
|
|
@@ -178,15 +147,11 @@ export class MigrationBuilder {
|
|
|
178
147
|
},
|
|
179
148
|
});
|
|
180
149
|
this._newLinks[core.id] = newHandle.url;
|
|
181
|
-
this._addHandleToFlushList(newHandle);
|
|
182
|
-
|
|
183
|
-
return core;
|
|
184
|
-
}
|
|
185
|
-
|
|
186
|
-
private _addHandleToFlushList(handle: DocHandle<any>) {
|
|
187
150
|
this._flushStates.push({
|
|
188
|
-
documentId:
|
|
189
|
-
heads:
|
|
151
|
+
documentId: newHandle.documentId,
|
|
152
|
+
heads: getHeads(newHandle.docSync()),
|
|
190
153
|
});
|
|
154
|
+
|
|
155
|
+
return core;
|
|
191
156
|
}
|
|
192
157
|
}
|