@dxos/plugin-sheet 0.7.2 → 0.7.3-main.2dd075e

package/dist/lib/node-esm/{chunk-CR4K75EL.mjs → chunk-6JF2AHKO.mjs}

@@ -1,7 +1,7 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   SheetType
-} from "./chunk-UIBWRHW7.mjs";
+} from "./chunk-BVS2IQRO.mjs";
 
 // packages/plugins/plugin-sheet/src/compute-graph/compute-graph.ts
 import { Event as Event2 } from "@dxos/async";
@@ -9,7 +9,7 @@ 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 { invariant as invariant2 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { FunctionType as FunctionType2 } from "@dxos/plugin-script/types";
@@ -69,7 +69,7 @@ var posEquals = (a, b) => {
 var columnLetter = (col) => {
   invariant(col < MAX_COLUMNS, `Invalid column: ${col}`, {
     F: __dxlog_file,
-    L: 31,
+    L: 32,
     S: void 0,
     A: [
       "col < MAX_COLUMNS",
@@ -85,7 +85,7 @@ var addressFromA1Notation = (ref) => {
   const match = ref.match(/([A-Z]+)(\d+)/);
   invariant(match, `Invalid notation: ${ref}`, {
     F: __dxlog_file,
-    L: 45,
+    L: 46,
     S: void 0,
     A: [
       "match",
@@ -103,6 +103,13 @@ var rangeToA1Notation = (range) => {
     range?.to && addressToA1Notation(range?.to)
   ].filter(Boolean).join(":");
 };
+var rangeFromA1Notation = (ref) => {
+  const [from, to] = ref.split(":").map(addressFromA1Notation);
+  return {
+    from,
+    to
+  };
+};
 var inRange = (range, cell) => {
   if (!range) {
     return false;
@@ -126,7 +133,9 @@ var inRange = (range, cell) => {
 
 // packages/plugins/plugin-sheet/src/defs/util.ts
 import { randomBytes } from "@dxos/crypto";
-import { create } from "@dxos/echo-schema";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { create } from "@dxos/live-object";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/defs/util.ts";
 var ApiError = class extends Error {
 };
 var ReadonlyException = class extends ApiError {
@@ -176,6 +185,9 @@ var createSheet = ({ name, cells, ...size } = {}) => {
   if (cells) {
     Object.entries(cells).forEach(([key, { value }]) => {
       const idx = addressToIndex(sheet, addressFromA1Notation(key));
+      if (isFormula(value)) {
+        value = mapFormulaRefsToIndices(sheet, value);
+      }
       sheet.cells[idx] = {
         value
       };
@@ -215,6 +227,34 @@ var compareIndexPositions = (sheet, indexA, indexB) => {
     return columnA - columnB;
   }
 };
+var mapFormulaRefsToIndices = (sheet, formula) => {
+  invariant2(isFormula(formula), void 0, {
+    F: __dxlog_file2,
+    L: 153,
+    S: void 0,
+    A: [
+      "isFormula(formula)",
+      ""
+    ]
+  });
+  return formula.replace(/([a-zA-Z]+)([0-9]+)/g, (match) => {
+    return addressToIndex(sheet, addressFromA1Notation(match));
+  });
+};
+var mapFormulaIndicesToRefs = (sheet, formula) => {
+  invariant2(isFormula(formula), void 0, {
+    F: __dxlog_file2,
+    L: 163,
+    S: void 0,
+    A: [
+      "isFormula(formula)",
+      ""
+    ]
+  });
+  return formula.replace(/([a-zA-Z0-9]+)@([a-zA-Z0-9]+)/g, (idx) => {
+    return addressToA1Notation(addressFromIndex(sheet, idx));
+  });
+};
 
 // packages/plugins/plugin-sheet/src/compute-graph/compute-node.ts
 var ComputeNode = class extends Resource {
@@ -263,7 +303,7 @@ import defaultsDeep from "lodash.defaultsdeep";
 import { debounce } from "@dxos/async";
 import { log } from "@dxos/log";
 import { CellError, ErrorType, EmptyValue, FunctionPlugin } from "#hyperformula";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/compute-graph/functions/async-function.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/compute-graph/functions/async-function.ts";
 var defaultFunctionContextOptions = {
   defaultTtl: 5e3,
   debounceDelay: 200,
@@ -287,7 +327,7 @@ var FunctionContext = class _FunctionContext {
     this._options = defaultsDeep(_options ?? {}, defaultFunctionContextOptions);
     this._onUpdate = debounce((update) => {
       log("update", update, {
-        F: __dxlog_file2,
+        F: __dxlog_file3,
         L: 86,
         S: this,
         C: (f, a) => f(...a)
@@ -343,7 +383,7 @@ var FunctionContext = class _FunctionContext {
             cell,
             value: value2
           }, {
-            F: __dxlog_file2,
+            F: __dxlog_file3,
             L: 144,
             S: this,
             C: (f, a) => f(...a)
@@ -357,7 +397,7 @@ var FunctionContext = class _FunctionContext {
             cell,
             err
           }, {
-            F: __dxlog_file2,
+            F: __dxlog_file3,
             L: 148,
             S: this,
             C: (f, a) => f(...a)
@@ -377,7 +417,7 @@ var FunctionContext = class _FunctionContext {
       args,
       cache: value
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 156,
       S: this,
       C: (f, a) => f(...a)
@@ -409,7 +449,7 @@ 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_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/compute-graph/functions/edge-function.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/compute-graph/functions/edge-function.ts";
 var EDGE_FUNCTION_NAME = "DX";
 var FUNCTION_TTL = 1e4;
 var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
@@ -426,7 +466,7 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
         log2.info("Function not found", {
           binding
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file4,
           L: 41,
           S: this,
           C: (f, a) => f(...a)
@@ -438,7 +478,7 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
           log2("function changed", {
             fn
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file4,
             L: 47,
             S: this,
             C: (f, a) => f(...a)
@@ -464,7 +504,7 @@ var EdgeFunctionPlugin = class extends AsyncFunctionPlugin {
       log2("function executed", {
         result
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file4,
         L: 65,
         S: this,
         C: (f, a) => f(...a)
@@ -2905,7 +2945,7 @@ var defaultFunctions = [
 ];
 
 // packages/plugins/plugin-sheet/src/compute-graph/compute-graph.ts
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/compute-graph/compute-graph.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/compute-graph/compute-graph.ts";
 var UNKNOWN_BINDING = "__UNKNOWN__";
 var createSheetName = ({ type, id }) => `${type}@${id}`;
 var parseSheetName = (name) => {
@@ -2982,8 +3022,8 @@ var ComputeGraph = class extends Resource2 {
   //  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.
   getOrCreateNode(name) {
-    invariant2(name.length, void 0, {
-      F: __dxlog_file4,
+    invariant3(name.length, void 0, {
+      F: __dxlog_file5,
       L: 129,
       S: this,
       A: [
@@ -2996,7 +3036,7 @@ var ComputeGraph = class extends Resource2 {
         space: this._space?.id,
         sheet: name
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file5,
         L: 131,
         S: this,
         C: (f, a) => f(...a)
@@ -3004,8 +3044,8 @@ var ComputeGraph = class extends Resource2 {
       this._hf.addSheet(name);
     }
     const sheetId = this._hf.getSheetId(name);
-    invariant2(sheetId !== void 0, void 0, {
-      F: __dxlog_file4,
+    invariant3(sheetId !== void 0, void 0, {
+      F: __dxlog_file5,
       L: 136,
       S: this,
       A: [
@@ -3114,10 +3154,10 @@ var ComputeGraph = class extends Resource2 {
 // packages/plugins/plugin-sheet/src/compute-graph/compute-graph-registry.ts
 import defaultsDeep2 from "lodash.defaultsdeep";
 import { Resource as Resource3 } from "@dxos/context";
-import { invariant as invariant3 } from "@dxos/invariant";
+import { invariant as invariant4 } from "@dxos/invariant";
 import { log as log4 } from "@dxos/log";
 import { HyperFormula } from "#hyperformula";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/compute-graph/compute-graph-registry.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-sheet/src/compute-graph/compute-graph-registry.ts";
 var defaultOptions = {
   licenseKey: "gpl-v3"
 };
@@ -3147,7 +3187,7 @@ var ComputeGraphRegistry = class extends Resource3 {
       log4("create graph", {
         space: space.id
       }, {
-        F: __dxlog_file5,
+        F: __dxlog_file6,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -3157,8 +3197,8 @@ var ComputeGraphRegistry = class extends Resource3 {
     return graph;
   }
   createGraph(space) {
-    invariant3(!this._graphs.has(space.id), `ComputeGraph already exists for space: ${space.id}`, {
-      F: __dxlog_file5,
+    invariant4(!this._graphs.has(space.id), `ComputeGraph already exists for space: ${space.id}`, {
+      F: __dxlog_file6,
       L: 77,
       S: this,
       A: [
@@ -3181,6 +3221,7 @@ var ComputeGraphRegistry = class extends Resource3 {
 
 export {
   alignKey,
+  commentKey,
   styleKey,
   cellClassNameForRange,
   DEFAULT_ROWS,
@@ -3189,11 +3230,18 @@ export {
   MAX_COLUMNS,
   RANGE_NOTATION,
   isFormula,
+  posEquals,
+  columnLetter,
   addressToA1Notation,
   addressFromA1Notation,
   rangeToA1Notation,
+  rangeFromA1Notation,
   inRange,
+  ApiError,
   ReadonlyException,
+  RangeException,
+  createIndex,
+  createIndices,
   insertIndices,
   initialize,
   createSheet,
@@ -3202,6 +3250,8 @@ export {
   rangeToIndex,
   rangeFromIndex,
   compareIndexPositions,
+  mapFormulaRefsToIndices,
+  mapFormulaIndicesToRefs,
   ComputeNode,
   defaultFunctionContextOptions,
   FunctionContext,
@@ -3217,4 +3267,4 @@ export {
   defaultPlugins,
   ComputeGraphRegistry
 };
-//# sourceMappingURL=chunk-CR4K75EL.mjs.map
+//# sourceMappingURL=chunk-6JF2AHKO.mjs.map