@dxos/compute 0.8.4-main.72ec0f3 → 0.8.4-main.74a063c4e0

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/compute",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.74a063c4e0",
   "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,36 +37,35 @@
     "src"
   ],
   "dependencies": {
-    "@preact/signals-core": "^1.12.1",
-    "effect": "3.18.3",
+    "effect": "3.20.0",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/ai": "0.8.4-main.72ec0f3",
-    "@dxos/client": "0.8.4-main.72ec0f3",
-    "@dxos/context": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/functions": "0.8.4-main.72ec0f3",
-    "@dxos/functions-runtime": "0.8.4-main.72ec0f3",
-    "@dxos/keys": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/protocols": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/vendor-hyperformula": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-automation": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3",
-    "@dxos/debug": "0.8.4-main.72ec0f3"
+    "@dxos/ai": "0.8.4-main.74a063c4e0",
+    "@dxos/client": "0.8.4-main.74a063c4e0",
+    "@dxos/async": "0.8.4-main.74a063c4e0",
+    "@dxos/context": "0.8.4-main.74a063c4e0",
+    "@dxos/debug": "0.8.4-main.74a063c4e0",
+    "@dxos/echo": "0.8.4-main.74a063c4e0",
+    "@dxos/functions": "0.8.4-main.74a063c4e0",
+    "@dxos/functions-runtime": "0.8.4-main.74a063c4e0",
+    "@dxos/invariant": "0.8.4-main.74a063c4e0",
+    "@dxos/keys": "0.8.4-main.74a063c4e0",
+    "@dxos/log": "0.8.4-main.74a063c4e0",
+    "@dxos/operation": "0.8.4-main.74a063c4e0",
+    "@dxos/protocols": "0.8.4-main.74a063c4e0",
+    "@dxos/schema": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-automation": "0.8.4-main.74a063c4e0",
+    "@dxos/util": "0.8.4-main.74a063c4e0",
+    "@dxos/vendor-hyperformula": "0.8.4-main.74a063c4e0"
   },
   "devDependencies": {
     "@tldraw/indices": "^2.0.0-alpha.14",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/echo-db": "0.8.4-main.72ec0f3",
-    "@dxos/random": "0.8.4-main.72ec0f3"
+    "@dxos/echo-db": "0.8.4-main.74a063c4e0",
+    "@dxos/random": "0.8.4-main.74a063c4e0",
+    "@dxos/echo": "0.8.4-main.74a063c4e0"
   },
   "peerDependencies": {
-    "effect": "^3.13.3"
+    "effect": "3.20.0"
   },
   "publishConfig": {
     "access": "public"

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

@@ -2,32 +2,43 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
 import { Obj } from '@dxos/echo';
-import { Function, FunctionDefinition } from '@dxos/functions';
+import { Operation, OperationHandlerSet } from '@dxos/operation';
 
 import { ComputeGraphRegistry, defaultPlugins } from './compute-graph-registry';
 import { TestBuilder, createMockedComputeRuntimeProvider } from './testing';
 
-describe('ComputeGraphRegistry', () => {
-  const add = FunctionDefinition.make({
+const AddDefinition = Operation.make({
+  meta: {
     key: 'add',
     name: 'add',
     description: 'Adds two numbers',
-    inputSchema: Schema.Struct({ a: Schema.Number, b: Schema.Number }),
-    outputSchema: Schema.Number,
-    handler: ({ data }) => data.a + data.b,
-  });
+  },
+  input: Schema.Struct({ a: Schema.Number, b: Schema.Number }),
+  output: Schema.Number,
+  services: [],
+});
+
+const add = AddDefinition.pipe(
+  Operation.withHandler(
+    Effect.fn(function* ({ a, b }) {
+      return a + b;
+    }),
+  ),
+);
 
+describe('ComputeGraphRegistry', () => {
   test('invokes user function through compute graph', async () => {
     const computeRuntime = createMockedComputeRuntimeProvider({
-      functions: [add],
+      functions: OperationHandlerSet.make(add),
     });
     const testBuilder = new TestBuilder({
-      types: [Function.Function],
+      types: [Operation.PersistentOperation],
       computeRuntime,
     });
     await testBuilder.open();
@@ -53,9 +64,10 @@ describe('ComputeGraphRegistry', () => {
       await graph.close();
     });
 
-    // Create a function object in ECHO with binding that maps to DX calls.
-    const functionObj = FunctionDefinition.serialize(add);
-    functionObj.binding = 'ADD';
+    const functionObj = Operation.serialize(add);
+    Obj.change(functionObj, (obj) => {
+      obj.binding = 'ADD';
+    });
     space.db.add(functionObj);
 
     const node = await graph.getOrCreateNode('sheet').open();
@@ -82,10 +94,10 @@ describe('ComputeGraphRegistry', () => {
 
   test('adding a function binding updates autocomplete and enables execution', async () => {
     const computeRuntime = createMockedComputeRuntimeProvider({
-      functions: [add],
+      functions: OperationHandlerSet.make(add),
     });
     const testBuilder = new TestBuilder({
-      types: [Function.Function],
+      types: [Operation.PersistentOperation],
       computeRuntime,
     });
     await testBuilder.open();
@@ -122,9 +134,10 @@ describe('ComputeGraphRegistry', () => {
     });
     onTestFinished(unsubscribe);
 
-    // Add a bound function to the space; graph should pick it up.
-    const functionObj = FunctionDefinition.serialize(add);
-    functionObj.binding = 'ADD';
+    const functionObj = Operation.serialize(add);
+    Obj.change(functionObj, (obj) => {
+      obj.binding = 'ADD';
+    });
     space.db.add(functionObj);
 
     await functionsUpdated.wait();

package/src/compute-graph.test.ts

@@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
 import { Obj } from '@dxos/echo';
-import { Function } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
 import { type CellValue } from '@dxos/vendor-hyperformula';
 import { DetailedCellError } from '@dxos/vendor-hyperformula';
 
@@ -15,7 +15,7 @@ import { TestBuilder } from './testing';
 describe('ComputeGraph', () => {
   let testBuilder: TestBuilder;
   beforeEach(async () => {
-    testBuilder = new TestBuilder({ types: [Function.Function] });
+    testBuilder = new TestBuilder({ types: [Operation.PersistentOperation] });
     await testBuilder.open();
   });
   afterEach(async () => {
@@ -30,13 +30,45 @@ describe('ComputeGraph', () => {
     // Create script.
     const trigger = new Trigger();
     graph.update.once(() => trigger.wake());
-    const functionObject = space.db.add(Function.make({ name: 'test', version: '0.0.1', binding: 'TEST' }));
+    const functionObject = space.db.add(
+      Obj.make(Operation.PersistentOperation, { 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(`${Obj.getDXN(functionObject).toString()}()`);
+
+    const restored = graph.mapFunctionBindingFromId(id);
+    expect(restored).to.eq('TEST()');
+  });
+
+  test('map functions roundtrip with args', async () => {
+    const space = await testBuilder.client.spaces.create();
+    const graph = testBuilder.registry.createGraph(space);
+    await graph.open();
+
+    const trigger = new Trigger();
+    graph.update.once(() => trigger.wake());
+    space.db.add(Obj.make(Operation.PersistentOperation, { name: 'forex', version: '0.0.1', binding: 'FOREX' }));
+    await trigger.wait();
+
+    const stored = graph.mapFunctionBindingToId('=FOREX(C6,C7)');
+    expect(stored).to.include('dxn:echo:');
+    expect(stored).not.to.include('FOREX');
+
+    const restored = graph.mapFunctionBindingFromId(stored);
+    expect(restored).to.eq('=FOREX(C6,C7)');
+  });
+
+  test('map functions unknown binding returns undefined', async () => {
+    const space = await testBuilder.client.spaces.create();
+    const graph = testBuilder.registry.createGraph(space);
+    await graph.open();
+
+    const result = graph.mapFunctionBindingFromId('=dxn:echo:@:01ABCDEF01ABCDEF01ABCDEF01(A1,B1)');
+    expect(result).to.be.undefined;
   });
 
   test('cross-node references', async () => {

package/src/compute-graph.ts

@@ -2,19 +2,17 @@
 // Copyright 2024 DXOS.org
 //
 
-import { effect } from '@preact/signals-core';
 import type * as ManagedRuntime from 'effect/ManagedRuntime';
 
 import { Event } from '@dxos/async';
 import { Filter, type Space } from '@dxos/client/echo';
-import { FQ_ID_LENGTH } from '@dxos/client/echo';
 import { Resource } from '@dxos/context';
 import { Obj } from '@dxos/echo';
-import { getTypename } from '@dxos/echo/internal';
-import { Function, type FunctionInvocationService } from '@dxos/functions';
+import { type FunctionInvocationService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { Operation } from '@dxos/operation';
 import { isNonNullable } from '@dxos/util';
 import type { Listeners } from '@dxos/vendor-hyperformula';
 import { ExportedCellChange, type HyperFormula } from '@dxos/vendor-hyperformula';
@@ -39,7 +37,7 @@ type ObjectRef = { type: string; id: string };
 
 /**
  * Marker for sheets that are managed by an ECHO object.
- * Sheet ID: `dxos.org/type/SheetType@1234`
+ * Sheet ID: `org.dxos.type.sheet-type@1234`
  */
 export const createSheetName = ({ type, id }: ObjectRef) => `${type}@${id}`;
 export const parseSheetName = (name: string): Partial<ObjectRef> => {
@@ -62,7 +60,7 @@ export class ComputeGraph extends Resource {
   private readonly _nodes = new Map<number, ComputeNode>();
 
   // Cached function objects.
-  private _remoteFunctions: Function.Function[] = [];
+  private _remoteFunctions: Operation.PersistentOperation[] = [];
 
   public readonly update = new Event<{ type: ComputeGraphEvent }>();
 
@@ -155,7 +153,7 @@ export class ComputeGraph extends Resource {
       formula
         //
         // Map cross-sheet references by name onto sheet stored by ECHO object/model.
-        // Example: "Test Sheet"!A0 => "dxos.org/type/SheetType@1234"!A0
+        // Example: "Test Sheet"!A0 => "org.dxos.type.sheet-type@1234"!A0
         // https://hyperformula.handsontable.com/guide/cell-references.html#cell-references
         //
         .replace(/['"]?([ \w]+)['"]?!/, (_match, name) => {
@@ -171,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 })}'!`;
               }
@@ -200,8 +198,8 @@ export class ComputeGraph extends Resource {
   }
 
   /**
-   * Map from binding to fully qualified ECHO ID (to store).
-   * E.g., HELLO() => spaceId:objectId()
+   * Map from binding to fully qualified ECHO DXN (to store).
+   * E.g., HELLO() => dxn:echo:spaceId:objectId()
    */
   mapFunctionBindingToId(formula: string): string {
     return formula.replace(/(\w+)\((.*)\)/g, (match, binding, args) => {
@@ -220,23 +218,22 @@ export class ComputeGraph extends Resource {
   }
 
   /**
-   * Map from fully qualified ECHO ID to binding (from store).
-   * E.g., spaceId:objectId() => HELLO()
+   * Map from fully qualified ECHO DXN to binding (from store).
+   * E.g., dxn:echo:spaceId:objectId() => HELLO()
    */
   mapFunctionBindingFromId(formula: string): string | undefined {
-    const binding = formula.replace(/(\w+):([a-zA-Z0-9]+)\((.*)\)/g, (match, spaceId, objectId, args) => {
-      const id = `${spaceId}:${objectId}`;
-      if (id.length !== FQ_ID_LENGTH) {
-        return match;
-      }
-
-      const fn = this._remoteFunctions.find((fn) => Obj.getDXN(fn).toString() === id);
-      if (fn?.binding) {
-        return `${fn.binding}(${args})`;
-      } else {
-        return UNKNOWN_BINDING;
-      }
-    });
+    const binding = formula.replace(
+      /dxn:([^:]+):([^:(]+):([a-zA-Z0-9]+)\((.*)\)/g,
+      (_match, kind, spaceTag, objectId, args) => {
+        const dxn = `dxn:${kind}:${spaceTag}:${objectId}`;
+        const fn = this._remoteFunctions.find((fn) => Obj.getDXN(fn).toString() === dxn);
+        if (fn?.binding) {
+          return `${fn.binding}(${args})`;
+        } else {
+          return UNKNOWN_BINDING;
+        }
+      },
+    );
 
     if (binding.startsWith(`=${UNKNOWN_BINDING}`)) {
       return undefined;
@@ -248,17 +245,16 @@ 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(Function.Function));
-      const unsubscribe = query.subscribe();
-      const dispose = effect(() => {
-        this._remoteFunctions = query.objects.filter(({ binding }) => binding);
-        this.update.emit({ type: 'functionsUpdated' });
-      });
-
-      this._ctx.onDispose(() => {
-        unsubscribe();
-        dispose();
-      });
+      const query = this._space.db.query(Filter.type(Operation.PersistentOperation));
+      const unsubscribe = query.subscribe(
+        () => {
+          this._remoteFunctions = query.results.filter((fn) => fn.binding);
+          this.update.emit({ type: 'functionsUpdated' });
+        },
+        { fire: true },
+      );
+
+      this._ctx.onDispose(unsubscribe);
     }
   }
 

package/src/functions/edge-function.ts

@@ -2,15 +2,14 @@
 // 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 { Function, FunctionInvocationService, TracingService } from '@dxos/functions';
-import { FunctionDefinition } from '@dxos/functions';
+import { JsonSchema, Obj } from '@dxos/echo';
+import { FunctionInvocationService, TracingService } from '@dxos/functions';
 import { log } from '@dxos/log';
+import { Operation } from '@dxos/operation';
 import { isNonNullable } from '@dxos/util';
 import { type ProcedureAst } from '@dxos/vendor-hyperformula';
 import { type InterpreterState } from '@dxos/vendor-hyperformula';
@@ -36,33 +35,31 @@ export class EdgeFunctionPlugin extends AsyncFunctionPlugin {
           return new CellError(ErrorType.REF, 'Missing space');
         }
 
-        const {
-          objects: [fn],
-        } = await space.db.query(Filter.type(Function.Function, { binding })).run();
+        const [fn] = await space.db.query(Filter.type(Operation.PersistentOperation, { 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);
         }
 
         const runtime = this.context.runtime;
-        const functionDef = FunctionDefinition.deserialize(fn);
+        const functionDef = Operation.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);
+          const schema = JsonSchema.toEffectSchema(fn.inputSchema);
           const props = SchemaAST.getPropertySignatures(schema.ast);
           input = {} as any;
           props.forEach(({ name }, index) => {
@@ -79,7 +76,9 @@ export class EdgeFunctionPlugin extends AsyncFunctionPlugin {
         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/testing/test-builder.ts

@@ -7,7 +7,6 @@ import { type Context, Resource } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 
 import { type ComputeGraphOptions, ComputeGraphRegistry } from '../compute-graph-registry';
-
 import { createMockedComputeRuntimeProvider } from './test-runtime';
 
 export type TestBuilderOptions = ClientOptions & Partial<ComputeGraphOptions>;

package/src/testing/test-runtime.ts

@@ -7,8 +7,10 @@ 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 { Database, Feed } from '@dxos/echo';
+import { CredentialsService, QueueService } from '@dxos/functions';
 import { FunctionInvocationServiceLayerTest } from '@dxos/functions-runtime/testing';
+import { OperationHandlerSet } from '@dxos/operation';
 
 import { type FunctionsRuntimeProvider } from '../compute-graph-registry';
 
@@ -18,15 +20,16 @@ import { type FunctionsRuntimeProvider } from '../compute-graph-registry';
  */
 export const createMockedComputeRuntimeProvider = ({
   functions,
-}: { functions?: FunctionDefinition.Any[] } = {}): FunctionsRuntimeProvider => {
+}: { functions?: OperationHandlerSet.OperationHandlerSet } = {}): FunctionsRuntimeProvider => {
   return {
     getRuntime: (_spaceId: SpaceId) =>
       ManagedRuntime.make(
         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),
         ),
       ),
   };