@dxos/echo-generator 0.7.1-staging.8709ba7 → 0.7.2-staging.6d26b2a

package/dist/types/src/generator.d.ts

@@ -1,5 +1,5 @@
 import { type Space } from '@dxos/client/echo';
-import { type EchoReactiveObject } from '@dxos/echo-db';
+import { type ReactiveEchoObject } from '@dxos/echo-db';
 import { MutableSchema, type ReactiveObject, type S } from '@dxos/echo-schema';
 import { type TestSchemaType } from './data';
 import { type MutationsProviderParams, type TestGeneratorMap, type TestMutationsMap, type TestObjectProvider, type TestSchemaMap } from './types';
@@ -29,9 +29,9 @@ export declare class SpaceObjectGenerator<T extends string> extends TestObjectGe
     addSchemas(): (MutableSchema | S.Schema<any, any, never>)[];
     createObject({ types }?: {
         types?: T[];
-    }): Promise<EchoReactiveObject<any>>;
+    }): Promise<ReactiveEchoObject<any>>;
     private _maybeRegisterSchema;
-    mutateObject(object: EchoReactiveObject<any>, params: MutationsProviderParams): Promise<void>;
-    mutateObjects(objects: EchoReactiveObject<any>[], params: MutationsProviderParams): Promise<void>;
+    mutateObject(object: ReactiveEchoObject<any>, params: MutationsProviderParams): Promise<void>;
+    mutateObjects(objects: ReactiveEchoObject<any>[], params: MutationsProviderParams): Promise<void>;
 }
 //# sourceMappingURL=generator.d.ts.map

package/dist/types/src/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../src/generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAU,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAEL,aAAa,EACb,KAAK,cAAc,EAInB,KAAK,CAAC,EACP,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EACnB,MAAM,SAAS,CAAC;AAGjB;;GAEG;AACH,qBAAa,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,cAAc;IAG9D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAFR,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC5B,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAChC,SAAS,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,YAAA;IAGpD,IAAI,OAAO,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAE/C;IAED,SAAS,CAAC,IAAI,EAAE,CAAC,GAAG,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS;IAI7D,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;IAI5D,YAAY,CAAC,EAAE,KAAK,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAA;KAAO,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAa3E,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;CASpD;AAED;;GAEG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAE,SAAQ,mBAAmB,CAAC,CAAC,CAAC;IAE9E,OAAO,CAAC,QAAQ,CAAC,MAAM;IAGvB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAHX,MAAM,EAAE,KAAK,EAC9B,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAC3B,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EACd,UAAU,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,YAAA;IAenD,UAAU;IASK,YAAY,CAAC,EAAE,KAAK,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAA;KAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAI9F,OAAO,CAAC,oBAAoB;IAkBtB,YAAY,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,uBAAuB;IAQ7E,aAAa,CAAC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,uBAAuB;CAKxF"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../src/generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAU,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAKL,aAAa,EACb,KAAK,cAAc,EACnB,KAAK,CAAC,EACP,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EACnB,MAAM,SAAS,CAAC;AAGjB;;GAEG;AACH,qBAAa,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,cAAc;IAG9D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAFR,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC5B,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAChC,SAAS,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,YAAA;IAGpD,IAAI,OAAO,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAE/C;IAED,SAAS,CAAC,IAAI,EAAE,CAAC,GAAG,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS;IAI7D,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;IAI5D,YAAY,CAAC,EAAE,KAAK,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAA;KAAO,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAY3E,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;CASpD;AAED;;GAEG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAE,SAAQ,mBAAmB,CAAC,CAAC,CAAC;IAE9E,OAAO,CAAC,QAAQ,CAAC,MAAM;IAGvB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAHX,MAAM,EAAE,KAAK,EAC9B,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAC3B,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EACd,UAAU,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,YAAA;IAenD,UAAU;IASK,YAAY,CAAC,EAAE,KAAK,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAA;KAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAI9F,OAAO,CAAC,oBAAoB;IAkBtB,YAAY,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,uBAAuB;IAQ7E,aAAa,CAAC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,uBAAuB;CAKxF"}

package/dist/types/src/types.d.ts

@@ -1,16 +1,16 @@
-import { type EchoReactiveObject } from '@dxos/echo-db';
+import { type ReactiveEchoObject } from '@dxos/echo-db';
 import { type MutableSchema, type ReactiveObject, type S } from '@dxos/echo-schema';
 export type TestObject = {
     id: string;
 } & Record<string, any>;
-export type TestSchemaMap<T extends string> = Record<T, MutableSchema | S.Schema<any>>;
-export type TestGeneratorMap<T extends string> = Record<T, (provider: TestObjectProvider<T> | undefined) => any>;
-export type TestObjectProvider<T extends string> = (type: T) => Promise<ReactiveObject<any>[]>;
-export type TestMutationsMap<T extends string> = Record<T, TestObjectMutators>;
+export type TestSchemaMap<T extends string = string> = Record<T, MutableSchema | S.Schema<any>>;
+export type TestObjectProvider<T extends string = string> = (type: T) => Promise<ReactiveObject<any>[]>;
+export type TestGeneratorMap<T extends string = string> = Record<T, (provider: TestObjectProvider<T> | undefined) => any>;
+export type TestMutationsMap<T extends string = string> = Record<T, TestObjectMutators>;
 export type MutationsProviderParams = {
     count: number;
     mutationSize: number;
     maxContentLength: number;
 };
-export type TestObjectMutators = (object: EchoReactiveObject<any>, params: MutationsProviderParams) => Promise<void>;
+export type TestObjectMutators = (object: ReactiveEchoObject<any>, params: MutationsProviderParams) => Promise<void>;
 //# sourceMappingURL=types.d.ts.map

package/dist/types/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEpF,MAAM,MAAM,UAAU,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE9D,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI,MAAM,CAAC,CAAC,EAAE,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAEvF,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI,MAAM,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC;AAEjH,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAE/F,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI,MAAM,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAE/E,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAGpF,MAAM,MAAM,UAAU,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE9D,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,EAAE,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAEhG,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAExG,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,MAAM,CAC9D,CAAC,EACD,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,GAAG,CACrD,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAExF,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/types/src/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,KAAK,GAAI,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,SAAS,UAAU,MAAM,KAAG,CAAC,EAGlD,CAAC;AAE5B,eAAO,MAAM,UAAU,WAAY,MAAM,WAQxC,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,KAAK,GAAI,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,SAAS,UAAU,MAAM,KAAG,CAAC,EAGlD,CAAC;AAE5B,eAAO,MAAM,UAAU,WAAY,MAAM,WASxC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-generator",
-  "version": "0.7.1-staging.8709ba7",
+  "version": "0.7.2-staging.6d26b2a",
   "description": "ECHO data generator for testing.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -23,18 +23,19 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/automerge": "0.7.1-staging.8709ba7",
-    "@dxos/client": "0.7.1-staging.8709ba7",
-    "@dxos/echo-db": "0.7.1-staging.8709ba7",
-    "@dxos/invariant": "0.7.1-staging.8709ba7",
-    "@dxos/echo-schema": "0.7.1-staging.8709ba7",
-    "@dxos/node-std": "0.7.1-staging.8709ba7"
+    "@dxos/automerge": "0.7.2-staging.6d26b2a",
+    "@dxos/client": "0.7.2-staging.6d26b2a",
+    "@dxos/echo-db": "0.7.2-staging.6d26b2a",
+    "@dxos/echo-schema": "0.7.2-staging.6d26b2a",
+    "@dxos/invariant": "0.7.2-staging.6d26b2a",
+    "@dxos/node-std": "0.7.2-staging.6d26b2a",
+    "@dxos/schema": "0.7.2-staging.6d26b2a"
   },
   "devDependencies": {
-    "@dxos/random": "0.7.1-staging.8709ba7"
+    "@dxos/random": "0.7.2-staging.6d26b2a"
   },
   "peerDependencies": {
-    "@dxos/random": "0.7.1-staging.8709ba7"
+    "@dxos/random": "0.7.2-staging.6d26b2a"
   },
   "publishConfig": {
     "access": "public"

package/src/data.ts

@@ -4,16 +4,7 @@
 
 import { next as A } from '@dxos/automerge/automerge';
 import { createDocAccessor, type Space } from '@dxos/client/echo';
-import {
-  createStoredSchema,
-  getObjectAnnotation,
-  ref,
-  toJsonSchema,
-  EchoObject,
-  MutableSchema,
-  ObjectAnnotationId,
-  S,
-} from '@dxos/echo-schema';
+import { createMutableSchema, ref, S } from '@dxos/echo-schema';
 import { faker } from '@dxos/random';
 
 import { SpaceObjectGenerator, TestObjectGenerator } from './generator';
@@ -34,47 +25,60 @@ export enum TestSchemaType {
   project = 'example.com/type/project',
 }
 
-const createDynamicSchema = (typename: string, fields: S.Struct.Fields): MutableSchema => {
-  const typeSchema = S.partial(S.Struct(fields)).pipe(EchoObject(typename, '1.0.0'));
-  const typeAnnotation = getObjectAnnotation(typeSchema);
-  const schemaToStore = createStoredSchema({ typename, version: '0.1.0' });
-  const updatedSchema = typeSchema.annotations({
-    [ObjectAnnotationId]: { ...typeAnnotation, schemaId: schemaToStore.id },
-  });
-  schemaToStore.jsonSchema = toJsonSchema(updatedSchema);
-  return new MutableSchema(schemaToStore);
-};
-
 const testSchemas = (): TestSchemaMap<TestSchemaType> => {
-  const document = createDynamicSchema(TestSchemaType.document, {
-    title: S.String.annotations({ description: 'title of the document' }),
-    content: S.String,
-  });
-
-  const organization = createDynamicSchema(TestSchemaType.organization, {
-    name: S.String.annotations({ description: 'name of the company or organization' }),
-    website: S.String.annotations({ description: 'public website URL' }),
-    description: S.String.annotations({ description: 'short summary of the company' }),
-  });
-
-  const contact = createDynamicSchema(TestSchemaType.contact, {
-    name: S.String.annotations({ description: 'name of the person' }),
-    email: S.String,
-    org: ref(organization),
-    lat: S.Number,
-    lng: S.Number,
-  });
-
-  const project = createDynamicSchema(TestSchemaType.project, {
-    name: S.String.annotations({ description: 'name of the project' }),
-    description: S.String,
-    website: S.String,
-    repo: S.String,
-    status: S.String,
-    priority: S.Number,
-    active: S.Boolean,
-    org: ref(organization),
-  });
+  const document = createMutableSchema(
+    {
+      typename: TestSchemaType.document,
+      version: '0.1.0',
+    },
+    {
+      title: S.String.annotations({ description: 'title of the document' }),
+      content: S.String,
+    },
+  );
+
+  const organization = createMutableSchema(
+    {
+      typename: TestSchemaType.organization,
+      version: '0.1.0',
+    },
+    {
+      name: S.String.annotations({ description: 'name of the company or organization' }),
+      website: S.String.annotations({ description: 'public website URL' }),
+      description: S.String.annotations({ description: 'short summary of the company' }),
+    },
+  );
+
+  const contact = createMutableSchema(
+    {
+      typename: TestSchemaType.contact,
+      version: '0.1.0',
+    },
+    {
+      name: S.String.annotations({ description: 'name of the person' }),
+      email: S.String,
+      org: ref(organization),
+      lat: S.Number,
+      lng: S.Number,
+    },
+  );
+
+  const project = createMutableSchema(
+    {
+      typename: TestSchemaType.project,
+      version: '0.1.0',
+    },
+    {
+      name: S.String.annotations({ description: 'name of the project' }),
+      description: S.String,
+      website: S.String,
+      repo: S.String,
+      status: S.String,
+      priority: S.Number,
+      active: S.Boolean,
+      org: ref(organization),
+    },
+  );
 
   return {
     [TestSchemaType.document]: document,
@@ -98,7 +102,7 @@ const testObjectGenerators: TestGeneratorMap<TestSchemaType> = {
 
   [TestSchemaType.contact]: async (provider) => {
     const organizations = await provider?.(TestSchemaType.organization);
-    const location = faker.datatype.boolean() ? faker.helpers.arrayElement(locations) : undefined;
+    const { location } = faker.datatype.boolean() ? faker.geo.airport() : {};
     return {
       name: faker.person.fullName(),
       email: faker.datatype.boolean({ probability: 0.5 }) ? faker.internet.email() : undefined,
@@ -150,107 +154,3 @@ export const createTestObjectGenerator = () => new TestObjectGenerator(testSchem
 
 export const createSpaceObjectGenerator = (space: Space) =>
   new SpaceObjectGenerator(space, testSchemas(), testObjectGenerators, testObjectMutators);
-
-// TODO(burdon): Move to @dxos/random.
-const locations = [
-  { lat: 139.74946157054467, lng: 35.686962764371174 },
-  { lat: -73.98196278740681, lng: 40.75192492259464 },
-  { lat: -99.1329340602939, lng: 19.444388301415472 },
-  { lat: 72.85504343876647, lng: 19.0189362343566 },
-  { lat: -46.62696583905523, lng: -23.55673372837896 },
-  { lat: 77.22805816860182, lng: 28.671938757181522 },
-  { lat: 121.43455881982015, lng: 31.218398311228327 },
-  { lat: 88.32272979950551, lng: 22.49691515689642 },
-  { lat: 90.40663360810754, lng: 23.725005570312817 },
-  { lat: -58.399477232331435, lng: -34.600555749907414 },
-  { lat: -118.18192636994041, lng: 33.99192410876543 },
-  { lat: 66.98806305137339, lng: 24.87193814681484 },
-  { lat: 31.248022361126118, lng: 30.051906205103705 },
-  { lat: -43.22696665284366, lng: -22.923077315615956 },
-  { lat: 135.4581989565952, lng: 34.75198107491417 },
-  { lat: 116.38633982565943, lng: 39.93083808990906 },
-  { lat: 120.9802713035424, lng: 14.606104813440538 },
-  { lat: 37.6135769672714, lng: 55.75410998124818 },
-  { lat: 29.008055727002613, lng: 41.10694201243979 },
-  { lat: 2.33138946713035, lng: 48.86863878981461 },
-  { lat: 126.99778513820195, lng: 37.56829495838895 },
-  { lat: 3.3895852125984334, lng: 6.445207512093191 },
-  { lat: 106.82749176247012, lng: -6.172471846798885 },
-  { lat: -87.75200083270931, lng: 41.83193651927843 },
-  { lat: 113.32306427226172, lng: 23.14692716047989 },
-  { lat: -0.11866770247593195, lng: 51.5019405883275 },
-  { lat: -77.05200795343472, lng: -12.04606681752557 },
-  { lat: 51.42239817500899, lng: 35.673888627001304 },
-  { lat: 15.313026023171744, lng: -4.327778243275986 },
-  { lat: -74.08528981377441, lng: 4.598369421147822 },
-  { lat: 114.1201772298325, lng: 22.554316369677963 },
-  { lat: 114.26807118958311, lng: 30.581977209337822 },
-  { lat: 114.18306345846304, lng: 22.30692675357551 },
-  { lat: 117.19807322410043, lng: 39.13197212310894 },
-  { lat: 80.27805287890033, lng: 13.091933670856292 },
-  { lat: 121.568333333333, lng: 25.0358333333333 },
-  { lat: 77.55806386521755, lng: 12.97194099507442 },
-  { lat: 100.51469879369489, lng: 13.751945064087977 },
-  { lat: 74.34807892054346, lng: 31.56191739488844 },
-  { lat: 106.59303578916195, lng: 29.566922888044644 },
-  { lat: 78.47800771287751, lng: 17.401928991511454 },
-  { lat: -70.66898671317483, lng: -33.448067956934096 },
-  { lat: -80.22605193945003, lng: 25.789556555021534 },
-  { lat: -43.916950376804834, lng: -19.91308016391116 },
-  { lat: -3.6852975446125242, lng: 40.40197212311381 },
-  { lat: -75.17194183200792, lng: 40.001919022526465 },
-  { lat: 72.57805776168215, lng: 23.031998775062675 },
-  { lat: 106.69308136207889, lng: 10.781971309193409 },
-  { lat: -79.42196665298843, lng: 43.70192573640844 },
-  { lat: 103.85387481909902, lng: 1.2949793251059418 },
-  { lat: 13.23248118266855, lng: -8.836340255012658 },
-  { lat: 44.391922914564134, lng: 33.34059435615865 },
-  { lat: 2.181424460619155, lng: 41.385245438547486 },
-  { lat: 88.32994665421205, lng: 22.580390440861947 },
-  { lat: -96.84196278749818, lng: 32.82196968167733 },
-  { lat: 123.44802765120869, lng: 41.80692512604918 },
-  { lat: 32.532233380011576, lng: 15.590024084277673 },
-  { lat: 73.84805776168719, lng: 18.531963374654026 },
-  { lat: 151.1832339501475, lng: -33.91806510862875 },
-  { lat: 30.314074200315076, lng: 59.94096036375191 },
-  { lat: 91.79802154756635, lng: 22.33193814680459 },
-  { lat: 113.74277634138707, lng: 23.050834758613007 },
-  { lat: -84.40189524187565, lng: 33.83195971260585 },
-  { lat: -71.07195953218684, lng: 42.33190600170229 },
-  { lat: 46.770795798688255, lng: 24.642779007816443 },
-  { lat: -95.341925149146, lng: 29.821920243188856 },
-  { lat: 105.8480683412422, lng: 21.035273107737055 },
-  { lat: -77.01136443943716, lng: 38.901495235087054 },
-  { lat: -103.33198008081848, lng: 20.671961950508944 },
-  { lat: 144.97307037590406, lng: -37.81808545369631 },
-  { lat: 29.948050030391755, lng: 31.201965205759393 },
-  { lat: 104.06807363094873, lng: 30.671945877957796 },
-  { lat: -83.0820016464927, lng: 42.33190600170229 },
-  { lat: 96.16473175266185, lng: 16.785299963188777 },
-  { lat: 108.89305043760862, lng: 34.27697130928732 },
-  { lat: -51.20195790450316, lng: -30.048068770722466 },
-  { lat: 121.465, lng: 25.0127777777778 },
-  { lat: 72.83809356897484, lng: 21.20192960187819 },
-  { lat: 109.60911291406296, lng: 23.09653464659317 },
-  { lat: -4.041994118507091, lng: 5.321942826098564 },
-  { lat: -47.91799814700306, lng: -15.781394372878992 },
-  { lat: 32.862445782356644, lng: 39.929184444075474 },
-  { lat: -100.33193064232995, lng: 25.671940995125283 },
-  { lat: 139.60202098994017, lng: 35.43065615270891 },
-  { lat: 118.77802846499208, lng: 32.05196500231233 },
-  { lat: -73.58524281670213, lng: 45.50194506421502 },
-  { lat: 106.7180927553083, lng: 26.581988806001448 },
-  { lat: -34.91755136960728, lng: -8.073699467249241 },
-  { lat: 126.64803904445057, lng: 45.75192980542715 },
-  { lat: -38.58192718342411, lng: -3.7480720258257634 },
-  { lat: -112.07193755969467, lng: 33.5419257363676 },
-  { lat: 117.67001623440774, lng: 24.520375385531167 },
-  { lat: -38.48193328693924, lng: -12.968026046044827 },
-  { lat: 129.00810170722048, lng: 35.09699877511093 },
-  { lat: -122.41716877355225, lng: 37.76919562968743 },
-  { lat: 28.028063865019476, lng: -26.16809888138414 },
-  { lat: 13.399602764700546, lng: 52.523764522251156 },
-  { lat: 3.048606670909237, lng: 36.765010656628135 },
-  { lat: 125.75274485499392, lng: 39.02138455800434 },
-  { lat: 12.481312562873995, lng: 41.89790148509894 },
-];

package/src/generator.test.ts

@@ -16,6 +16,16 @@ import { SpaceObjectGenerator } from './generator';
 faker.seed(3);
 
 describe('TestObjectGenerator', () => {
+  // TODO(burdon): Use TestBuilder.
+  const setupTest = async () => {
+    const client = new Client();
+    await client.initialize();
+    onTestFinished(async () => await client.destroy());
+    await client.halo.createIdentity();
+    const space = await client.spaces.create();
+    return { client, space };
+  };
+
   test('basic', async () => {
     const generator = createTestObjectGenerator();
 
@@ -81,44 +91,34 @@ describe('TestObjectGenerator', () => {
   });
 
   test('create object with in memory schema', async () => {
-    class Todo extends TypedObject({
-      typename: 'example.org/type/Todo',
+    class Task extends TypedObject({
+      typename: 'example.org/type/Task',
       version: '0.1.0',
     })({
       name: S.optional(S.String),
     }) {}
 
     enum Types {
-      todo = 'example.org/type/Todo',
+      task = 'example.org/type/Task',
     }
 
     const { space } = await setupTest();
     const generator = new SpaceObjectGenerator<Types>(
       space,
-      { [Types.todo]: Todo },
+      { [Types.task]: Task },
       {
-        [Types.todo]: () => ({ name: 'Default' }),
+        [Types.task]: () => ({ name: 'Default' }),
       },
       {
-        [Types.todo]: async (todo, params) => {
+        [Types.task]: async (task, params) => {
           for (const _ in Array.from({ length: params.count })) {
-            todo.name = faker.lorem.sentence();
+            task.name = faker.lorem.sentence();
           }
         },
       },
     );
 
-    const todo = await generator.createObject({ types: [Types.todo] });
-
+    const todo = await generator.createObject({ types: [Types.task] });
     expect(getType(todo)).to.exist;
   });
-
-  const setupTest = async () => {
-    const client = new Client();
-    await client.initialize();
-    onTestFinished(async () => await client.destroy());
-    await client.halo.createIdentity();
-    const space = await client.spaces.create();
-    return { client, space };
-  };
 });

package/src/generator.ts

@@ -3,14 +3,14 @@
 //
 
 import { type Space, Filter } from '@dxos/client/echo';
-import { type EchoReactiveObject } from '@dxos/echo-db';
+import { type ReactiveEchoObject } from '@dxos/echo-db';
 import {
   create,
-  MutableSchema,
-  type ReactiveObject,
   getObjectAnnotation,
   getSchema,
   isReactiveObject,
+  MutableSchema,
+  type ReactiveObject,
   type S,
 } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
@@ -60,7 +60,6 @@ export class TestObjectGenerator<T extends string = TestSchemaType> {
     return schema ? create(schema, data) : create(data);
   }
 
-  // TODO(burdon): Create batch.
   // TODO(burdon): Based on dependencies (e.g., organization before contact).
   async createObjects(map: Partial<Record<T, number>>) {
     const tasks = Object.entries<number>(map as any)
@@ -105,7 +104,7 @@ export class SpaceObjectGenerator<T extends string> extends TestObjectGenerator<
     return result;
   }
 
-  override async createObject({ types }: { types?: T[] } = {}): Promise<EchoReactiveObject<any>> {
+  override async createObject({ types }: { types?: T[] } = {}): Promise<ReactiveEchoObject<any>> {
     return this._space.db.add(await super.createObject({ types }));
   }
 
@@ -127,7 +126,7 @@ export class SpaceObjectGenerator<T extends string> extends TestObjectGenerator<
     }
   }
 
-  async mutateObject(object: EchoReactiveObject<any>, params: MutationsProviderParams) {
+  async mutateObject(object: ReactiveEchoObject<any>, params: MutationsProviderParams) {
     invariant(this._mutations, 'Mutations not defined.');
     const type = getObjectAnnotation(getSchema(object)!)!.typename as T;
     invariant(type && this._mutations?.[type], 'Invalid object type.');
@@ -135,7 +134,7 @@ export class SpaceObjectGenerator<T extends string> extends TestObjectGenerator<
     await this._mutations![type](object, params);
   }
 
-  async mutateObjects(objects: EchoReactiveObject<any>[], params: MutationsProviderParams) {
+  async mutateObjects(objects: ReactiveEchoObject<any>[], params: MutationsProviderParams) {
     for (const object of objects) {
       await this.mutateObject(object, params);
     }

package/src/types.ts

@@ -2,18 +2,22 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type EchoReactiveObject } from '@dxos/echo-db';
+import { type ReactiveEchoObject } from '@dxos/echo-db';
 import { type MutableSchema, type ReactiveObject, type S } from '@dxos/echo-schema';
 
+// TODO(burdon): Use echo-schema types.
 export type TestObject = { id: string } & Record<string, any>;
 
-export type TestSchemaMap<T extends string> = Record<T, MutableSchema | S.Schema<any>>;
+export type TestSchemaMap<T extends string = string> = Record<T, MutableSchema | S.Schema<any>>;
 
-export type TestGeneratorMap<T extends string> = Record<T, (provider: TestObjectProvider<T> | undefined) => any>;
+export type TestObjectProvider<T extends string = string> = (type: T) => Promise<ReactiveObject<any>[]>;
 
-export type TestObjectProvider<T extends string> = (type: T) => Promise<ReactiveObject<any>[]>;
+export type TestGeneratorMap<T extends string = string> = Record<
+  T,
+  (provider: TestObjectProvider<T> | undefined) => any
+>;
 
-export type TestMutationsMap<T extends string> = Record<T, TestObjectMutators>;
+export type TestMutationsMap<T extends string = string> = Record<T, TestObjectMutators>;
 
 export type MutationsProviderParams = {
   count: number;
@@ -21,4 +25,4 @@ export type MutationsProviderParams = {
   maxContentLength: number;
 };
 
-export type TestObjectMutators = (object: EchoReactiveObject<any>, params: MutationsProviderParams) => Promise<void>;
+export type TestObjectMutators = (object: ReactiveEchoObject<any>, params: MutationsProviderParams) => Promise<void>;

package/src/util.ts

@@ -15,5 +15,6 @@ export const randomText = (length: number) => {
   for (let index = 0; index < length; index++) {
     result += characters.charAt(Math.floor(Math.random() * charactersLength));
   }
+
   return result;
 };