@dxos/echo-generator 0.8.4-main.2e9d522 → 0.8.4-main.3c1ae3b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-generator",
-  "version": "0.8.4-main.2e9d522",
+  "version": "0.8.4-main.3c1ae3b",
   "description": "ECHO data generator for testing.",
   "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,24 +25,23 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.1",
-    "effect": "3.17.0",
-    "@dxos/client": "0.8.4-main.2e9d522",
-    "@dxos/echo-db": "0.8.4-main.2e9d522",
-    "@dxos/echo-schema": "0.8.4-main.2e9d522",
-    "@dxos/invariant": "0.8.4-main.2e9d522",
-    "@dxos/live-object": "0.8.4-main.2e9d522",
-    "@dxos/log": "0.8.4-main.2e9d522",
-    "@dxos/node-std": "0.8.4-main.2e9d522",
-    "@dxos/schema": "0.8.4-main.2e9d522",
-    "@dxos/util": "0.8.4-main.2e9d522"
+    "@automerge/automerge": "3.1.2",
+    "effect": "3.18.3",
+    "@dxos/client": "0.8.4-main.3c1ae3b",
+    "@dxos/echo": "0.8.4-main.3c1ae3b",
+    "@dxos/echo-db": "0.8.4-main.3c1ae3b",
+    "@dxos/live-object": "0.8.4-main.3c1ae3b",
+    "@dxos/invariant": "0.8.4-main.3c1ae3b",
+    "@dxos/log": "0.8.4-main.3c1ae3b",
+    "@dxos/node-std": "0.8.4-main.3c1ae3b",
+    "@dxos/util": "0.8.4-main.3c1ae3b"
   },
   "devDependencies": {
-    "@dxos/random": "0.8.4-main.2e9d522"
+    "@dxos/random": "0.8.4-main.3c1ae3b"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
-    "@dxos/random": "0.8.4-main.2e9d522"
+    "@dxos/random": "0.8.4-main.3c1ae3b"
   },
   "publishConfig": {
     "access": "public"

package/src/data.ts

@@ -3,10 +3,12 @@
 //
 
 import { next as A } from '@automerge/automerge';
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { createDocAccessor, type Space } from '@dxos/client/echo';
-import { EchoObject, Ref } from '@dxos/echo-schema';
+import { type Space } from '@dxos/client/echo';
+import { Ref, Type } from '@dxos/echo';
+import { EchoObjectSchema } from '@dxos/echo/internal';
+import { createDocAccessor } from '@dxos/echo-db';
 import { faker } from '@dxos/random';
 
 import { SpaceObjectGenerator, TestObjectGenerator } from './generator';
@@ -26,7 +28,7 @@ export const Priority = [1, 2, 3, 4, 5];
 export enum TestSchemaType {
   document = 'example.com/type/Document',
   organization = 'example.com/type/Organization',
-  contact = 'example.com/type/Contact',
+  contact = 'example.com/type/Person',
   project = 'example.com/type/Project',
 }
 
@@ -37,21 +39,21 @@ const testSchemas = (): TestSchemaMap<TestSchemaType> => {
   const document = Schema.Struct({
     title: Schema.String.annotations({ description: 'title of the document' }),
     content: Schema.String,
-  }).pipe(EchoObject({ typename: TestSchemaType.document, version: '0.1.0' }));
+  }).pipe(EchoObjectSchema({ typename: TestSchemaType.document, version: '0.1.0' }));
 
   const organization = Schema.Struct({
     name: Schema.String.annotations({ description: 'name of the company or organization' }),
     website: Schema.optional(Schema.String.annotations({ description: 'public website URL' })),
     description: Schema.String.annotations({ description: 'short summary of the company' }),
-  }).pipe(EchoObject({ typename: TestSchemaType.organization, version: '0.1.0' }));
+  }).pipe(EchoObjectSchema({ typename: TestSchemaType.organization, version: '0.1.0' }));
 
   const contact = Schema.Struct({
     name: Schema.String.annotations({ description: 'name of the person' }),
     email: Schema.optional(Schema.String),
-    org: Schema.optional(Ref(organization)),
+    org: Schema.optional(Type.Ref(organization)),
     lat: Schema.optional(Schema.Number),
     lng: Schema.optional(Schema.Number),
-  }).pipe(EchoObject({ typename: TestSchemaType.contact, version: '0.1.0' }));
+  }).pipe(EchoObjectSchema({ typename: TestSchemaType.contact, version: '0.1.0' }));
 
   const project = Schema.Struct({
     name: Schema.String.annotations({ description: 'name of the project' }),
@@ -61,8 +63,8 @@ const testSchemas = (): TestSchemaMap<TestSchemaType> => {
     status: Schema.String,
     priority: Schema.Number,
     active: Schema.Boolean,
-    org: Schema.optional(Ref(organization)),
-  }).pipe(EchoObject({ typename: TestSchemaType.project, version: '0.1.0' }));
+    org: Schema.optional(Type.Ref(organization)),
+  }).pipe(EchoObjectSchema({ typename: TestSchemaType.project, version: '0.1.0' }));
 
   return {
     [TestSchemaType.document]: document,

package/src/generator.test.ts

@@ -3,15 +3,16 @@
 //
 
 import { next as A } from '@automerge/automerge';
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Client } from '@dxos/client';
+import { Obj } from '@dxos/echo';
+import { TypedObject } from '@dxos/echo/internal';
 import { getObjectCore } from '@dxos/echo-db';
-import { TypedObject, getType } from '@dxos/echo-schema';
 import { faker } from '@dxos/random';
 
-import { createSpaceObjectGenerator, createTestObjectGenerator, TestSchemaType } from './data';
+import { TestSchemaType, createSpaceObjectGenerator, createTestObjectGenerator } from './data';
 import { SpaceObjectGenerator } from './generator';
 
 faker.seed(3);
@@ -43,7 +44,7 @@ describe('TestObjectGenerator', () => {
 
     // Create org object.
     const organization = await generator.createObject({ types: [TestSchemaType.organization] });
-    expect(getType(organization)).to.exist;
+    expect(Obj.getTypeDXN(organization)).to.exist;
 
     // Expect at least one person object with a linked org reference.
     const objects = await generator.createObjects({ [TestSchemaType.contact]: 10 });
@@ -59,14 +60,14 @@ describe('TestObjectGenerator', () => {
       const generator = createSpaceObjectGenerator(space);
       await generator.addSchemas();
       const organization = await generator.createObject({ types: [TestSchemaType.organization] });
-      schemaId.push(getType(organization)!.toString());
+      schemaId.push(Obj.getTypeDXN(organization)!.toString());
     }
 
     {
       const generator = createSpaceObjectGenerator(space);
       await generator.addSchemas();
       const organization = await generator.createObject({ types: [TestSchemaType.organization] });
-      schemaId.push(getType(organization)!.toString());
+      schemaId.push(Obj.getTypeDXN(organization)!.toString());
     }
 
     expect(schemaId[0]).not.to.be.undefined;
@@ -78,7 +79,7 @@ describe('TestObjectGenerator', () => {
     const generator = createSpaceObjectGenerator(space);
     await generator.addSchemas();
     const document = await generator.createObject({ types: [TestSchemaType.document] });
-    expect(getType(document)).to.exist;
+    expect(Obj.getTypeDXN(document)).to.exist;
 
     const beforeChangesCount = A.getAllChanges(getObjectCore(document).docHandle!.doc()).length;
 
@@ -106,7 +107,9 @@ describe('TestObjectGenerator', () => {
     const { space } = await setupTest();
     const generator = new SpaceObjectGenerator<Types>(
       space,
-      { [Types.task]: Task },
+      {
+        [Types.task]: Task,
+      },
       {
         [Types.task]: () => ({ name: 'Default' }),
       },
@@ -121,7 +124,7 @@ describe('TestObjectGenerator', () => {
     await generator.addSchemas();
 
     const todo = await generator.createObject({ types: [Types.task] });
-    expect(getType(todo)).to.exist;
+    expect(Obj.getTypeDXN(todo)).to.exist;
   });
 
   test('references', async () => {
@@ -141,7 +144,7 @@ describe('TestObjectGenerator', () => {
   test('create project', async () => {
     const generator = createTestObjectGenerator();
     const project = await generator.createObject({ types: [TestSchemaType.project] });
-    expect(getType(project)).to.exist;
+    expect(Obj.getTypeDXN(project)).to.exist;
   });
 
   test('create object with not type', async () => {

package/src/generator.ts

@@ -2,13 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 
 import { Filter, type Space } from '@dxos/client/echo';
+import { Obj } from '@dxos/echo';
+import { EchoSchema, getTypeAnnotation } from '@dxos/echo/internal';
 import { type AnyLiveObject } from '@dxos/echo-db';
-import { getTypeAnnotation, EchoSchema, getSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
-import { live, isLiveObject, type Live } from '@dxos/live-object';
+import { type Live, isLiveObject, live } from '@dxos/live-object';
 import { faker } from '@dxos/random';
 import { entries, range } from '@dxos/util';
 
@@ -28,10 +29,10 @@ import {
 export class TestObjectGenerator<T extends string = TestSchemaType> {
   // prettier-ignore
   constructor(
-    protected readonly _schemas: TestSchemaMap<T>,
-    private readonly _generators: TestGeneratorMap<T>,
-    private readonly _provider?: TestObjectProvider<T>,
-  ) {}
+		protected readonly _schemas: TestSchemaMap<T>,
+		private readonly _generators: TestGeneratorMap<T>,
+		private readonly _provider?: TestObjectProvider<T>,
+	) {}
 
   get schemas(): (EchoSchema | Schema.Schema.AnyNoContext)[] {
     return Object.values(this._schemas);
@@ -53,7 +54,7 @@ export class TestObjectGenerator<T extends string = TestSchemaType> {
     }
 
     const schema = this.getSchema(type);
-    return schema ? live(schema, data) : live(data);
+    return schema ? Obj.make(schema, data) : live(data);
   }
 
   // TODO(burdon): Based on dependencies (e.g., organization before contact).
@@ -85,7 +86,7 @@ export class SpaceObjectGenerator<T extends string> extends TestObjectGenerator<
   ) {
     super(schemaMap, generators, async (type: T) => {
       const schema = this.getSchema(type);
-      const { objects } = await this._space.db.query(schema ? Filter.type(schema) : Filter.nothing()).run();
+      const objects = await this._space.db.query(schema ? Filter.type(schema) : Filter.nothing()).run();
       return objects;
     });
   }
@@ -101,7 +102,11 @@ export class SpaceObjectGenerator<T extends string> extends TestObjectGenerator<
     return result;
   }
 
-  override async createObject({ types }: { types?: T[] } = {}): Promise<AnyLiveObject<any>> {
+  override async createObject({
+    types,
+  }: {
+    types?: T[];
+  } = {}): Promise<AnyLiveObject<any>> {
     return this._space.db.add(await super.createObject({ types }));
   }
 
@@ -121,14 +126,14 @@ export class SpaceObjectGenerator<T extends string> extends TestObjectGenerator<
       if (existingSchema != null) {
         return existingSchema;
       }
-      this._space.db.graph.schemaRegistry.addSchema([schema]);
+      await this._space.db.graph.schemaRegistry.register([schema]);
       return schema;
     }
   }
 
   async mutateObject(object: AnyLiveObject<any>, params: MutationsProviderParams): Promise<void> {
     invariant(this._mutations, 'Mutations not defined.');
-    const type = getTypeAnnotation(getSchema(object)!)!.typename as T;
+    const type = getTypeAnnotation(Obj.getSchema(object)!)!.typename as T;
     invariant(type && this._mutations?.[type], 'Invalid object type.');
 
     await this._mutations![type](object, params);

package/src/types.ts

@@ -2,10 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 
+import { type EchoSchema } from '@dxos/echo/internal';
 import { type AnyLiveObject } from '@dxos/echo-db';
-import { type EchoSchema } from '@dxos/echo-schema';
 import { type Live } from '@dxos/live-object';
 
 // TODO(burdon): Use echo-schema types.