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

package/src/shapes/Json.tsx

@@ -8,10 +8,9 @@ import React from 'react';
 import { DEFAULT_INPUT, DefaultOutput, JsonTransformInput } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
-import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
+import { Syntax } from '@dxos/react-ui-syntax-highlighter';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, createFunctionAnchors, getHeight } from './common';
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
@@ -50,7 +49,14 @@ export const JsonComponent = ({ shape, ...props }: JsonComponentProps) => {
 
   return (
     <Box shape={shape}>
-      <JsonFilter data={value} classNames='text-xs' />
+      <Syntax.Root data={value}>
+        <Syntax.Content>
+          <Syntax.Filter />
+          <Syntax.Viewport>
+            <Syntax.Code classNames='text-xs' />
+          </Syntax.Viewport>
+        </Syntax.Content>
+      </Syntax.Root>
     </Box>
   );
 };

package/src/shapes/RNG.tsx

@@ -10,7 +10,6 @@ import { Icon, type IconProps } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const RandomShape = Schema.extend(

package/src/shapes/Scope.tsx

@@ -10,7 +10,6 @@ import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/
 import { Chaos, shaderPresets, useAudioStream } from '@dxos/react-ui-sfx';
 
 import { useComputeNodeState } from '../hooks';
-
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const ScopeShape = Schema.extend(

package/src/shapes/Surface.tsx

@@ -6,13 +6,13 @@ import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/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';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
@@ -48,7 +48,9 @@ export const SurfaceComponent = ({ shape }: ShapeComponentProps<SurfaceShape>) =
   // TODO(burdon): Subject property?
   return (
     <Box shape={shape} onAction={handleAction}>
-      <Card.Root>{value !== null && <Surface.Surface role='card--content' data={{ value }} limit={1} />}</Card.Root>
+      <Card.Root>
+        {value !== null && <Surface.Surface type={AppSurface.Card} data={{ subject: value }} limit={1} />}
+      </Card.Root>
     </Box>
   );
 };

package/src/shapes/Switch.tsx

@@ -10,7 +10,6 @@ import { Input } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const SwitchShape = Schema.extend(

package/src/shapes/Table.tsx

@@ -6,14 +6,15 @@ import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';
+import { Type } from '@dxos/echo';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { Message } from '@dxos/types';
 
 import { Box, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
-const InputSchema = createInputSchema(Message.Message);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Message.Message)));
+const InputSchema = createInputSchema(Type.getSchema(Message.Message));
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Type.getSchema(Message.Message))));
 
 export const TableShape = Schema.extend(
   ComputeShape,

package/src/shapes/Template.tsx

@@ -17,7 +17,6 @@ import {
 } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, TypeSelect, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 

package/src/shapes/Text.tsx

@@ -10,7 +10,6 @@ import { type ShapeComponentProps, type ShapeDef, TextBox } from '@dxos/react-ui
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 

package/src/shapes/Thread.tsx

@@ -6,6 +6,7 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect, useRef } from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';
+import { Type } from '@dxos/echo';
 import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { Message } from '@dxos/types';
@@ -14,8 +15,8 @@ import { mx } from '@dxos/ui-theme';
 import { Box, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
-const InputSchema = createInputSchema(Message.Message);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Message.Message)));
+const InputSchema = createInputSchema(Type.getSchema(Message.Message));
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Type.getSchema(Message.Message))));
 
 export const ThreadShape = Schema.extend(
   ComputeShape,
@@ -55,11 +56,7 @@ export const ThreadComponent = ({ shape }: ShapeComponentProps<ThreadShape>) =>
 
 export const ThreadItem = ({ classNames, item }: ThemedClassName<{ item: any }>) => {
   if (typeof item !== 'object') {
-    return (
-      <div role='none' className={mx(classNames)}>
-        {item}
-      </div>
-    );
+    return <div className={mx(classNames)}>{item}</div>;
   }
 
   // TODO(burdon): Hack; introspect type.

package/src/shapes/Trigger.tsx

@@ -5,19 +5,19 @@
 import * as Schema from 'effect/Schema';
 import React, { useEffect } from 'react';
 
+import { Trigger, TriggerEvent } from '@dxos/compute';
 import { VoidInput } from '@dxos/conductor';
 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 { type SpaceId } from '@dxos/keys';
+import { useSpaces } from '@dxos/react-client/echo';
 import { Select, type SelectRootProps } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { FunctionBody, createFunctionAnchors, getHeight } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
-export const TriggerShape = Schema.extend(
+const TriggerShapeSchema = Schema.extend(
   ComputeShape,
   Schema.Struct({
     type: Schema.Literal('trigger'),
@@ -25,7 +25,13 @@ export const TriggerShape = Schema.extend(
   }),
 );
 
-export interface TriggerShape extends Schema.Schema.Type<typeof TriggerShape> {}
+// TODO(wittjosiah): Try to clean up this type inference.
+export interface TriggerShape extends ComputeShape {
+  type: 'trigger';
+  functionTrigger?: Ref.Ref<Trigger.Trigger>;
+}
+
+export const TriggerShape: Schema.Schema<TriggerShape> = TriggerShapeSchema as any;
 
 export type CreateTriggerProps = CreateShapeProps<Omit<TriggerShape, 'functionTrigger'>> & {
   spaceId?: SpaceId;
@@ -48,13 +54,13 @@ export const createTrigger = (props: CreateTriggerProps): TriggerShape => {
 export type TriggerComponentProps = ShapeComponentProps<TriggerShape>;
 
 export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
-  const space = useSpace();
+  const [space] = useSpaces();
   const functionTrigger = shape.functionTrigger?.target;
 
   useEffect(() => {
     if (functionTrigger && !functionTrigger.spec) {
-      Obj.change(functionTrigger, (t) => {
-        t.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id }) as Mutable<Trigger.Spec>;
+      Obj.update(functionTrigger, (functionTrigger) => {
+        functionTrigger.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id }) as Mutable<Trigger.Spec>;
       });
     }
   }, [functionTrigger, functionTrigger?.spec]);
@@ -65,8 +71,8 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 
   const setKind = (kind: Trigger.Kind) => {
     if (functionTrigger?.spec?.kind !== kind) {
-      Obj.change(functionTrigger!, (t) => {
-        t.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id }) as Mutable<Trigger.Spec>;
+      Obj.update(functionTrigger!, (obj) => {
+        obj.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id }) as Mutable<Trigger.Spec>;
       });
     }
   };
@@ -114,21 +120,15 @@ const createTriggerSpec = (props: { triggerKind?: Trigger.Kind; spaceId?: SpaceI
   const kind = props.triggerKind ?? 'email';
   switch (kind) {
     case 'timer':
-      return { kind: 'timer', cron: '*/10 * * * * *' } satisfies Trigger.TimerSpec;
+      return Trigger.specTimer('*/10 * * * * *');
     case 'webhook':
-      return { kind: 'webhook', method: 'POST' } satisfies Trigger.WebhookSpec;
+      return Trigger.specWebhook({ method: 'POST' });
     case 'subscription':
-      return {
-        kind: 'subscription',
-        query: {
-          ast: Query.select(Filter.nothing()).ast,
-        },
-      } satisfies Trigger.SubscriptionSpec;
+      return Trigger.specSubscription(Query.select(Filter.nothing()));
     case 'email':
-      return { kind: 'email' } satisfies Trigger.EmailSpec;
-    case 'queue': {
-      const dxn = new DXN(DXN.kind.QUEUE, ['data', props.spaceId ?? SpaceId.random(), Obj.ID.random()]).toString();
-      return { kind: 'queue', queue: dxn } satisfies Trigger.QueueSpec;
+      return Trigger.specEmail();
+    case 'feed': {
+      return { kind: 'feed' } satisfies Trigger.FeedSpec;
     }
   }
 };
@@ -139,7 +139,7 @@ const getOutputSchema = (kind: Trigger.Kind) => {
     ['subscription']: TriggerEvent.SubscriptionEvent,
     ['timer']: TriggerEvent.TimerEvent,
     ['webhook']: TriggerEvent.WebhookEvent,
-    ['queue']: TriggerEvent.QueueEvent,
+    ['feed']: TriggerEvent.FeedEvent,
   };
   return kindToSchema[kind];
 };

package/src/shapes/common/Box.tsx

@@ -27,7 +27,7 @@ export type BoxProps = PropsWithChildren<
 export const Box = forwardRef<HTMLDivElement, BoxProps>(
   ({ children, classNames, shape, title, status, open, onAction }, forwardedRef) => {
     invariant(shape.type);
-    const { icon, name, openable } = useShapeDef(shape.type) ?? { icon: 'ph--placeholder--regular' };
+    const { icon, name, openable } = useShapeDef(shape.type) ?? { icon: 'ph--circle-dashed--regular' };
     const { debug } = useEditorContext();
 
     return (
@@ -39,7 +39,6 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
             classNames='p-1 text-green-500'
             variant='ghost'
             icon='ph--play--regular'
-            size={4}
             label='run'
             iconOnly
             onDoubleClick={(ev) => ev.stopPropagation()}
@@ -57,7 +56,6 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
               classNames='p-1'
               variant='ghost'
               icon={open ? 'ph--caret-up--regular' : 'ph--caret-down--regular'}
-              size={4}
               label={open ? 'close' : 'open'}
               iconOnly
               onClick={(ev) => {

package/src/shapes/index.ts

@@ -13,11 +13,12 @@ export * from './Boolean';
 export * from './Chat';
 export * from './Constant';
 export * from './Database';
+export * from './Feed';
 export * from './Function';
 export * from './Gpt';
+export * from './GptRealtime';
 export * from './Json';
 export * from './Logic';
-export * from './Queue';
 export * from './RNG';
 export * from './Scope';
 export * from './Surface';
@@ -28,4 +29,3 @@ export * from './Text';
 export * from './Thread';
 export * from './TextToImage';
 export * from './Trigger';
-export * from './GptRealtime';

package/src/testing/circuits.ts

@@ -3,7 +3,7 @@
 //
 
 import { createSystemPrompt } from '@dxos/assistant';
-import { DXN, ObjectId, SpaceId } from '@dxos/keys';
+import { EID, EntityId, 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';
 
@@ -24,7 +24,7 @@ import {
   createJsonTransform,
   createNot,
   createOr,
-  createQueue,
+  createFeed,
   createRandom,
   createScope,
   createSurface,
@@ -67,7 +67,7 @@ export const createTransformCircuit = () => {
 
     model.builder
       // TODO(burdon): Make id optional.
-      .createNode(createNote({ id: ObjectId.random(), text: 'Random number generator', ...position({ x: 0, y: -6 }) }))
+      .createNode(createNote({ id: EntityId.random(), text: 'Random number generator', ...position({ x: 0, y: -6 }) }))
       .createEdge({ source: a.id, target: c.id })
       .createEdge({ source: b.id, target: c.id, input: 'expression' })
       .createEdge({ source: c.id, target: d.id });
@@ -236,12 +236,12 @@ export const createGptCircuit = (options: {
     if (options.history) {
       const queue = model.createNode(
         createConstant({
-          value: new DXN(DXN.kind.QUEUE, ['data', SpaceId.random(), ObjectId.random()]).toString(),
+          value: EID.make({ spaceId: SpaceId.random(), entityId: EntityId.random() }),
           ...position({ x: -18, y: 5, width: 8, height: 6 }),
         }),
       );
 
-      const thread = model.createNode(createQueue(position({ x: -3, y: 3, width: 14, height: 10 })));
+      const thread = model.createNode(createFeed(position({ x: -3, y: 3, width: 14, height: 10 })));
       const append = model.createNode(createAppend(position({ x: 10, y: 6 })));
 
       builder

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

@@ -1 +0,0 @@
-{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/shapes/Queue.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAOvF,OAAO,EAAgB,KAAK,gBAAgB,EAAe,MAAM,QAAQ,CAAC;AAE1E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;GAKtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAE5D,eAAO,MAAM,WAAW,GAAI,OAAO,gBAAgB;;;;;;;;;;;;;;;;;;;CAK/C,CAAC;AAEL,eAAO,MAAM,cAAc,GAAI,WAAW,mBAAmB,CAAC,UAAU,CAAC,sBAqBxE,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,sBAAsB,eAAe,CAAC;IAAE,IAAI,EAAE,GAAG,CAAA;CAAE,CAAC,sBAe7E,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,UAAU,CAQ3C,CAAC"}