@dxos/compute 0.8.4-main.67995b8 → 0.8.4-main.72ec0f3

package/src/functions/edge-function.ts

@@ -3,17 +3,18 @@
 //
 
 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 * as Effect from 'effect/Effect';
+import * as SchemaAST from 'effect/SchemaAST';
 
-import { Filter, getMeta } from '@dxos/client/echo';
-import { toEffectSchema } from '@dxos/echo-schema';
-import { FunctionType, getUserFunctionUrlInMetadata } from '@dxos/functions';
+import { Filter } from '@dxos/client/echo';
+import { toEffectSchema } from '@dxos/echo/internal';
+import { Function, FunctionInvocationService, TracingService } from '@dxos/functions';
+import { FunctionDefinition } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { isNonNullable } from '@dxos/util';
-
-import { CellError, ErrorType, FunctionArgumentType } from '#hyperformula';
+import { type ProcedureAst } from '@dxos/vendor-hyperformula';
+import { type InterpreterState } from '@dxos/vendor-hyperformula';
+import { CellError, ErrorType, FunctionArgumentType } from '@dxos/vendor-hyperformula';
 
 import { type AsyncFunction, AsyncFunctionPlugin } from './async-function';
 
@@ -37,7 +38,7 @@ export class EdgeFunctionPlugin extends AsyncFunctionPlugin {
 
         const {
           objects: [fn],
-        } = await space.db.query(Filter.type(FunctionType, { binding })).run();
+        } = await space.db.query(Filter.type(Function.Function, { binding })).run();
         if (!fn) {
           log.info('Function not found', { binding });
           return new CellError(ErrorType.REF, 'Function not found');
@@ -56,25 +57,26 @@ export class EdgeFunctionPlugin extends AsyncFunctionPlugin {
           this.context.createSubscription(ast.procedureName, unsubscribe);
         }
 
-        const body: Record<string, any> = {};
+        const runtime = this.context.runtime;
+        const functionDef = FunctionDefinition.deserialize(fn);
+        // If input schema exists, construct an object from args using the schema props order, otherwise pass { args }.
+        let input: any;
         if (fn.inputSchema) {
           const schema = toEffectSchema(fn.inputSchema);
-          SchemaAST.getPropertySignatures(schema.ast).forEach(({ name }, index) => {
-            body[name.toString()] = args[index];
+          const props = SchemaAST.getPropertySignatures(schema.ast);
+          input = {} as any;
+          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();
-        log('function executed', { result });
-
-        return result;
+        const result = runtime.runPromise(
+          Effect.gen(function* () {
+            return yield* FunctionInvocationService.invokeFunction(functionDef, input);
+          }).pipe(Effect.provide(TracingService.layerNoop)),
+        );
+        return result as any;
       };
 
     return this.runAsyncFunction(ast, state, handler(true), { ttl: FUNCTION_TTL });

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/index.ts

@@ -2,33 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
-// TODO(burdon): Separate hyperformula (client compute) from remote/edge functions.
-
-// TODO(burdon): Reconcile: types.
-//  - dxos/graph
-//  - dxos/compute
-//  - dxos/functions
-//  - dxos/assistant
-//  - dxos/plugin-automation
-//  - dxos/plugin-script
-//  - dxos/plugin-sheet
-
-// TODO(burdon): Tech debt.
-//  - move hyperformula defs from sheet to compute.
-//  - standard from ./types exports for plugins.
-//  - dxos/agent
-//  - dxos/agent-functions
-//  - dxos/mosaic, dxos-card
-
-// TODO(burdon): Reconcile UX.
-//  - dxos/plugin-explorer
-//  - dxos/plugin-canvas
-//  - dxos/gem-*
-
-// TODO(burdon): Next
-//  - dxos/plugin-search
-//  - dxos/plugin-threads
-
 export * from './compute-graph';
 export * from './compute-graph-registry';
 export * from './compute-node';

package/src/testing/index.ts

@@ -5,3 +5,4 @@
 export * from './test-builder';
 export * from './test-plugin';
 export * from './util';
+export * from './test-runtime';

package/src/testing/test-builder.ts

@@ -8,7 +8,9 @@ import { invariant } from '@dxos/invariant';
 
 import { type ComputeGraphOptions, ComputeGraphRegistry } from '../compute-graph-registry';
 
-export type TestBuilderOptions = ClientOptions & ComputeGraphOptions;
+import { createMockedComputeRuntimeProvider } from './test-runtime';
+
+export type TestBuilderOptions = ClientOptions & Partial<ComputeGraphOptions>;
 
 // TODO(burdon): Reconcile with @dxos/client/testing.
 export class TestBuilder extends Resource {
@@ -43,7 +45,11 @@ export class TestBuilder extends Resource {
       this._client = undefined;
     });
 
-    const registry = new ComputeGraphRegistry(this._options);
+    const registry = new ComputeGraphRegistry({
+      ...this._options,
+      // Provide a default runtime provider for tests if not supplied.
+      computeRuntime: this._options.computeRuntime ?? createMockedComputeRuntimeProvider(),
+    });
     await registry.open();
     this._registry = registry;
     this._ctx.onDispose(async () => {

package/src/testing/test-plugin.ts

@@ -2,12 +2,9 @@
 // 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 { FunctionArgumentType } from '#hyperformula';
+import { type InterpreterState, type ProcedureAst } from '@dxos/vendor-hyperformula';
+import { FunctionArgumentType } from '@dxos/vendor-hyperformula';
 
 import { type ComputeGraphPlugin } from '../compute-graph-registry';
 import { type AsyncFunction, AsyncFunctionPlugin } from '../functions';

package/src/testing/test-runtime.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Layer from 'effect/Layer';
+import * as ManagedRuntime from 'effect/ManagedRuntime';
+
+import { AiService } from '@dxos/ai';
+import { type SpaceId } from '@dxos/client/echo';
+import { CredentialsService, DatabaseService, type FunctionDefinition, QueueService } from '@dxos/functions';
+import { FunctionInvocationServiceLayerTest } from '@dxos/functions-runtime/testing';
+
+import { type FunctionsRuntimeProvider } from '../compute-graph-registry';
+
+/**
+ * Minimal compute runtime provider for tests and Storybook.
+ * Will cause errors if used for actual runtime.
+ */
+export const createMockedComputeRuntimeProvider = ({
+  functions,
+}: { functions?: FunctionDefinition.Any[] } = {}): FunctionsRuntimeProvider => {
+  return {
+    getRuntime: (_spaceId: SpaceId) =>
+      ManagedRuntime.make(
+        FunctionInvocationServiceLayerTest({ functions }).pipe(
+          Layer.provide(AiService.notAvailable),
+          Layer.provide(CredentialsService.configuredLayer([])),
+          Layer.provide(DatabaseService.notAvailable),
+          Layer.provide(QueueService.notAvailable),
+        ),
+      ),
+  };
+};

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', () => {