@dxos/echo-generator 0.7.1 → 0.7.2-main.f1adc9f

package/src/generator.ts

@@ -3,18 +3,19 @@
 //
 
 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';
 import { faker } from '@dxos/random';
+import { range } from '@dxos/util';
 
 import { type TestSchemaType } from './data';
 import {
@@ -24,7 +25,6 @@ import {
   type TestObjectProvider,
   type TestSchemaMap,
 } from './types';
-import { range } from './util';
 
 /**
  * Typed object generator.
@@ -60,12 +60,11 @@ 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)
       .map(([type, count]) => {
-        return range(() => this.createObject({ types: [type as T] }), count);
+        return range(count, () => this.createObject({ types: [type as T] }));
       })
       .flatMap((t) => t);
 
@@ -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

@@ -2,12 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-// TODO(burdon): Util.
-export const range = <T>(fn: (i: number) => T | undefined, length: number): T[] =>
-  Array.from({ length })
-    .map((_, i) => fn(i))
-    .filter(Boolean) as T[];
-
 export const randomText = (length: number) => {
   let result = '';
   const characters = 'abcdefghijklmnopqrstuvwxyz';
@@ -15,5 +9,6 @@ export const randomText = (length: number) => {
   for (let index = 0; index < length; index++) {
     result += characters.charAt(Math.floor(Math.random() * charactersLength));
   }
+
   return result;
 };