@dxos/migrations 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/migrations",
-  "version": "0.8.4-main.a4bbb77",
+  "version": "0.8.4-main.ae835ea",
   "description": "",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -26,15 +26,15 @@
   ],
   "dependencies": {
     "@automerge/automerge": "3.1.2",
-    "@automerge/automerge-repo": "2.3.1",
-    "@dxos/client": "0.8.4-main.a4bbb77",
-    "@dxos/echo-db": "0.8.4-main.a4bbb77",
-    "@dxos/echo-protocol": "0.8.4-main.a4bbb77",
-    "@dxos/invariant": "0.8.4-main.a4bbb77",
-    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
-    "@dxos/protocols": "0.8.4-main.a4bbb77",
-    "@dxos/util": "0.8.4-main.a4bbb77",
-    "@dxos/log": "0.8.4-main.a4bbb77"
+    "@automerge/automerge-repo": "2.4.0",
+    "@dxos/client": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea",
+    "@dxos/echo-db": "0.8.4-main.ae835ea",
+    "@dxos/echo-protocol": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/protocols": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea"
   },
   "devDependencies": {},
   "publishConfig": {

package/src/migration-builder.ts

@@ -2,12 +2,13 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Doc, next as am } from '@automerge/automerge';
+import { next as A, type Doc } from '@automerge/automerge';
 import { type AnyDocumentId, type DocumentId } from '@automerge/automerge-repo';
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 
 import { type Space } from '@dxos/client/echo';
 import { CreateEpochRequest } from '@dxos/client/halo';
+import { requireTypeReference } from '@dxos/echo/internal';
 import { type DocHandleProxy, ObjectCore, type RepoProxy, migrateDocument } from '@dxos/echo-db';
 import {
   type DatabaseDirectory,
@@ -16,7 +17,6 @@ import {
   SpaceDocVersion,
   encodeReference,
 } from '@dxos/echo-protocol';
-import { requireTypeReference } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { type MaybePromise } from '@dxos/util';
 
@@ -101,7 +101,7 @@ export class MigrationBuilder {
       },
     };
     const migratedDoc = migrateDocument(oldHandle.doc() as Doc<DatabaseDirectory>, newState);
-    const newHandle = this._repo.import<DatabaseDirectory>(am.save(migratedDoc));
+    const newHandle = this._repo.import<DatabaseDirectory>(A.save(migratedDoc));
     this._newLinks[id] = newHandle.url;
     this._addHandleToFlushList(newHandle);
   }
@@ -168,7 +168,7 @@ export class MigrationBuilder {
     }
 
     for (const [id, url] of Object.entries(this._newLinks)) {
-      links[id] = new am.RawString(url);
+      links[id] = new A.RawString(url);
     }
 
     this._newRoot = this._repo.create<DatabaseDirectory>({

package/src/migrations.test.ts

@@ -5,9 +5,10 @@
 import { afterAll, beforeAll, beforeEach, describe, expect, test } from 'vitest';
 
 import { Client } from '@dxos/client';
-import { Filter, type Space, live } from '@dxos/client/echo';
+import { Filter, type Space } from '@dxos/client/echo';
 import { TestBuilder } from '@dxos/client/testing';
-import { Expando } from '@dxos/echo-schema';
+import { Obj, Type } from '@dxos/echo';
+import { Expando } from '@dxos/echo/internal';
 
 import { Migrations } from './migrations';
 
@@ -75,7 +76,7 @@ describe('Migrations', () => {
 
   test('if some migrations have been run before, runs only the remaining migrations', async () => {
     space.properties['test.version'] = '1970-01-02';
-    space.db.add(live(Expando, { namespace: 'test', count: 5 }));
+    space.db.add(Obj.make(Type.Expando, { namespace: 'test', count: 5 }));
     await Migrations.migrate(space);
     const { objects } = await space.db.query(Filter.type(Expando, { namespace: 'test' })).run();
     expect(objects).to.have.length(1);