@dxos/plugin-sheet 0.6.12-main.f9d0246 → 0.6.12-staging.e11e696

package/dist/lib/browser/{chunk-Z2XOOC2R.mjs → chunk-GSV5QNLD.mjs}

@@ -1,24 +1,69 @@
 // packages/plugins/plugin-sheet/src/graph/compute-graph.ts
-import defaultsDeep2 from "lodash.defaultsdeep";
 import { Event as Event2 } from "@dxos/async";
 import { Filter as Filter2, fullyQualifiedId } from "@dxos/client/echo";
 import { Resource as Resource2 } from "@dxos/context";
+import { getTypename } from "@dxos/echo-schema";
 import { invariant } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { FunctionType as FunctionType2 } from "@dxos/plugin-script/types";
 import { nonNullable as nonNullable2 } from "@dxos/util";
-import { ExportedCellChange, HyperFormula } from "#hyperformula";
+import { ExportedCellChange } from "#hyperformula";
 
-// packages/plugins/plugin-sheet/src/graph/async-function.ts
+// packages/plugins/plugin-sheet/src/graph/compute-node.ts
+import { Event } from "@dxos/async";
+import { Resource } from "@dxos/context";
+import { DetailedCellError } from "#hyperformula";
+var ComputeNode = class extends Resource {
+  constructor(_graph, sheetId) {
+    super();
+    this._graph = _graph;
+    this.sheetId = sheetId;
+    this.update = new Event();
+  }
+  get graph() {
+    return this._graph;
+  }
+  clear() {
+    this._graph.hf.clearSheet(this.sheetId);
+  }
+  getValue(cell) {
+    const value = this._graph.hf.getCellValue({
+      sheet: this.sheetId,
+      row: cell.row,
+      col: cell.col
+    });
+    if (value instanceof DetailedCellError) {
+      return null;
+    }
+    return value;
+  }
+  setValue(cell, value) {
+    const mappedValue = typeof value === "string" && value.charAt(0) === "=" ? this._graph.mapFormulaToNative(value) : value;
+    this._graph.hf.setCellContents({
+      sheet: this.sheetId,
+      row: cell.row,
+      col: cell.col
+    }, [
+      [
+        mappedValue
+      ]
+    ]);
+  }
+  // TODO(burdon): Load data into sheet.
+  async _open() {
+  }
+};
+
+// packages/plugins/plugin-sheet/src/graph/functions/async-function.ts
 import defaultsDeep from "lodash.defaultsdeep";
 import { debounce } from "@dxos/async";
 import { log } from "@dxos/log";
 import { CellError, ErrorType, EmptyValue, FunctionPlugin } from "#hyperformula";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/graph/async-function.ts";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/graph/functions/async-function.ts";
 var defaultFunctionContextOptions = {
   defaultTtl: 5e3,
-  recalculationDelay: 200,
+  debounceDelay: 200,
   remoteFunctionUrl: "https://edge.dxos.workers.dev/functions"
 };
 var FunctionContext = class _FunctionContext {
@@ -40,7 +85,7 @@ var FunctionContext = class _FunctionContext {
     this._onUpdate = debounce((update) => {
       this._hf.resumeEvaluation();
       this._options.onUpdate?.(update);
-    }, this._options.recalculationDelay);
+    }, this._options.debounceDelay);
   }
   get space() {
     return this._space;
@@ -90,7 +135,7 @@ var FunctionContext = class _FunctionContext {
             value: value2
           }, {
             F: __dxlog_file,
-            L: 145,
+            L: 143,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -104,7 +149,7 @@ var FunctionContext = class _FunctionContext {
             err
           }, {
             F: __dxlog_file,
-            L: 149,
+            L: 147,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -124,17 +169,20 @@ var FunctionContext = class _FunctionContext {
       cache: value
     }, {
       F: __dxlog_file,
-      L: 157,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
     return value;
   }
 };
-var FunctionPluginAsync = class extends FunctionPlugin {
+var AsyncFunctionPlugin = class extends FunctionPlugin {
   get context() {
     return this.config.context;
   }
+  /**
+  * Immediately returns cached value then runs the async function.
+  */
   runAsyncFunction(ast, state, cb, options) {
     const { procedureName } = ast;
     const metadata = this.metadata(procedureName);
@@ -144,51 +192,7 @@ var FunctionPluginAsync = class extends FunctionPlugin {
   }
 };
 
-// packages/plugins/plugin-sheet/src/graph/compute-node.ts
-import { Event } from "@dxos/async";
-import { Resource } from "@dxos/context";
-import { DetailedCellError } from "#hyperformula";
-var ComputeNode = class extends Resource {
-  constructor(_graph, sheetId) {
-    super();
-    this._graph = _graph;
-    this.sheetId = sheetId;
-    this.update = new Event();
-  }
-  get graph() {
-    return this._graph;
-  }
-  clear() {
-    this._graph.hf.clearSheet(this.sheetId);
-  }
-  getValue(cell) {
-    const value = this._graph.hf.getCellValue({
-      sheet: this.sheetId,
-      row: cell.row,
-      col: cell.col
-    });
-    if (value instanceof DetailedCellError) {
-      return null;
-    }
-    return value;
-  }
-  setValue(cell, value) {
-    const mappedValue = typeof value === "string" && value.charAt(0) === "=" ? this._graph.mapFormulaToNative(value) : value;
-    this._graph.hf.setCellContents({
-      sheet: this.sheetId,
-      row: cell.row,
-      col: cell.col
-    }, [
-      [
-        mappedValue
-      ]
-    ]);
-  }
-  async _open() {
-  }
-};
-
-// packages/plugins/plugin-sheet/src/graph/edge-function.ts
+// packages/plugins/plugin-sheet/src/graph/functions/edge-function.ts
 import { effect } from "@preact/signals-core";
 import { Filter, getMeta } from "@dxos/client/echo";
 import { log as log2 } from "@dxos/log";
@@ -196,10 +200,11 @@ import { getUserFunctionUrlInMetadata } from "@dxos/plugin-script/edge";
 import { FunctionType } from "@dxos/plugin-script/types";
 import { nonNullable } from "@dxos/util";
 import { CellError as CellError2, ErrorType as ErrorType2, FunctionArgumentType } from "#hyperformula";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/graph/edge-function.ts";
-var EDGE_FUNCTION_TTL = 1e4;
-var EdgeFunctionPlugin = class extends FunctionPluginAsync {
-  edge(ast, state) {
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/graph/functions/edge-function.ts";
+var EDGE_FUNCTION_NAME = "DX";
+var FUNCTION_TTL = 1e4;
+var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
+  dx(ast, state) {
     const handler = (subscribe = false) => async (binding, ...args) => {
       const space = this.context.space;
       if (!space) {
@@ -213,7 +218,7 @@ var EdgeFunctionPlugin = class extends FunctionPluginAsync {
           binding
         }, {
           F: __dxlog_file2,
-          L: 39,
+          L: 41,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -225,13 +230,13 @@ var EdgeFunctionPlugin = class extends FunctionPluginAsync {
             fn
           }, {
             F: __dxlog_file2,
-            L: 45,
+            L: 47,
             S: this,
             C: (f, a) => f(...a)
           });
           const _ = fn?.version;
           this.runAsyncFunction(ast, state, handler(false), {
-            ttl: EDGE_FUNCTION_TTL
+            ttl: FUNCTION_TTL
           });
         });
         this.context.createSubscription(ast.procedureName, unsubscribe);
@@ -249,13 +254,13 @@ var EdgeFunctionPlugin = class extends FunctionPluginAsync {
       return await result.text();
     };
     return this.runAsyncFunction(ast, state, handler(true), {
-      ttl: EDGE_FUNCTION_TTL
+      ttl: FUNCTION_TTL
     });
   }
 };
 EdgeFunctionPlugin.implementedFunctions = {
-  EDGE: {
-    method: "edge",
+  [EDGE_FUNCTION_NAME]: {
+    method: "dx",
     parameters: [
       // Binding
       {
@@ -300,14 +305,14 @@ EdgeFunctionPlugin.implementedFunctions = {
 };
 var EdgeFunctionPluginTranslations = {
   enGB: {
-    EDGE: "EDGE"
+    [EDGE_FUNCTION_NAME]: "Remote function"
   },
   enUS: {
-    EDGE: "EDGE"
+    [EDGE_FUNCTION_NAME]: "Remote function"
   }
 };
 
-// packages/plugins/plugin-sheet/src/graph/function-defs.ts
+// packages/plugins/plugin-sheet/src/graph/functions/function-defs.ts
 var defaultFunctions = [
   // Array
   {
@@ -2684,69 +2689,15 @@ var defaultFunctions = [
 // packages/plugins/plugin-sheet/src/graph/compute-graph.ts
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/graph/compute-graph.ts";
 var OBJECT_ID_LENGTH = 60;
-var CUSTOM_FUNCTION = "ECHO";
-var defaultOptions = {
-  licenseKey: "gpl-v3"
-};
-var defaultPlugins = [
-  {
-    plugin: EdgeFunctionPlugin,
-    translations: EdgeFunctionPluginTranslations
-  }
-];
-var PREFIX = "__";
-var createSheetName = (id) => `${PREFIX}${id}`;
-var getSheetId = (name) => name.startsWith(PREFIX) ? name.slice(PREFIX.length) : void 0;
-var ComputeGraphRegistry = class extends Resource2 {
-  constructor(options = {
-    plugins: defaultPlugins
-  }) {
-    super();
-    this._graphs = /* @__PURE__ */ new Map();
-    this._options = defaultsDeep2({}, options, defaultOptions);
-    this._options.plugins?.forEach(({ plugin, translations }) => {
-      HyperFormula.registerFunctionPlugin(plugin, translations);
-    });
-  }
-  getGraph(spaceId) {
-    return this._graphs.get(spaceId);
-  }
-  async getOrCreateGraph(space) {
-    let graph = this.getGraph(space.id);
-    if (!graph) {
-      log3.info("create graph", {
-        space: space.id
-      }, {
-        F: __dxlog_file3,
-        L: 93,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      graph = await this.createGraph(space);
-    }
-    return graph;
-  }
-  async createGraph(space) {
-    invariant(!this._graphs.has(space.id), `ComputeGraph already exists for space: ${space.id}`, {
-      F: __dxlog_file3,
-      L: 101,
-      S: this,
-      A: [
-        "!this._graphs.has(space.id)",
-        "`ComputeGraph already exists for space: ${space.id}`"
-      ]
-    });
-    const hf = HyperFormula.buildEmpty(this._options);
-    const graph = new ComputeGraph(hf, space, this._options);
-    this._graphs.set(space.id, graph);
-    await graph.open();
-    return graph;
-  }
-  async _close() {
-    for (const graph of this._graphs.values()) {
-      await graph.close();
-    }
-  }
+var createSheetName = ({ type, id }) => `${type}@${id}`;
+var parseSheetName = (name) => {
+  const [type, id] = name.split("@");
+  return id ? {
+    type,
+    id
+  } : {
+    id: type
+  };
 };
 var ComputeGraph = class extends Resource2 {
   constructor(_hf, _space, _options) {
@@ -2756,7 +2707,7 @@ var ComputeGraph = class extends Resource2 {
     this._options = _options;
     this.id = `graph-${PublicKey.random().truncate()}`;
     this._nodes = /* @__PURE__ */ new Map();
-    this._functions = [];
+    this._remoteFunctions = [];
     this.update = new Event2();
     this.context = new FunctionContext(this._hf, this._space, this._options);
     this._hf.updateConfig({
@@ -2782,10 +2733,6 @@ var ComputeGraph = class extends Resource2 {
   get hf() {
     return this._hf;
   }
-  // refresh() {
-  //   log('refresh', { id: this.id });
-  //   this.update.emit();
-  // }
   getFunctions({ standard, echo } = {
     standard: true,
     echo: true
@@ -2794,7 +2741,7 @@ var ComputeGraph = class extends Resource2 {
       ...standard ? this._hf.getRegisteredFunctionNames().map((name) => defaultFunctions.find((fn) => fn.name === name) ?? {
         name
       }) : [],
-      ...echo ? this._functions.map((fn) => ({
+      ...echo ? this._remoteFunctions.map((fn) => ({
         name: fn.binding
       })) : []
     ];
@@ -2807,10 +2754,10 @@ var ComputeGraph = class extends Resource2 {
   //  This would enable on-the-fly instantiation of new models when then are referenced.
   //  E.g., Cross-object reference would be stored as "ObjectId!A1"
   //  The graph would then load the object and create a ComputeNode (model) of the appropriate type.
-  async getOrCreateNode(name) {
+  getOrCreateNode(name) {
     invariant(name.length, void 0, {
       F: __dxlog_file3,
-      L: 193,
+      L: 117,
       S: this,
       A: [
         "name.length",
@@ -2820,10 +2767,10 @@ var ComputeGraph = class extends Resource2 {
     if (!this._hf.doesSheetExist(name)) {
       log3.info("created node", {
         space: this._space?.id,
-        name
+        sheet: name
       }, {
         F: __dxlog_file3,
-        L: 195,
+        L: 119,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2832,7 +2779,7 @@ var ComputeGraph = class extends Resource2 {
     const sheetId = this._hf.getSheetId(name);
     invariant(sheetId !== void 0, void 0, {
       F: __dxlog_file3,
-      L: 201,
+      L: 124,
       S: this,
       A: [
         "sheetId !== undefined",
@@ -2840,7 +2787,6 @@ var ComputeGraph = class extends Resource2 {
       ]
     });
     const node = new ComputeNode(this, sheetId);
-    await node.open();
     this._nodes.set(sheetId, node);
     return node;
   }
@@ -2852,25 +2798,29 @@ var ComputeGraph = class extends Resource2 {
     return formula.replace(/['"]?([ \w]+)['"]?!/, (_match, name) => {
       if (name) {
         const objects = this._hf.getSheetNames().map((name2) => {
-          const id = getSheetId(name2);
-          return id ? this._space?.db.getObjectById(id) : void 0;
+          const { type, id } = parseSheetName(name2);
+          return type && id ? this._space?.db.getObjectById(id) : void 0;
         }).filter(nonNullable2);
         for (const obj of objects) {
-          if (obj.name === name || obj.title === name) {
-            return `${createSheetName(obj.id)}!`;
+          if (obj.name === name) {
+            const type = getTypename(obj);
+            return `'${createSheetName({
+              type,
+              id: obj.id
+            })}'!`;
           }
         }
       }
       return `${name}!`;
     }).replace(/(\w+)\((.*)\)/g, (match, binding, args) => {
-      const fn = this._functions.find((fn2) => fn2.binding === binding);
+      const fn = this._remoteFunctions.find((fn2) => fn2.binding === binding);
       if (!fn) {
         return match;
       }
       if (args.trim() === "") {
-        return `${CUSTOM_FUNCTION}("${binding}")`;
+        return `${EDGE_FUNCTION_NAME}("${binding}")`;
       } else {
-        return `${CUSTOM_FUNCTION}("${binding}", ${args})`;
+        return `${EDGE_FUNCTION_NAME}("${binding}", ${args})`;
       }
     });
   }
@@ -2880,10 +2830,10 @@ var ComputeGraph = class extends Resource2 {
   */
   mapFunctionBindingToId(formula) {
     return formula.replace(/(\w+)\((.*)\)/g, (match, binding, args) => {
-      if (binding === CUSTOM_FUNCTION || defaultFunctions.find((fn2) => fn2.name === binding)) {
+      if (binding === EDGE_FUNCTION_NAME || defaultFunctions.find((fn2) => fn2.name === binding)) {
         return match;
       }
-      const fn = this._functions.find((fn2) => fn2.binding === binding);
+      const fn = this._remoteFunctions.find((fn2) => fn2.binding === binding);
       if (fn) {
         const id = fullyQualifiedId(fn);
         return `${id}(${args})`;
@@ -2902,7 +2852,7 @@ var ComputeGraph = class extends Resource2 {
       if (id.length !== OBJECT_ID_LENGTH) {
         return match;
       }
-      const fn = this._functions.find((fn2) => fullyQualifiedId(fn2) === id);
+      const fn = this._remoteFunctions.find((fn2) => fullyQualifiedId(fn2) === id);
       if (fn?.binding) {
         return `${fn.binding}(${args})`;
       } else {
@@ -2914,7 +2864,7 @@ var ComputeGraph = class extends Resource2 {
     if (this._space) {
       const query = this._space.db.query(Filter2.schema(FunctionType2));
       const unsubscribe = query.subscribe(({ objects }) => {
-        this._functions = objects.filter(({ binding }) => binding);
+        this._remoteFunctions = objects.filter(({ binding }) => binding);
         this.update.emit({
           type: "functionsUpdated"
         });
@@ -2929,14 +2879,88 @@ var ComputeGraph = class extends Resource2 {
   }
 };
 
+// packages/plugins/plugin-sheet/src/graph/compute-graph-registry.ts
+import defaultsDeep2 from "lodash.defaultsdeep";
+import { Resource as Resource3 } from "@dxos/context";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { log as log4 } from "@dxos/log";
+import { HyperFormula } from "#hyperformula";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/graph/compute-graph-registry.ts";
+var defaultOptions = {
+  licenseKey: "gpl-v3"
+};
+var defaultPlugins = [
+  {
+    plugin: EdgeFunctionPlugin,
+    translations: EdgeFunctionPluginTranslations
+  }
+];
+var ComputeGraphRegistry = class extends Resource3 {
+  constructor(options = {
+    plugins: defaultPlugins
+  }) {
+    super();
+    this._graphs = /* @__PURE__ */ new Map();
+    this._options = defaultsDeep2({}, options, defaultOptions);
+    this._options.plugins?.forEach(({ plugin, translations }) => {
+      HyperFormula.registerFunctionPlugin(plugin, translations);
+    });
+  }
+  getGraph(spaceId) {
+    return this._graphs.get(spaceId);
+  }
+  getOrCreateGraph(space) {
+    let graph = this._graphs.get(space.id);
+    if (!graph) {
+      log4("create graph", {
+        space: space.id
+      }, {
+        F: __dxlog_file4,
+        L: 69,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      graph = this.createGraph(space);
+    }
+    return graph;
+  }
+  createGraph(space) {
+    invariant2(!this._graphs.has(space.id), `ComputeGraph already exists for space: ${space.id}`, {
+      F: __dxlog_file4,
+      L: 77,
+      S: this,
+      A: [
+        "!this._graphs.has(space.id)",
+        "`ComputeGraph already exists for space: ${space.id}`"
+      ]
+    });
+    const hf = HyperFormula.buildEmpty(this._options);
+    const graph = new ComputeGraph(hf, space, this._options);
+    this._graphs.set(space.id, graph);
+    return graph;
+  }
+  async _close() {
+    for (const graph of this._graphs.values()) {
+      await graph.close();
+    }
+    this._graphs.clear();
+  }
+};
+
 export {
   ComputeNode,
+  defaultFunctionContextOptions,
+  FunctionContext,
+  AsyncFunctionPlugin,
+  EDGE_FUNCTION_NAME,
+  EdgeFunctionPlugin,
+  EdgeFunctionPluginTranslations,
   defaultFunctions,
+  createSheetName,
+  parseSheetName,
+  ComputeGraph,
   defaultOptions,
   defaultPlugins,
-  createSheetName,
-  getSheetId,
-  ComputeGraphRegistry,
-  ComputeGraph
+  ComputeGraphRegistry
 };
-//# sourceMappingURL=chunk-Z2XOOC2R.mjs.map
+//# sourceMappingURL=chunk-GSV5QNLD.mjs.map