@dxos/plugin-debug 0.8.3 → 0.8.4-main.c1de068

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-debug",
-  "version": "0.8.3",
+  "version": "0.8.4-main.c1de068",
   "description": "DXOS Surface plugin for testing.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
-    "@automerge/automerge": "3.0.0-beta.4",
+    "@automerge/automerge": "3.0.0",
     "@preact-signals/safe-react": "^0.9.0",
     "@preact/signals-core": "^1.9.0",
     "@tldraw/tldraw": "^3.0.0",
@@ -33,75 +33,73 @@
     "react-json-tree": "^0.18.0",
     "react-resize-detector": "^11.0.1",
     "workerize-loader": "^2.0.2",
-    "@dxos/app-framework": "0.8.3",
-    "@dxos/async": "0.8.3",
-    "@dxos/compute": "0.8.3",
-    "@dxos/client-services": "0.8.3",
-    "@dxos/config": "0.8.3",
-    "@dxos/conductor": "0.8.3",
-    "@dxos/context": "0.8.3",
-    "@dxos/devtools": "0.8.3",
-    "@dxos/echo": "0.8.3",
-    "@dxos/echo-generator": "0.8.3",
-    "@dxos/echo-pipeline": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/functions": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/local-storage": "0.8.3",
-    "@dxos/live-object": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/plugin-client": "0.8.3",
-    "@dxos/plugin-deck": "0.8.3",
-    "@dxos/plugin-graph": "0.8.3",
-    "@dxos/plugin-markdown": "0.8.3",
-    "@dxos/plugin-meeting": "0.8.3",
-    "@dxos/plugin-sheet": "0.8.3",
-    "@dxos/plugin-space": "0.8.3",
-    "@dxos/plugin-script": "0.8.3",
-    "@dxos/plugin-table": "0.8.3",
-    "@dxos/plugin-status-bar": "0.8.3",
-    "@dxos/protocols": "0.8.3",
-    "@dxos/plugin-theme": "0.8.3",
-    "@dxos/react-client": "0.8.3",
-    "@dxos/react-ui-attention": "0.8.3",
-    "@dxos/react-ui-canvas-compute": "0.8.3",
-    "@dxos/react-ui-canvas-editor": "0.8.3",
-    "@dxos/random": "0.8.3",
-    "@dxos/react-ui-form": "0.8.3",
-    "@dxos/react-ui-kanban": "0.8.3",
-    "@dxos/react-hooks": "0.8.3",
-    "@dxos/react-ui-stack": "0.8.3",
-    "@dxos/react-ui-table": "0.8.3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3",
-    "@dxos/schema": "0.8.3",
-    "@dxos/util": "0.8.3",
-    "@dxos/plugin-sketch": "0.8.3"
+    "@dxos/app-framework": "0.8.4-main.c1de068",
+    "@dxos/compute": "0.8.4-main.c1de068",
+    "@dxos/client-services": "0.8.4-main.c1de068",
+    "@dxos/conductor": "0.8.4-main.c1de068",
+    "@dxos/async": "0.8.4-main.c1de068",
+    "@dxos/context": "0.8.4-main.c1de068",
+    "@dxos/devtools": "0.8.4-main.c1de068",
+    "@dxos/config": "0.8.4-main.c1de068",
+    "@dxos/echo": "0.8.4-main.c1de068",
+    "@dxos/echo-generator": "0.8.4-main.c1de068",
+    "@dxos/echo-pipeline": "0.8.4-main.c1de068",
+    "@dxos/echo-schema": "0.8.4-main.c1de068",
+    "@dxos/invariant": "0.8.4-main.c1de068",
+    "@dxos/keys": "0.8.4-main.c1de068",
+    "@dxos/functions": "0.8.4-main.c1de068",
+    "@dxos/live-object": "0.8.4-main.c1de068",
+    "@dxos/local-storage": "0.8.4-main.c1de068",
+    "@dxos/plugin-client": "0.8.4-main.c1de068",
+    "@dxos/log": "0.8.4-main.c1de068",
+    "@dxos/plugin-deck": "0.8.4-main.c1de068",
+    "@dxos/plugin-graph": "0.8.4-main.c1de068",
+    "@dxos/plugin-markdown": "0.8.4-main.c1de068",
+    "@dxos/plugin-meeting": "0.8.4-main.c1de068",
+    "@dxos/plugin-script": "0.8.4-main.c1de068",
+    "@dxos/plugin-sheet": "0.8.4-main.c1de068",
+    "@dxos/plugin-sketch": "0.8.4-main.c1de068",
+    "@dxos/plugin-status-bar": "0.8.4-main.c1de068",
+    "@dxos/plugin-space": "0.8.4-main.c1de068",
+    "@dxos/plugin-table": "0.8.4-main.c1de068",
+    "@dxos/plugin-theme": "0.8.4-main.c1de068",
+    "@dxos/protocols": "0.8.4-main.c1de068",
+    "@dxos/random": "0.8.4-main.c1de068",
+    "@dxos/react-client": "0.8.4-main.c1de068",
+    "@dxos/react-hooks": "0.8.4-main.c1de068",
+    "@dxos/react-ui-attention": "0.8.4-main.c1de068",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.c1de068",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.c1de068",
+    "@dxos/react-ui-form": "0.8.4-main.c1de068",
+    "@dxos/react-ui-kanban": "0.8.4-main.c1de068",
+    "@dxos/react-ui-stack": "0.8.4-main.c1de068",
+    "@dxos/react-ui-table": "0.8.4-main.c1de068",
+    "@dxos/schema": "0.8.4-main.c1de068",
+    "@dxos/util": "0.8.4-main.c1de068",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c1de068"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
+    "@effect-rx/rx-react": "0.38.0",
+    "@effect/platform": "0.89.0",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.17.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3",
-    "@dxos/storybook-utils": "0.8.3"
+    "@dxos/react-ui": "0.8.4-main.c1de068",
+    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
+    "@dxos/storybook-utils": "0.8.4-main.c1de068"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
+    "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.8.3",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/random": "0.8.3"
+    "@dxos/random": "0.8.4-main.c1de068",
+    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
+    "@dxos/react-ui": "0.8.4-main.c1de068"
   },
   "publishConfig": {
     "access": "public"

package/src/DebugPlugin.tsx

@@ -7,7 +7,7 @@ import { type Client } from '@dxos/react-client';
 
 import { AppGraphBuilder, DebugSettings, ReactContext, ReactSurface } from './capabilities';
 import { meta } from './meta';
-import translations from './translations';
+import { translations } from './translations';
 
 // TODO(wittjosiah): Rename to DevtoolsPlugin?
 export const DebugPlugin = () => {

package/src/capabilities/react-surface.tsx

@@ -43,7 +43,7 @@ import {
   TracingPanel,
   WorkflowPanel,
 } from '@dxos/devtools';
-import { Obj, Type } from '@dxos/echo';
+import { Obj } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
 import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
@@ -111,7 +111,7 @@ export default (context: PluginContext) =>
 
             const collection =
               data.subject.space.state.get() === SpaceState.SPACE_READY &&
-              data.subject.space.properties[Type.getTypename(DataType.Collection)]?.target;
+              data.subject.space.properties[DataType.Collection.typename]?.target;
             if (!Obj.instanceOf(DataType.Collection, collection)) {
               return;
             }

package/src/components/DebugApp/DebugApp.tsx

@@ -2,13 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Gauge, Graph as GraphIcon, Gear, Toolbox, Warning } from '@phosphor-icons/react';
 import React, { type FC, useEffect, useState } from 'react';
 
 import { type Graph } from '@dxos/plugin-graph';
 import { useClient, useConfig } from '@dxos/react-client';
-import { Button, ToggleGroup, ToggleGroupItem, Toolbar } from '@dxos/react-ui';
-import { getSize, mx } from '@dxos/react-ui-theme';
+import { ToggleGroup, ToggleGroupItem, Toolbar, Icon, IconButton } from '@dxos/react-ui';
 
 import { Json, Tree } from './Tree';
 import { Container } from '../Container';
@@ -49,23 +47,32 @@ export const DebugApp: FC<{ graph: Graph }> = ({ graph }) => {
         <Toolbar.Root classNames='p-1'>
           <ToggleGroup type='single' value={view}>
             <ToggleGroupItem value={'graph'} onClick={() => setView('graph')} title={'Plugin graph'}>
-              <GraphIcon className={getSize(5)} />
+              <Icon icon='ph--graph--regular' size={5} />
             </ToggleGroupItem>
             <ToggleGroupItem value={'diagnostics'} onClick={() => setView('diagnostics')} title={'Diagnostics'}>
-              <Gauge className={getSize(5)} />
+              <Icon icon='ph--gauge--regular' size={5} />
             </ToggleGroupItem>
             <ToggleGroupItem value={'config'} onClick={() => setView('config')} title={'Config'}>
-              <Gear className={getSize(5)} />
+              <Icon icon='ph--gear--regular' size={5} />
             </ToggleGroupItem>
           </ToggleGroup>
 
           <Toolbar.Separator variant='gap' />
-          <Button onClick={(event) => handleResetClient(event.shiftKey)} title='Reset client'>
-            <Warning className={mx(getSize(5), 'text-red-700')} />
-          </Button>
-          <Button onClick={handleOpenDevtools} title='Open Devtools'>
-            <Toolbox weight='duotone' className={mx(getSize(5), 'text-700')} />
-          </Button>
+          <IconButton
+            icon='ph--warning--regular'
+            iconOnly
+            size={5}
+            classNames='text-red-700'
+            onClick={(event) => handleResetClient(event.shiftKey)}
+            label='Reset client'
+          />
+          <IconButton
+            icon='ph--toolbox--duotone'
+            iconOnly
+            size={5}
+            onClick={handleOpenDevtools}
+            label='Open Devtools'
+          />
         </Toolbar.Root>
       }
     >

package/src/components/SpaceGenerator/ObjectGenerator.tsx

@@ -2,18 +2,20 @@
 // Copyright 2024 DXOS.org
 //
 
+import { createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
 import { addressToA1Notation } from '@dxos/compute';
 import { ComputeGraph, ComputeGraphModel, DEFAULT_OUTPUT, NODE_INPUT, NODE_OUTPUT } from '@dxos/conductor';
-import { DXN, Filter, Key, Obj, Ref } from '@dxos/echo';
+import { DXN, Filter, Key, Obj, Ref, Type } from '@dxos/echo';
 import { type TypedObject } from '@dxos/echo-schema';
 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 { SpaceAction } from '@dxos/plugin-space/types';
 import { faker } from '@dxos/random';
+import { type Client } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
-import { TableType } from '@dxos/react-ui-table';
-import { createView, DataType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 import { createAsyncGenerator, type ValueGenerator } from '@dxos/schema/testing';
 import { range } from '@dxos/util';
 
@@ -21,27 +23,31 @@ const generator: ValueGenerator = faker as any;
 
 export type ObjectGenerator<T extends Obj.Any> = (space: Space, n: number, cb?: (objects: T[]) => void) => Promise<T[]>;
 
-export const createGenerator = <T extends Obj.Any>(type: TypedObject<T>): ObjectGenerator<T> => {
-  return async (space: Space, n: number, cb?: (objects: T[]) => void): Promise<T[]> => {
-    // Find or create mutable schema.
-    const schema =
-      (await space.db.schemaRegistry.query({ typename: type.typename }).firstOrUndefined()) ??
-      (await space.db.schemaRegistry.register([type]))[0];
+const findViewByTypename = async (views: DataType.View[], typename: string) => {
+  return views.find((view) => view.query.typename === typename);
+};
 
-    // Create objects.
-    const generate = createAsyncGenerator(generator, schema.snapshot, { db: space.db });
-    const objects = await generate.createObjects(n);
+export const createGenerator = <T extends Obj.Any>(
+  client: Client,
+  dispatch: PromiseIntentDispatcher,
+  schema: TypedObject<T>,
+): ObjectGenerator<T> => {
+  return async (space: Space, n: number, cb?: (objects: T[]) => void): Promise<T[]> => {
+    const typename = schema.typename;
 
     // Find or create table and view.
-    const { objects: tables } = await space.db.query(Filter.type(TableType)).run();
-    const table = tables.find((table) => table.view?.target?.query?.typename === type.typename);
-    if (!table) {
-      const name = type.typename.split('/').pop() ?? type.typename;
-      const view = createView({ name, typename: type.typename, jsonSchema: schema.jsonSchema });
-      space.db.add(Obj.make(TableType, { name, view: Ref.make(view) }));
+    const { objects: views } = await space.db.query(Filter.type(DataType.View)).run();
+    const view = await findViewByTypename(views, typename);
+    const staticSchema = client?.graph.schemaRegistry.schemas.find((schema) => Type.getTypename(schema) === typename);
+    if (!view && !staticSchema) {
+      await dispatch(createIntent(SpaceAction.AddSchema, { space, schema }));
+    } else if (!view && staticSchema) {
+      await dispatch(createIntent(SpaceAction.UseStaticSchema, { space, typename }));
     }
 
-    return objects;
+    // Create objects.
+    const generate = createAsyncGenerator(generator, schema, { db: space.db });
+    return generate.createObjects(n);
   };
 };
 

package/src/components/SpaceGenerator/SpaceGenerator.stories.tsx

@@ -4,7 +4,7 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta } from '@storybook/react-vite';
 import React from 'react';
 
 import { IntentPlugin } from '@dxos/app-framework';

package/src/components/SpaceGenerator/SpaceGenerator.tsx

@@ -4,19 +4,16 @@
 
 import React, { useCallback, useMemo, useState } from 'react';
 
-import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { useIntentDispatcher } from '@dxos/app-framework';
 import { ComputeGraph } from '@dxos/conductor';
-import { Filter, Obj, Type } from '@dxos/echo';
-import { log } from '@dxos/log';
+import { Filter, type Obj } from '@dxos/echo';
 import { DocumentType } from '@dxos/plugin-markdown/types';
 import { SheetType } from '@dxos/plugin-sheet/types';
 import { DiagramType } from '@dxos/plugin-sketch/types';
-import { SpaceAction } from '@dxos/plugin-space/types';
 import { useClient } from '@dxos/react-client';
 import { getTypename, type Space } from '@dxos/react-client/echo';
 import { IconButton, Input, Toolbar, useAsyncEffect } from '@dxos/react-ui';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
-import { initializeTable, TableType } from '@dxos/react-ui-table';
 import { DataType } from '@dxos/schema';
 import { jsonKeyReplacer, sortKeys } from '@dxos/util';
 
@@ -33,20 +30,20 @@ export const SpaceGenerator = ({ space, onCreateObjects }: SpaceGeneratorProps)
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const client = useClient();
   const staticTypes = [DocumentType, DiagramType, SheetType, ComputeGraph]; // TODO(burdon): Make extensible.
-  const mutableTypes = [DataType.Organization, DataType.Project, DataType.Person, DataType.Message];
+  const recordTypes = [DataType.Organization, DataType.Project, DataType.Person, DataType.Message];
   const [count, setCount] = useState(1);
   const [info, setInfo] = useState<any>({});
   const presets = useMemo(() => generator(), []);
 
   // Create type generators.
   const typeMap = useMemo(() => {
-    client.addTypes([...staticTypes, ...presets.schemas]);
-    const mutableGenerators = new Map<string, ObjectGenerator<any>>(
-      mutableTypes.map((type) => [type.typename, createGenerator(type as any)]),
+    client.addTypes([...staticTypes, ...recordTypes, ...presets.schemas]);
+    const recordGenerators = new Map<string, ObjectGenerator<any>>(
+      recordTypes.map((type) => [type.typename, createGenerator(client, dispatch, type as any)]),
     );
 
-    return new Map([...staticGenerators, ...presets.items, ...mutableGenerators]);
-  }, [client, mutableTypes]);
+    return new Map([...staticGenerators, ...presets.items, ...recordGenerators]);
+  }, [client, recordTypes]);
 
   // Query space to get info.
   const updateInfo = async () => {
@@ -90,64 +87,10 @@ export const SpaceGenerator = ({ space, onCreateObjects }: SpaceGeneratorProps)
     [typeMap, count],
   );
 
-  // TODO(wittjosiah): Remove. Replace with proper echo import.
-  const handleLoadTables = useCallback(async () => {
-    const input = document.createElement('input');
-    input.type = 'file';
-    input.accept = '.json';
-
-    input.onchange = async (e) => {
-      const file = (e.target as HTMLInputElement).files?.[0];
-      if (!file) {
-        return;
-      }
-
-      try {
-        const content = await file.text();
-        const data = JSON.parse(content);
-        const schemas = await space.db.schemaRegistry.register(data.schemas.map(Type.toEffectSchema));
-        // TODO(wittjosiah): If the schema is already registered this should skip.
-        await Promise.all(
-          schemas.map(async (schema) => {
-            const parts = schema.typename.split('/');
-            const name = parts[parts.length - 1];
-            const table = Obj.make(TableType, { name, threads: [] });
-            await initializeTable({ client, space, table, typename: schema.typename });
-            await dispatch(createIntent(SpaceAction.AddObject, { target: space, object: table }));
-            return table;
-          }),
-        );
-        // TODO(wittjosiah): This should query the space for schemas.
-        await Promise.all(
-          data.objects.map(async ({ id, '@type': typename, ...fields }: any) => {
-            const schema = schemas.find((s) => `dxn:type:${s.typename}:${s.version}` === typename);
-            if (!schema) {
-              log.warn('Missing schema for object', { id, typename });
-              return;
-            }
-            const object = Obj.make(schema, fields);
-            space.db.add(object);
-            return object;
-          }),
-        );
-      } catch (err) {
-        log.catch(err);
-      }
-    };
-
-    input.click();
-  }, []);
-
   return (
     <div role='none' className='flex flex-col grow overflow-hidden'>
       <Toolbar.Root classNames='border-be border-subduedSeparator'>
         <IconButton icon='ph--arrow-clockwise--regular' iconOnly label='Refresh' onClick={updateInfo} />
-        <IconButton
-          icon='ph--file-arrow-up--regular'
-          iconOnly
-          label='Load tables from JSON'
-          onClick={handleLoadTables}
-        />
         <Toolbar.Separator variant='gap' />
         <Input.Root>
           <Input.TextInput
@@ -165,7 +108,7 @@ export const SpaceGenerator = ({ space, onCreateObjects }: SpaceGeneratorProps)
 
       <div className='flex flex-col overflow-y-auto divide-y divide-separator'>
         <SchemaTable types={staticTypes} objects={info.objects} label='Static Types' onClick={handleCreateData} />
-        <SchemaTable types={mutableTypes} objects={info.objects} label='Mutable Types' onClick={handleCreateData} />
+        <SchemaTable types={recordTypes} objects={info.objects} label='Record Types' onClick={handleCreateData} />
         <SchemaTable types={presets.types} objects={info.objects} label='Presets' onClick={handleCreateData} />
 
         <div>