@dxos/plugin-debug 0.7.4 → 0.7.5-labs.401163d

package/src/components/SpaceGenerator/ObjectGenerator.tsx

@@ -2,17 +2,19 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type AbstractSchema, type BaseObject } from '@dxos/echo-schema';
-import { create, type ReactiveObject } from '@dxos/live-object';
-import { DocumentType, TextType } from '@dxos/plugin-markdown/types';
-import { addressToA1Notation, createSheet } from '@dxos/plugin-sheet';
-import { type CellValue } from '@dxos/plugin-sheet/types';
-import { SheetType } from '@dxos/plugin-sheet/types';
+import { addressToA1Notation } from '@dxos/compute';
+import { ComputeGraph, ComputeGraphModel, DEFAULT_OUTPUT, NODE_INPUT, NODE_OUTPUT } from '@dxos/conductor';
+import { ObjectId, type BaseObject, type TypedObject } from '@dxos/echo-schema';
+import { DXN, SpaceId } from '@dxos/keys';
+import { create, makeRef, type ReactiveObject } from '@dxos/live-object';
+import { DocumentType } from '@dxos/plugin-markdown/types';
+import { createSheet } from '@dxos/plugin-sheet/types';
+import { SheetType, type CellValue } from '@dxos/plugin-sheet/types';
 import { CanvasType, DiagramType } from '@dxos/plugin-sketch/types';
 import { faker } from '@dxos/random';
 import { Filter, type Space } from '@dxos/react-client/echo';
 import { TableType } from '@dxos/react-ui-table';
-import { createView } from '@dxos/schema';
+import { createView, TextType } from '@dxos/schema';
 import { createAsyncGenerator, type ValueGenerator } from '@dxos/schema/testing';
 import { range } from '@dxos/util';
 
@@ -37,15 +39,13 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
     DocumentType.typename,
     async (space, n, cb) => {
       const objects = range(n).map(() => {
-        const obj = space.db.add(
+        return space.db.add(
           create(DocumentType, {
             name: faker.commerce.productName(),
-            content: create(TextType, { content: faker.lorem.sentences(5) }),
+            content: makeRef(create(TextType, { content: faker.lorem.sentences(5) })),
             threads: [],
           }),
         );
-
-        return obj;
       });
 
       cb?.(objects);
@@ -60,7 +60,7 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
         const obj = space.db.add(
           create(DiagramType, {
             name: faker.commerce.productName(),
-            canvas: create(CanvasType, { content: {} }),
+            canvas: makeRef(create(CanvasType, { content: {} })),
           }),
         );
 
@@ -109,30 +109,57 @@ export const staticGenerators = new Map<string, ObjectGenerator<any>>([
       return objects;
     },
   ],
+  [
+    ComputeGraph.typename,
+    async (space, n, cb) => {
+      const objects = range(n, () => {
+        const model = ComputeGraphModel.create();
+        model.builder
+          .createNode({ id: 'gpt-INPUT', type: NODE_INPUT })
+          .createNode({ id: 'gpt-GPT', type: 'gpt' })
+          .createNode({
+            id: 'gpt-QUEUE_ID',
+            type: 'constant',
+            value: new DXN(DXN.kind.QUEUE, ['data', SpaceId.random(), ObjectId.random()]).toString(),
+          })
+          .createNode({ id: 'gpt-APPEND', type: 'append' })
+          .createNode({ id: 'gpt-OUTPUT', type: NODE_OUTPUT })
+          .createEdge({ node: 'gpt-INPUT', property: 'prompt' }, { node: 'gpt-GPT', property: 'prompt' })
+          .createEdge({ node: 'gpt-GPT', property: 'text' }, { node: 'gpt-OUTPUT', property: 'text' })
+          .createEdge({ node: 'gpt-QUEUE_ID', property: DEFAULT_OUTPUT }, { node: 'gpt-APPEND', property: 'id' })
+          .createEdge({ node: 'gpt-GPT', property: 'messages' }, { node: 'gpt-APPEND', property: 'items' })
+          .createEdge({ node: 'gpt-QUEUE_ID', property: DEFAULT_OUTPUT }, { node: 'gpt-OUTPUT', property: 'queue' });
+
+        return space.db.add(model.root);
+      });
+      cb?.(objects);
+      return objects;
+    },
+  ],
 ]);
 
-export const createGenerator = <T extends BaseObject>(type: AbstractSchema<T>): ObjectGenerator<T> => {
+export const createGenerator = <T extends BaseObject>(type: TypedObject<T>): ObjectGenerator<T> => {
   return async (
     space: Space,
     n: number,
     cb?: (objects: ReactiveObject<any>[]) => void,
   ): Promise<ReactiveObject<T>[]> => {
     // Find or create mutable schema.
-    const mutableSchema = await space.db.schemaRegistry.query();
     const schema =
-      mutableSchema.find((schema) => schema.typename === type.typename) ?? space.db.schemaRegistry.addSchema(type);
+      (await space.db.schemaRegistry.query({ typename: type.typename }).firstOrUndefined()) ??
+      (await space.db.schemaRegistry.register([type]))[0];
 
     // Create objects.
-    const generate = createAsyncGenerator(generator, schema.schema, { db: space.db });
+    const generate = createAsyncGenerator(generator, schema.getSchemaSnapshot(), { db: space.db });
     const objects = await generate.createObjects(n);
 
     // Find or create table and view.
     const { objects: tables } = await space.db.query(Filter.schema(TableType)).run();
-    const table = tables.find((table) => table.view?.query?.type === type.typename);
+    const table = tables.find((table) => table.view?.target?.query?.type === type.typename);
     if (!table) {
       const name = type.typename.split('/').pop() ?? type.typename;
       const view = createView({ name, typename: type.typename, jsonSchema: schema.jsonSchema });
-      const table = space.db.add(create(TableType, { name, view }));
+      const table = space.db.add(create(TableType, { name, view: makeRef(view) }));
       cb?.([table]);
     }
 

package/src/components/SpaceGenerator/SpaceGenerator.tsx

@@ -4,6 +4,7 @@
 
 import React, { useCallback, useMemo, useState } from 'react';
 
+import { ComputeGraph } from '@dxos/conductor';
 import { type ReactiveObject } from '@dxos/live-object';
 import { DocumentType } from '@dxos/plugin-markdown/types';
 import { SheetType } from '@dxos/plugin-sheet/types';
@@ -17,6 +18,7 @@ import { jsonKeyReplacer, sortKeys } from '@dxos/util';
 
 import { type ObjectGenerator, createGenerator, staticGenerators } from './ObjectGenerator';
 import { SchemaTable } from './SchemaTable';
+import { presets } from './presets';
 
 export type SpaceGeneratorProps = {
   space: Space;
@@ -25,25 +27,25 @@ export type SpaceGeneratorProps = {
 
 export const SpaceGenerator = ({ space, onCreateObjects }: SpaceGeneratorProps) => {
   const client = useClient();
-  const staticTypes = [DocumentType, DiagramType, SheetType]; // TODO(burdon): Make extensible.
-  const mutableTypes = [Testing.OrgType, Testing.ProjectType, Testing.ContactType];
+  const staticTypes = [DocumentType, DiagramType, SheetType, ComputeGraph]; // TODO(burdon): Make extensible.
+  const mutableTypes = [Testing.OrgType, Testing.ProjectType, Testing.ContactType, Testing.EmailType];
   const [count, setCount] = useState(1);
   const [info, setInfo] = useState<any>({});
 
   // Create type generators.
   const typeMap = useMemo(() => {
-    client.addTypes(staticTypes);
+    client.addTypes([...staticTypes, ...presets.schemas]);
     const mutableGenerators = new Map<string, ObjectGenerator<any>>(
-      mutableTypes.map((type) => [type.typename, createGenerator(type)]),
+      mutableTypes.map((type) => [type.typename, createGenerator(type as any)]),
     );
 
-    return new Map([...staticGenerators, ...mutableGenerators]);
+    return new Map([...staticGenerators, ...presets.items, ...mutableGenerators]);
   }, [client, mutableTypes]);
 
   // Query space to get info.
   const updateInfo = async () => {
     // Create schema map.
-    const mutableSchema = await space.db.schemaRegistry.query();
+    const echoSchema = await space.db.schemaRegistry.query().run();
     const staticSchema = space.db.graph.schemaRegistry.schemas;
 
     // Create object map.
@@ -62,7 +64,7 @@ export const SpaceGenerator = ({ space, onCreateObjects }: SpaceGeneratorProps)
     setInfo({
       schema: {
         static: staticSchema.length,
-        mutable: mutableSchema.length,
+        mutable: echoSchema.length,
       },
       objects: objectMap,
     });
@@ -86,7 +88,7 @@ export const SpaceGenerator = ({ space, onCreateObjects }: SpaceGeneratorProps)
     <div role='none' className='flex flex-col divide-y divide-separator'>
       <Toolbar.Root classNames='p-1'>
         <IconButton icon='ph--arrow-clockwise--regular' iconOnly label='Refresh' onClick={updateInfo} />
-        <Toolbar.Expander />
+        <Toolbar.Separator variant='gap' />
         <div className='flex'>
           <Input.Root>
             <Input.TextInput
@@ -104,6 +106,7 @@ export const SpaceGenerator = ({ space, onCreateObjects }: SpaceGeneratorProps)
 
       <SchemaTable types={staticTypes} objects={info.objects} label='Static Types' onClick={handleCreateData} />
       <SchemaTable types={mutableTypes} objects={info.objects} label='Mutable Types' onClick={handleCreateData} />
+      <SchemaTable types={presets.types} objects={info.objects} label='Presets' onClick={handleCreateData} />
 
       <SyntaxHighlighter classNames='flex text-xs' language='json'>
         {JSON.stringify({ space, ...info }, jsonKeyReplacer({ truncate: true }), 2)}

package/src/components/SpaceGenerator/draw-util.ts

@@ -86,20 +86,21 @@ export const drawGraph = async (
   editor: Editor,
   graph: Graph<PlainObject, PlainObject>,
 ): Promise<SerializedStore<TLRecord>> => {
-  const grid = 40;
+  const gridSize = 40;
   const nodeSize = 80;
 
-  const snap = (n: number) => Math.round(n / grid) * grid;
+  const snap = (n: number) => Math.round(n / gridSize) * gridSize;
 
+  // TODO(burdon): Util.
   type Intersection<Types extends readonly unknown[]> = Types extends [infer First, ...infer Rest]
     ? First & Intersection<Rest>
     : unknown;
 
   const defaultOptions: Intersection<[D3ForceLayoutOptions, GridLayoutOptions, RadialLayoutOptions]> = {
     center: [0, 0],
-    width: grid * 20,
-    height: grid * 20,
-    linkDistance: grid * 2,
+    width: gridSize * 20,
+    height: gridSize * 20,
+    linkDistance: gridSize * 2,
     nodeSize,
     nodeSpacing: nodeSize,
     preventOverlap: true,
@@ -129,7 +130,7 @@ export const drawGraph = async (
       layout = new RadialLayout({
         ...defaultOptions,
         focusNode: graph.getAllNodes()[0],
-        unitRadius: grid * 2,
+        unitRadius: gridSize * 2,
       });
     }
   }