@dxos/migrations 0.8.4-main.84f28bd → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/migrations",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.ae835ea",
   "description": "",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,6 +10,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
@@ -24,16 +25,16 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.0.0",
-    "@automerge/automerge-repo": "2.0.8",
-    "@dxos/echo-db": "0.8.4-main.84f28bd",
-    "@dxos/client": "0.8.4-main.84f28bd",
-    "@dxos/echo-protocol": "0.8.4-main.84f28bd",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd",
-    "@dxos/invariant": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/protocols": "0.8.4-main.84f28bd",
-    "@dxos/util": "0.8.4-main.84f28bd"
+    "@automerge/automerge": "3.1.2",
+    "@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,21 +2,21 @@
 // Copyright 2024 DXOS.org
 //
 
-import { next as am, type Doc } 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 { ObjectCore, migrateDocument, type DocHandleProxy, type RepoProxy } from '@dxos/echo-db';
+import { requireTypeReference } from '@dxos/echo/internal';
+import { type DocHandleProxy, ObjectCore, type RepoProxy, migrateDocument } from '@dxos/echo-db';
 import {
+  type DatabaseDirectory,
+  type ObjectStructure,
   Reference,
   SpaceDocVersion,
   encodeReference,
-  type DatabaseDirectory,
-  type ObjectStructure,
 } 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 { live, Filter, type Space } 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';
 
@@ -22,7 +23,7 @@ Migrations.define('test', [
     version: '1970-01-02',
     next: async ({ space, builder }) => {
       // TODO(dmaretskyi): Is this intended to query only expando objects? Change to `Filter.type(Expando, { namespace: 'test' })`
-      const { objects } = await space.db.query(Filter._props<any>({ namespace: 'test' })).run();
+      const { objects } = await space.db.query(Filter.props<any>({ namespace: 'test' })).run();
       for (const object of objects) {
         await builder.migrateObject(object.id, ({ data }) => ({
           schema: Expando,
@@ -35,7 +36,7 @@ Migrations.define('test', [
     version: '1970-01-03',
     next: async ({ space, builder }) => {
       // TODO(dmaretskyi): Is this intended to query only expando objects? Change to `Filter.type(Expando, { namespace: 'test' })`
-      const { objects } = await space.db.query(Filter._props<any>({ namespace: 'test' })).run();
+      const { objects } = await space.db.query(Filter.props<any>({ namespace: 'test' })).run();
       for (const object of objects) {
         await builder.migrateObject(object.id, ({ data }) => ({
           schema: Expando,
@@ -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);

package/src/migrations.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Space, live, SpaceState } from '@dxos/client/echo';
+import { type Space, SpaceState, live } from '@dxos/client/echo';
 import { invariant } from '@dxos/invariant';
 import { type MaybePromise } from '@dxos/util';