@dxos/compute 0.8.4-main.dedc0f3 → 0.8.4-main.ead640a

package/dist/lib/browser/{chunk-XQYPCRZP.mjs → chunk-C7KLV2IU.mjs}

@@ -150,8 +150,7 @@ function _define_property2(obj, key, value) {
 var __dxlog_file2 = "/__w/dxos/dxos/packages/core/compute/src/functions/async-function.ts";
 var defaultFunctionContextOptions = {
   defaultTtl: 5e3,
-  debounceDelay: 200,
-  remoteFunctionUrl: "https://edge.dxos.workers.dev/functions"
+  debounceDelay: 200
 };
 var FunctionContext = class _FunctionContext {
   // Mangle name with params.
@@ -164,15 +163,15 @@ var FunctionContext = class _FunctionContext {
   get space() {
     return this._space;
   }
-  get remoteFunctionUrl() {
-    return this._options.remoteFunctionUrl;
-  }
   get info() {
     return {
       cache: this._cache.size,
       invocations: this._invocations
     };
   }
+  get runtime() {
+    return this._runtime;
+  }
   flush() {
     this._cache.clear();
     this._invocations = {};
@@ -209,7 +208,7 @@ var FunctionContext = class _FunctionContext {
             value: value2
           }, {
             F: __dxlog_file2,
-            L: 143,
+            L: 144,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -223,7 +222,7 @@ var FunctionContext = class _FunctionContext {
             err
           }, {
             F: __dxlog_file2,
-            L: 147,
+            L: 148,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -243,14 +242,15 @@ var FunctionContext = class _FunctionContext {
       cache: value
     }, {
       F: __dxlog_file2,
-      L: 155,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
     return value;
   }
-  constructor(_hf, _space, _options) {
+  constructor(_hf, _runtime, _space, _options) {
     _define_property2(this, "_hf", void 0);
+    _define_property2(this, "_runtime", void 0);
     _define_property2(this, "_space", void 0);
     _define_property2(this, "_cache", void 0);
     _define_property2(this, "_pending", void 0);
@@ -259,6 +259,7 @@ var FunctionContext = class _FunctionContext {
     _define_property2(this, "_options", void 0);
     _define_property2(this, "_onUpdate", void 0);
     this._hf = _hf;
+    this._runtime = _runtime;
     this._space = _space;
     this._cache = /* @__PURE__ */ new Map();
     this._pending = /* @__PURE__ */ new Map();
@@ -268,7 +269,7 @@ var FunctionContext = class _FunctionContext {
     this._onUpdate = debounce((update) => {
       log("update", update, {
         F: __dxlog_file2,
-        L: 85,
+        L: 86,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -295,10 +296,12 @@ var AsyncFunctionPlugin = class extends FunctionPlugin {
 
 // src/functions/edge-function.ts
 import { effect } from "@preact/signals-core";
-import { SchemaAST } from "effect";
-import { Filter, getMeta } from "@dxos/client/echo";
-import { toEffectSchema } from "@dxos/echo-schema";
-import { FunctionType, getUserFunctionIdInMetadata } from "@dxos/functions";
+import * as Effect from "effect/Effect";
+import * as SchemaAST from "effect/SchemaAST";
+import { Filter } from "@dxos/client/echo";
+import { toEffectSchema } from "@dxos/echo/internal";
+import { ComputeEventLogger, FunctionInvocationService, FunctionType, TracingService } from "@dxos/functions";
+import { FunctionDefinition } from "@dxos/functions";
 import { log as log2 } from "@dxos/log";
 import { isNonNullable } from "@dxos/util";
 import { CellError as CellError2, ErrorType as ErrorType2, FunctionArgumentType } from "@dxos/vendor-hyperformula";
@@ -320,7 +323,7 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
           binding
         }, {
           F: __dxlog_file3,
-          L: 41,
+          L: 43,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -332,7 +335,7 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
             fn
           }, {
             F: __dxlog_file3,
-            L: 47,
+            L: 49,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -343,32 +346,24 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
         });
         this.context.createSubscription(ast.procedureName, unsubscribe);
       }
-      const body = {};
+      const runtime = this.context.runtime;
+      const functionDef = FunctionDefinition.deserialize(fn);
+      let input;
       if (fn.inputSchema) {
         const schema = toEffectSchema(fn.inputSchema);
-        SchemaAST.getPropertySignatures(schema.ast).forEach(({ name }, index) => {
-          body[name.toString()] = args[index];
+        const props = SchemaAST.getPropertySignatures(schema.ast);
+        input = {};
+        props.forEach(({ name }, index) => {
+          input[name.toString()] = args[index];
         });
       } else {
-        body.args = args.filter(isNonNullable);
+        input = {
+          args: args.filter(isNonNullable)
+        };
       }
-      const id = getUserFunctionIdInMetadata(getMeta(fn));
-      const response = await fetch(`${this.context.remoteFunctionUrl}/${id}`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(body)
-      });
-      const result = await response.text();
-      log2("function executed", {
-        result
-      }, {
-        F: __dxlog_file3,
-        L: 74,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      const result = runtime.runPromise(Effect.gen(function* () {
+        return yield* FunctionInvocationService.invokeFunction(functionDef, input);
+      }).pipe(Effect.provide(ComputeEventLogger.layerFromTracing), Effect.provide(TracingService.layerNoop)));
       return result;
     };
     return this.runAsyncFunction(ast, state, handler(true), {
@@ -2809,7 +2804,7 @@ import { Event as Event2 } from "@dxos/async";
 import { Filter as Filter2, fullyQualifiedId } from "@dxos/client/echo";
 import { FQ_ID_LENGTH } from "@dxos/client/echo";
 import { Resource as Resource2 } from "@dxos/context";
-import { getTypename } from "@dxos/echo-schema";
+import { getTypename } from "@dxos/echo/internal";
 import { FunctionType as FunctionType2 } from "@dxos/functions";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
@@ -2869,7 +2864,7 @@ var ComputeGraph = class extends Resource2 {
   getOrCreateNode(name) {
     invariant2(name.length, void 0, {
       F: __dxlog_file4,
-      L: 127,
+      L: 130,
       S: this,
       A: [
         "name.length",
@@ -2882,7 +2877,7 @@ var ComputeGraph = class extends Resource2 {
         sheet: name
       }, {
         F: __dxlog_file4,
-        L: 129,
+        L: 132,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2891,7 +2886,7 @@ var ComputeGraph = class extends Resource2 {
     const sheetId = this._hf.getSheetId(name);
     invariant2(sheetId !== void 0, void 0, {
       F: __dxlog_file4,
-      L: 134,
+      L: 137,
       S: this,
       A: [
         "sheetId !== undefined",
@@ -2994,12 +2989,12 @@ var ComputeGraph = class extends Resource2 {
       await node.close();
     }
   }
-  constructor(_hf, _space, _options) {
-    super(), _define_property3(this, "_hf", void 0), _define_property3(this, "_space", void 0), _define_property3(this, "_options", void 0), _define_property3(this, "id", void 0), // Map of nodes indexed by sheet number.
+  constructor(_hf, _runtime, _space, _options) {
+    super(), _define_property3(this, "_hf", void 0), _define_property3(this, "_runtime", void 0), _define_property3(this, "_space", void 0), _define_property3(this, "_options", void 0), _define_property3(this, "id", void 0), // Map of nodes indexed by sheet number.
     _define_property3(this, "_nodes", void 0), // Cached function objects.
     _define_property3(this, "_remoteFunctions", void 0), _define_property3(this, "update", void 0), // The context is passed to all functions.
-    _define_property3(this, "context", void 0), this._hf = _hf, this._space = _space, this._options = _options, this.id = `graph-${PublicKey.random().truncate()}`, this._nodes = /* @__PURE__ */ new Map(), this._remoteFunctions = [], this.update = new Event2();
-    this.context = new FunctionContext(this._hf, this._space, {
+    _define_property3(this, "context", void 0), this._hf = _hf, this._runtime = _runtime, this._space = _space, this._options = _options, this.id = `graph-${PublicKey.random().truncate()}`, this._nodes = /* @__PURE__ */ new Map(), this._remoteFunctions = [], this.update = new Event2();
+    this.context = new FunctionContext(this._hf, this._runtime, this._space, {
       ...this._options,
       onUpdate: (update) => {
         this._options?.onUpdate?.(update);
@@ -3050,15 +3045,15 @@ function _define_property4(obj, key, value) {
   return obj;
 }
 var __dxlog_file5 = "/__w/dxos/dxos/packages/core/compute/src/compute-graph-registry.ts";
-var defaultOptions = {
-  licenseKey: "gpl-v3"
-};
 var defaultPlugins = [
   {
     plugin: EdgeFunctionPlugin,
     translations: EdgeFunctionPluginTranslations
   }
 ];
+var defaultOptions = {
+  licenseKey: "gpl-v3"
+};
 var ComputeGraphRegistry = class extends Resource3 {
   getGraph(spaceId) {
     return this._graphs.get(spaceId);
@@ -3070,7 +3065,7 @@ var ComputeGraphRegistry = class extends Resource3 {
         space: space.id
       }, {
         F: __dxlog_file5,
-        L: 67,
+        L: 73,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3081,7 +3076,7 @@ var ComputeGraphRegistry = class extends Resource3 {
   createGraph(space) {
     invariant3(!this._graphs.has(space.id), `ComputeGraph already exists for space: ${space.id}`, {
       F: __dxlog_file5,
-      L: 75,
+      L: 81,
       S: this,
       A: [
         "!this._graphs.has(space.id)",
@@ -3089,7 +3084,17 @@ var ComputeGraphRegistry = class extends Resource3 {
       ]
     });
     const hf = HyperFormula.buildEmpty(this._options);
-    const graph = new ComputeGraph(hf, space, this._options);
+    invariant3(this._options.computeRuntime, "ComputeRuntime is required", {
+      F: __dxlog_file5,
+      L: 83,
+      S: this,
+      A: [
+        "this._options.computeRuntime",
+        "'ComputeRuntime is required'"
+      ]
+    });
+    const runtime = this._options.computeRuntime.getRuntime(space.id);
+    const graph = new ComputeGraph(hf, runtime, space, this._options);
     this._graphs.set(space.id, graph);
     return graph;
   }
@@ -3099,11 +3104,10 @@ var ComputeGraphRegistry = class extends Resource3 {
     }
     this._graphs.clear();
   }
-  constructor(options = {
-    plugins: defaultPlugins
-  }) {
+  constructor(options) {
     super(), _define_property4(this, "_graphs", /* @__PURE__ */ new Map()), _define_property4(this, "_options", void 0);
     this._options = defaultsDeep2({}, options, defaultOptions);
+    this._options.plugins = this._options.plugins ?? defaultPlugins;
     this._options.plugins?.forEach(({ plugin, translations }) => {
       HyperFormula.registerFunctionPlugin(plugin, translations);
     });
@@ -3133,8 +3137,8 @@ export {
   createSheetName,
   parseSheetName,
   ComputeGraph,
-  defaultOptions,
   defaultPlugins,
+  defaultOptions,
   ComputeGraphRegistry
 };
-//# sourceMappingURL=chunk-XQYPCRZP.mjs.map
+//# sourceMappingURL=chunk-C7KLV2IU.mjs.map