@dxos/react-ui-canvas-compute 0.8.2-staging.7ac8446 → 0.8.2

package/src/shapes/Database.tsx

@@ -2,23 +2,23 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React from 'react';
 
-import { S } from '@dxos/echo-schema';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { Box } from './common';
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 
-export const DatabaseShape = S.extend(
+export const DatabaseShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('database'),
+  Schema.Struct({
+    type: Schema.Literal('database'),
   }),
 );
 
-export type DatabaseShape = S.Schema.Type<typeof DatabaseShape>;
+export type DatabaseShape = Schema.Schema.Type<typeof DatabaseShape>;
 
 export type CreateDatabaseProps = CreateShapeProps<DatabaseShape>;
 

package/src/shapes/Function.tsx

@@ -2,11 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React, { useCallback, useRef } from 'react';
 
 import { AnyOutput, FunctionInput } from '@dxos/conductor';
-import { getSnapshot, isInstanceOf, S } from '@dxos/echo-schema';
-import { FunctionType, ScriptType } from '@dxos/functions/types';
+import { getSnapshot, isInstanceOf, Ref } from '@dxos/echo-schema';
+import { FunctionType, ScriptType } from '@dxos/functions';
 import { useClient } from '@dxos/react-client';
 import { Filter, makeRef, parseId } from '@dxos/react-client/echo';
 import {
@@ -21,14 +22,14 @@ import { Box, createFunctionAnchors } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const FunctionShape = S.extend(
+export const FunctionShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('function'),
+  Schema.Struct({
+    type: Schema.Literal('function'),
   }),
 );
 
-export type FunctionShape = S.Schema.Type<typeof FunctionShape>;
+export type FunctionShape = Schema.Schema.Type<typeof FunctionShape>;
 
 export type CreateFunctionProps = CreateShapeProps<FunctionShape>;
 
@@ -62,7 +63,7 @@ const TextInputComponent = ({ shape, title, ...props }: TextInputComponentProps)
 
       const {
         objects: [fn],
-      } = await space.db.query(Filter.schema(FunctionType, { source: object })).run();
+      } = await space.db.query(Filter.type(FunctionType, { source: Ref.make(object) })).run();
       if (!fn) {
         return;
       }

package/src/shapes/Gpt.tsx

@@ -2,25 +2,25 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React, { useEffect, useState } from 'react';
 
-import type { GenerationStreamEvent } from '@dxos/assistant';
+import { type GenerationStreamEvent } from '@dxos/ai';
 import { GptInput, GptOutput } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { createFunctionAnchors, FunctionBody, getHeight } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const GptShape = S.extend(
+export const GptShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('gpt'),
+  Schema.Struct({
+    type: Schema.Literal('gpt'),
   }),
 );
 
-export type GptShape = S.Schema.Type<typeof GptShape>;
+export type GptShape = Schema.Schema.Type<typeof GptShape>;
 
 export type CreateGptProps = CreateShapeProps<GptShape>;
 

package/src/shapes/GptRealtime.tsx

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React, { useState } from 'react';
 
-import { S } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 import { useConfig } from '@dxos/react-client';
 import { Icon } from '@dxos/react-ui';
@@ -13,14 +13,14 @@ import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-e
 import { createFunctionAnchors } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 
-export const GptRealtimeShape = S.extend(
+export const GptRealtimeShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('gpt-realtime'),
+  Schema.Struct({
+    type: Schema.Literal('gpt-realtime'),
   }),
 );
 
-export type GptRealtimeShape = S.Schema.Type<typeof GptRealtimeShape>;
+export type GptRealtimeShape = Schema.Schema.Type<typeof GptRealtimeShape>;
 
 export type CreateGptRealtimeProps = CreateShapeProps<GptRealtimeShape>;
 
@@ -164,10 +164,10 @@ export const gptRealtimeShape: ShapeDef<GptRealtimeShape> = {
   getAnchors: (shape) =>
     createFunctionAnchors(
       shape,
-      S.Struct({
-        audio: S.Any,
+      Schema.Struct({
+        audio: Schema.Any,
       }),
-      S.Struct({}),
+      Schema.Struct({}),
     ),
   resizable: true,
 };

package/src/shapes/Json.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React from 'react';
 
 import { DEFAULT_INPUT, DefaultOutput, JsonTransformInput } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 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';
@@ -18,23 +18,23 @@ import { useComputeNodeState } from '../hooks';
 // Data
 //
 
-export const JsonShape = S.extend(
+export const JsonShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('json'),
+  Schema.Struct({
+    type: Schema.Literal('json'),
   }),
 );
 
-export type JsonShape = S.Schema.Type<typeof JsonShape>;
+export type JsonShape = Schema.Schema.Type<typeof JsonShape>;
 
-export const JsonTransformShape = S.extend(
+export const JsonTransformShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('json-transform'),
+  Schema.Struct({
+    type: Schema.Literal('json-transform'),
   }),
 );
 
-export type JsonTransformShape = S.Schema.Type<typeof JsonTransformShape>;
+export type JsonTransformShape = Schema.Schema.Type<typeof JsonTransformShape>;
 
 //
 // Component

package/src/shapes/Logic.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React from 'react';
 
 import { IfElseInput, IfElseOutput, IfInput, IfOutput } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { createFunctionAnchors, FunctionBody, getHeight } from './common';
@@ -15,23 +15,23 @@ import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 // Data
 //
 
-export const IfShape = S.extend(
+export const IfShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('if'),
+  Schema.Struct({
+    type: Schema.Literal('if'),
   }),
 );
 
-export type IfShape = S.Schema.Type<typeof IfShape>;
+export type IfShape = Schema.Schema.Type<typeof IfShape>;
 
-export const IfElseShape = S.extend(
+export const IfElseShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('if-else'),
+  Schema.Struct({
+    type: Schema.Literal('if-else'),
   }),
 );
 
-export type IfElseShape = S.Schema.Type<typeof IfElseShape>;
+export type IfElseShape = Schema.Schema.Type<typeof IfElseShape>;
 
 //
 // Components

package/src/shapes/Queue.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React, { Fragment } from 'react';
 
 import { DEFAULT_OUTPUT, QueueInput, QueueOutput } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { mx } from '@dxos/react-ui-theme';
@@ -15,14 +15,14 @@ import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const QueueShape = S.extend(
+export const QueueShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('queue'),
+  Schema.Struct({
+    type: Schema.Literal('queue'),
   }),
 );
 
-export type QueueShape = S.Schema.Type<typeof QueueShape>;
+export type QueueShape = Schema.Schema.Type<typeof QueueShape>;
 
 export type CreateQueueProps = CreateShapeProps<QueueShape>;
 

package/src/shapes/RNG.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React, { useEffect, useState } from 'react';
 
 import { DEFAULT_OUTPUT } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { Icon, type IconProps } from '@dxos/react-ui';
 import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { mx } from '@dxos/react-ui-theme';
@@ -13,16 +13,16 @@ import { mx } from '@dxos/react-ui-theme';
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const RandomShape = S.extend(
+export const RandomShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('rng'),
-    min: S.optional(S.Number),
-    max: S.optional(S.Number),
+  Schema.Struct({
+    type: Schema.Literal('rng'),
+    min: Schema.optional(Schema.Number),
+    max: Schema.optional(Schema.Number),
   }),
 );
 
-export type RandomShape = S.Schema.Type<typeof RandomShape>;
+export type RandomShape = Schema.Schema.Type<typeof RandomShape>;
 
 export type CreateRandomProps = CreateShapeProps<RandomShape>;
 

package/src/shapes/Scope.tsx

@@ -2,24 +2,24 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React from 'react';
 
 import { DEFAULT_INPUT } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { useAudioStream, Chaos, shaderPresets } from '@dxos/react-ui-sfx';
 
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const ScopeShape = S.extend(
+export const ScopeShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('scope'),
+  Schema.Struct({
+    type: Schema.Literal('scope'),
   }),
 );
 
-export type ScopeShape = S.Schema.Type<typeof ScopeShape>;
+export type ScopeShape = Schema.Schema.Type<typeof ScopeShape>;
 
 export type CreateScopeProps = CreateShapeProps<ScopeShape>;
 

package/src/shapes/Surface.tsx

@@ -2,11 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React from 'react';
 
 import { Surface } from '@dxos/app-framework';
 import { DEFAULT_INPUT } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
@@ -14,14 +14,14 @@ import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const SurfaceShape = S.extend(
+export const SurfaceShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('surface'),
+  Schema.Struct({
+    type: Schema.Literal('surface'),
   }),
 );
 
-export type SurfaceShape = S.Schema.Type<typeof SurfaceShape>;
+export type SurfaceShape = Schema.Schema.Type<typeof SurfaceShape>;
 
 export type CreateSurfaceProps = CreateShapeProps<SurfaceShape>;
 

package/src/shapes/Switch.tsx

@@ -2,24 +2,24 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React, { useEffect, useState } from 'react';
 
 import { DEFAULT_OUTPUT } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { Input } from '@dxos/react-ui';
 import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const SwitchShape = S.extend(
+export const SwitchShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('switch'),
+  Schema.Struct({
+    type: Schema.Literal('switch'),
   }),
 );
 
-export type SwitchShape = S.Schema.Type<typeof SwitchShape>;
+export type SwitchShape = Schema.Schema.Type<typeof SwitchShape>;
 
 export type CreateSwitchProps = CreateShapeProps<SwitchShape>;
 

package/src/shapes/Table.tsx

@@ -2,26 +2,26 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React from 'react';
 
 import { createInputSchema, createOutputSchema, GptMessage } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { createFunctionAnchors, Box } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 
 const InputSchema = createInputSchema(GptMessage);
-const OutputSchema = createOutputSchema(S.mutable(S.Array(GptMessage)));
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(GptMessage)));
 
-export const TableShape = S.extend(
+export const TableShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('table'),
+  Schema.Struct({
+    type: Schema.Literal('table'),
   }),
 );
 
-export type TableShape = S.Schema.Type<typeof TableShape>;
+export type TableShape = Schema.Schema.Type<typeof TableShape>;
 
 export type CreateTableProps = CreateShapeProps<TableShape>;
 

package/src/shapes/Template.tsx

@@ -2,10 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React, { useRef } from 'react';
 
 import { ComputeValueType, getTemplateInputSchema, TemplateOutput, VoidInput } from '@dxos/conductor';
-import { S, toJsonSchema } from '@dxos/echo-schema';
+import { toJsonSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import {
   type ShapeComponentProps,
@@ -23,15 +24,15 @@ import { useComputeNodeState } from '../hooks';
 // Data
 //
 
-export const TemplateShape = S.extend(
+export const TemplateShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('template'),
-    valueType: S.optional(ComputeValueType),
+  Schema.Struct({
+    type: Schema.Literal('template'),
+    valueType: Schema.optional(ComputeValueType),
   }),
 );
 
-export type TemplateShape = S.Schema.Type<typeof TemplateShape>;
+export type TemplateShape = Schema.Schema.Type<typeof TemplateShape>;
 
 //
 // Component
@@ -54,7 +55,7 @@ const TextInputComponent = ({ shape, title, ...props }: TextInputComponentProps)
   };
 
   const handleTypeChange = (newType: string) => {
-    invariant(S.is(ComputeValueType)(newType), 'Invalid type');
+    invariant(Schema.is(ComputeValueType)(newType), 'Invalid type');
 
     node.valueType = newType;
     node.inputSchema = toJsonSchema(getTemplateInputSchema(node));

package/src/shapes/Text.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React from 'react';
 
 import { DEFAULT_INPUT } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { TextBox, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
@@ -13,14 +13,14 @@ import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const TextShape = S.extend(
+export const TextShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('text'),
+  Schema.Struct({
+    type: Schema.Literal('text'),
   }),
 );
 
-export type TextShape = S.Schema.Type<typeof TextShape>;
+export type TextShape = Schema.Schema.Type<typeof TextShape>;
 
 export type CreateTextProps = CreateShapeProps<TextShape>;
 

package/src/shapes/TextToImage.tsx

@@ -2,23 +2,23 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React from 'react';
 
-import { S } from '@dxos/echo-schema';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { Box } from './common';
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 
-export const TextToImageShape = S.extend(
+export const TextToImageShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('text-to-image'),
+  Schema.Struct({
+    type: Schema.Literal('text-to-image'),
   }),
 );
 
-export type TextToImageShape = S.Schema.Type<typeof TextToImageShape>;
+export type TextToImageShape = Schema.Schema.Type<typeof TextToImageShape>;
 
 export type CreateTextToImageProps = CreateShapeProps<TextToImageShape>;
 

package/src/shapes/Thread.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import React, { useEffect, useRef } from 'react';
 
 import { createInputSchema, createOutputSchema, GptMessage } from '@dxos/conductor';
-import { S } from '@dxos/echo-schema';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { mx } from '@dxos/react-ui-theme';
@@ -14,16 +14,16 @@ import { createFunctionAnchors, Box } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 
 const InputSchema = createInputSchema(GptMessage);
-const OutputSchema = createOutputSchema(S.mutable(S.Array(GptMessage)));
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(GptMessage)));
 
-export const ThreadShape = S.extend(
+export const ThreadShape = Schema.extend(
   ComputeShape,
-  S.Struct({
-    type: S.Literal('thread'),
+  Schema.Struct({
+    type: Schema.Literal('thread'),
   }),
 );
 
-export type ThreadShape = S.Schema.Type<typeof ThreadShape>;
+export type ThreadShape = Schema.Schema.Type<typeof ThreadShape>;
 
 export type CreateThreadProps = CreateShapeProps<ThreadShape>;