@dxos/compute 0.8.4-main.84f28bd → 0.8.4-main.a4bbb77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/compute",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.a4bbb77",
   "description": "Low-level compute API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,19 +8,15 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
-  "imports": {
-    "#hyperformula": {
-      "types": "hyperformula",
-      "default": "./dist/vendor/hyperformula.mjs"
-    }
-  },
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": "./dist/lib/node-esm/testing/index.mjs"
@@ -39,32 +35,32 @@
     "src"
   ],
   "dependencies": {
-    "@preact/signals-core": "^1.9.0",
-    "effect": "3.16.13",
-    "hyperformula": "^2.7.1",
+    "@preact/signals-core": "^1.12.1",
+    "effect": "3.18.3",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/async": "0.8.4-main.84f28bd",
-    "@dxos/client": "0.8.4-main.84f28bd",
-    "@dxos/context": "0.8.4-main.84f28bd",
-    "@dxos/debug": "0.8.4-main.84f28bd",
-    "@dxos/echo": "0.8.4-main.84f28bd",
-    "@dxos/echo-db": "0.8.4-main.84f28bd",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd",
-    "@dxos/functions": "0.8.4-main.84f28bd",
-    "@dxos/invariant": "0.8.4-main.84f28bd",
-    "@dxos/keys": "0.8.4-main.84f28bd",
-    "@dxos/live-object": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/protocols": "0.8.4-main.84f28bd",
-    "@dxos/schema": "0.8.4-main.84f28bd",
-    "@dxos/util": "0.8.4-main.84f28bd"
+    "@dxos/client": "0.8.4-main.a4bbb77",
+    "@dxos/async": "0.8.4-main.a4bbb77",
+    "@dxos/debug": "0.8.4-main.a4bbb77",
+    "@dxos/context": "0.8.4-main.a4bbb77",
+    "@dxos/echo-db": "0.8.4-main.a4bbb77",
+    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
+    "@dxos/functions": "0.8.4-main.a4bbb77",
+    "@dxos/invariant": "0.8.4-main.a4bbb77",
+    "@dxos/keys": "0.8.4-main.a4bbb77",
+    "@dxos/live-object": "0.8.4-main.a4bbb77",
+    "@dxos/log": "0.8.4-main.a4bbb77",
+    "@dxos/protocols": "0.8.4-main.a4bbb77",
+    "@dxos/schema": "0.8.4-main.a4bbb77",
+    "@dxos/util": "0.8.4-main.a4bbb77",
+    "@dxos/vendor-hyperformula": "0.8.4-main.a4bbb77",
+    "@dxos/echo": "0.8.4-main.a4bbb77"
   },
   "devDependencies": {
     "@tldraw/indices": "^2.0.0-alpha.14",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@dxos/echo-db": "0.8.4-main.84f28bd",
-    "@dxos/random": "0.8.4-main.84f28bd",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd"
+    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
+    "@dxos/echo-db": "0.8.4-main.a4bbb77",
+    "@dxos/random": "0.8.4-main.a4bbb77"
   },
   "peerDependencies": {
     "effect": "^3.13.3"

package/src/compute-graph-registry.ts

@@ -2,17 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import type { FunctionPluginDefinition } from 'hyperformula';
-import type { ConfigParams } from 'hyperformula/typings/ConfigParams';
-import type { FunctionTranslationsPackage } from 'hyperformula/typings/interpreter';
 import defaultsDeep from 'lodash.defaultsdeep';
 
-import { type SpaceId, type Space } from '@dxos/client/echo';
+import { type Space, type SpaceId } from '@dxos/client/echo';
 import { Resource } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
+import type { ConfigParams, FunctionPluginDefinition, FunctionTranslationsPackage } from '@dxos/vendor-hyperformula';
+import { HyperFormula } from '@dxos/vendor-hyperformula';
 
-import { HyperFormula } from '#hyperformula';
 import { ComputeGraph } from './compute-graph';
 import { EdgeFunctionPlugin, EdgeFunctionPluginTranslations, type FunctionContextOptions } from './functions';
 

package/src/compute-graph.test.ts

@@ -2,15 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type CellValue } from 'hyperformula';
 import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
 import { fullyQualifiedId } from '@dxos/client/echo';
 import { Obj } from '@dxos/echo';
 import { FunctionType } from '@dxos/functions';
+import { type CellValue } from '@dxos/vendor-hyperformula';
+import { DetailedCellError } from '@dxos/vendor-hyperformula';
 
-import { DetailedCellError } from '#hyperformula';
 import { TestBuilder } from './testing';
 
 describe('ComputeGraph', () => {

package/src/compute-graph.ts

@@ -2,10 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Listeners } from 'hyperformula/typings/Emitter';
-
 import { Event } from '@dxos/async';
-import { type Space, Filter, fullyQualifiedId } from '@dxos/client/echo';
+import { Filter, type Space, fullyQualifiedId } from '@dxos/client/echo';
 import { FQ_ID_LENGTH } from '@dxos/client/echo';
 import { Resource } from '@dxos/context';
 import { getTypename } from '@dxos/echo-schema';
@@ -14,15 +12,16 @@ import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { isNonNullable } from '@dxos/util';
+import { type Listeners } from '@dxos/vendor-hyperformula';
+import { ExportedCellChange, type HyperFormula } from '@dxos/vendor-hyperformula';
 
-import { ExportedCellChange, type HyperFormula } from '#hyperformula';
 import { ComputeNode } from './compute-node';
 import {
-  defaultFunctions,
+  EDGE_FUNCTION_NAME,
   FunctionContext,
   type FunctionContextOptions,
   type FunctionDefinition,
-  EDGE_FUNCTION_NAME,
+  defaultFunctions,
 } from './functions';
 
 // TODO(burdon): Factor out compute-graph.

package/src/compute-node.ts

@@ -2,13 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Listeners } from 'hyperformula/typings/Emitter';
-import { type ExportedCellChange } from 'hyperformula/typings/Exporter';
-
 import { Event } from '@dxos/async';
 import { Resource } from '@dxos/context';
+import { type ExportedCellChange, type Listeners } from '@dxos/vendor-hyperformula';
+import { DetailedCellError } from '@dxos/vendor-hyperformula';
 
-import { DetailedCellError } from '#hyperformula';
 import { type ComputeGraph } from './compute-graph';
 import { type CellAddress, type CellScalarValue, isFormula } from './types';
 

package/src/functions/async-function.ts

@@ -2,17 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type SimpleCellAddress } from 'hyperformula/typings/Cell';
-import { type InterpreterState } from 'hyperformula/typings/interpreter/InterpreterState';
-import { type InterpreterValue } from 'hyperformula/typings/interpreter/InterpreterValue';
-import { type ProcedureAst } from 'hyperformula/typings/parser';
 import defaultsDeep from 'lodash.defaultsdeep';
 
-import { debounce, type CleanupFn } from '@dxos/async';
+import { type CleanupFn, debounce } from '@dxos/async';
 import { type Space } from '@dxos/client/echo';
 import { log } from '@dxos/log';
-
-import { CellError, ErrorType, EmptyValue, FunctionPlugin, type HyperFormula } from '#hyperformula';
+import { type RawInterpreterValue, type SimpleCellAddress } from '@dxos/vendor-hyperformula';
+import { type InterpreterState } from '@dxos/vendor-hyperformula';
+import { type InterpreterValue } from '@dxos/vendor-hyperformula';
+import { type ProcedureAst } from '@dxos/vendor-hyperformula';
+import { CellError, EmptyValue, ErrorType, FunctionPlugin, type HyperFormula } from '@dxos/vendor-hyperformula';
 
 // TODO(burdon): Create API gateways:
 //  https://publicapis.io
@@ -169,7 +168,12 @@ export class AsyncFunctionPlugin extends FunctionPlugin {
   /**
    * Immediately returns cached value then runs the async function.
    */
-  protected runAsyncFunction(ast: ProcedureAst, state: InterpreterState, cb: AsyncFunction, options?: FunctionOptions) {
+  protected runAsyncFunction(
+    ast: ProcedureAst,
+    state: InterpreterState,
+    cb: AsyncFunction,
+    options?: FunctionOptions,
+  ): RawInterpreterValue {
     const { procedureName } = ast;
     const metadata = this.metadata(procedureName);
     return this.runFunction(ast.args, state, metadata, (...args: any) => {

package/src/functions/edge-function.ts

@@ -4,16 +4,16 @@
 
 import { effect } from '@preact/signals-core';
 import { SchemaAST } from 'effect';
-import { type InterpreterState } from 'hyperformula/typings/interpreter/InterpreterState';
-import { type ProcedureAst } from 'hyperformula/typings/parser';
 
 import { Filter, getMeta } from '@dxos/client/echo';
 import { toEffectSchema } from '@dxos/echo-schema';
-import { FunctionType, getUserFunctionUrlInMetadata } from '@dxos/functions';
+import { FunctionType, getUserFunctionIdInMetadata } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { isNonNullable } from '@dxos/util';
+import { type ProcedureAst } from '@dxos/vendor-hyperformula';
+import { type InterpreterState } from '@dxos/vendor-hyperformula';
+import { CellError, ErrorType, FunctionArgumentType } from '@dxos/vendor-hyperformula';
 
-import { CellError, ErrorType, FunctionArgumentType } from '#hyperformula';
 import { type AsyncFunction, AsyncFunctionPlugin } from './async-function';
 
 export const EDGE_FUNCTION_NAME = 'DX';
@@ -64,8 +64,8 @@ export class EdgeFunctionPlugin extends AsyncFunctionPlugin {
         } else {
           body.args = args.filter(isNonNullable);
         }
-        const path = getUserFunctionUrlInMetadata(getMeta(fn));
-        const response = await fetch(`${this.context.remoteFunctionUrl}${path}`, {
+        const id = getUserFunctionIdInMetadata(getMeta(fn));
+        const response = await fetch(`${this.context.remoteFunctionUrl}/${id}`, {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify(body),

package/src/hyperformula.test.ts

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { describe, test, expect } from 'vitest';
+import { describe, expect, test } from 'vitest';
 
-import { HyperFormula } from '#hyperformula';
+import { HyperFormula } from '@dxos/vendor-hyperformula';
 
 describe('hyperformula', () => {
   test('sanity test', async () => {

package/src/testing/test-plugin.ts

@@ -2,12 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type InterpreterState } from 'hyperformula/typings/interpreter/InterpreterState';
-import { type ProcedureAst } from 'hyperformula/typings/parser';
-
 import { getDeep } from '@dxos/util';
+import { type InterpreterState, type ProcedureAst } from '@dxos/vendor-hyperformula';
+import { FunctionArgumentType } from '@dxos/vendor-hyperformula';
 
-import { FunctionArgumentType } from '#hyperformula';
 import { type ComputeGraphPlugin } from '../compute-graph-registry';
 import { type AsyncFunction, AsyncFunctionPlugin } from '../functions';
 import { parseNumberString } from '../util';

package/src/testing/util.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { HyperFormula } from 'hyperformula';
+import { HyperFormula } from '@dxos/vendor-hyperformula';
 
 export const getRegisteredFunctionNames = () => {
   return HyperFormula.buildEmpty({ licenseKey: 'gpl-v3' }).getRegisteredFunctionNames();

package/src/types/hyperformula.ts

@@ -2,16 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type SimpleCellRange } from 'hyperformula/typings/AbsoluteCellRange';
-import { type SimpleCellAddress } from 'hyperformula/typings/Cell';
-import { type SimpleDate, type SimpleDateTime } from 'hyperformula/typings/DateTimeHelper';
-
-// TODO(burdon): Explain special import.
-import { DetailedCellError, ExportedCellChange } from '#hyperformula';
+import {
+  type SimpleCellAddress,
+  type SimpleCellRange,
+  type SimpleDate,
+  type SimpleDateTime,
+} from '@dxos/vendor-hyperformula';
+import { DetailedCellError, ExportedCellChange } from '@dxos/vendor-hyperformula';
 
 /**
- * Hyperformula had issues during bundling with vite,
- * so we pre-bundle hyperformula and place it in the vendor directory of this package.
+ * Re-exported from vendored hyperformula package.
  */
 
 export { DetailedCellError, ExportedCellChange };

package/src/types/types.test.ts

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { getIndices, sortByIndex, getIndicesBelow, getIndicesAbove, getIndicesBetween } from '@tldraw/indices';
+import { getIndices, getIndicesAbove, getIndicesBelow, getIndicesBetween, sortByIndex } from '@tldraw/indices';
 import { describe, expect, test } from 'vitest';
 
-import { inRange, addressFromA1Notation, addressToA1Notation, rangeFromA1Notation, rangeToA1Notation } from './types';
+import { addressFromA1Notation, addressToA1Notation, inRange, rangeFromA1Notation, rangeToA1Notation } from './types';
 
 describe('cell', () => {
   test('posToA1Notation', () => {