@dxos/react-ui-canvas-compute 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/dist/lib/browser/index.mjs

@@ -7,10 +7,10 @@ import * as Exit from "effect/Exit";
 import * as Layer from "effect/Layer";
 import * as Scope from "effect/Scope";
 import { Event, synchronized } from "@dxos/async";
-import { GraphExecutor, ValueBag, isNotExecuted } from "@dxos/conductor";
+import { Trace } from "@dxos/compute";
+import { ComputeBeginEvent, ComputeCustomEvent, ComputeEndEvent, ComputeInputEvent, ComputeNodeContext, ComputeOutputEvent, GraphExecutor, ValueBag, isNotExecuted } from "@dxos/conductor";
 import { Resource } from "@dxos/context";
 import { unwrapExit } from "@dxos/effect";
-import { ComputeEventLogger, Trace, TracingService } from "@dxos/functions";
 import { log } from "@dxos/log";
 
 // src/hooks/compute-context.ts
@@ -78,28 +78,12 @@ import { invariant } from "@dxos/invariant";
 var __dxlog_file = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/hooks/useComputeNodeState.ts";
 var useComputeNodeState = (shape) => {
   const { controller } = useComputeContext();
-  invariant(controller, void 0, {
-    F: __dxlog_file,
-    L: 33,
-    S: void 0,
-    A: [
-      "controller",
-      ""
-    ]
-  });
+  invariant(controller, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 12, S: void 0, A: ["controller", ""] });
   const [meta, setMeta] = useState2();
   useEffect2(() => {
     let disposed = false;
     queueMicrotask(async () => {
-      invariant(shape.node, "Node not specified", {
-        F: __dxlog_file,
-        L: 39,
-        S: void 0,
-        A: [
-          "shape.node",
-          "'Node not specified'"
-        ]
-      });
+      invariant(shape.node, "Node not specified", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 17, S: void 0, A: ["shape.node", "'Node not specified'"] });
       const node = controller.getComputeNode(shape.node);
       const meta2 = await controller.getMeta(node);
       if (disposed) {
@@ -155,24 +139,8 @@ var __dxlog_file2 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/hook
 var mapEdge = (graph, { source, target, output = DEFAULT_OUTPUT, input = DEFAULT_INPUT }) => {
   const sourceNode = graph.findNode(source);
   const targetNode = graph.findNode(target);
-  invariant2(sourceNode?.node, void 0, {
-    F: __dxlog_file2,
-    L: 25,
-    S: void 0,
-    A: [
-      "sourceNode?.node",
-      ""
-    ]
-  });
-  invariant2(targetNode?.node, void 0, {
-    F: __dxlog_file2,
-    L: 26,
-    S: void 0,
-    A: [
-      "targetNode?.node",
-      ""
-    ]
-  });
+  invariant2(sourceNode?.node, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 15, S: void 0, A: ["sourceNode?.node", ""] });
+  invariant2(targetNode?.node, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 16, S: void 0, A: ["targetNode?.node", ""] });
   return {
     id: Obj.ID.random(),
     source: sourceNode.node,
@@ -188,15 +156,7 @@ var useGraphMonitor = (model) => {
         if (!model) {
           return;
         }
-        invariant2(node.type, void 0, {
-          F: __dxlog_file2,
-          L: 51,
-          S: void 0,
-          A: [
-            "node.type",
-            ""
-          ]
-        });
+        invariant2(node.type, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 37, S: void 0, A: ["node.type", ""] });
         if (!isValidComputeNode(node.type)) {
           return;
         }
@@ -246,16 +206,8 @@ var createComputeGraph = (graph) => {
 };
 var linkTriggerToCompute = (graph, computeNode, triggerData) => {
   const functionTrigger = triggerData.functionTrigger?.target;
-  invariant2(functionTrigger, void 0, {
-    F: __dxlog_file2,
-    L: 114,
-    S: void 0,
-    A: [
-      "functionTrigger",
-      ""
-    ]
-  });
-  Obj.change(functionTrigger, (functionTrigger2) => {
+  invariant2(functionTrigger, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 88, S: void 0, A: ["functionTrigger", ""] });
+  Obj.update(functionTrigger, (functionTrigger2) => {
     functionTrigger2.function = Ref.make(graph.root);
     functionTrigger2.inputNodeId = computeNode.id;
   });
@@ -281,15 +233,7 @@ import { invariant as invariant3 } from "@dxos/invariant";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/graph/node-defs.ts";
 var resolveComputeNode = async (node) => {
   const impl = registry[node.type];
-  invariant3(impl, `Unknown node type: ${node.type}`, {
-    F: __dxlog_file3,
-    L: 22,
-    S: void 0,
-    A: [
-      "impl",
-      "`Unknown node type: ${node.type}`"
-    ]
-  });
+  invariant3(impl, `Unknown node type: ${node.type}`, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 10, S: void 0, A: ["impl", "`Unknown node type: ${node.type}`"] });
   return impl;
 };
 var isValidComputeNode = (type) => {
@@ -350,13 +294,13 @@ var createNode = (type, props) => ({
 });
 
 // src/graph/controller.ts
+var __dxlog_file4 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/graph/controller.ts";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file4 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/graph/controller.ts";
 var InvalidStateError = Error;
 var AUTO_TRIGGER_NODES = [
   "chat",
@@ -461,12 +405,7 @@ var ComputeGraphController = class extends Resource {
       try {
         await this.exec(nodeId);
       } catch (err) {
-        log.catch(err, void 0, {
-          F: __dxlog_file4,
-          L: 230,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 128, S: this });
       }
     });
   }
@@ -489,7 +428,7 @@ var ComputeGraphController = class extends Resource {
       const scope = yield* Scope.make();
       const executable = yield* Effect.promise(() => resolveComputeNode(this._graph.getNode(nodeId)));
       const computingOutputs = executable.exec != null;
-      const effect = (computingOutputs ? executor.computeOutputs(nodeId) : executor.computeInputs(nodeId)).pipe(Effect.withSpan("runGraph"), Scope.extend(scope), Effect.provide(ComputeEventLogger.layerFromTracing.pipe(Layer.provideMerge(TracingService.layerNoop), Layer.provideMerge(Trace.writerLayerNoop))), Effect.flatMap(computeValueBag), Effect.withSpan("test"), Effect.tap((values) => {
+      const effect = (computingOutputs ? executor.computeOutputs(nodeId) : executor.computeInputs(nodeId)).pipe(Effect.withSpan("runGraph"), Scope.extend(scope), Effect.provide(Layer.mergeAll(Layer.succeed(Trace.TraceService, this._createTraceWriter()), ComputeNodeContext.layerNoop)), Effect.flatMap(computeValueBag), Effect.withSpan("test"), Effect.tap((values) => {
         for (const [key, value] of Object.entries(values)) {
           if (computingOutputs) {
             this._onOutputComputed(nodeId, key, value);
@@ -527,7 +466,7 @@ var ComputeGraphController = class extends Resource {
       for (const node of allAffectedNodes) {
         const executable = yield* Effect.promise(() => resolveComputeNode(this._graph.getNode(node)));
         const computingOutputs = executable.exec != null;
-        const effect = (computingOutputs ? executor.computeOutputs(node) : executor.computeInputs(node)).pipe(Effect.withSpan("runGraph"), Scope.extend(scope), Effect.flatMap(computeValueBag), Effect.provide(ComputeEventLogger.layerFromTracing.pipe(Layer.provideMerge(TracingService.layerNoop), Layer.provideMerge(Trace.writerLayerNoop))), Effect.withSpan("test"), Effect.tap((values) => {
+        const effect = (computingOutputs ? executor.computeOutputs(node) : executor.computeInputs(node)).pipe(Effect.withSpan("runGraph"), Scope.extend(scope), Effect.flatMap(computeValueBag), Effect.provide(Layer.mergeAll(Layer.succeed(Trace.TraceService, this._createTraceWriter()), ComputeNodeContext.layerNoop)), Effect.withSpan("test"), Effect.tap((values) => {
           for (const [key, value] of Object.entries(values)) {
             if (computingOutputs) {
               this._onOutputComputed(node, key, value);
@@ -543,23 +482,20 @@ var ComputeGraphController = class extends Resource {
     })));
     this.update.emit();
   }
-  _createLogger() {
+  _createTraceWriter() {
     return {
-      log: (event) => {
-        this._handleEvent(event);
-      },
-      nodeId: void 0
+      write: (eventType, payload) => {
+        const event = traceEventToComputeEvent(eventType.key, payload);
+        if (event) {
+          this._handleEvent(event);
+        }
+      }
     };
   }
   _handleEvent(event) {
     log("handleEvent", {
       event
-    }, {
-      F: __dxlog_file4,
-      L: 379,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 223, S: this });
     switch (event.type) {
       case "compute-input": {
         this._onInputComputed(event.nodeId, event.property, {
@@ -598,6 +534,37 @@ _ts_decorate([
 _ts_decorate([
   synchronized
 ], ComputeGraphController.prototype, "exec", null);
+var traceEventToComputeEvent = (key, payload) => {
+  switch (key) {
+    case ComputeBeginEvent.key:
+      return {
+        type: "begin-compute",
+        ...payload
+      };
+    case ComputeEndEvent.key:
+      return {
+        type: "end-compute",
+        ...payload
+      };
+    case ComputeInputEvent.key:
+      return {
+        type: "compute-input",
+        ...payload
+      };
+    case ComputeOutputEvent.key:
+      return {
+        type: "compute-output",
+        ...payload
+      };
+    case ComputeCustomEvent.key:
+      return {
+        type: "custom",
+        ...payload
+      };
+    default:
+      return void 0;
+  }
+};
 var computeValueBag = (bag) => {
   return Effect.all(Object.entries(bag.values).map(([key, eff]) => Effect.either(eff).pipe(Effect.map((value) => {
     if (Either.isLeft(value)) {
@@ -642,15 +609,7 @@ var __dxlog_file5 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/shap
 var headerHeight = 32;
 var footerHeight = 32;
 var Box = /* @__PURE__ */ forwardRef(({ children, classNames, shape, title, status, open, onAction }, forwardedRef) => {
-  invariant4(shape.type, void 0, {
-    F: __dxlog_file5,
-    L: 29,
-    S: void 0,
-    A: [
-      "shape.type",
-      ""
-    ]
-  });
+  invariant4(shape.type, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 12, S: void 0, A: ["shape.type", ""] });
   const { icon, name, openable } = useShapeDef(shape.type) ?? {
     icon: "ph--placeholder--regular"
   };
@@ -1418,10 +1377,10 @@ var feedShape = {
 // src/shapes/Function.tsx
 import * as Schema12 from "effect/Schema";
 import React13, { useCallback as useCallback3, useRef as useRef4 } from "react";
+import { Script } from "@dxos/compute";
+import { Operation } from "@dxos/compute";
 import { AnyOutput, FunctionInput } from "@dxos/conductor";
 import { Ref as Ref2, getSnapshot, isInstanceOf } from "@dxos/echo/internal";
-import { Script } from "@dxos/functions";
-import { Operation } from "@dxos/operation";
 import { useClient } from "@dxos/react-client";
 import { Filter, parseId } from "@dxos/react-client/echo";
 import { TextBox as TextBox3 } from "@dxos/react-ui-canvas-editor";
@@ -1625,12 +1584,7 @@ var GptRealtimeComponent = ({ shape }) => {
       });
       const dataChannel = peerConnection.createDataChannel("response");
       const configureData = () => {
-        log2.info("Configuring data channel", void 0, {
-          F: __dxlog_file6,
-          L: 87,
-          S: void 0,
-          C: (f, a) => f(...a)
-        });
+        log2.info("Configuring data channel", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 69, S: void 0 });
         const event = {
           type: "session.update",
           session: {
@@ -1647,12 +1601,7 @@ var GptRealtimeComponent = ({ shape }) => {
       dataChannel.addEventListener("open", (ev) => {
         log2.info("Opening data channel", {
           ev
-        }, {
-          F: __dxlog_file6,
-          L: 100,
-          S: void 0,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 84, S: void 0 });
         configureData();
       });
       dataChannel.addEventListener("message", async (ev) => {
@@ -1663,12 +1612,7 @@ var GptRealtimeComponent = ({ shape }) => {
     } catch (error) {
       log2.error("Error in realtime session:", {
         error
-      }, {
-        F: __dxlog_file6,
-        L: 140,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 124, S: void 0 });
       throw error;
     }
   };
@@ -1700,7 +1644,7 @@ import * as Schema15 from "effect/Schema";
 import React16 from "react";
 import { DEFAULT_INPUT as DEFAULT_INPUT4, DefaultOutput, JsonTransformInput } from "@dxos/conductor";
 import { createAnchorMap as createAnchorMap6 } from "@dxos/react-ui-canvas-editor";
-import { Json } from "@dxos/react-ui-syntax-highlighter";
+import { Syntax } from "@dxos/react-ui-syntax-highlighter";
 var JsonShape = Schema15.extend(ComputeShape, Schema15.Struct({
   type: Schema15.Literal("json")
 }));
@@ -1713,11 +1657,11 @@ var JsonComponent = ({ shape, ...props }) => {
   const value = input?.type === "executed" ? input.value : void 0;
   return /* @__PURE__ */ React16.createElement(Box, {
     shape
-  }, /* @__PURE__ */ React16.createElement(Json.Root, {
+  }, /* @__PURE__ */ React16.createElement(Syntax.Root, {
     data: value
-  }, /* @__PURE__ */ React16.createElement(Json.Content, null, /* @__PURE__ */ React16.createElement(Json.Filter, null), /* @__PURE__ */ React16.createElement(Json.Data, {
+  }, /* @__PURE__ */ React16.createElement(Syntax.Content, null, /* @__PURE__ */ React16.createElement(Syntax.Filter, null), /* @__PURE__ */ React16.createElement(Syntax.Viewport, null, /* @__PURE__ */ React16.createElement(Syntax.Code, {
     classNames: "text-xs"
-  }))));
+  })))));
 };
 var JsonTransformComponent = ({ shape, ...props }) => {
   return /* @__PURE__ */ React16.createElement(Box, {
@@ -1952,6 +1896,7 @@ var scopeShape = {
 import * as Schema19 from "effect/Schema";
 import React20 from "react";
 import { Surface } from "@dxos/app-framework/ui";
+import { AppSurface } from "@dxos/app-toolkit/ui";
 import { DEFAULT_INPUT as DEFAULT_INPUT6 } from "@dxos/conductor";
 import { Card } from "@dxos/react-ui";
 import { createAnchorMap as createAnchorMap9 } from "@dxos/react-ui-canvas-editor";
@@ -1979,9 +1924,9 @@ var SurfaceComponent = ({ shape }) => {
     shape,
     onAction: handleAction
   }, /* @__PURE__ */ React20.createElement(Card.Root, null, value !== null && /* @__PURE__ */ React20.createElement(Surface.Surface, {
-    role: "card--content",
+    type: AppSurface.Card,
     data: {
-      value
+      subject: value
     },
     limit: 1
   })));
@@ -2105,15 +2050,7 @@ var TextInputComponent3 = ({ shape, title, ...props }) => {
     }
   };
   const handleTypeChange = (newType) => {
-    invariant5(Schema22.is(ComputeValueType3)(newType), "Invalid type", {
-      F: __dxlog_file7,
-      L: 58,
-      S: void 0,
-      A: [
-        "Schema.is(ComputeValueType)(newType)",
-        "'Invalid type'"
-      ]
-    });
+    invariant5(Schema22.is(ComputeValueType3)(newType), "Invalid type", { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 32, S: void 0, A: ["Schema.is(ComputeValueType)(newType)", "'Invalid type'"] });
     node.valueType = newType;
     node.inputSchema = toJsonSchema(getTemplateInputSchema2(node));
   };
@@ -2307,9 +2244,9 @@ var textToImageShape = {
 // src/shapes/Trigger.tsx
 import * as Schema26 from "effect/Schema";
 import React27, { useEffect as useEffect8 } from "react";
+import { Trigger, TriggerEvent } from "@dxos/compute";
 import { VoidInput as VoidInput3 } from "@dxos/conductor";
 import { Filter as Filter2, Obj as Obj4, Query, Ref as Ref3 } from "@dxos/echo";
-import { Trigger, TriggerEvent } from "@dxos/functions";
 import { DXN, SpaceId } from "@dxos/keys";
 import { useSpaces } from "@dxos/react-client/echo";
 import { Select as Select2 } from "@dxos/react-ui";
@@ -2337,7 +2274,7 @@ var TriggerComponent = ({ shape }) => {
   const functionTrigger = shape.functionTrigger?.target;
   useEffect8(() => {
     if (functionTrigger && !functionTrigger.spec) {
-      Obj4.change(functionTrigger, (functionTrigger2) => {
+      Obj4.update(functionTrigger, (functionTrigger2) => {
         functionTrigger2.spec = createTriggerSpec({
           triggerKind: "email",
           spaceId: space?.id
@@ -2355,7 +2292,7 @@ var TriggerComponent = ({ shape }) => {
   ]);
   const setKind = (kind) => {
     if (functionTrigger?.spec?.kind !== kind) {
-      Obj4.change(functionTrigger, (obj) => {
+      Obj4.update(functionTrigger, (obj) => {
         obj.spec = createTriggerSpec({
           triggerKind: kind,
           spaceId: space?.id
@@ -2392,36 +2329,22 @@ var createTriggerSpec = (props) => {
   const kind = props.triggerKind ?? "email";
   switch (kind) {
     case "timer":
-      return {
-        kind: "timer",
-        cron: "*/10 * * * * *"
-      };
+      return Trigger.specTimer("*/10 * * * * *");
     case "webhook":
-      return {
-        kind: "webhook",
+      return Trigger.specWebhook({
         method: "POST"
-      };
+      });
     case "subscription":
-      return {
-        kind: "subscription",
-        query: {
-          ast: Query.select(Filter2.nothing()).ast
-        }
-      };
+      return Trigger.specSubscription(Query.select(Filter2.nothing()));
     case "email":
-      return {
-        kind: "email"
-      };
+      return Trigger.specEmail();
     case "queue": {
       const dxn = new DXN(DXN.kind.QUEUE, [
         "data",
         props.spaceId ?? SpaceId.random(),
         Obj4.ID.random()
       ]).toString();
-      return {
-        kind: "queue",
-        queue: dxn
-      };
+      return Trigger.specQueue(dxn);
     }
   }
 };