@dxos/react-ui-canvas-compute 0.8.4-main.72ec0f3 → 0.8.4-main.8360d9e660

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/dist/lib/browser/index.mjs +738 -903
  2. package/dist/lib/browser/index.mjs.map +3 -3
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/node-esm/index.mjs +738 -903
  5. package/dist/lib/node-esm/index.mjs.map +3 -3
  6. package/dist/lib/node-esm/meta.json +1 -1
  7. package/dist/types/src/compute.stories.d.ts +22 -1
  8. package/dist/types/src/compute.stories.d.ts.map +1 -1
  9. package/dist/types/src/graph/controller.d.ts +8 -4
  10. package/dist/types/src/graph/controller.d.ts.map +1 -1
  11. package/dist/types/src/hooks/useGraphMonitor.d.ts +2 -2
  12. package/dist/types/src/hooks/useGraphMonitor.d.ts.map +1 -1
  13. package/dist/types/src/shapes/Function.d.ts.map +1 -1
  14. package/dist/types/src/shapes/Gpt.d.ts.map +1 -1
  15. package/dist/types/src/shapes/Queue.d.ts.map +1 -1
  16. package/dist/types/src/shapes/Surface.d.ts.map +1 -1
  17. package/dist/types/src/shapes/Thread.d.ts.map +1 -1
  18. package/dist/types/src/shapes/Trigger.d.ts +4 -2
  19. package/dist/types/src/shapes/Trigger.d.ts.map +1 -1
  20. package/dist/types/src/shapes/common/Box.d.ts +4 -4
  21. package/dist/types/src/shapes/common/Box.d.ts.map +1 -1
  22. package/dist/types/src/shapes/common/FunctionBody.d.ts +2 -2
  23. package/dist/types/src/shapes/common/FunctionBody.d.ts.map +1 -1
  24. package/dist/types/src/testing/circuits.d.ts +18 -24
  25. package/dist/types/src/testing/circuits.d.ts.map +1 -1
  26. package/dist/types/tsconfig.tsbuildinfo +1 -1
  27. package/package.json +59 -56
  28. package/src/README.md +0 -3
  29. package/src/compute.stories.tsx +73 -114
  30. package/src/graph/controller.ts +98 -67
  31. package/src/graph/node-defs.ts +31 -31
  32. package/src/hooks/useGraphMonitor.ts +11 -10
  33. package/src/json.test.ts +3 -3
  34. package/src/schema.test.ts +11 -11
  35. package/src/shapes/Audio.tsx +2 -2
  36. package/src/shapes/Beacon.tsx +1 -1
  37. package/src/shapes/Boolean.tsx +2 -2
  38. package/src/shapes/Function.tsx +8 -6
  39. package/src/shapes/Gpt.tsx +6 -1
  40. package/src/shapes/GptRealtime.tsx +1 -1
  41. package/src/shapes/Queue.tsx +15 -9
  42. package/src/shapes/Scope.tsx +1 -1
  43. package/src/shapes/Surface.tsx +4 -2
  44. package/src/shapes/Switch.tsx +1 -1
  45. package/src/shapes/Thread.tsx +15 -9
  46. package/src/shapes/Trigger.tsx +13 -8
  47. package/src/shapes/common/Box.tsx +8 -9
  48. package/src/shapes/common/FunctionBody.tsx +4 -4
  49. package/src/shapes/common/TypeSelect.tsx +1 -1
  50. package/src/shapes/defs.ts +3 -3
  51. package/src/testing/circuits.ts +5 -14
@@ -6,10 +6,10 @@ import * as Schema from 'effect/Schema';
6
6
  import React, { useEffect, useRef } from 'react';
7
7
 
8
8
  import { createInputSchema, createOutputSchema } from '@dxos/conductor';
9
- import { type ThemedClassName } from '@dxos/react-ui';
9
+ import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
10
10
  import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
11
- import { mx } from '@dxos/react-ui-theme';
12
11
  import { Message } from '@dxos/types';
12
+ import { mx } from '@dxos/ui-theme';
13
13
 
14
14
  import { Box, createFunctionAnchors } from './common';
15
15
  import { ComputeShape, type CreateShapeProps, createShape } from './defs';
@@ -42,18 +42,24 @@ export const ThreadComponent = ({ shape }: ShapeComponentProps<ThreadShape>) =>
42
42
 
43
43
  return (
44
44
  <Box shape={shape}>
45
- <div ref={scrollRef} className='flex flex-col is-full overflow-y-auto gap-2 p-2'>
46
- {[...items].map((item, i) => (
47
- <ThreadItem key={i} item={item} />
48
- ))}
49
- </div>
45
+ <ScrollArea.Root orientation='vertical'>
46
+ <ScrollArea.Viewport classNames='gap-2 p-2' ref={scrollRef}>
47
+ {[...items].map((item, i) => (
48
+ <ThreadItem key={i} item={item} />
49
+ ))}
50
+ </ScrollArea.Viewport>
51
+ </ScrollArea.Root>
50
52
  </Box>
51
53
  );
52
54
  };
53
55
 
54
56
  export const ThreadItem = ({ classNames, item }: ThemedClassName<{ item: any }>) => {
55
57
  if (typeof item !== 'object') {
56
- return <div className={mx(classNames)}>{item}</div>;
58
+ return (
59
+ <div role='none' className={mx(classNames)}>
60
+ {item}
61
+ </div>
62
+ );
57
63
  }
58
64
 
59
65
  // TODO(burdon): Hack; introspect type.
@@ -63,7 +69,7 @@ export const ThreadItem = ({ classNames, item }: ThemedClassName<{ item: any }>)
63
69
  <div className={mx('flex', classNames, role === 'user' && 'justify-end')}>
64
70
  <div
65
71
  className={mx(
66
- 'block rounded-md p-1 pli-2 text-sm',
72
+ 'block rounded-md p-1 px-2 text-sm',
67
73
  role === 'user'
68
74
  ? 'bg-blue-100 dark:bg-blue-800'
69
75
  : role === 'system'
@@ -6,8 +6,8 @@ import * as Schema from 'effect/Schema';
6
6
  import React, { useEffect } from 'react';
7
7
 
8
8
  import { VoidInput } from '@dxos/conductor';
9
- import { Filter, Query } from '@dxos/echo';
10
- import { ObjectId, Ref } from '@dxos/echo/internal';
9
+ import { Filter, Obj, Query, Ref } from '@dxos/echo';
10
+ import { type Mutable } from '@dxos/echo/internal';
11
11
  import { Trigger, TriggerEvent } from '@dxos/functions';
12
12
  import { DXN, SpaceId } from '@dxos/keys';
13
13
  import { useSpace } from '@dxos/react-client/echo';
@@ -21,10 +21,11 @@ export const TriggerShape = Schema.extend(
21
21
  ComputeShape,
22
22
  Schema.Struct({
23
23
  type: Schema.Literal('trigger'),
24
- functionTrigger: Schema.optional(Ref(Trigger.Trigger)),
24
+ functionTrigger: Schema.optional(Ref.Ref(Trigger.Trigger)),
25
25
  }),
26
26
  );
27
- export type TriggerShape = Schema.Schema.Type<typeof TriggerShape>;
27
+
28
+ export interface TriggerShape extends Schema.Schema.Type<typeof TriggerShape> {}
28
29
 
29
30
  export type CreateTriggerProps = CreateShapeProps<Omit<TriggerShape, 'functionTrigger'>> & {
30
31
  spaceId?: SpaceId;
@@ -52,7 +53,9 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
52
53
 
53
54
  useEffect(() => {
54
55
  if (functionTrigger && !functionTrigger.spec) {
55
- functionTrigger.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id });
56
+ Obj.change(functionTrigger, (t) => {
57
+ t.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id }) as Mutable<Trigger.Spec>;
58
+ });
56
59
  }
57
60
  }, [functionTrigger, functionTrigger?.spec]);
58
61
 
@@ -62,7 +65,9 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
62
65
 
63
66
  const setKind = (kind: Trigger.Kind) => {
64
67
  if (functionTrigger?.spec?.kind !== kind) {
65
- functionTrigger!.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id });
68
+ Obj.change(functionTrigger!, (t) => {
69
+ t.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id }) as Mutable<Trigger.Spec>;
70
+ });
66
71
  }
67
72
  };
68
73
 
@@ -86,7 +91,7 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
86
91
  const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'value' | 'onValueChange'>) => {
87
92
  return (
88
93
  <Select.Root value={value} onValueChange={onValueChange}>
89
- <Select.TriggerButton variant='ghost' classNames='is-full !pli-0' />
94
+ <Select.TriggerButton variant='ghost' classNames='w-full px-0!' />
90
95
  <Select.Portal>
91
96
  <Select.Content>
92
97
  <Select.ScrollUpButton />
@@ -122,7 +127,7 @@ const createTriggerSpec = (props: { triggerKind?: Trigger.Kind; spaceId?: SpaceI
122
127
  case 'email':
123
128
  return { kind: 'email' } satisfies Trigger.EmailSpec;
124
129
  case 'queue': {
125
- const dxn = new DXN(DXN.kind.QUEUE, ['data', props.spaceId ?? SpaceId.random(), ObjectId.random()]).toString();
130
+ const dxn = new DXN(DXN.kind.QUEUE, ['data', props.spaceId ?? SpaceId.random(), Obj.ID.random()]).toString();
126
131
  return { kind: 'queue', queue: dxn } satisfies Trigger.QueueSpec;
127
132
  }
128
133
  }
@@ -6,9 +6,8 @@ import React, { type PropsWithChildren, type ReactNode, forwardRef } from 'react
6
6
 
7
7
  import { invariant } from '@dxos/invariant';
8
8
  import { Icon, IconButton, type ThemedClassName } from '@dxos/react-ui';
9
- import { useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
10
- import { type Shape } from '@dxos/react-ui-canvas-editor';
11
- import { mx } from '@dxos/react-ui-theme';
9
+ import { type CanvasBoard, useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
10
+ import { mx } from '@dxos/ui-theme';
12
11
 
13
12
  export const headerHeight = 32;
14
13
  export const footerHeight = 32;
@@ -17,7 +16,7 @@ export type BoxActionHandler = (action: 'run' | 'open' | 'close') => void;
17
16
 
18
17
  export type BoxProps = PropsWithChildren<
19
18
  ThemedClassName<{
20
- shape: Shape;
19
+ shape: CanvasBoard.Shape;
21
20
  title?: string;
22
21
  status?: string | ReactNode;
23
22
  open?: boolean;
@@ -32,8 +31,8 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
32
31
  const { debug } = useEditorContext();
33
32
 
34
33
  return (
35
- <div ref={forwardedRef} className='flex flex-col bs-full is-full justify-between'>
36
- <div className='flex shrink-0 is-full justify-between items-center bs-[32px] bg-hoverSurface'>
34
+ <div ref={forwardedRef} className='flex flex-col h-full w-full justify-between'>
35
+ <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
37
36
  <Icon icon={icon} classNames='mx-2' />
38
37
  <div className='grow text-sm truncate'>{debug ? shape.type : (name ?? shape.text ?? title)}</div>
39
38
  <IconButton
@@ -50,9 +49,9 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
50
49
  }}
51
50
  />
52
51
  </div>
53
- <div className={mx('flex flex-col bs-full grow overflow-hidden', classNames)}>{children}</div>
54
- <div className='flex shrink-0 is-full justify-between items-center bs-[32px] bg-hoverSurface'>
55
- <div className='grow pli-2 text-sm truncate'>{debug ? shape.id : status}</div>
52
+ <div className={mx('flex flex-col h-full grow overflow-hidden', classNames)}>{children}</div>
53
+ <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
54
+ <div className='grow px-2 text-sm truncate'>{debug ? shape.id : status}</div>
56
55
  {openable && (
57
56
  <IconButton
58
57
  classNames='p-1'
@@ -8,7 +8,7 @@ import React, { type JSX, useRef, useState } from 'react';
8
8
 
9
9
  import { VoidInput, VoidOutput } from '@dxos/conductor';
10
10
  import { useCanvasContext } from '@dxos/react-ui-canvas';
11
- import { type Polygon, type Shape } from '@dxos/react-ui-canvas-editor';
11
+ import { type CanvasBoard, type Polygon } from '@dxos/react-ui-canvas-editor';
12
12
  import { createAnchors, getParentShapeElement, rowHeight } from '@dxos/react-ui-canvas-editor';
13
13
 
14
14
  import { Box, type BoxProps, footerHeight, headerHeight } from '../common';
@@ -18,7 +18,7 @@ const bodyPadding = 8;
18
18
  const expandedHeight = 200;
19
19
 
20
20
  export type FunctionBodyProps = {
21
- shape: Shape;
21
+ shape: CanvasBoard.Shape;
22
22
  name?: string;
23
23
  content?: JSX.Element;
24
24
  inputSchema?: Schema.Schema.Any;
@@ -82,7 +82,7 @@ export const FunctionBody = ({
82
82
  {(inputs?.length ?? 0) > 0 && (
83
83
  <div className='flex flex-col'>
84
84
  {inputs?.map(({ name }) => (
85
- <div key={name} className='pli-2 truncate text-sm font-mono items-center' style={{ height: rowHeight }}>
85
+ <div key={name} className='px-2 truncate text-sm font-mono items-center' style={{ height: rowHeight }}>
86
86
  {name}
87
87
  </div>
88
88
  ))}
@@ -93,7 +93,7 @@ export const FunctionBody = ({
93
93
  {outputs?.map(({ name }) => (
94
94
  <div
95
95
  key={name}
96
- className='pli-2 truncate text-sm font-mono items-center text-right'
96
+ className='px-2 truncate text-sm font-mono items-center text-right'
97
97
  style={{ height: rowHeight }}
98
98
  >
99
99
  {name}
@@ -11,7 +11,7 @@ import { Select, type SelectRootProps } from '@dxos/react-ui';
11
11
  export const TypeSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'value' | 'onValueChange'>) => {
12
12
  return (
13
13
  <Select.Root value={value} onValueChange={onValueChange}>
14
- <Select.TriggerButton variant='ghost' classNames='is-full !pli-0' />
14
+ <Select.TriggerButton variant='ghost' classNames='w-full px-0!' />
15
15
  <Select.Portal>
16
16
  <Select.Content>
17
17
  <Select.ScrollUpButton />
@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
6
6
  import * as SchemaAST from 'effect/SchemaAST';
7
7
 
8
8
  import { DEFAULT_INPUT, DEFAULT_OUTPUT } from '@dxos/conductor';
9
- import { ObjectId } from '@dxos/echo/internal';
9
+ import { Obj } from '@dxos/echo';
10
10
  import { Polygon } from '@dxos/react-ui-canvas-editor';
11
11
  import { type MakeOptional } from '@dxos/util';
12
12
 
@@ -37,7 +37,7 @@ export const ComputeShape = Schema.extend(
37
37
  Polygon,
38
38
  Schema.Struct({
39
39
  // TODO(burdon): Rename computeNode?
40
- node: Schema.optional(ObjectId.annotations({ description: 'Compute node id' })),
40
+ node: Schema.optional(Obj.ID.annotations({ description: 'Compute node id' })),
41
41
  }).pipe(Schema.mutable),
42
42
  );
43
43
 
@@ -45,7 +45,7 @@ export type ComputeShape = Schema.Schema.Type<typeof ComputeShape>;
45
45
 
46
46
  export const createShape = <S extends ComputeShape>({ id, ...rest }: CreateShapeProps<S> & { type: string }): S => {
47
47
  return {
48
- id: id ?? ObjectId.random(),
48
+ id: id ?? Obj.ID.random(),
49
49
  ...rest,
50
50
  } as S;
51
51
  };
@@ -3,14 +3,10 @@
3
3
  //
4
4
 
5
5
  import { createSystemPrompt } from '@dxos/assistant';
6
- import { ObjectId } from '@dxos/echo/internal';
7
- import { type ServiceContainer } from '@dxos/functions-runtime';
8
- import { DXN, SpaceId } from '@dxos/keys';
6
+ import { DXN, ObjectId, SpaceId } from '@dxos/keys';
9
7
  import { type Dimension, type Point } from '@dxos/react-ui-canvas';
10
8
  import { CanvasGraphModel, createNote, pointMultiply, pointsToRect, rectToPoints } from '@dxos/react-ui-canvas-editor';
11
9
 
12
- import { ComputeGraphController } from '../graph';
13
- import { createComputeGraph } from '../hooks';
14
10
  import {
15
11
  type ComputeShape,
16
12
  createAnd,
@@ -38,19 +34,14 @@ import {
38
34
  createTextToImage,
39
35
  } from '../shapes';
40
36
 
41
- export const createComputeGraphController = (
42
- graph: CanvasGraphModel<ComputeShape>,
43
- serviceContainer: ServiceContainer,
44
- ) => {
45
- const computeGraph = createComputeGraph(graph);
46
- const controller = new ComputeGraphController(serviceContainer, computeGraph);
47
- return { controller, graph };
48
- };
49
-
50
37
  //
51
38
  // Circuits
52
39
  //
53
40
 
41
+ export const createEmptyCircuit = () => {
42
+ return CanvasGraphModel.create<ComputeShape>();
43
+ };
44
+
54
45
  export const createBasicCircuit = () => {
55
46
  const model = CanvasGraphModel.create<ComputeShape>();
56
47
  model.builder.call(({ model }) => {