@dxos/migrations 0.4.10-main.bf8d896 → 0.4.10-main.c16d37b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/migrations",
-  "version": "0.4.10-main.bf8d896",
+  "version": "0.4.10-main.c16d37b",
   "description": "",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -20,10 +20,10 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/client": "0.4.10-main.bf8d896",
-    "@dxos/echo-schema": "0.4.10-main.bf8d896",
-    "@dxos/invariant": "0.4.10-main.bf8d896",
-    "@dxos/util": "0.4.10-main.bf8d896"
+    "@dxos/client": "0.4.10-main.c16d37b",
+    "@dxos/echo-schema": "0.4.10-main.c16d37b",
+    "@dxos/invariant": "0.4.10-main.c16d37b",
+    "@dxos/util": "0.4.10-main.c16d37b"
   },
   "devDependencies": {},
   "publishConfig": {

package/src/migrations.test.ts

@@ -7,8 +7,7 @@ import { expect } from 'chai';
 import { Client } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
 import { TestBuilder } from '@dxos/client/testing';
-import * as E from '@dxos/echo-schema';
-import { Expando } from '@dxos/echo-schema';
+import { Expando, create } from '@dxos/echo-schema';
 import { describe, test, beforeEach, beforeAll, afterAll } from '@dxos/test';
 
 import { Migrations } from './migrations';
@@ -17,10 +16,10 @@ Migrations.define('test', [
   {
     version: 1,
     up: async ({ space }) => {
-      space.db.add(E.object(E.Expando, { namespace: 'test', count: 1 }));
+      space.db.add(create(Expando, { namespace: 'test', count: 1 }));
     },
     down: async ({ space }) => {
-      const { objects } = space.db.query({ namespace: 'test' });
+      const { objects } = await space.db.query({ namespace: 'test' }).run();
       for (const object of objects) {
         space.db.remove(object);
       }
@@ -29,7 +28,7 @@ Migrations.define('test', [
   {
     version: 2,
     up: async ({ space }) => {
-      const { objects } = space.db.query({ namespace: 'test' });
+      const { objects } = await space.db.query({ namespace: 'test' }).run();
       for (const object of objects) {
         object.count = 2;
       }
@@ -41,13 +40,13 @@ Migrations.define('test', [
   {
     version: 3,
     up: async ({ space }) => {
-      const { objects } = space.db.query({ namespace: 'test' });
+      const { objects } = await space.db.query({ namespace: 'test' }).run();
       for (const object of objects) {
         object.count *= 3;
       }
     },
     down: async ({ space }) => {
-      const { objects } = space.db.query({ namespace: 'test' });
+      const { objects } = await space.db.query({ namespace: 'test' }).run();
       for (const object of objects) {
         object.count /= 3;
       }
@@ -76,7 +75,7 @@ describe('Migrations', () => {
 
   test('if no migrations have been run before, runs all migrations', async () => {
     await Migrations.migrate(space);
-    const { objects } = space.db.query({ namespace: 'test' });
+    const { objects } = await space.db.query({ namespace: 'test' }).run();
     expect(objects).to.have.length(1);
     expect(objects[0].count).to.equal(6);
     expect(space.properties['test.version']).to.equal(3);
@@ -84,9 +83,9 @@ describe('Migrations', () => {
 
   test('if some migrations have been run before, runs only the remaining migrations', async () => {
     space.properties['test.version'] = 2;
-    space.db.add(E.object(Expando, { namespace: 'test', count: 5 }));
+    space.db.add(create(Expando, { namespace: 'test', count: 5 }));
     await Migrations.migrate(space);
-    const { objects } = space.db.query({ namespace: 'test' });
+    const { objects } = await space.db.query({ namespace: 'test' }).run();
     expect(objects).to.have.length(1);
     expect(objects[0].count).to.equal(15);
     expect(space.properties['test.version']).to.equal(3);
@@ -95,27 +94,28 @@ describe('Migrations', () => {
   test('if all migrations have been run before, does nothing', async () => {
     space.properties['test.version'] = 3;
     await Migrations.migrate(space);
-    const { objects } = space.db.query({ namespace: 'test' });
+    const { objects } = await space.db.query({ namespace: 'test' }).run();
     expect(objects).to.have.length(0);
   });
 
   test('if target version is specified, runs only the migrations up to that version', async () => {
     await Migrations.migrate(space, 2);
-    const { objects } = space.db.query({ namespace: 'test' });
+    const { objects } = await space.db.query({ namespace: 'test' }).run();
     expect(objects).to.have.length(1);
     expect(objects[0].count).to.equal(2);
     expect(space.properties['test.version']).to.equal(2);
   });
 
   test('if target version is specified and is lower than current version, runs the down migrations', async () => {
-    const query = space.db.query({ namespace: 'test' });
     await Migrations.migrate(space);
-    expect(query.objects).to.have.length(1);
-    expect(query.objects[0].count).to.equal(6);
+    const beforeDowngrade = await space.db.query({ namespace: 'test' }).run();
+    expect(beforeDowngrade.objects).to.have.length(1);
+    expect(beforeDowngrade.objects[0].count).to.equal(6);
     expect(space.properties['test.version']).to.equal(3);
     await Migrations.migrate(space, 1);
-    expect(query.objects).to.have.length(1);
-    expect(query.objects[0].count).to.equal(2);
+    const afterDowngrade = await space.db.query({ namespace: 'test' }).run();
+    expect(afterDowngrade.objects).to.have.length(1);
+    expect(afterDowngrade.objects[0].count).to.equal(2);
     expect(space.properties['test.version']).to.equal(1);
   });
 });