@dxos/compute 0.8.4-main.c4373fc → 0.8.4-main.c85a9c8dae

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/compute",
-  "version": "0.8.4-main.c4373fc",
+  "version": "0.8.4-main.c85a9c8dae",
   "description": "Low-level compute API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
@@ -12,14 +16,12 @@
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/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"
+      "default": "./dist/lib/neutral/testing/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -35,35 +37,34 @@
     "src"
   ],
   "dependencies": {
-    "@preact/signals-core": "^1.12.1",
-    "effect": "3.18.3",
+    "effect": "3.19.16",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/ai": "0.8.4-main.c4373fc",
-    "@dxos/async": "0.8.4-main.c4373fc",
-    "@dxos/context": "0.8.4-main.c4373fc",
-    "@dxos/debug": "0.8.4-main.c4373fc",
-    "@dxos/functions": "0.8.4-main.c4373fc",
-    "@dxos/keys": "0.8.4-main.c4373fc",
-    "@dxos/echo": "0.8.4-main.c4373fc",
-    "@dxos/invariant": "0.8.4-main.c4373fc",
-    "@dxos/live-object": "0.8.4-main.c4373fc",
-    "@dxos/plugin-automation": "0.8.4-main.c4373fc",
-    "@dxos/protocols": "0.8.4-main.c4373fc",
-    "@dxos/client": "0.8.4-main.c4373fc",
-    "@dxos/log": "0.8.4-main.c4373fc",
-    "@dxos/schema": "0.8.4-main.c4373fc",
-    "@dxos/util": "0.8.4-main.c4373fc",
-    "@dxos/vendor-hyperformula": "0.8.4-main.c4373fc"
+    "@dxos/async": "0.8.4-main.c85a9c8dae",
+    "@dxos/client": "0.8.4-main.c85a9c8dae",
+    "@dxos/context": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo": "0.8.4-main.c85a9c8dae",
+    "@dxos/functions": "0.8.4-main.c85a9c8dae",
+    "@dxos/functions-runtime": "0.8.4-main.c85a9c8dae",
+    "@dxos/debug": "0.8.4-main.c85a9c8dae",
+    "@dxos/invariant": "0.8.4-main.c85a9c8dae",
+    "@dxos/keys": "0.8.4-main.c85a9c8dae",
+    "@dxos/log": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-automation": "0.8.4-main.c85a9c8dae",
+    "@dxos/protocols": "0.8.4-main.c85a9c8dae",
+    "@dxos/util": "0.8.4-main.c85a9c8dae",
+    "@dxos/schema": "0.8.4-main.c85a9c8dae",
+    "@dxos/vendor-hyperformula": "0.8.4-main.c85a9c8dae",
+    "@dxos/ai": "0.8.4-main.c85a9c8dae"
   },
   "devDependencies": {
     "@tldraw/indices": "^2.0.0-alpha.14",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@dxos/echo": "0.8.4-main.c4373fc",
-    "@dxos/random": "0.8.4-main.c4373fc",
-    "@dxos/echo-db": "0.8.4-main.c4373fc"
+    "@dxos/echo": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo-db": "0.8.4-main.c85a9c8dae",
+    "@dxos/random": "0.8.4-main.c85a9c8dae"
   },
   "peerDependencies": {
-    "effect": "^3.13.3"
+    "effect": "3.19.16"
   },
   "publishConfig": {
     "access": "public"

package/src/compute-graph-registry.test.ts

@@ -6,8 +6,8 @@ import * as Schema from 'effect/Schema';
 import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
-import { fullyQualifiedId } from '@dxos/client/echo';
-import { FunctionDefinition, FunctionType } from '@dxos/functions';
+import { Obj } from '@dxos/echo';
+import { Function, FunctionDefinition } from '@dxos/functions';
 
 import { ComputeGraphRegistry, defaultPlugins } from './compute-graph-registry';
 import { TestBuilder, createMockedComputeRuntimeProvider } from './testing';
@@ -23,8 +23,13 @@ describe('ComputeGraphRegistry', () => {
   });
 
   test('invokes user function through compute graph', async () => {
-    const computeRuntime = createMockedComputeRuntimeProvider({ functions: [add] });
-    const testBuilder = new TestBuilder({ types: [FunctionType], computeRuntime });
+    const computeRuntime = createMockedComputeRuntimeProvider({
+      functions: [add],
+    });
+    const testBuilder = new TestBuilder({
+      types: [Function.Function],
+      computeRuntime,
+    });
     await testBuilder.open();
     onTestFinished(async () => {
       await testBuilder.close();
@@ -33,7 +38,10 @@ describe('ComputeGraphRegistry', () => {
     const space = await testBuilder.client.spaces.create();
 
     // Register Edge function plugin and runtime in the registry.
-    const registry = new ComputeGraphRegistry({ plugins: defaultPlugins, computeRuntime });
+    const registry = new ComputeGraphRegistry({
+      plugins: defaultPlugins,
+      computeRuntime,
+    });
     await registry.open();
     onTestFinished(async () => {
       await registry.close();
@@ -47,7 +55,9 @@ describe('ComputeGraphRegistry', () => {
 
     // Create a function object in ECHO with binding that maps to DX calls.
     const functionObj = FunctionDefinition.serialize(add);
-    functionObj.binding = 'ADD';
+    Obj.change(functionObj, (f) => {
+      f.binding = 'ADD';
+    });
     space.db.add(functionObj);
 
     const node = await graph.getOrCreateNode('sheet').open();
@@ -69,12 +79,17 @@ describe('ComputeGraphRegistry', () => {
 
     // Sanity check: mapping to fully qualified id works as well.
     const bindingId = graph.mapFunctionBindingToId('ADD(2, 3)');
-    expect(bindingId.startsWith(`${fullyQualifiedId(functionObj)}`)).to.be.true;
+    expect(bindingId.startsWith(`${Obj.getDXN(functionObj).toString()}`)).to.be.true;
   });
 
   test('adding a function binding updates autocomplete and enables execution', async () => {
-    const computeRuntime = createMockedComputeRuntimeProvider({ functions: [add] });
-    const testBuilder = new TestBuilder({ types: [FunctionType], computeRuntime });
+    const computeRuntime = createMockedComputeRuntimeProvider({
+      functions: [add],
+    });
+    const testBuilder = new TestBuilder({
+      types: [Function.Function],
+      computeRuntime,
+    });
     await testBuilder.open();
     onTestFinished(async () => {
       await testBuilder.close();
@@ -82,7 +97,10 @@ describe('ComputeGraphRegistry', () => {
 
     const space = await testBuilder.client.spaces.create();
 
-    const registry = new ComputeGraphRegistry({ plugins: defaultPlugins, computeRuntime });
+    const registry = new ComputeGraphRegistry({
+      plugins: defaultPlugins,
+      computeRuntime,
+    });
     await registry.open();
     onTestFinished(async () => {
       await registry.close();
@@ -108,13 +126,15 @@ describe('ComputeGraphRegistry', () => {
 
     // Add a bound function to the space; graph should pick it up.
     const functionObj = FunctionDefinition.serialize(add);
-    functionObj.binding = 'ADD';
+    Obj.change(functionObj, (f) => {
+      f.binding = 'ADD';
+    });
     space.db.add(functionObj);
 
     await functionsUpdated.wait();
 
     // Autocomplete should now include the binding.
-    const echoFunctions = graph.getFunctions({ standard: false, echo: true }).map((f) => f.name);
+    const echoFunctions = graph.getFunctions({ standard: false, echo: true }).map((fn) => fn.name);
     expect(echoFunctions).toContain('ADD');
 
     // And the binding should execute when used in a formula.

package/src/compute-graph.test.ts

@@ -5,9 +5,8 @@
 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 { Function } from '@dxos/functions';
 import { type CellValue } from '@dxos/vendor-hyperformula';
 import { DetailedCellError } from '@dxos/vendor-hyperformula';
 
@@ -16,7 +15,7 @@ import { TestBuilder } from './testing';
 describe('ComputeGraph', () => {
   let testBuilder: TestBuilder;
   beforeEach(async () => {
-    testBuilder = new TestBuilder({ types: [FunctionType] });
+    testBuilder = new TestBuilder({ types: [Function.Function] });
     await testBuilder.open();
   });
   afterEach(async () => {
@@ -31,13 +30,13 @@ describe('ComputeGraph', () => {
     // Create script.
     const trigger = new Trigger();
     graph.update.once(() => trigger.wake());
-    const functionObject = space.db.add(Obj.make(FunctionType, { name: 'test', version: '0.0.1', binding: 'TEST' }));
+    const functionObject = space.db.add(Function.make({ name: 'test', version: '0.0.1', binding: 'TEST' }));
     await trigger.wait();
     const functions = graph.getFunctions({ echo: true });
     expect(functions).to.toHaveLength(1);
 
     const id = graph.mapFunctionBindingToId('TEST()');
-    expect(id).to.eq(`${fullyQualifiedId(functionObject)}()`);
+    expect(id).to.eq(`${Obj.getDXN(functionObject).toString()}()`);
   });
 
   test('cross-node references', async () => {
@@ -52,22 +51,38 @@ describe('ComputeGraph', () => {
     {
       node1.graph.hf.setCellContents({ sheet: node1.sheetId, row: 0, col: 0 }, [[100, 200, 300, '=SUM(A1:C1)']]);
       node2.graph.hf.setCellContents({ sheet: node2.sheetId, row: 0, col: 0 }, "='node-1'!D1");
-      const value1 = node1.graph.hf.getCellValue({ sheet: node1.sheetId, col: 3, row: 0 });
-      const value2 = node2.graph.hf.getCellValue({ sheet: node2.sheetId, col: 0, row: 0 });
+      const value1 = node1.graph.hf.getCellValue({
+        sheet: node1.sheetId,
+        col: 3,
+        row: 0,
+      });
+      const value2 = node2.graph.hf.getCellValue({
+        sheet: node2.sheetId,
+        col: 0,
+        row: 0,
+      });
       expect(value1).to.eq(value2);
     }
 
     // Get updated event.
     const trigger = new Trigger<CellValue>();
     node2.update.on(({ change }) => {
-      const value = node2.graph.hf.getCellValue({ sheet: node2.sheetId, col: 0, row: 0 });
+      const value = node2.graph.hf.getCellValue({
+        sheet: node2.sheetId,
+        col: 0,
+        row: 0,
+      });
       expect(value).to.eq(change?.newValue);
       trigger.wake(value);
     });
 
     {
       node1.graph.hf.setCellContents({ sheet: node1.sheetId, row: 0, col: 0 }, 400);
-      const value1 = node1.graph.hf.getCellValue({ sheet: node1.sheetId, col: 3, row: 0 });
+      const value1 = node1.graph.hf.getCellValue({
+        sheet: node1.sheetId,
+        col: 3,
+        row: 0,
+      });
       const value2 = await trigger.wait();
       expect(value1).to.eq(value2);
     }
@@ -81,7 +96,11 @@ describe('ComputeGraph', () => {
 
     const node1 = await graph.getOrCreateNode('node-1').open();
     node1.graph.hf.setCellContents({ sheet: node1.sheetId, row: 0, col: 0 }, "='node-2'!A1");
-    const value1 = node1.graph.hf.getCellValue({ sheet: node1.sheetId, col: 0, row: 0 });
+    const value1 = node1.graph.hf.getCellValue({
+      sheet: node1.sheetId,
+      col: 0,
+      row: 0,
+    });
     expect(value1).to.be.instanceof(DetailedCellError);
     expect((value1 as DetailedCellError).type).to.eq('REF');
   });

package/src/compute-graph.ts

@@ -5,11 +5,11 @@
 import type * as ManagedRuntime from 'effect/ManagedRuntime';
 
 import { Event } from '@dxos/async';
-import { Filter, type Space, fullyQualifiedId } from '@dxos/client/echo';
+import { Filter, type Space } from '@dxos/client/echo';
 import { FQ_ID_LENGTH } from '@dxos/client/echo';
 import { Resource } from '@dxos/context';
-import { getTypename } from '@dxos/echo/internal';
-import { type FunctionInvocationService, FunctionType } from '@dxos/functions';
+import { Obj } from '@dxos/echo';
+import { Function, type FunctionInvocationService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -60,7 +60,7 @@ export class ComputeGraph extends Resource {
   private readonly _nodes = new Map<number, ComputeNode>();
 
   // Cached function objects.
-  private _remoteFunctions: FunctionType[] = [];
+  private _remoteFunctions: Function.Function[] = [];
 
   public readonly update = new Event<{ type: ComputeGraphEvent }>();
 
@@ -106,7 +106,10 @@ export class ComputeGraph extends Resource {
   }
 
   getFunctions(
-    { standard, echo }: { standard?: boolean; echo?: boolean } = { standard: true, echo: true },
+    { standard, echo }: { standard?: boolean; echo?: boolean } = {
+      standard: true,
+      echo: true,
+    },
   ): FunctionDefinition[] {
     return [
       ...(standard
@@ -166,7 +169,7 @@ export class ComputeGraph extends Resource {
 
             for (const obj of objects) {
               if (obj.name === name) {
-                const type = getTypename(obj)!;
+                const type = Obj.getTypename(obj)!;
                 // NOTE: Names must be single quoted.
                 return `'${createSheetName({ type, id: obj.id })}'!`;
               }
@@ -206,7 +209,7 @@ export class ComputeGraph extends Resource {
 
       const fn = this._remoteFunctions.find((fn) => fn.binding === binding);
       if (fn) {
-        const id = fullyQualifiedId(fn);
+        const id = Obj.getDXN(fn).toString();
         return `${id}(${args})`;
       } else {
         return match;
@@ -225,7 +228,7 @@ export class ComputeGraph extends Resource {
         return match;
       }
 
-      const fn = this._remoteFunctions.find((fn) => fullyQualifiedId(fn) === id);
+      const fn = this._remoteFunctions.find((fn) => Obj.getDXN(fn).toString() === id);
       if (fn?.binding) {
         return `${fn.binding}(${args})`;
       } else {
@@ -243,9 +246,9 @@ export class ComputeGraph extends Resource {
   protected override async _open(): Promise<void> {
     if (this._space) {
       // Subscribe to remote function definitions.
-      const query = this._space.db.query(Filter.type(FunctionType));
-      const unsubscribe = query.subscribe(({ objects }) => {
-        this._remoteFunctions = objects.filter(({ binding }) => binding);
+      const query = this._space.db.query(Filter.type(Function.Function));
+      const unsubscribe = query.subscribe(() => {
+        this._remoteFunctions = query.results.filter((fn) => fn.binding);
         this.update.emit({ type: 'functionsUpdated' });
       });
 

package/src/functions/edge-function.ts

@@ -2,13 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
-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, Obj } from '@dxos/echo';
+import { Function, FunctionInvocationService, TracingService } from '@dxos/functions';
 import { FunctionDefinition } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { isNonNullable } from '@dxos/util';
@@ -36,22 +35,20 @@ export class EdgeFunctionPlugin extends AsyncFunctionPlugin {
           return new CellError(ErrorType.REF, 'Missing space');
         }
 
-        const {
-          objects: [fn],
-        } = await space.db.query(Filter.type(FunctionType, { binding })).run();
+        const [fn] = 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');
         }
 
         if (subscribe) {
-          const unsubscribe = effect(() => {
+          const unsubscribe = Obj.subscribe(fn, () => {
             log('function changed', { fn });
-            const _ = fn?.version;
-
             // TODO(wittjosiah): `ttl` should be 0 to force a recalculation when a new version is deployed.
             //  This needs a ttl to prevent a binding change from causing the function not to be found.
-            this.runAsyncFunction(ast, state, handler(false), { ttl: FUNCTION_TTL });
+            this.runAsyncFunction(ast, state, handler(false), {
+              ttl: FUNCTION_TTL,
+            });
           });
 
           this.context.createSubscription(ast.procedureName, unsubscribe);
@@ -62,7 +59,7 @@ export class EdgeFunctionPlugin extends AsyncFunctionPlugin {
         // 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);
+          const schema = JsonSchema.toEffectSchema(fn.inputSchema);
           const props = SchemaAST.getPropertySignatures(schema.ast);
           input = {} as any;
           props.forEach(({ name }, index) => {
@@ -74,12 +71,14 @@ export class EdgeFunctionPlugin 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 as any;
       };
 
-    return this.runAsyncFunction(ast, state, handler(true), { ttl: FUNCTION_TTL });
+    return this.runAsyncFunction(ast, state, handler(true), {
+      ttl: FUNCTION_TTL,
+    });
   }
 }
 

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/test-runtime.ts

@@ -7,13 +7,9 @@ import * as ManagedRuntime from 'effect/ManagedRuntime';
 
 import { AiService } from '@dxos/ai';
 import { type SpaceId } from '@dxos/client/echo';
-import {
-  CredentialsService,
-  DatabaseService,
-  type FunctionDefinition,
-  FunctionInvocationService,
-  QueueService,
-} from '@dxos/functions';
+import { Database, Feed } from '@dxos/echo';
+import { CredentialsService, type FunctionDefinition, QueueService } from '@dxos/functions';
+import { FunctionInvocationServiceLayerTest } from '@dxos/functions-runtime/testing';
 
 import { type FunctionsRuntimeProvider } from '../compute-graph-registry';
 
@@ -23,15 +19,16 @@ import { type FunctionsRuntimeProvider } from '../compute-graph-registry';
  */
 export const createMockedComputeRuntimeProvider = ({
   functions,
-}: { functions?: FunctionDefinition<any, any>[] } = {}): FunctionsRuntimeProvider => {
+}: { functions?: FunctionDefinition.Any[] } = {}): FunctionsRuntimeProvider => {
   return {
     getRuntime: (_spaceId: SpaceId) =>
       ManagedRuntime.make(
-        FunctionInvocationService.layerTest({ functions }).pipe(
+        FunctionInvocationServiceLayerTest({ functions }).pipe(
           Layer.provide(AiService.notAvailable),
           Layer.provide(CredentialsService.configuredLayer([])),
-          Layer.provide(DatabaseService.notAvailable),
+          Layer.provide(Database.notAvailable),
           Layer.provide(QueueService.notAvailable),
+          Layer.provide(Feed.notAvailable),
         ),
       ),
   };