@dxos/compute 0.8.4-main.f5c0578 → 0.8.4-main.fcfe5033a5

package/dist/lib/{browser/chunk-X2FWMHD4.mjs → neutral/chunk-JRV42MW3.mjs}

@@ -1,5 +1,5 @@
 // src/types/hyperformula.ts
-import { DetailedCellError, ExportedCellChange } from "#hyperformula";
+import { DetailedCellError, ExportedCellChange } from "@dxos/vendor-hyperformula";
 
 // src/types/types.ts
 import { invariant } from "@dxos/invariant";
@@ -77,13 +77,13 @@ var inRange = (range, cell) => {
 // src/compute-node.ts
 import { Event } from "@dxos/async";
 import { Resource } from "@dxos/context";
-import { DetailedCellError as DetailedCellError2 } from "#hyperformula";
+import { DetailedCellError as DetailedCellError2 } from "@dxos/vendor-hyperformula";
 var ComputeNode = class extends Resource {
   _graph;
   sheetId;
-  update;
+  update = new Event();
   constructor(_graph, sheetId) {
-    super(), this._graph = _graph, this.sheetId = sheetId, this.update = new Event();
+    super(), this._graph = _graph, this.sheetId = sheetId;
   }
   get graph() {
     return this._graph;
@@ -123,15 +123,15 @@ var ComputeNode = class extends Resource {
 import defaultsDeep from "lodash.defaultsdeep";
 import { debounce } from "@dxos/async";
 import { log } from "@dxos/log";
-import { CellError, EmptyValue, ErrorType, FunctionPlugin } from "#hyperformula";
+import { CellError, EmptyValue, ErrorType, FunctionPlugin } from "@dxos/vendor-hyperformula";
 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 {
   _hf;
+  _runtime;
   _space;
   // Mangle name with params.
   static createInvocationKey(name, ...args) {
@@ -142,23 +142,20 @@ var FunctionContext = class _FunctionContext {
   }
   // TODO(wittjosiah): Persist cached values.
   // Cached values for cell.
-  _cache;
+  _cache = /* @__PURE__ */ new Map();
   // Active requests.
-  _pending;
+  _pending = /* @__PURE__ */ new Map();
   // Query subscriptions.
-  _subscriptions;
+  _subscriptions = /* @__PURE__ */ new Map();
   // Invocation count.
-  _invocations;
+  _invocations = {};
   _options;
   // Debounced update handler.
   _onUpdate;
-  constructor(_hf, _space, _options) {
+  constructor(_hf, _runtime, _space, _options) {
     this._hf = _hf;
+    this._runtime = _runtime;
     this._space = _space;
-    this._cache = /* @__PURE__ */ new Map();
-    this._pending = /* @__PURE__ */ new Map();
-    this._subscriptions = /* @__PURE__ */ new Map();
-    this._invocations = {};
     this._options = defaultsDeep(_options ?? {}, defaultFunctionContextOptions);
     this._onUpdate = debounce((update) => {
       log("update", update, {
@@ -174,15 +171,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 = {};
@@ -277,14 +274,14 @@ 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, getUserFunctionUrlInMetadata } from "@dxos/functions";
+import * as Effect from "effect/Effect";
+import * as SchemaAST from "effect/SchemaAST";
+import { Filter } from "@dxos/client/echo";
+import { JsonSchema, Obj } from "@dxos/echo";
 import { log as log2 } from "@dxos/log";
+import { Operation } from "@dxos/operation";
 import { isNonNullable } from "@dxos/util";
-import { CellError as CellError2, ErrorType as ErrorType2, FunctionArgumentType } from "#hyperformula";
+import { CellError as CellError2, ErrorType as ErrorType2, FunctionArgumentType } from "@dxos/vendor-hyperformula";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/core/compute/src/functions/edge-function.ts";
 var EDGE_FUNCTION_NAME = "DX";
 var FUNCTION_TTL = 1e4;
@@ -295,7 +292,7 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
       if (!space) {
         return new CellError2(ErrorType2.REF, "Missing space");
       }
-      const { objects: [fn] } = await space.db.query(Filter.type(FunctionType, {
+      const [fn] = await space.db.query(Filter.type(Operation.PersistentOperation, {
         binding
       })).run();
       if (!fn) {
@@ -303,55 +300,44 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
           binding
         }, {
           F: __dxlog_file3,
-          L: 42,
+          L: 39,
           S: this,
           C: (f, a) => f(...a)
         });
         return new CellError2(ErrorType2.REF, "Function not found");
       }
       if (subscribe) {
-        const unsubscribe = effect(() => {
+        const unsubscribe = Obj.subscribe(fn, () => {
           log2("function changed", {
             fn
           }, {
             F: __dxlog_file3,
-            L: 48,
+            L: 45,
             S: this,
             C: (f, a) => f(...a)
           });
-          const _ = fn?.version;
           this.runAsyncFunction(ast, state, handler(false), {
             ttl: FUNCTION_TTL
           });
         });
         this.context.createSubscription(ast.procedureName, unsubscribe);
       }
-      const body = {};
+      const runtime = this.context.runtime;
+      const functionDef = Operation.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 schema = JsonSchema.toEffectSchema(fn.inputSchema);
+        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 path = getUserFunctionUrlInMetadata(getMeta(fn));
-      const response = await fetch(`${this.context.remoteFunctionUrl}${path}`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(body)
-      });
-      const result = await response.text();
-      log2("function executed", {
-        result
-      }, {
-        F: __dxlog_file3,
-        L: 75,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      const result = runtime.runPromise(Operation.invoke(functionDef, input).pipe(Effect.orDie));
       return result;
     };
     return this.runAsyncFunction(ast, state, handler(true), {
@@ -2789,16 +2775,15 @@ var defaultFunctions = [
 
 // src/compute-graph.ts
 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 { Filter as Filter2 } from "@dxos/client/echo";
 import { Resource as Resource2 } from "@dxos/context";
-import { getTypename } from "@dxos/echo-schema";
-import { FunctionType as FunctionType2 } from "@dxos/functions";
+import { Obj as Obj2 } from "@dxos/echo";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
+import { Operation as Operation2 } from "@dxos/operation";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
-import { ExportedCellChange as ExportedCellChange2 } from "#hyperformula";
+import { ExportedCellChange as ExportedCellChange2 } from "@dxos/vendor-hyperformula";
 var __dxlog_file4 = "/__w/dxos/dxos/packages/core/compute/src/compute-graph.ts";
 var UNKNOWN_BINDING = "__UNKNOWN__";
 var createSheetName = ({ type, id }) => `${type}@${id}`;
@@ -2813,19 +2798,20 @@ var parseSheetName = (name) => {
 };
 var ComputeGraph = class extends Resource2 {
   _hf;
+  _runtime;
   _space;
   _options;
-  id;
+  id = `graph-${PublicKey.random().truncate()}`;
   // Map of nodes indexed by sheet number.
-  _nodes;
+  _nodes = /* @__PURE__ */ new Map();
   // Cached function objects.
-  _remoteFunctions;
-  update;
+  _remoteFunctions = [];
+  update = new Event2();
   // The context is passed to all functions.
   context;
-  constructor(_hf, _space, _options) {
-    super(), 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, {
+  constructor(_hf, _runtime, _space, _options) {
+    super(), this._hf = _hf, this._runtime = _runtime, this._space = _space, this._options = _options;
+    this.context = new FunctionContext(this._hf, this._runtime, this._space, {
       ...this._options,
       onUpdate: (update) => {
         this._options?.onUpdate?.(update);
@@ -2881,7 +2867,7 @@ var ComputeGraph = class extends Resource2 {
   getOrCreateNode(name) {
     invariant2(name.length, void 0, {
       F: __dxlog_file4,
-      L: 129,
+      L: 132,
       S: this,
       A: [
         "name.length",
@@ -2894,7 +2880,7 @@ var ComputeGraph = class extends Resource2 {
         sheet: name
       }, {
         F: __dxlog_file4,
-        L: 131,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2903,7 +2889,7 @@ var ComputeGraph = class extends Resource2 {
     const sheetId = this._hf.getSheetId(name);
     invariant2(sheetId !== void 0, void 0, {
       F: __dxlog_file4,
-      L: 136,
+      L: 139,
       S: this,
       A: [
         "sheetId !== undefined",
@@ -2927,7 +2913,7 @@ var ComputeGraph = class extends Resource2 {
         }).filter(isNonNullable2);
         for (const obj of objects) {
           if (obj.name === name) {
-            const type = getTypename(obj);
+            const type = Obj2.getTypename(obj);
             return `'${createSheetName({
               type,
               id: obj.id
@@ -2949,8 +2935,8 @@ var ComputeGraph = class extends Resource2 {
     });
   }
   /**
-  * Map from binding to fully qualified ECHO ID (to store).
-  * E.g., HELLO() => spaceId:objectId()
+  * Map from binding to fully qualified ECHO DXN (to store).
+  * E.g., HELLO() => dxn:echo:spaceId:objectId()
   */
   mapFunctionBindingToId(formula) {
     return formula.replace(/(\w+)\((.*)\)/g, (match, binding, args) => {
@@ -2959,7 +2945,7 @@ var ComputeGraph = class extends Resource2 {
       }
       const fn = this._remoteFunctions.find((fn2) => fn2.binding === binding);
       if (fn) {
-        const id = fullyQualifiedId(fn);
+        const id = Obj2.getDXN(fn).toString();
         return `${id}(${args})`;
       } else {
         return match;
@@ -2967,16 +2953,13 @@ var ComputeGraph = class extends Resource2 {
     });
   }
   /**
-  * Map from fully qualified ECHO ID to binding (from store).
-  * E.g., spaceId:objectId() => HELLO()
+  * Map from fully qualified ECHO DXN to binding (from store).
+  * E.g., dxn:echo:spaceId:objectId() => HELLO()
   */
   mapFunctionBindingFromId(formula) {
-    const binding = formula.replace(/(\w+):([a-zA-Z0-9]+)\((.*)\)/g, (match, spaceId, objectId, args) => {
-      const id = `${spaceId}:${objectId}`;
-      if (id.length !== FQ_ID_LENGTH) {
-        return match;
-      }
-      const fn = this._remoteFunctions.find((fn2) => fullyQualifiedId(fn2) === id);
+    const binding = formula.replace(/dxn:([^:]+):([^:(]+):([a-zA-Z0-9]+)\((.*)\)/g, (_match, kind, spaceTag, objectId, args) => {
+      const dxn = `dxn:${kind}:${spaceTag}:${objectId}`;
+      const fn = this._remoteFunctions.find((fn2) => Obj2.getDXN(fn2).toString() === dxn);
       if (fn?.binding) {
         return `${fn.binding}(${args})`;
       } else {
@@ -2991,12 +2974,14 @@ var ComputeGraph = class extends Resource2 {
   }
   async _open() {
     if (this._space) {
-      const query = this._space.db.query(Filter2.type(FunctionType2));
-      const unsubscribe = query.subscribe(({ objects }) => {
-        this._remoteFunctions = objects.filter(({ binding }) => binding);
+      const query = this._space.db.query(Filter2.type(Operation2.PersistentOperation));
+      const unsubscribe = query.subscribe(() => {
+        this._remoteFunctions = query.results.filter((fn) => fn.binding);
         this.update.emit({
           type: "functionsUpdated"
         });
+      }, {
+        fire: true
       });
       this._ctx.onDispose(unsubscribe);
     }
@@ -3013,25 +2998,24 @@ import defaultsDeep2 from "lodash.defaultsdeep";
 import { Resource as Resource3 } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { log as log4 } from "@dxos/log";
-import { HyperFormula } from "#hyperformula";
+import { HyperFormula } from "@dxos/vendor-hyperformula";
 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 {
   _graphs = /* @__PURE__ */ new Map();
   _options;
-  constructor(options = {
-    plugins: defaultPlugins
-  }) {
+  constructor(options) {
     super();
     this._options = defaultsDeep2({}, options, defaultOptions);
+    this._options.plugins = this._options.plugins ?? defaultPlugins;
     this._options.plugins?.forEach(({ plugin, translations }) => {
       HyperFormula.registerFunctionPlugin(plugin, translations);
     });
@@ -3046,7 +3030,7 @@ var ComputeGraphRegistry = class extends Resource3 {
         space: space.id
       }, {
         F: __dxlog_file5,
-        L: 70,
+        L: 73,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3057,7 +3041,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: 78,
+      L: 81,
       S: this,
       A: [
         "!this._graphs.has(space.id)",
@@ -3065,7 +3049,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;
   }
@@ -3100,8 +3094,8 @@ export {
   createSheetName,
   parseSheetName,
   ComputeGraph,
-  defaultOptions,
   defaultPlugins,
+  defaultOptions,
   ComputeGraphRegistry
 };
-//# sourceMappingURL=chunk-X2FWMHD4.mjs.map
+//# sourceMappingURL=chunk-JRV42MW3.mjs.map