@dxos/compute 0.8.4-main.5ad4a44 → 0.8.4-main.66e292d

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

@@ -78,20 +78,13 @@ var inRange = (range, cell) => {
 import { Event } from "@dxos/async";
 import { Resource } from "@dxos/context";
 import { DetailedCellError as DetailedCellError2 } from "@dxos/vendor-hyperformula";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var ComputeNode = class extends Resource {
+  _graph;
+  sheetId;
+  update = new Event();
+  constructor(_graph, sheetId) {
+    super(), this._graph = _graph, this.sheetId = sheetId;
+  }
   get graph() {
     return this._graph;
   }
@@ -124,9 +117,6 @@ var ComputeNode = class extends Resource {
   // TODO(burdon): Load data into sheet.
   async _open() {
   }
-  constructor(_graph, sheetId) {
-    super(), _define_property(this, "_graph", void 0), _define_property(this, "sheetId", void 0), _define_property(this, "update", void 0), this._graph = _graph, this.sheetId = sheetId, this.update = new Event();
-  }
 };
 
 // src/functions/async-function.ts
@@ -134,25 +124,15 @@ import defaultsDeep from "lodash.defaultsdeep";
 import { debounce } from "@dxos/async";
 import { log } from "@dxos/log";
 import { CellError, EmptyValue, ErrorType, FunctionPlugin } from "@dxos/vendor-hyperformula";
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file2 = "/__w/dxos/dxos/packages/core/compute/src/functions/async-function.ts";
 var defaultFunctionContextOptions = {
   defaultTtl: 5e3,
   debounceDelay: 200
 };
 var FunctionContext = class _FunctionContext {
+  _hf;
+  _runtime;
+  _space;
   // Mangle name with params.
   static createInvocationKey(name, ...args) {
     return JSON.stringify({
@@ -160,6 +140,34 @@ var FunctionContext = class _FunctionContext {
       ...args
     });
   }
+  // TODO(wittjosiah): Persist cached values.
+  // Cached values for cell.
+  _cache = /* @__PURE__ */ new Map();
+  // Active requests.
+  _pending = /* @__PURE__ */ new Map();
+  // Query subscriptions.
+  _subscriptions = /* @__PURE__ */ new Map();
+  // Invocation count.
+  _invocations = {};
+  _options;
+  // Debounced update handler.
+  _onUpdate;
+  constructor(_hf, _runtime, _space, _options) {
+    this._hf = _hf;
+    this._runtime = _runtime;
+    this._space = _space;
+    this._options = defaultsDeep(_options ?? {}, defaultFunctionContextOptions);
+    this._onUpdate = debounce((update) => {
+      log("update", update, {
+        F: __dxlog_file2,
+        L: 86,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._hf.resumeEvaluation();
+      this._options.onUpdate?.(update);
+    }, this._options.debounceDelay);
+  }
   get space() {
     return this._space;
   }
@@ -248,35 +256,6 @@ var FunctionContext = class _FunctionContext {
     });
     return value;
   }
-  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);
-    _define_property2(this, "_subscriptions", void 0);
-    _define_property2(this, "_invocations", void 0);
-    _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();
-    this._subscriptions = /* @__PURE__ */ new Map();
-    this._invocations = {};
-    this._options = defaultsDeep(_options ?? {}, defaultFunctionContextOptions);
-    this._onUpdate = debounce((update) => {
-      log("update", update, {
-        F: __dxlog_file2,
-        L: 86,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._hf.resumeEvaluation();
-      this._options.onUpdate?.(update);
-    }, this._options.debounceDelay);
-  }
 };
 var AsyncFunctionPlugin = class extends FunctionPlugin {
   get context() {
@@ -299,8 +278,8 @@ import { effect } from "@preact/signals-core";
 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 { JsonSchema } from "@dxos/echo";
+import { Function, FunctionInvocationService, TracingService } from "@dxos/functions";
 import { FunctionDefinition } from "@dxos/functions";
 import { log as log2 } from "@dxos/log";
 import { isNonNullable } from "@dxos/util";
@@ -315,7 +294,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 { objects: [fn] } = await space.db.query(Filter.type(Function.Function, {
         binding
       })).run();
       if (!fn) {
@@ -350,7 +329,7 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
       const functionDef = FunctionDefinition.deserialize(fn);
       let input;
       if (fn.inputSchema) {
-        const schema = toEffectSchema(fn.inputSchema);
+        const schema = JsonSchema.toEffectSchema(fn.inputSchema);
         const props = SchemaAST.getPropertySignatures(schema.ast);
         input = {};
         props.forEach(({ name }, index) => {
@@ -363,7 +342,7 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
       }
       const result = runtime.runPromise(Effect.gen(function* () {
         return yield* FunctionInvocationService.invokeFunction(functionDef, input);
-      }).pipe(Effect.provide(ComputeEventLogger.layerFromTracing), Effect.provide(TracingService.layerNoop)));
+      }).pipe(Effect.provide(TracingService.layerNoop)));
       return result;
     };
     return this.runAsyncFunction(ast, state, handler(true), {
@@ -2800,30 +2779,18 @@ var defaultFunctions = [
 ];
 
 // src/compute-graph.ts
+import { effect as effect2 } from "@preact/signals-core";
 import { Event as Event2 } from "@dxos/async";
-import { Filter as Filter2, fullyQualifiedId } from "@dxos/client/echo";
+import { Filter as Filter2 } from "@dxos/client/echo";
 import { FQ_ID_LENGTH } from "@dxos/client/echo";
 import { Resource as Resource2 } from "@dxos/context";
-import { getTypename } from "@dxos/echo/internal";
-import { FunctionType as FunctionType2 } from "@dxos/functions";
+import { Obj } from "@dxos/echo";
+import { Function as Function2 } from "@dxos/functions";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
 import { ExportedCellChange as ExportedCellChange2 } from "@dxos/vendor-hyperformula";
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file4 = "/__w/dxos/dxos/packages/core/compute/src/compute-graph.ts";
 var UNKNOWN_BINDING = "__UNKNOWN__";
 var createSheetName = ({ type, id }) => `${type}@${id}`;
@@ -2837,6 +2804,49 @@ var parseSheetName = (name) => {
   };
 };
 var ComputeGraph = class extends Resource2 {
+  _hf;
+  _runtime;
+  _space;
+  _options;
+  id = `graph-${PublicKey.random().truncate()}`;
+  // Map of nodes indexed by sheet number.
+  _nodes = /* @__PURE__ */ new Map();
+  // Cached function objects.
+  _remoteFunctions = [];
+  update = new Event2();
+  // The context is passed to all functions.
+  context;
+  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);
+        this.update.emit({
+          type: "valuesUpdated"
+        });
+      }
+    });
+    this._hf.updateConfig({
+      context: this.context
+    });
+    const onValuesUpdate = (changes) => {
+      for (const change of changes) {
+        if (change instanceof ExportedCellChange2) {
+          const { sheet } = change;
+          const node = this._nodes.get(sheet);
+          if (node) {
+            node.update.emit({
+              type: "valuesUpdated",
+              change
+            });
+          }
+        }
+      }
+    };
+    this._hf.on("valuesUpdated", onValuesUpdate);
+    this._ctx.onDispose(() => this._hf.off("valuesUpdated", onValuesUpdate));
+  }
   get hf() {
     return this._hf;
   }
@@ -2864,7 +2874,7 @@ var ComputeGraph = class extends Resource2 {
   getOrCreateNode(name) {
     invariant2(name.length, void 0, {
       F: __dxlog_file4,
-      L: 130,
+      L: 134,
       S: this,
       A: [
         "name.length",
@@ -2877,7 +2887,7 @@ var ComputeGraph = class extends Resource2 {
         sheet: name
       }, {
         F: __dxlog_file4,
-        L: 132,
+        L: 136,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2886,7 +2896,7 @@ var ComputeGraph = class extends Resource2 {
     const sheetId = this._hf.getSheetId(name);
     invariant2(sheetId !== void 0, void 0, {
       F: __dxlog_file4,
-      L: 137,
+      L: 141,
       S: this,
       A: [
         "sheetId !== undefined",
@@ -2910,7 +2920,7 @@ var ComputeGraph = class extends Resource2 {
         }).filter(isNonNullable2);
         for (const obj of objects) {
           if (obj.name === name) {
-            const type = getTypename(obj);
+            const type = Obj.getTypename(obj);
             return `'${createSheetName({
               type,
               id: obj.id
@@ -2942,7 +2952,7 @@ var ComputeGraph = class extends Resource2 {
       }
       const fn = this._remoteFunctions.find((fn2) => fn2.binding === binding);
       if (fn) {
-        const id = fullyQualifiedId(fn);
+        const id = Obj.getDXN(fn).toString();
         return `${id}(${args})`;
       } else {
         return match;
@@ -2959,7 +2969,7 @@ var ComputeGraph = class extends Resource2 {
       if (id.length !== FQ_ID_LENGTH) {
         return match;
       }
-      const fn = this._remoteFunctions.find((fn2) => fullyQualifiedId(fn2) === id);
+      const fn = this._remoteFunctions.find((fn2) => Obj.getDXN(fn2).toString() === id);
       if (fn?.binding) {
         return `${fn.binding}(${args})`;
       } else {
@@ -2974,14 +2984,18 @@ 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(Function2.Function));
+      const unsubscribe = query.subscribe();
+      const dispose = effect2(() => {
+        this._remoteFunctions = query.objects.filter(({ binding }) => binding);
         this.update.emit({
           type: "functionsUpdated"
         });
       });
-      this._ctx.onDispose(unsubscribe);
+      this._ctx.onDispose(() => {
+        unsubscribe();
+        dispose();
+      });
     }
   }
   async _close() {
@@ -2989,40 +3003,6 @@ var ComputeGraph = class extends Resource2 {
       await node.close();
     }
   }
-  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._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);
-        this.update.emit({
-          type: "valuesUpdated"
-        });
-      }
-    });
-    this._hf.updateConfig({
-      context: this.context
-    });
-    const onValuesUpdate = (changes) => {
-      for (const change of changes) {
-        if (change instanceof ExportedCellChange2) {
-          const { sheet } = change;
-          const node = this._nodes.get(sheet);
-          if (node) {
-            node.update.emit({
-              type: "valuesUpdated",
-              change
-            });
-          }
-        }
-      }
-    };
-    this._hf.on("valuesUpdated", onValuesUpdate);
-    this._ctx.onDispose(() => this._hf.off("valuesUpdated", onValuesUpdate));
-  }
 };
 
 // src/compute-graph-registry.ts
@@ -3031,19 +3011,6 @@ import { Resource as Resource3 } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { log as log4 } from "@dxos/log";
 import { HyperFormula } from "@dxos/vendor-hyperformula";
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file5 = "/__w/dxos/dxos/packages/core/compute/src/compute-graph-registry.ts";
 var defaultPlugins = [
   {
@@ -3055,6 +3022,16 @@ var defaultOptions = {
   licenseKey: "gpl-v3"
 };
 var ComputeGraphRegistry = class extends Resource3 {
+  _graphs = /* @__PURE__ */ new Map();
+  _options;
+  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);
+    });
+  }
   getGraph(spaceId) {
     return this._graphs.get(spaceId);
   }
@@ -3104,14 +3081,6 @@ var ComputeGraphRegistry = class extends Resource3 {
     }
     this._graphs.clear();
   }
-  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);
-    });
-  }
 };
 
 export {
@@ -3141,4 +3110,4 @@ export {
   defaultOptions,
   ComputeGraphRegistry
 };
-//# sourceMappingURL=chunk-C7KLV2IU.mjs.map
+//# sourceMappingURL=chunk-ILJV45WQ.mjs.map