@dxos/react-ui-canvas-compute 0.8.4-main.c4373fc → 0.8.4-main.c85a9c8dae

package/src/shapes/Surface.tsx

@@ -5,8 +5,9 @@
 import * as Schema from 'effect/Schema';
 import React from 'react';
 
-import { Surface } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
 import { DEFAULT_INPUT } from '@dxos/conductor';
+import { Card } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
@@ -27,7 +28,11 @@ export type SurfaceShape = Schema.Schema.Type<typeof SurfaceShape>;
 export type CreateSurfaceProps = CreateShapeProps<SurfaceShape>;
 
 export const createSurface = (props: CreateSurfaceProps) =>
-  createShape<SurfaceShape>({ type: 'surface', size: { width: 384, height: 384 }, ...props });
+  createShape<SurfaceShape>({
+    type: 'surface',
+    size: { width: 384, height: 384 },
+    ...props,
+  });
 
 export const SurfaceComponent = ({ shape }: ShapeComponentProps<SurfaceShape>) => {
   const { runtime } = useComputeNodeState(shape);
@@ -40,9 +45,10 @@ export const SurfaceComponent = ({ shape }: ShapeComponentProps<SurfaceShape>) =
     }
   };
 
+  // TODO(burdon): Subject property?
   return (
     <Box shape={shape} onAction={handleAction}>
-      {value !== null && <Surface role='card--extrinsic' data={{ value }} limit={1} />}
+      <Card.Root>{value !== null && <Surface.Surface role='card--content' data={{ value }} limit={1} />}</Card.Root>
     </Box>
   );
 };

package/src/shapes/Table.tsx

@@ -7,13 +7,13 @@ import React from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
-import { DataType } from '@dxos/schema';
+import { Message } from '@dxos/types';
 
 import { Box, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
-const InputSchema = createInputSchema(DataType.Message);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(DataType.Message)));
+const InputSchema = createInputSchema(Message.Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Message.Message)));
 
 export const TableShape = Schema.extend(
   ComputeShape,

package/src/shapes/Thread.tsx

@@ -6,16 +6,16 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect, useRef } from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';
-import { type ThemedClassName } from '@dxos/react-ui';
+import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
-import { mx } from '@dxos/react-ui-theme';
-import { DataType } from '@dxos/schema';
+import { Message } from '@dxos/types';
+import { mx } from '@dxos/ui-theme';
 
 import { Box, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
-const InputSchema = createInputSchema(DataType.Message);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(DataType.Message)));
+const InputSchema = createInputSchema(Message.Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Message.Message)));
 
 export const ThreadShape = Schema.extend(
   ComputeShape,
@@ -42,18 +42,24 @@ export const ThreadComponent = ({ shape }: ShapeComponentProps<ThreadShape>) =>
 
   return (
     <Box shape={shape}>
-      <div ref={scrollRef} className='flex flex-col w-full overflow-y-scroll gap-2 p-2'>
-        {[...items].map((item, i) => (
-          <ThreadItem key={i} item={item} />
-        ))}
-      </div>
+      <ScrollArea.Root orientation='vertical'>
+        <ScrollArea.Viewport classNames='gap-2 p-2' ref={scrollRef}>
+          {[...items].map((item, i) => (
+            <ThreadItem key={i} item={item} />
+          ))}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
     </Box>
   );
 };
 
 export const ThreadItem = ({ classNames, item }: ThemedClassName<{ item: any }>) => {
   if (typeof item !== 'object') {
-    return <div className={mx(classNames)}>{item}</div>;
+    return (
+      <div role='none' className={mx(classNames)}>
+        {item}
+      </div>
+    );
   }
 
   // TODO(burdon): Hack; introspect type.

package/src/shapes/Trigger.tsx

@@ -6,24 +6,9 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect } from 'react';
 
 import { VoidInput } from '@dxos/conductor';
-import { Filter, Obj, Query } from '@dxos/echo';
-import { ObjectId, Ref } from '@dxos/echo/internal';
-import {
-  type EmailTrigger,
-  EmailTriggerOutput,
-  FunctionTrigger,
-  type QueueTrigger,
-  QueueTriggerOutput,
-  type SubscriptionTrigger,
-  SubscriptionTriggerOutput,
-  type TimerTrigger,
-  TimerTriggerOutput,
-  type TriggerKind,
-  TriggerKinds,
-  type TriggerType,
-  type WebhookTrigger,
-  WebhookTriggerOutput,
-} from '@dxos/functions';
+import { Filter, Obj, Query, Ref } from '@dxos/echo';
+import { type Mutable } from '@dxos/echo/internal';
+import { Trigger, TriggerEvent } from '@dxos/functions';
 import { DXN, SpaceId } from '@dxos/keys';
 import { useSpace } from '@dxos/react-client/echo';
 import { Select, type SelectRootProps } from '@dxos/react-ui';
@@ -36,25 +21,26 @@ export const TriggerShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
     type: Schema.Literal('trigger'),
-    functionTrigger: Schema.optional(Ref(FunctionTrigger)),
+    functionTrigger: Schema.optional(Ref.Ref(Trigger.Trigger)),
   }),
 );
-export type TriggerShape = Schema.Schema.Type<typeof TriggerShape>;
+
+export interface TriggerShape extends Schema.Schema.Type<typeof TriggerShape> {}
 
 export type CreateTriggerProps = CreateShapeProps<Omit<TriggerShape, 'functionTrigger'>> & {
   spaceId?: SpaceId;
-  triggerKind?: TriggerKind;
+  triggerKind?: Trigger.Kind;
 };
 
 export const createTrigger = (props: CreateTriggerProps): TriggerShape => {
-  const functionTrigger = Obj.make(FunctionTrigger, {
+  const functionTrigger = Trigger.make({
     enabled: true,
     spec: createTriggerSpec(props),
   });
   return createShape<TriggerShape>({
     type: 'trigger',
     functionTrigger: Ref.make(functionTrigger),
-    size: { width: 192, height: getHeight(EmailTriggerOutput) },
+    size: { width: 192, height: getHeight(TriggerEvent.EmailEvent) },
     ...props,
   });
 };
@@ -67,7 +53,9 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 
   useEffect(() => {
     if (functionTrigger && !functionTrigger.spec) {
-      functionTrigger.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id });
+      Obj.change(functionTrigger, (t) => {
+        t.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id }) as Mutable<Trigger.Spec>;
+      });
     }
   }, [functionTrigger, functionTrigger?.spec]);
 
@@ -75,9 +63,11 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
     shape.size.height = getHeight(getOutputSchema(functionTrigger?.spec?.kind ?? 'email'));
   }, [functionTrigger?.spec?.kind]);
 
-  const setKind = (kind: TriggerKind) => {
+  const setKind = (kind: Trigger.Kind) => {
     if (functionTrigger?.spec?.kind !== kind) {
-      functionTrigger!.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id });
+      Obj.change(functionTrigger!, (t) => {
+        t.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id }) as Mutable<Trigger.Spec>;
+      });
     }
   };
 
@@ -89,7 +79,7 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
     <FunctionBody
       shape={shape}
       status={
-        <TriggerKindSelect value={functionTrigger.spec?.kind} onValueChange={(kind) => setKind(kind as TriggerKind)} />
+        <TriggerKindSelect value={functionTrigger.spec?.kind} onValueChange={(kind) => setKind(kind as Trigger.Kind)} />
       }
       inputSchema={VoidInput}
       outputSchema={getOutputSchema(functionTrigger.spec!.kind!)}
@@ -101,12 +91,12 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'value' | 'onValueChange'>) => {
   return (
     <Select.Root value={value} onValueChange={onValueChange}>
-      <Select.TriggerButton variant='ghost' classNames='w-full !px-0' />
+      <Select.TriggerButton variant='ghost' classNames='w-full px-0!' />
       <Select.Portal>
         <Select.Content>
           <Select.ScrollUpButton />
           <Select.Viewport>
-            {TriggerKinds.map((kind) => (
+            {Trigger.Kinds.map((kind) => (
               <Select.Option key={kind} value={kind}>
                 {kind}
               </Select.Option>
@@ -120,37 +110,36 @@ const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'valu
   );
 };
 
-const createTriggerSpec = (props: { triggerKind?: TriggerKind; spaceId?: SpaceId }): TriggerType => {
+const createTriggerSpec = (props: { triggerKind?: Trigger.Kind; spaceId?: SpaceId }): Trigger.Spec => {
   const kind = props.triggerKind ?? 'email';
   switch (kind) {
     case 'timer':
-      return { kind: 'timer', cron: '*/10 * * * * *' } satisfies TimerTrigger;
+      return { kind: 'timer', cron: '*/10 * * * * *' } satisfies Trigger.TimerSpec;
     case 'webhook':
-      return { kind: 'webhook', method: 'POST' } satisfies WebhookTrigger;
+      return { kind: 'webhook', method: 'POST' } satisfies Trigger.WebhookSpec;
     case 'subscription':
       return {
         kind: 'subscription',
         query: {
-          string: 'Query.select(Filter.nothing())',
           ast: Query.select(Filter.nothing()).ast,
         },
-      } satisfies SubscriptionTrigger;
+      } satisfies Trigger.SubscriptionSpec;
     case 'email':
-      return { kind: 'email' } satisfies EmailTrigger;
+      return { kind: 'email' } satisfies Trigger.EmailSpec;
     case 'queue': {
-      const dxn = new DXN(DXN.kind.QUEUE, ['data', props.spaceId ?? SpaceId.random(), ObjectId.random()]).toString();
-      return { kind: 'queue', queue: dxn } satisfies QueueTrigger;
+      const dxn = new DXN(DXN.kind.QUEUE, ['data', props.spaceId ?? SpaceId.random(), Obj.ID.random()]).toString();
+      return { kind: 'queue', queue: dxn } satisfies Trigger.QueueSpec;
     }
   }
 };
 
-const getOutputSchema = (kind: TriggerKind) => {
-  const kindToSchema: Record<TriggerKind, Schema.Schema<any>> = {
-    ['email']: EmailTriggerOutput,
-    ['subscription']: SubscriptionTriggerOutput,
-    ['timer']: TimerTriggerOutput,
-    ['webhook']: WebhookTriggerOutput,
-    ['queue']: QueueTriggerOutput,
+const getOutputSchema = (kind: Trigger.Kind) => {
+  const kindToSchema: Record<Trigger.Kind, Schema.Schema<any>> = {
+    ['email']: TriggerEvent.EmailEvent,
+    ['subscription']: TriggerEvent.SubscriptionEvent,
+    ['timer']: TriggerEvent.TimerEvent,
+    ['webhook']: TriggerEvent.WebhookEvent,
+    ['queue']: TriggerEvent.QueueEvent,
   };
   return kindToSchema[kind];
 };

package/src/shapes/common/Box.tsx

@@ -6,9 +6,8 @@ import React, { type PropsWithChildren, type ReactNode, forwardRef } from 'react
 
 import { invariant } from '@dxos/invariant';
 import { Icon, IconButton, type ThemedClassName } from '@dxos/react-ui';
-import { useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
-import { type Shape } from '@dxos/react-ui-canvas-editor';
-import { mx } from '@dxos/react-ui-theme';
+import { type CanvasBoard, useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
+import { mx } from '@dxos/ui-theme';
 
 export const headerHeight = 32;
 export const footerHeight = 32;
@@ -17,7 +16,7 @@ export type BoxActionHandler = (action: 'run' | 'open' | 'close') => void;
 
 export type BoxProps = PropsWithChildren<
   ThemedClassName<{
-    shape: Shape;
+    shape: CanvasBoard.Shape;
     title?: string;
     status?: string | ReactNode;
     open?: boolean;
@@ -33,7 +32,7 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
 
     return (
       <div ref={forwardedRef} className='flex flex-col h-full w-full justify-between'>
-        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-hoverSurface'>
+        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
           <Icon icon={icon} classNames='mx-2' />
           <div className='grow text-sm truncate'>{debug ? shape.type : (name ?? shape.text ?? title)}</div>
           <IconButton
@@ -51,7 +50,7 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
           />
         </div>
         <div className={mx('flex flex-col h-full grow overflow-hidden', classNames)}>{children}</div>
-        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-hoverSurface'>
+        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
           <div className='grow px-2 text-sm truncate'>{debug ? shape.id : status}</div>
           {openable && (
             <IconButton

package/src/shapes/common/FunctionBody.tsx

@@ -8,7 +8,7 @@ import React, { type JSX, useRef, useState } from 'react';
 
 import { VoidInput, VoidOutput } from '@dxos/conductor';
 import { useCanvasContext } from '@dxos/react-ui-canvas';
-import { type Polygon, type Shape } from '@dxos/react-ui-canvas-editor';
+import { type CanvasBoard, type Polygon } from '@dxos/react-ui-canvas-editor';
 import { createAnchors, getParentShapeElement, rowHeight } from '@dxos/react-ui-canvas-editor';
 
 import { Box, type BoxProps, footerHeight, headerHeight } from '../common';
@@ -18,7 +18,7 @@ const bodyPadding = 8;
 const expandedHeight = 200;
 
 export type FunctionBodyProps = {
-  shape: Shape;
+  shape: CanvasBoard.Shape;
   name?: string;
   content?: JSX.Element;
   inputSchema?: Schema.Schema.Any;

package/src/shapes/common/TypeSelect.tsx

@@ -11,7 +11,7 @@ import { Select, type SelectRootProps } from '@dxos/react-ui';
 export const TypeSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'value' | 'onValueChange'>) => {
   return (
     <Select.Root value={value} onValueChange={onValueChange}>
-      <Select.TriggerButton variant='ghost' classNames='w-full !px-0' />
+      <Select.TriggerButton variant='ghost' classNames='w-full px-0!' />
       <Select.Portal>
         <Select.Content>
           <Select.ScrollUpButton />

package/src/shapes/defs.ts

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
 import { DEFAULT_INPUT, DEFAULT_OUTPUT } from '@dxos/conductor';
-import { ObjectId } from '@dxos/echo/internal';
+import { Obj } from '@dxos/echo';
 import { Polygon } from '@dxos/react-ui-canvas-editor';
 import { type MakeOptional } from '@dxos/util';
 
@@ -37,7 +37,7 @@ export const ComputeShape = Schema.extend(
   Polygon,
   Schema.Struct({
     // TODO(burdon): Rename computeNode?
-    node: Schema.optional(ObjectId.annotations({ description: 'Compute node id' })),
+    node: Schema.optional(Obj.ID.annotations({ description: 'Compute node id' })),
   }).pipe(Schema.mutable),
 );
 
@@ -45,7 +45,7 @@ export type ComputeShape = Schema.Schema.Type<typeof ComputeShape>;
 
 export const createShape = <S extends ComputeShape>({ id, ...rest }: CreateShapeProps<S> & { type: string }): S => {
   return {
-    id: id ?? ObjectId.random(),
+    id: id ?? Obj.ID.random(),
     ...rest,
   } as S;
 };

package/src/testing/circuits.ts

@@ -3,14 +3,10 @@
 //
 
 import { createSystemPrompt } from '@dxos/assistant';
-import { ObjectId } from '@dxos/echo/internal';
-import { type ServiceContainer } from '@dxos/functions';
-import { DXN, SpaceId } from '@dxos/keys';
+import { DXN, ObjectId, SpaceId } from '@dxos/keys';
 import { type Dimension, type Point } from '@dxos/react-ui-canvas';
 import { CanvasGraphModel, createNote, pointMultiply, pointsToRect, rectToPoints } from '@dxos/react-ui-canvas-editor';
 
-import { ComputeGraphController } from '../graph';
-import { createComputeGraph } from '../hooks';
 import {
   type ComputeShape,
   createAnd,
@@ -38,19 +34,14 @@ import {
   createTextToImage,
 } from '../shapes';
 
-export const createComputeGraphController = (
-  graph: CanvasGraphModel<ComputeShape>,
-  serviceContainer: ServiceContainer,
-) => {
-  const computeGraph = createComputeGraph(graph);
-  const controller = new ComputeGraphController(serviceContainer, computeGraph);
-  return { controller, graph };
-};
-
 //
 // Circuits
 //
 
+export const createEmptyCircuit = () => {
+  return CanvasGraphModel.create<ComputeShape>();
+};
+
 export const createBasicCircuit = () => {
   const model = CanvasGraphModel.create<ComputeShape>();
   model.builder.call(({ model }) => {