@dxos/migrations 0.8.2-main.fbd8ed0 → 0.8.2-staging.7ac8446
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 +10 -10
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node/index.cjs +9 -9
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node-esm/index.mjs +10 -10
- 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.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -11
- package/src/migration-builder.ts +9 -11
- package/src/migrations.test.ts +6 -6
- package/src/migrations.ts +3 -3
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// packages/sdk/migrations/src/migration-builder.ts
|
|
2
|
-
import { next as am } from "@automerge/automerge";
|
|
2
|
+
import { next as am } from "@dxos/automerge/automerge";
|
|
3
3
|
import { CreateEpochRequest } from "@dxos/client/halo";
|
|
4
4
|
import { ObjectCore, migrateDocument } from "@dxos/echo-db";
|
|
5
5
|
import { SpaceDocVersion, encodeReference, Reference } from "@dxos/echo-protocol";
|
|
@@ -14,7 +14,7 @@ var MigrationBuilder = class {
|
|
|
14
14
|
this._deleteObjects = [];
|
|
15
15
|
this._newRoot = void 0;
|
|
16
16
|
this._repo = this._space.db.coreDatabase._repo;
|
|
17
|
-
this._rootDoc = this._space.db.coreDatabase._automergeDocLoader.getSpaceRootDocHandle().
|
|
17
|
+
this._rootDoc = this._space.db.coreDatabase._automergeDocLoader.getSpaceRootDocHandle().docSync();
|
|
18
18
|
}
|
|
19
19
|
async findObject(id) {
|
|
20
20
|
const documentId = (this._rootDoc.links?.[id] || this._newLinks[id])?.toString();
|
|
@@ -23,7 +23,7 @@ var MigrationBuilder = class {
|
|
|
23
23
|
return void 0;
|
|
24
24
|
}
|
|
25
25
|
await docHandle.whenReady();
|
|
26
|
-
const doc = docHandle.
|
|
26
|
+
const doc = docHandle.docSync();
|
|
27
27
|
return doc.objects?.[id];
|
|
28
28
|
}
|
|
29
29
|
async migrateObject(id, migrate) {
|
|
@@ -35,7 +35,7 @@ var MigrationBuilder = class {
|
|
|
35
35
|
const oldHandle = await this._findObjectContainingHandle(id);
|
|
36
36
|
invariant(oldHandle, void 0, {
|
|
37
37
|
F: __dxlog_file,
|
|
38
|
-
L:
|
|
38
|
+
L: 58,
|
|
39
39
|
S: this,
|
|
40
40
|
A: [
|
|
41
41
|
"oldHandle",
|
|
@@ -59,7 +59,7 @@ var MigrationBuilder = class {
|
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
};
|
|
62
|
-
const migratedDoc = migrateDocument(oldHandle.
|
|
62
|
+
const migratedDoc = migrateDocument(oldHandle.docSync(), newState);
|
|
63
63
|
const newHandle = this._repo.import(am.save(migratedDoc));
|
|
64
64
|
this._newLinks[id] = newHandle.url;
|
|
65
65
|
this._addHandleToFlushList(newHandle);
|
|
@@ -83,7 +83,7 @@ var MigrationBuilder = class {
|
|
|
83
83
|
}
|
|
84
84
|
invariant(this._newRoot, "New root not created", {
|
|
85
85
|
F: __dxlog_file,
|
|
86
|
-
L:
|
|
86
|
+
L: 100,
|
|
87
87
|
S: this,
|
|
88
88
|
A: [
|
|
89
89
|
"this._newRoot",
|
|
@@ -105,7 +105,7 @@ var MigrationBuilder = class {
|
|
|
105
105
|
}
|
|
106
106
|
invariant(this._newRoot, "New root not created", {
|
|
107
107
|
F: __dxlog_file,
|
|
108
|
-
L:
|
|
108
|
+
L: 116,
|
|
109
109
|
S: this,
|
|
110
110
|
A: [
|
|
111
111
|
"this._newRoot",
|
|
@@ -173,7 +173,7 @@ var MigrationBuilder = class {
|
|
|
173
173
|
};
|
|
174
174
|
|
|
175
175
|
// packages/sdk/migrations/src/migrations.ts
|
|
176
|
-
import {
|
|
176
|
+
import { create, SpaceState } from "@dxos/client/echo";
|
|
177
177
|
import { invariant as invariant2 } from "@dxos/invariant";
|
|
178
178
|
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/migrations/src/migrations.ts";
|
|
179
179
|
var Migrations = class {
|
|
@@ -181,7 +181,7 @@ var Migrations = class {
|
|
|
181
181
|
this.migrations = [];
|
|
182
182
|
}
|
|
183
183
|
static {
|
|
184
|
-
this._state =
|
|
184
|
+
this._state = create({
|
|
185
185
|
running: []
|
|
186
186
|
});
|
|
187
187
|
}
|
|
@@ -189,7 +189,7 @@ var Migrations = class {
|
|
|
189
189
|
return this.namespace && `${this.namespace}.version`;
|
|
190
190
|
}
|
|
191
191
|
static get targetVersion() {
|
|
192
|
-
return this.migrations[this.migrations.length - 1]
|
|
192
|
+
return this.migrations[this.migrations.length - 1].version;
|
|
193
193
|
}
|
|
194
194
|
static running(space) {
|
|
195
195
|
return this._state.running.includes(space.key.toHex());
|
|
@@ -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, next as am } from '@automerge/automerge';\nimport { type AnyDocumentId, type DocumentId } from '@automerge/automerge-repo';\nimport { type
|
|
5
|
-
"mappings": ";AAIA,SAAmBA,QAAQC,UAAU;
|
|
6
|
-
"names": ["next", "am", "CreateEpochRequest", "ObjectCore", "migrateDocument", "SpaceDocVersion", "encodeReference", "Reference", "requireTypeReference", "invariant", "MigrationBuilder", "constructor", "_space", "_newLinks", "_flushIds", "_deleteObjects", "_newRoot", "undefined", "_repo", "db", "coreDatabase", "_rootDoc", "_automergeDocLoader", "getSpaceRootDocHandle", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Doc, next as am } from '@dxos/automerge/automerge';\nimport { type AnyDocumentId, type DocumentId } from '@dxos/automerge/automerge-repo';\nimport { type Space } from '@dxos/client/echo';\nimport { CreateEpochRequest } from '@dxos/client/halo';\nimport { ObjectCore, migrateDocument, type RepoProxy, type DocHandleProxy } from '@dxos/echo-db';\nimport { SpaceDocVersion, encodeReference, type ObjectStructure, type SpaceDoc, Reference } from '@dxos/echo-protocol';\nimport { requireTypeReference, type S } from '@dxos/echo-schema';\nimport { invariant } from '@dxos/invariant';\nimport { type MaybePromise } from '@dxos/util';\n\nexport class MigrationBuilder {\n private readonly _repo: RepoProxy;\n private readonly _rootDoc: Doc<SpaceDoc>;\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<SpaceDoc> = undefined;\n\n constructor(private readonly _space: Space) {\n this._repo = this._space.db.coreDatabase._repo;\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])?.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.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.AnyNoContext; 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\n const oldHandle = await this._findObjectContainingHandle(id);\n invariant(oldHandle);\n\n const newState: SpaceDoc = {\n version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [id]: {\n system: {\n type: encodeReference(requireTypeReference(schema)),\n },\n data: props,\n meta: {\n keys: [],\n },\n },\n },\n };\n const migratedDoc = migrateDocument(oldHandle.docSync() as Doc<SpaceDoc>, newState);\n const newHandle = this._repo.import<SpaceDoc>(am.save(migratedDoc));\n this._newLinks[id] = newHandle.url;\n this._addHandleToFlushList(newHandle);\n }\n\n async addObject(schema: S.Schema.AnyNoContext, props: any) {\n const core = this._createObject({ schema, props });\n return core.id;\n }\n\n createReference(id: string) {\n return encodeReference(Reference.localObjectReference(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._addHandleToFlushList(this._newRoot);\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._space.db.flush();\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 async _findObjectContainingHandle(id: string): Promise<DocHandleProxy<SpaceDoc> | 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 _buildNewRoot() {\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 am.RawString(url);\n }\n\n this._newRoot = this._repo.create<SpaceDoc>({\n version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: this._rootDoc.objects,\n links,\n });\n this._addHandleToFlushList(this._newRoot);\n }\n\n private _createObject({ id, schema, props }: { id?: string; schema: S.Schema.AnyNoContext; 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 version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [core.id]: core.getDoc() as ObjectStructure,\n },\n });\n this._newLinks[core.id] = newHandle.url;\n this._addHandleToFlushList(newHandle);\n\n return core;\n }\n\n private _addHandleToFlushList(handle: DocHandleProxy<any>) {\n this._flushIds.push(handle.documentId);\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.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 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": ";AAIA,SAAmBA,QAAQC,UAAU;AAGrC,SAASC,0BAA0B;AACnC,SAASC,YAAYC,uBAA4D;AACjF,SAASC,iBAAiBC,iBAAsDC,iBAAiB;AACjG,SAASC,4BAAoC;AAC7C,SAASC,iBAAiB;;AAGnB,IAAMC,mBAAN,MAAMA;EAWXC,YAA6BC,QAAe;SAAfA,SAAAA;SANZC,YAAoC,CAAC;SACrCC,YAA0B,CAAA;SAC1BC,iBAA2B,CAAA;SAEpCC,WAAsCC;AAG5C,SAAKC,QAAQ,KAAKN,OAAOO,GAAGC,aAAaF;AAEzC,SAAKG,WAAY,KAAKT,OAAOO,GAAGC,aAAqBE,oBAClDC,sBAAqB,EACrBC,QAAO;EACZ;EAEA,MAAMC,WAAWC,IAAkD;AACjE,UAAMC,cAAc,KAAKN,SAASO,QAAQF,EAAAA,KAAO,KAAKb,UAAUa,EAAAA,IAAMG,SAAAA;AACtE,UAAMC,YAAYH,cAAc,KAAKT,MAAMa,KAAKJ,UAAAA;AAChD,QAAI,CAACG,WAAW;AACd,aAAOb;IACT;AAEA,UAAMa,UAAUE,UAAS;AACzB,UAAMC,MAAMH,UAAUN,QAAO;AAC7B,WAAOS,IAAIC,UAAUR,EAAAA;EACvB;EAEA,MAAMS,cACJT,IACAU,SACA;AACA,UAAMC,kBAAkB,MAAM,KAAKZ,WAAWC,EAAAA;AAC9C,QAAI,CAACW,iBAAiB;AACpB;IACF;AAEA,UAAM,EAAEC,QAAQC,MAAK,IAAK,MAAMH,QAAQC,eAAAA;AAExC,UAAMG,YAAY,MAAM,KAAKC,4BAA4Bf,EAAAA;AACzDjB,cAAU+B,WAAAA,QAAAA;;;;;;;;;AAEV,UAAME,WAAqB;MACzBC,SAAStC,gBAAgBuC;MACzBC,QAAQ;QACNC,UAAU,KAAKlC,OAAOmC,IAAIC,MAAK;MACjC;MACAd,SAAS;QACP,CAACR,EAAAA,GAAK;UACJuB,QAAQ;YACNC,MAAM5C,gBAAgBE,qBAAqB8B,MAAAA,CAAAA;UAC7C;UACAa,MAAMZ;UACNa,MAAM;YACJC,MAAM,CAAA;UACR;QACF;MACF;IACF;AACA,UAAMC,cAAclD,gBAAgBoC,UAAUhB,QAAO,GAAqBkB,QAAAA;AAC1E,UAAMa,YAAY,KAAKrC,MAAMsC,OAAiBvD,GAAGwD,KAAKH,WAAAA,CAAAA;AACtD,SAAKzC,UAAUa,EAAAA,IAAM6B,UAAUG;AAC/B,SAAKC,sBAAsBJ,SAAAA;EAC7B;EAEA,MAAMK,UAAUtB,QAA+BC,OAAY;AACzD,UAAMsB,OAAO,KAAKC,cAAc;MAAExB;MAAQC;IAAM,CAAA;AAChD,WAAOsB,KAAKnC;EACd;EAEAqC,gBAAgBrC,IAAY;AAC1B,WAAOpB,gBAAgBC,UAAUyD,qBAAqBtC,EAAAA,CAAAA;EACxD;EAEAuC,aAAavC,IAAY;AACvB,SAAKX,eAAemD,KAAKxC,EAAAA;EAC3B;EAEAyC,iBAAiBC,UAAiD;AAChE,QAAI,CAAC,KAAKpD,UAAU;AAClB,WAAKqD,cAAa;IACpB;AACA5D,cAAU,KAAKO,UAAU,wBAAA;;;;;;;;;AAEzB,SAAKA,SAASsD,OAAO,CAACrC,QAAAA;AACpB,YAAMsC,sBAAsBtC,IAAIC,UAAU,KAAKtB,OAAO4D,WAAW9C,EAAE;AACnE6C,6BAAuBH,SAASG,mBAAAA;IAClC,CAAA;AACA,SAAKZ,sBAAsB,KAAK3C,QAAQ;EAC1C;;;;EAKA,MAAMyD,UAAU;AACd,QAAI,CAAC,KAAKzD,UAAU;AAClB,WAAKqD,cAAa;IACpB;AACA5D,cAAU,KAAKO,UAAU,wBAAA;;;;;;;;;AAEzB,UAAM,KAAKJ,OAAOO,GAAGuD,MAAK;AAG1B,UAAM,KAAK9D,OAAO+D,SAASC,YAAY;MACrCC,WAAW3E,mBAAmB4E,UAAUC;MACxCC,kBAAkB,KAAKhE,SAAS0C;IAClC,CAAA;EACF;EAEA,MAAcjB,4BAA4Bf,IAA2D;AACnG,UAAMC,cAAc,KAAKN,SAASO,QAAQF,EAAAA,KAAO,KAAKb,UAAUa,EAAAA,IAAMG,SAAAA;AACtE,UAAMC,YAAYH,cAAc,KAAKT,MAAMa,KAAKJ,UAAAA;AAChD,QAAI,CAACG,WAAW;AACd,aAAOb;IACT;AAEA,UAAMa,UAAUE,UAAS;AACzB,WAAOF;EACT;EAEQuC,gBAAgB;AACtB,UAAMzC,QAAQ;MAAE,GAAI,KAAKP,SAASO,SAAS,CAAC;IAAG;AAC/C,eAAWF,MAAM,KAAKX,gBAAgB;AACpC,aAAOa,MAAMF,EAAAA;IACf;AAEA,eAAW,CAACA,IAAIgC,GAAAA,KAAQuB,OAAOC,QAAQ,KAAKrE,SAAS,GAAG;AACtDe,YAAMF,EAAAA,IAAM,IAAIzB,GAAGkF,UAAUzB,GAAAA;IAC/B;AAEA,SAAK1C,WAAW,KAAKE,MAAMkE,OAAiB;MAC1CzC,SAAStC,gBAAgBuC;MACzBC,QAAQ;QACNC,UAAU,KAAKlC,OAAOmC,IAAIC,MAAK;MACjC;MACAd,SAAS,KAAKb,SAASa;MACvBN;IACF,CAAA;AACA,SAAK+B,sBAAsB,KAAK3C,QAAQ;EAC1C;EAEQ8C,cAAc,EAAEpC,IAAIY,QAAQC,MAAK,GAAgE;AACvG,UAAMsB,OAAO,IAAI1D,WAAAA;AACjB,QAAIuB,IAAI;AACNmC,WAAKnC,KAAKA;IACZ;AAEAmC,SAAKwB,cAAc9C,KAAAA;AACnBsB,SAAKyB,QAAQ9E,qBAAqB8B,MAAAA,CAAAA;AAClC,UAAMiB,YAAY,KAAKrC,MAAMkE,OAAiB;MAC5CzC,SAAStC,gBAAgBuC;MACzBC,QAAQ;QACNC,UAAU,KAAKlC,OAAOmC,IAAIC,MAAK;MACjC;MACAd,SAAS;QACP,CAAC2B,KAAKnC,EAAE,GAAGmC,KAAK0B,OAAM;MACxB;IACF,CAAA;AACA,SAAK1E,UAAUgD,KAAKnC,EAAE,IAAI6B,UAAUG;AACpC,SAAKC,sBAAsBJ,SAAAA;AAE3B,WAAOM;EACT;EAEQF,sBAAsB6B,QAA6B;AACzD,SAAK1E,UAAUoD,KAAKsB,OAAO7D,UAAU;EACvC;AACF;;;ACpLA,SAAqB8D,QAAQC,kBAAkB;AAC/C,SAASC,aAAAA,kBAAiB;;AAenB,IAAMC,aAAN,MAAMA;EAEX;SAAOC,aAA0B,CAAA;;EACjC;SAAeC,SAASC,OAA8B;MAAEC,SAAS,CAAA;IAAG,CAAA;;EAEpE,WAAWC,kBAAkB;AAC3B,WAAO,KAAKC,aAAa,GAAG,KAAKA,SAAS;EAC5C;EAEA,WAAWC,gBAAgB;AACzB,WAAO,KAAKN,WAAW,KAAKA,WAAWO,SAAS,CAAA,EAAGC;EACrD;EAEA,OAAOL,QAAQM,OAAc;AAC3B,WAAO,KAAKR,OAAOE,QAAQO,SAASD,MAAME,IAAIC,MAAK,CAAA;EACrD;EAEA,OAAOC,OAAOR,WAAmBL,YAAyB;AACxD,SAAKK,YAAYA;AACjB,SAAKL,aAAaA;EACpB;EAEA,aAAac,QAAQL,OAAcH,eAAiC;AAClES,IAAAA,WAAU,CAAC,KAAKZ,QAAQM,KAAAA,GAAQ,6BAAA;;;;;;;;;AAChCM,IAAAA,WAAU,KAAKX,iBAAiB,gCAAA;;;;;;;;;AAChCW,IAAAA,WAAUN,MAAMO,MAAMC,IAAG,MAAOC,WAAWC,aAAa,mBAAA;;;;;;;;;AACxD,UAAMC,iBAAiBX,MAAMY,WAAW,KAAKjB,eAAe;AAC5D,UAAMkB,eAAe,KAAKtB,WAAWuB,UAAU,CAACC,MAAMA,EAAEhB,YAAYY,cAAAA,IAAkB;AACtF,UAAMK,IAAI,KAAKzB,WAAWuB,UAAU,CAACC,MAAMA,EAAEhB,YAAYF,aAAAA;AACzD,UAAMoB,cAAcD,MAAM,KAAK,KAAKzB,WAAWO,SAASkB,IAAI;AAC5D,QAAIH,iBAAiBI,aAAa;AAChC,aAAO;IACT;AAEA,SAAKzB,OAAOE,QAAQwB,KAAKlB,MAAME,IAAIC,MAAK,CAAA;AACxC,QAAIc,cAAcJ,cAAc;AAC9B,YAAMtB,aAAa,KAAKA,WAAW4B,MAAMN,cAAcI,WAAAA;AACvD,iBAAWG,aAAa7B,YAAY;AAClC,cAAM8B,UAAU,IAAIC,iBAAiBtB,KAAAA;AACrC,cAAMoB,UAAUG,KAAK;UAAEvB;UAAOqB;QAAQ,CAAA;AACtCA,gBAAQG,iBAAiB,CAACC,wBAAAA;AACxBnB,UAAAA,WAAU,KAAKX,iBAAiB,gCAAA;;;;;;;;;AAChC8B,8BAAoBC,KAAK,KAAK/B,eAAe,IAAIyB,UAAUrB;QAC7D,CAAA;AACA,cAAMsB,QAAQM,QAAO;MACvB;IACF;AACA,SAAKnC,OAAOE,QAAQkC,OAAO,KAAKpC,OAAOE,QAAQmC,QAAQ7B,MAAME,IAAIC,MAAK,CAAA,GAAK,CAAA;AAE3E,WAAO;EACT;AACF;",
|
|
6
|
+
"names": ["next", "am", "CreateEpochRequest", "ObjectCore", "migrateDocument", "SpaceDocVersion", "encodeReference", "Reference", "requireTypeReference", "invariant", "MigrationBuilder", "constructor", "_space", "_newLinks", "_flushIds", "_deleteObjects", "_newRoot", "undefined", "_repo", "db", "coreDatabase", "_rootDoc", "_automergeDocLoader", "getSpaceRootDocHandle", "docSync", "findObject", "id", "documentId", "links", "toString", "docHandle", "find", "whenReady", "doc", "objects", "migrateObject", "migrate", "objectStructure", "schema", "props", "oldHandle", "_findObjectContainingHandle", "newState", "version", "CURRENT", "access", "spaceKey", "key", "toHex", "system", "type", "data", "meta", "keys", "migratedDoc", "newHandle", "import", "save", "url", "_addHandleToFlushList", "addObject", "core", "_createObject", "createReference", "localObjectReference", "deleteObject", "push", "changeProperties", "changeFn", "_buildNewRoot", "change", "propertiesStructure", "properties", "_commit", "flush", "internal", "createEpoch", "migration", "Migration", "REPLACE_AUTOMERGE_ROOT", "automergeRootUrl", "Object", "entries", "RawString", "create", "initNewObject", "setType", "getDoc", "handle", "create", "SpaceState", "invariant", "Migrations", "migrations", "_state", "create", "running", "versionProperty", "namespace", "targetVersion", "length", "version", "space", "includes", "key", "toHex", "define", "migrate", "invariant", "state", "get", "SpaceState", "SPACE_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":21027,"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":9845,"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":14843},"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":4851},"packages/sdk/migrations/src/index.ts":{"bytesInOutput":0},"packages/sdk/migrations/src/migrations.ts":{"bytesInOutput":2757}},"bytes":7786}}}
|
package/dist/lib/node/index.cjs
CHANGED
|
@@ -22,7 +22,7 @@ __export(node_exports, {
|
|
|
22
22
|
Migrations: () => Migrations
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(node_exports);
|
|
25
|
-
var import_automerge = require("@automerge/automerge");
|
|
25
|
+
var import_automerge = require("@dxos/automerge/automerge");
|
|
26
26
|
var import_halo = require("@dxos/client/halo");
|
|
27
27
|
var import_echo_db = require("@dxos/echo-db");
|
|
28
28
|
var import_echo_protocol = require("@dxos/echo-protocol");
|
|
@@ -39,7 +39,7 @@ var MigrationBuilder = class {
|
|
|
39
39
|
this._deleteObjects = [];
|
|
40
40
|
this._newRoot = void 0;
|
|
41
41
|
this._repo = this._space.db.coreDatabase._repo;
|
|
42
|
-
this._rootDoc = this._space.db.coreDatabase._automergeDocLoader.getSpaceRootDocHandle().
|
|
42
|
+
this._rootDoc = this._space.db.coreDatabase._automergeDocLoader.getSpaceRootDocHandle().docSync();
|
|
43
43
|
}
|
|
44
44
|
async findObject(id) {
|
|
45
45
|
const documentId = (this._rootDoc.links?.[id] || this._newLinks[id])?.toString();
|
|
@@ -48,7 +48,7 @@ var MigrationBuilder = class {
|
|
|
48
48
|
return void 0;
|
|
49
49
|
}
|
|
50
50
|
await docHandle.whenReady();
|
|
51
|
-
const doc = docHandle.
|
|
51
|
+
const doc = docHandle.docSync();
|
|
52
52
|
return doc.objects?.[id];
|
|
53
53
|
}
|
|
54
54
|
async migrateObject(id, migrate) {
|
|
@@ -60,7 +60,7 @@ var MigrationBuilder = class {
|
|
|
60
60
|
const oldHandle = await this._findObjectContainingHandle(id);
|
|
61
61
|
(0, import_invariant.invariant)(oldHandle, void 0, {
|
|
62
62
|
F: __dxlog_file,
|
|
63
|
-
L:
|
|
63
|
+
L: 58,
|
|
64
64
|
S: this,
|
|
65
65
|
A: [
|
|
66
66
|
"oldHandle",
|
|
@@ -84,7 +84,7 @@ var MigrationBuilder = class {
|
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
};
|
|
87
|
-
const migratedDoc = (0, import_echo_db.migrateDocument)(oldHandle.
|
|
87
|
+
const migratedDoc = (0, import_echo_db.migrateDocument)(oldHandle.docSync(), newState);
|
|
88
88
|
const newHandle = this._repo.import(import_automerge.next.save(migratedDoc));
|
|
89
89
|
this._newLinks[id] = newHandle.url;
|
|
90
90
|
this._addHandleToFlushList(newHandle);
|
|
@@ -108,7 +108,7 @@ var MigrationBuilder = class {
|
|
|
108
108
|
}
|
|
109
109
|
(0, import_invariant.invariant)(this._newRoot, "New root not created", {
|
|
110
110
|
F: __dxlog_file,
|
|
111
|
-
L:
|
|
111
|
+
L: 100,
|
|
112
112
|
S: this,
|
|
113
113
|
A: [
|
|
114
114
|
"this._newRoot",
|
|
@@ -130,7 +130,7 @@ var MigrationBuilder = class {
|
|
|
130
130
|
}
|
|
131
131
|
(0, import_invariant.invariant)(this._newRoot, "New root not created", {
|
|
132
132
|
F: __dxlog_file,
|
|
133
|
-
L:
|
|
133
|
+
L: 116,
|
|
134
134
|
S: this,
|
|
135
135
|
A: [
|
|
136
136
|
"this._newRoot",
|
|
@@ -202,7 +202,7 @@ var Migrations = class {
|
|
|
202
202
|
this.migrations = [];
|
|
203
203
|
}
|
|
204
204
|
static {
|
|
205
|
-
this._state = (0, import_echo.
|
|
205
|
+
this._state = (0, import_echo.create)({
|
|
206
206
|
running: []
|
|
207
207
|
});
|
|
208
208
|
}
|
|
@@ -210,7 +210,7 @@ var Migrations = class {
|
|
|
210
210
|
return this.namespace && `${this.namespace}.version`;
|
|
211
211
|
}
|
|
212
212
|
static get targetVersion() {
|
|
213
|
-
return this.migrations[this.migrations.length - 1]
|
|
213
|
+
return this.migrations[this.migrations.length - 1].version;
|
|
214
214
|
}
|
|
215
215
|
static running(space) {
|
|
216
216
|
return this._state.running.includes(space.key.toHex());
|
|
@@ -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, next as am } from '@automerge/automerge';\nimport { type AnyDocumentId, type DocumentId } from '@automerge/automerge-repo';\nimport { type
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAIA,uBAAqC;
|
|
6
|
-
"names": ["import_invariant", "MigrationBuilder", "constructor", "_space", "_newLinks", "_flushIds", "_deleteObjects", "_newRoot", "undefined", "_repo", "db", "coreDatabase", "_rootDoc", "_automergeDocLoader", "getSpaceRootDocHandle", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Doc, next as am } from '@dxos/automerge/automerge';\nimport { type AnyDocumentId, type DocumentId } from '@dxos/automerge/automerge-repo';\nimport { type Space } from '@dxos/client/echo';\nimport { CreateEpochRequest } from '@dxos/client/halo';\nimport { ObjectCore, migrateDocument, type RepoProxy, type DocHandleProxy } from '@dxos/echo-db';\nimport { SpaceDocVersion, encodeReference, type ObjectStructure, type SpaceDoc, Reference } from '@dxos/echo-protocol';\nimport { requireTypeReference, type S } from '@dxos/echo-schema';\nimport { invariant } from '@dxos/invariant';\nimport { type MaybePromise } from '@dxos/util';\n\nexport class MigrationBuilder {\n private readonly _repo: RepoProxy;\n private readonly _rootDoc: Doc<SpaceDoc>;\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<SpaceDoc> = undefined;\n\n constructor(private readonly _space: Space) {\n this._repo = this._space.db.coreDatabase._repo;\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])?.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.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.AnyNoContext; 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\n const oldHandle = await this._findObjectContainingHandle(id);\n invariant(oldHandle);\n\n const newState: SpaceDoc = {\n version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [id]: {\n system: {\n type: encodeReference(requireTypeReference(schema)),\n },\n data: props,\n meta: {\n keys: [],\n },\n },\n },\n };\n const migratedDoc = migrateDocument(oldHandle.docSync() as Doc<SpaceDoc>, newState);\n const newHandle = this._repo.import<SpaceDoc>(am.save(migratedDoc));\n this._newLinks[id] = newHandle.url;\n this._addHandleToFlushList(newHandle);\n }\n\n async addObject(schema: S.Schema.AnyNoContext, props: any) {\n const core = this._createObject({ schema, props });\n return core.id;\n }\n\n createReference(id: string) {\n return encodeReference(Reference.localObjectReference(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._addHandleToFlushList(this._newRoot);\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._space.db.flush();\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 async _findObjectContainingHandle(id: string): Promise<DocHandleProxy<SpaceDoc> | 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 _buildNewRoot() {\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 am.RawString(url);\n }\n\n this._newRoot = this._repo.create<SpaceDoc>({\n version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: this._rootDoc.objects,\n links,\n });\n this._addHandleToFlushList(this._newRoot);\n }\n\n private _createObject({ id, schema, props }: { id?: string; schema: S.Schema.AnyNoContext; 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 version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [core.id]: core.getDoc() as ObjectStructure,\n },\n });\n this._newLinks[core.id] = newHandle.url;\n this._addHandleToFlushList(newHandle);\n\n return core;\n }\n\n private _addHandleToFlushList(handle: DocHandleProxy<any>) {\n this._flushIds.push(handle.documentId);\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.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 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", "_flushIds", "_deleteObjects", "_newRoot", "undefined", "_repo", "db", "coreDatabase", "_rootDoc", "_automergeDocLoader", "getSpaceRootDocHandle", "docSync", "findObject", "id", "documentId", "links", "toString", "docHandle", "find", "whenReady", "doc", "objects", "migrateObject", "migrate", "objectStructure", "schema", "props", "oldHandle", "_findObjectContainingHandle", "invariant", "newState", "version", "SpaceDocVersion", "CURRENT", "access", "spaceKey", "key", "toHex", "system", "type", "encodeReference", "requireTypeReference", "data", "meta", "keys", "migratedDoc", "migrateDocument", "newHandle", "import", "am", "save", "url", "_addHandleToFlushList", "addObject", "core", "_createObject", "createReference", "Reference", "localObjectReference", "deleteObject", "push", "changeProperties", "changeFn", "_buildNewRoot", "change", "propertiesStructure", "properties", "_commit", "flush", "internal", "createEpoch", "migration", "CreateEpochRequest", "Migration", "REPLACE_AUTOMERGE_ROOT", "automergeRootUrl", "Object", "entries", "RawString", "create", "ObjectCore", "initNewObject", "setType", "getDoc", "handle", "Migrations", "migrations", "_state", "running", "versionProperty", "namespace", "targetVersion", "length", "space", "includes", "define", "state", "get", "SpaceState", "SPACE_READY", "currentVersion", "currentIndex", "findIndex", "m", "i", "targetIndex", "slice", "builder", "next", "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":21027,"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":9845,"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":14843},"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":4851},"packages/sdk/migrations/src/index.ts":{"bytesInOutput":0},"packages/sdk/migrations/src/migrations.ts":{"bytesInOutput":2757}},"bytes":7786}}}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
|
|
2
2
|
|
|
3
3
|
// packages/sdk/migrations/src/migration-builder.ts
|
|
4
|
-
import { next as am } from "@automerge/automerge";
|
|
4
|
+
import { next as am } from "@dxos/automerge/automerge";
|
|
5
5
|
import { CreateEpochRequest } from "@dxos/client/halo";
|
|
6
6
|
import { ObjectCore, migrateDocument } from "@dxos/echo-db";
|
|
7
7
|
import { SpaceDocVersion, encodeReference, Reference } from "@dxos/echo-protocol";
|
|
@@ -16,7 +16,7 @@ var MigrationBuilder = class {
|
|
|
16
16
|
this._deleteObjects = [];
|
|
17
17
|
this._newRoot = void 0;
|
|
18
18
|
this._repo = this._space.db.coreDatabase._repo;
|
|
19
|
-
this._rootDoc = this._space.db.coreDatabase._automergeDocLoader.getSpaceRootDocHandle().
|
|
19
|
+
this._rootDoc = this._space.db.coreDatabase._automergeDocLoader.getSpaceRootDocHandle().docSync();
|
|
20
20
|
}
|
|
21
21
|
async findObject(id) {
|
|
22
22
|
const documentId = (this._rootDoc.links?.[id] || this._newLinks[id])?.toString();
|
|
@@ -25,7 +25,7 @@ var MigrationBuilder = class {
|
|
|
25
25
|
return void 0;
|
|
26
26
|
}
|
|
27
27
|
await docHandle.whenReady();
|
|
28
|
-
const doc = docHandle.
|
|
28
|
+
const doc = docHandle.docSync();
|
|
29
29
|
return doc.objects?.[id];
|
|
30
30
|
}
|
|
31
31
|
async migrateObject(id, migrate) {
|
|
@@ -37,7 +37,7 @@ var MigrationBuilder = class {
|
|
|
37
37
|
const oldHandle = await this._findObjectContainingHandle(id);
|
|
38
38
|
invariant(oldHandle, void 0, {
|
|
39
39
|
F: __dxlog_file,
|
|
40
|
-
L:
|
|
40
|
+
L: 58,
|
|
41
41
|
S: this,
|
|
42
42
|
A: [
|
|
43
43
|
"oldHandle",
|
|
@@ -61,7 +61,7 @@ var MigrationBuilder = class {
|
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
};
|
|
64
|
-
const migratedDoc = migrateDocument(oldHandle.
|
|
64
|
+
const migratedDoc = migrateDocument(oldHandle.docSync(), newState);
|
|
65
65
|
const newHandle = this._repo.import(am.save(migratedDoc));
|
|
66
66
|
this._newLinks[id] = newHandle.url;
|
|
67
67
|
this._addHandleToFlushList(newHandle);
|
|
@@ -85,7 +85,7 @@ var MigrationBuilder = class {
|
|
|
85
85
|
}
|
|
86
86
|
invariant(this._newRoot, "New root not created", {
|
|
87
87
|
F: __dxlog_file,
|
|
88
|
-
L:
|
|
88
|
+
L: 100,
|
|
89
89
|
S: this,
|
|
90
90
|
A: [
|
|
91
91
|
"this._newRoot",
|
|
@@ -107,7 +107,7 @@ var MigrationBuilder = class {
|
|
|
107
107
|
}
|
|
108
108
|
invariant(this._newRoot, "New root not created", {
|
|
109
109
|
F: __dxlog_file,
|
|
110
|
-
L:
|
|
110
|
+
L: 116,
|
|
111
111
|
S: this,
|
|
112
112
|
A: [
|
|
113
113
|
"this._newRoot",
|
|
@@ -175,7 +175,7 @@ var MigrationBuilder = class {
|
|
|
175
175
|
};
|
|
176
176
|
|
|
177
177
|
// packages/sdk/migrations/src/migrations.ts
|
|
178
|
-
import {
|
|
178
|
+
import { create, SpaceState } from "@dxos/client/echo";
|
|
179
179
|
import { invariant as invariant2 } from "@dxos/invariant";
|
|
180
180
|
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/migrations/src/migrations.ts";
|
|
181
181
|
var Migrations = class {
|
|
@@ -183,7 +183,7 @@ var Migrations = class {
|
|
|
183
183
|
this.migrations = [];
|
|
184
184
|
}
|
|
185
185
|
static {
|
|
186
|
-
this._state =
|
|
186
|
+
this._state = create({
|
|
187
187
|
running: []
|
|
188
188
|
});
|
|
189
189
|
}
|
|
@@ -191,7 +191,7 @@ var Migrations = class {
|
|
|
191
191
|
return this.namespace && `${this.namespace}.version`;
|
|
192
192
|
}
|
|
193
193
|
static get targetVersion() {
|
|
194
|
-
return this.migrations[this.migrations.length - 1]
|
|
194
|
+
return this.migrations[this.migrations.length - 1].version;
|
|
195
195
|
}
|
|
196
196
|
static running(space) {
|
|
197
197
|
return this._state.running.includes(space.key.toHex());
|
|
@@ -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, next as am } from '@automerge/automerge';\nimport { type AnyDocumentId, type DocumentId } from '@automerge/automerge-repo';\nimport { type
|
|
5
|
-
"mappings": ";;;AAIA,SAAmBA,QAAQC,UAAU;
|
|
6
|
-
"names": ["next", "am", "CreateEpochRequest", "ObjectCore", "migrateDocument", "SpaceDocVersion", "encodeReference", "Reference", "requireTypeReference", "invariant", "MigrationBuilder", "constructor", "_space", "_newLinks", "_flushIds", "_deleteObjects", "_newRoot", "undefined", "_repo", "db", "coreDatabase", "_rootDoc", "_automergeDocLoader", "getSpaceRootDocHandle", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Doc, next as am } from '@dxos/automerge/automerge';\nimport { type AnyDocumentId, type DocumentId } from '@dxos/automerge/automerge-repo';\nimport { type Space } from '@dxos/client/echo';\nimport { CreateEpochRequest } from '@dxos/client/halo';\nimport { ObjectCore, migrateDocument, type RepoProxy, type DocHandleProxy } from '@dxos/echo-db';\nimport { SpaceDocVersion, encodeReference, type ObjectStructure, type SpaceDoc, Reference } from '@dxos/echo-protocol';\nimport { requireTypeReference, type S } from '@dxos/echo-schema';\nimport { invariant } from '@dxos/invariant';\nimport { type MaybePromise } from '@dxos/util';\n\nexport class MigrationBuilder {\n private readonly _repo: RepoProxy;\n private readonly _rootDoc: Doc<SpaceDoc>;\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<SpaceDoc> = undefined;\n\n constructor(private readonly _space: Space) {\n this._repo = this._space.db.coreDatabase._repo;\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])?.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.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.AnyNoContext; 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\n const oldHandle = await this._findObjectContainingHandle(id);\n invariant(oldHandle);\n\n const newState: SpaceDoc = {\n version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [id]: {\n system: {\n type: encodeReference(requireTypeReference(schema)),\n },\n data: props,\n meta: {\n keys: [],\n },\n },\n },\n };\n const migratedDoc = migrateDocument(oldHandle.docSync() as Doc<SpaceDoc>, newState);\n const newHandle = this._repo.import<SpaceDoc>(am.save(migratedDoc));\n this._newLinks[id] = newHandle.url;\n this._addHandleToFlushList(newHandle);\n }\n\n async addObject(schema: S.Schema.AnyNoContext, props: any) {\n const core = this._createObject({ schema, props });\n return core.id;\n }\n\n createReference(id: string) {\n return encodeReference(Reference.localObjectReference(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._addHandleToFlushList(this._newRoot);\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._space.db.flush();\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 async _findObjectContainingHandle(id: string): Promise<DocHandleProxy<SpaceDoc> | 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 _buildNewRoot() {\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 am.RawString(url);\n }\n\n this._newRoot = this._repo.create<SpaceDoc>({\n version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: this._rootDoc.objects,\n links,\n });\n this._addHandleToFlushList(this._newRoot);\n }\n\n private _createObject({ id, schema, props }: { id?: string; schema: S.Schema.AnyNoContext; 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 version: SpaceDocVersion.CURRENT,\n access: {\n spaceKey: this._space.key.toHex(),\n },\n objects: {\n [core.id]: core.getDoc() as ObjectStructure,\n },\n });\n this._newLinks[core.id] = newHandle.url;\n this._addHandleToFlushList(newHandle);\n\n return core;\n }\n\n private _addHandleToFlushList(handle: DocHandleProxy<any>) {\n this._flushIds.push(handle.documentId);\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.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 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": ["next", "am", "CreateEpochRequest", "ObjectCore", "migrateDocument", "SpaceDocVersion", "encodeReference", "Reference", "requireTypeReference", "invariant", "MigrationBuilder", "constructor", "_space", "_newLinks", "_flushIds", "_deleteObjects", "_newRoot", "undefined", "_repo", "db", "coreDatabase", "_rootDoc", "_automergeDocLoader", "getSpaceRootDocHandle", "docSync", "findObject", "id", "documentId", "links", "toString", "docHandle", "find", "whenReady", "doc", "objects", "migrateObject", "migrate", "objectStructure", "schema", "props", "oldHandle", "_findObjectContainingHandle", "newState", "version", "CURRENT", "access", "spaceKey", "key", "toHex", "system", "type", "data", "meta", "keys", "migratedDoc", "newHandle", "import", "save", "url", "_addHandleToFlushList", "addObject", "core", "_createObject", "createReference", "localObjectReference", "deleteObject", "push", "changeProperties", "changeFn", "_buildNewRoot", "change", "propertiesStructure", "properties", "_commit", "flush", "internal", "createEpoch", "migration", "Migration", "REPLACE_AUTOMERGE_ROOT", "automergeRootUrl", "Object", "entries", "RawString", "create", "initNewObject", "setType", "getDoc", "handle", "create", "SpaceState", "invariant", "Migrations", "migrations", "_state", "create", "running", "versionProperty", "namespace", "targetVersion", "length", "version", "space", "includes", "key", "toHex", "define", "migrate", "invariant", "state", "get", "SpaceState", "SPACE_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":21027,"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":9845,"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-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":14845},"packages/sdk/migrations/dist/lib/node-esm/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":4851},"packages/sdk/migrations/src/index.ts":{"bytesInOutput":0},"packages/sdk/migrations/src/migrations.ts":{"bytesInOutput":2757}},"bytes":7879}}}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type Schema } from 'effect';
|
|
2
1
|
import { type Space } from '@dxos/client/echo';
|
|
3
2
|
import { type ObjectStructure } from '@dxos/echo-protocol';
|
|
3
|
+
import { type S } from '@dxos/echo-schema';
|
|
4
4
|
import { type MaybePromise } from '@dxos/util';
|
|
5
5
|
export declare class MigrationBuilder {
|
|
6
6
|
private readonly _space;
|
|
@@ -13,10 +13,10 @@ export declare class MigrationBuilder {
|
|
|
13
13
|
constructor(_space: Space);
|
|
14
14
|
findObject(id: string): Promise<ObjectStructure | undefined>;
|
|
15
15
|
migrateObject(id: string, migrate: (objectStructure: ObjectStructure) => MaybePromise<{
|
|
16
|
-
schema:
|
|
16
|
+
schema: S.Schema.AnyNoContext;
|
|
17
17
|
props: any;
|
|
18
18
|
}>): Promise<void>;
|
|
19
|
-
addObject(schema:
|
|
19
|
+
addObject(schema: S.Schema.AnyNoContext, props: any): Promise<string>;
|
|
20
20
|
createReference(id: string): import("@dxos/echo-protocol").EncodedReference;
|
|
21
21
|
deleteObject(id: string): void;
|
|
22
22
|
changeProperties(changeFn: (properties: ObjectStructure) => void): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration-builder.d.ts","sourceRoot":"","sources":["../../../src/migration-builder.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,
|
|
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,EAAoC,KAAK,eAAe,EAA4B,MAAM,qBAAqB,CAAC;AACvH,OAAO,EAAwB,KAAK,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEjE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,qBAAa,gBAAgB;IAWf,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAY;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAGzC,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,CAAuC;gBAE3B,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,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC;IAmCtG,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG;IAKzD,eAAe,CAAC,EAAE,EAAE,MAAM;IAI1B,YAAY,CAAC,EAAE,EAAE,MAAM;IAIvB,gBAAgB,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,eAAe,KAAK,IAAI;YA+BlD,2BAA2B;IAWzC,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,qBAAqB;CAG9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../src/migrations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../../src/migrations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAsB,MAAM,mBAAmB,CAAC;AAEnE,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,MAAM,CAAkD;IAEvE,MAAM,KAAK,eAAe,uBAEzB;IAED,MAAM,KAAK,aAAa,WAEvB;IAED,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK;IAI3B,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE;WAK3C,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM;CA6BnE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"5.
|
|
1
|
+
{"version":"5.7.3"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/migrations",
|
|
3
|
-
"version": "0.8.2-
|
|
3
|
+
"version": "0.8.2-staging.7ac8446",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -24,16 +24,15 @@
|
|
|
24
24
|
"src"
|
|
25
25
|
],
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@
|
|
28
|
-
"@
|
|
29
|
-
"@dxos/client": "0.8.2-
|
|
30
|
-
"@dxos/echo-
|
|
31
|
-
"@dxos/
|
|
32
|
-
"@dxos/echo-schema": "0.8.2-
|
|
33
|
-
"@dxos/
|
|
34
|
-
"@dxos/log": "0.8.2-
|
|
35
|
-
"@dxos/protocols": "0.8.2-
|
|
36
|
-
"@dxos/util": "0.8.2-main.fbd8ed0"
|
|
27
|
+
"@dxos/automerge": "0.8.2-staging.7ac8446",
|
|
28
|
+
"@dxos/echo-db": "0.8.2-staging.7ac8446",
|
|
29
|
+
"@dxos/client": "0.8.2-staging.7ac8446",
|
|
30
|
+
"@dxos/echo-protocol": "0.8.2-staging.7ac8446",
|
|
31
|
+
"@dxos/invariant": "0.8.2-staging.7ac8446",
|
|
32
|
+
"@dxos/echo-schema": "0.8.2-staging.7ac8446",
|
|
33
|
+
"@dxos/util": "0.8.2-staging.7ac8446",
|
|
34
|
+
"@dxos/log": "0.8.2-staging.7ac8446",
|
|
35
|
+
"@dxos/protocols": "0.8.2-staging.7ac8446"
|
|
37
36
|
},
|
|
38
37
|
"devDependencies": {},
|
|
39
38
|
"publishConfig": {
|
package/src/migration-builder.ts
CHANGED
|
@@ -2,15 +2,13 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { type Doc, next as am } from '@automerge/automerge';
|
|
6
|
-
import { type AnyDocumentId, type DocumentId } from '@automerge/automerge-repo';
|
|
7
|
-
import { type Schema } from 'effect';
|
|
8
|
-
|
|
5
|
+
import { type Doc, next as am } from '@dxos/automerge/automerge';
|
|
6
|
+
import { type AnyDocumentId, type DocumentId } from '@dxos/automerge/automerge-repo';
|
|
9
7
|
import { type Space } from '@dxos/client/echo';
|
|
10
8
|
import { CreateEpochRequest } from '@dxos/client/halo';
|
|
11
9
|
import { ObjectCore, migrateDocument, type RepoProxy, type DocHandleProxy } from '@dxos/echo-db';
|
|
12
10
|
import { SpaceDocVersion, encodeReference, type ObjectStructure, type SpaceDoc, Reference } from '@dxos/echo-protocol';
|
|
13
|
-
import { requireTypeReference } from '@dxos/echo-schema';
|
|
11
|
+
import { requireTypeReference, type S } from '@dxos/echo-schema';
|
|
14
12
|
import { invariant } from '@dxos/invariant';
|
|
15
13
|
import { type MaybePromise } from '@dxos/util';
|
|
16
14
|
|
|
@@ -30,7 +28,7 @@ export class MigrationBuilder {
|
|
|
30
28
|
// TODO(wittjosiah): Accessing private API.
|
|
31
29
|
this._rootDoc = (this._space.db.coreDatabase as any)._automergeDocLoader
|
|
32
30
|
.getSpaceRootDocHandle()
|
|
33
|
-
.
|
|
31
|
+
.docSync() as Doc<SpaceDoc>;
|
|
34
32
|
}
|
|
35
33
|
|
|
36
34
|
async findObject(id: string): Promise<ObjectStructure | undefined> {
|
|
@@ -41,13 +39,13 @@ export class MigrationBuilder {
|
|
|
41
39
|
}
|
|
42
40
|
|
|
43
41
|
await docHandle.whenReady();
|
|
44
|
-
const doc = docHandle.
|
|
42
|
+
const doc = docHandle.docSync() as Doc<SpaceDoc>;
|
|
45
43
|
return doc.objects?.[id];
|
|
46
44
|
}
|
|
47
45
|
|
|
48
46
|
async migrateObject(
|
|
49
47
|
id: string,
|
|
50
|
-
migrate: (objectStructure: ObjectStructure) => MaybePromise<{ schema:
|
|
48
|
+
migrate: (objectStructure: ObjectStructure) => MaybePromise<{ schema: S.Schema.AnyNoContext; props: any }>,
|
|
51
49
|
) {
|
|
52
50
|
const objectStructure = await this.findObject(id);
|
|
53
51
|
if (!objectStructure) {
|
|
@@ -76,13 +74,13 @@ export class MigrationBuilder {
|
|
|
76
74
|
},
|
|
77
75
|
},
|
|
78
76
|
};
|
|
79
|
-
const migratedDoc = migrateDocument(oldHandle.
|
|
77
|
+
const migratedDoc = migrateDocument(oldHandle.docSync() as Doc<SpaceDoc>, newState);
|
|
80
78
|
const newHandle = this._repo.import<SpaceDoc>(am.save(migratedDoc));
|
|
81
79
|
this._newLinks[id] = newHandle.url;
|
|
82
80
|
this._addHandleToFlushList(newHandle);
|
|
83
81
|
}
|
|
84
82
|
|
|
85
|
-
async addObject(schema:
|
|
83
|
+
async addObject(schema: S.Schema.AnyNoContext, props: any) {
|
|
86
84
|
const core = this._createObject({ schema, props });
|
|
87
85
|
return core.id;
|
|
88
86
|
}
|
|
@@ -158,7 +156,7 @@ export class MigrationBuilder {
|
|
|
158
156
|
this._addHandleToFlushList(this._newRoot);
|
|
159
157
|
}
|
|
160
158
|
|
|
161
|
-
private _createObject({ id, schema, props }: { id?: string; schema:
|
|
159
|
+
private _createObject({ id, schema, props }: { id?: string; schema: S.Schema.AnyNoContext; props: any }) {
|
|
162
160
|
const core = new ObjectCore();
|
|
163
161
|
if (id) {
|
|
164
162
|
core.id = id;
|
package/src/migrations.test.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { afterAll, beforeAll, beforeEach, describe, expect, test } from 'vitest';
|
|
6
6
|
|
|
7
7
|
import { Client } from '@dxos/client';
|
|
8
|
-
import {
|
|
8
|
+
import { create, Filter, type Space } from '@dxos/client/echo';
|
|
9
9
|
import { TestBuilder } from '@dxos/client/testing';
|
|
10
10
|
import { Expando } from '@dxos/echo-schema';
|
|
11
11
|
|
|
@@ -65,7 +65,7 @@ describe('Migrations', () => {
|
|
|
65
65
|
|
|
66
66
|
test('if no migrations have been run before, runs all migrations', async () => {
|
|
67
67
|
await Migrations.migrate(space);
|
|
68
|
-
const { objects } = await space.db.query(Filter.
|
|
68
|
+
const { objects } = await space.db.query(Filter.schema(Expando, { namespace: 'test' })).run();
|
|
69
69
|
expect(objects).to.have.length(1);
|
|
70
70
|
expect(objects[0].count).to.equal(6);
|
|
71
71
|
expect(space.properties['test.version']).to.equal('1970-01-03');
|
|
@@ -73,9 +73,9 @@ describe('Migrations', () => {
|
|
|
73
73
|
|
|
74
74
|
test('if some migrations have been run before, runs only the remaining migrations', async () => {
|
|
75
75
|
space.properties['test.version'] = '1970-01-02';
|
|
76
|
-
space.db.add(
|
|
76
|
+
space.db.add(create(Expando, { namespace: 'test', count: 5 }));
|
|
77
77
|
await Migrations.migrate(space);
|
|
78
|
-
const { objects } = await space.db.query(Filter.
|
|
78
|
+
const { objects } = await space.db.query(Filter.schema(Expando, { namespace: 'test' })).run();
|
|
79
79
|
expect(objects).to.have.length(1);
|
|
80
80
|
expect(objects[0].count).to.equal(15);
|
|
81
81
|
expect(space.properties['test.version']).to.equal('1970-01-03');
|
|
@@ -84,13 +84,13 @@ describe('Migrations', () => {
|
|
|
84
84
|
test('if all migrations have been run before, does nothing', async () => {
|
|
85
85
|
space.properties['test.version'] = '1970-01-03';
|
|
86
86
|
await Migrations.migrate(space);
|
|
87
|
-
const { objects } = await space.db.query(Filter.
|
|
87
|
+
const { objects } = await space.db.query(Filter.schema(Expando, { namespace: 'test' })).run();
|
|
88
88
|
expect(objects).to.have.length(0);
|
|
89
89
|
});
|
|
90
90
|
|
|
91
91
|
test('if target version is specified, runs only the migrations up to that version', async () => {
|
|
92
92
|
await Migrations.migrate(space, '1970-01-02');
|
|
93
|
-
const { objects } = await space.db.query(Filter.
|
|
93
|
+
const { objects } = await space.db.query(Filter.schema(Expando, { namespace: 'test' })).run();
|
|
94
94
|
expect(objects).to.have.length(1);
|
|
95
95
|
expect(objects[0].count).to.equal(2);
|
|
96
96
|
expect(space.properties['test.version']).to.equal('1970-01-02');
|
package/src/migrations.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { type Space,
|
|
5
|
+
import { type Space, create, SpaceState } from '@dxos/client/echo';
|
|
6
6
|
import { invariant } from '@dxos/invariant';
|
|
7
7
|
import { type MaybePromise } from '@dxos/util';
|
|
8
8
|
|
|
@@ -21,14 +21,14 @@ export type Migration = {
|
|
|
21
21
|
export class Migrations {
|
|
22
22
|
static namespace?: string;
|
|
23
23
|
static migrations: Migration[] = [];
|
|
24
|
-
private static _state =
|
|
24
|
+
private static _state = create<{ running: string[] }>({ running: [] });
|
|
25
25
|
|
|
26
26
|
static get versionProperty() {
|
|
27
27
|
return this.namespace && `${this.namespace}.version`;
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
static get targetVersion() {
|
|
31
|
-
return this.migrations[this.migrations.length - 1]
|
|
31
|
+
return this.migrations[this.migrations.length - 1].version;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
static running(space: Space) {
|