@dxos/plugin-automation 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/src/{cli/commands → commands}/trigger/update/queue.ts

@@ -12,12 +12,11 @@ import * as Option from 'effect/Option';
 import { CommandConfig } from '@dxos/cli-util';
 import { flushAndSync, print, spaceLayer, withTypes } from '@dxos/cli-util';
 import { Common } from '@dxos/cli-util';
+import { Operation, Trigger } from '@dxos/compute';
 import { DXN, Database, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 import { Enabled, Input, Queue, TriggerId } from '../options';
-import { printTrigger, promptForSchemaInput, selectFunction, selectQueue, selectTrigger } from '../util';
+import { printTrigger, promptForSchemaInput, selectFunction, selectFeed, selectTrigger } from '../util';
 
 export const queue = Command.make(
   'queue',
@@ -92,8 +91,8 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
     if (!foundFn || !Obj.instanceOf(Operation.PersistentOperation, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
     }
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.function = Ref.make(foundFn);
+    Obj.update(trigger, (trigger) => {
+      trigger.function = Ref.make(foundFn);
     });
     currentFn = foundFn;
   }
@@ -126,13 +125,13 @@ const updateQueue = Effect.fn(function* (trigger: Trigger.Trigger, queueOption:
     onSome: () => Effect.succeed(true),
   });
   if (shouldChangeQueue) {
-    const queueDxn = yield* Option.match(queueOption, {
-      onNone: () => selectQueue(),
+    const queueDXN = yield* Option.match(queueOption, {
+      onNone: () => selectFeed(),
       onSome: (dxn) => Effect.succeed(dxn.toString()),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      if (mutableTrigger.spec?.kind === 'queue') {
-        mutableTrigger.spec.queue = queueDxn;
+    Obj.update(trigger, (trigger) => {
+      if (trigger.spec?.kind === 'queue') {
+        trigger.spec.queue = queueDXN;
       }
     });
   }
@@ -166,8 +165,8 @@ const updateInput = Effect.fn(function* (
         promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined, currentInput),
       onSome: (value) => Effect.succeed(value as Record<string, any>),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.input = inputObj;
+    Obj.update(trigger, (trigger) => {
+      trigger.input = inputObj;
     });
   }
 });
@@ -189,7 +188,7 @@ const updateEnabled = Effect.fn(function* (
       }).pipe(Prompt.run),
     onSome: () => Effect.succeed(enabled),
   });
-  Obj.change(trigger, (mutableTrigger) => {
-    mutableTrigger.enabled = enabledValue;
+  Obj.update(trigger, (trigger) => {
+    trigger.enabled = enabledValue;
   });
 });

package/src/{cli/commands → commands}/trigger/update/subscription.ts

@@ -13,9 +13,8 @@ import * as Option from 'effect/Option';
 import { CommandConfig } from '@dxos/cli-util';
 import { flushAndSync, print, spaceLayer, withTypes } from '@dxos/cli-util';
 import { Common } from '@dxos/cli-util';
+import { Operation, Trigger } from '@dxos/compute';
 import { DXN, Database, Filter, JsonSchema, Obj, Query, Ref } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 import { Deep, Delay, Enabled, Input, TriggerId, Typename } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectTrigger } from '../util';
@@ -121,8 +120,8 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
     if (!foundFn || !Obj.instanceOf(Operation.PersistentOperation, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
     }
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.function = Ref.make(foundFn);
+    Obj.update(trigger, (trigger) => {
+      trigger.function = Ref.make(foundFn);
     });
     currentFn = foundFn;
   }
@@ -211,8 +210,8 @@ const updateSpec = Effect.fn(function* (
       subscriptionOptions.delay = delayOptionValue.value;
     }
 
-    Obj.change(trigger, (mutableTrigger) => {
-      const spec = mutableTrigger.spec;
+    Obj.update(trigger, (trigger) => {
+      const spec = trigger.spec;
       if (spec?.kind === 'subscription') {
         // Cast needed because QueryAST types are deeply readonly but spec.query expects mutable.
         spec.query = { ast: queryAst } as NonNullable<typeof spec.query>;
@@ -250,8 +249,8 @@ const updateInput = Effect.fn(function* (
         promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined, currentInput),
       onSome: (value) => Effect.succeed(value as Record<string, any>),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.input = inputObj;
+    Obj.update(trigger, (trigger) => {
+      trigger.input = inputObj;
     });
   }
 });
@@ -273,7 +272,7 @@ const updateEnabled = Effect.fn(function* (
       }).pipe(Prompt.run),
     onSome: () => Effect.succeed(enabled),
   });
-  Obj.change(trigger, (mutableTrigger) => {
-    mutableTrigger.enabled = enabledValue;
+  Obj.update(trigger, (trigger) => {
+    trigger.enabled = enabledValue;
   });
 });

package/src/{cli/commands → commands}/trigger/update/timer.ts

@@ -12,9 +12,8 @@ import * as Option from 'effect/Option';
 import { CommandConfig } from '@dxos/cli-util';
 import { flushAndSync, print, spaceLayer, withTypes } from '@dxos/cli-util';
 import { Common } from '@dxos/cli-util';
+import { Operation, Trigger } from '@dxos/compute';
 import { DXN, Database, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 import { Cron, Enabled, Input, TriggerId } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectTrigger } from '../util';
@@ -93,8 +92,8 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
     if (!foundFn || !Obj.instanceOf(Operation.PersistentOperation, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
     }
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.function = Ref.make(foundFn);
+    Obj.update(trigger, (trigger) => {
+      trigger.function = Ref.make(foundFn);
     });
     currentFn = foundFn;
   }
@@ -129,9 +128,9 @@ const updateCron = Effect.fn(function* (trigger: Trigger.Trigger, cronOption: Op
         }).pipe(Prompt.run),
       onSome: (value) => Effect.succeed(value),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      if (mutableTrigger.spec?.kind === 'timer') {
-        mutableTrigger.spec.cron = cron;
+    Obj.update(trigger, (trigger) => {
+      if (trigger.spec?.kind === 'timer') {
+        trigger.spec.cron = cron;
       }
     });
   }
@@ -165,8 +164,8 @@ const updateInput = Effect.fn(function* (
         promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined, currentInput),
       onSome: (value) => Effect.succeed(value as Record<string, any>),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.input = inputObj;
+    Obj.update(trigger, (trigger) => {
+      trigger.input = inputObj;
     });
   }
 });
@@ -188,7 +187,7 @@ const updateEnabled = Effect.fn(function* (
       }).pipe(Prompt.run),
     onSome: () => Effect.succeed(enabled),
   });
-  Obj.change(trigger, (mutableTrigger) => {
-    mutableTrigger.enabled = enabledValue;
+  Obj.update(trigger, (trigger) => {
+    trigger.enabled = enabledValue;
   });
 });

package/src/{cli/commands → commands}/trigger/util.ts

@@ -12,10 +12,9 @@ import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
 import { FormBuilder } from '@dxos/cli-util';
-import { Annotation, Database, Entity, Feed, Filter, Obj, Ref, Type } from '@dxos/echo';
+import { Operation, Trigger } from '@dxos/compute';
+import { Annotation, Database, Entity, Feed, Filter, Obj, Query, Ref, Type } from '@dxos/echo';
 import { getProperties } from '@dxos/effect';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 import { FeedAnnotation } from '@dxos/schema';
 
 export type TriggerRemoteStatus = 'available' | 'not available' | 'n/a';
@@ -62,7 +61,7 @@ export const printTrigger = Effect.fn(function* (trigger: Trigger.Trigger, remot
       FormBuilder.nest(
         'function',
         FormBuilder.make().pipe(
-          FormBuilder.set('key', (fn as Operation.PersistentOperation).key),
+          FormBuilder.set('key', Obj.getMeta(fn as Operation.PersistentOperation).key),
           FormBuilder.set('dxn', Obj.getDXN(fn as Obj.Unknown).toString()),
         ),
       ),
@@ -300,7 +299,9 @@ export const selectFunction = Effect.fn(function* () {
  * Queries the database for triggers and prompts the user to select one.
  */
 export const selectTrigger = Effect.fn(function* (kind?: Trigger.Kind) {
-  const triggers = yield* Database.runQuery(Filter.type(Trigger.Trigger));
+  const triggers = yield* Database.runQuery(
+    Query.select(Filter.type(Trigger.Trigger)).debugLabel('cli.trigger.selectTrigger'),
+  );
   const filteredTriggers = kind ? triggers.filter((trigger) => trigger.spec?.kind === kind) : triggers;
 
   if (filteredTriggers.length === 0) {
@@ -312,7 +313,9 @@ export const selectTrigger = Effect.fn(function* (kind?: Trigger.Kind) {
       Effect.gen(function* () {
         const fn = trigger.function ? yield* Database.load(trigger.function) : undefined;
         const functionName =
-          fn && Obj.instanceOf(Operation.PersistentOperation, fn) ? (fn.name ?? fn.key ?? fn.id) : undefined;
+          fn && Obj.instanceOf(Operation.PersistentOperation, fn)
+            ? (fn.name ?? Obj.getMeta(fn).key ?? fn.id)
+            : undefined;
         const title = functionName ?? trigger.id;
         const description = `${trigger.enabled ? 'enabled' : 'disabled'} - ${trigger.spec?.kind ?? 'unknown'}`;
 
@@ -334,11 +337,11 @@ export const selectTrigger = Effect.fn(function* (kind?: Trigger.Kind) {
 });
 
 /**
- * Selects a queue interactively from available queues in the database.
+ * Selects a feed interactively from available feeds in the database.
  * Queries schemas with FeedAnnotation, then queries objects of those types,
  * and extracts queue DXNs from the objects' feed properties.
  */
-export const selectQueue = Effect.fn(function* () {
+export const selectFeed = Effect.fn(function* () {
   // Query schema registry for schemas with FeedAnnotation.
   const schemas = yield* Database.runSchemaQuery({ location: ['database', 'runtime'] });
 
@@ -352,8 +355,8 @@ export const selectQueue = Effect.fn(function* () {
     return yield* Effect.fail(new Error('No schemas with Feed annotation found'));
   }
 
-  // Collect all objects with queues.
-  const queueChoices: Array<{ title: string; value: string; description?: string }> = [];
+  // Collect all objects with feeds.
+  const feedChoices: Array<{ title: string; value: string; description?: string }> = [];
 
   // Process each feed schema, loading the Feed object to extract queue DXN.
   for (const schema of feedSchemas) {
@@ -373,30 +376,30 @@ export const selectQueue = Effect.fn(function* () {
           continue;
         }
 
-        const queueDxn = Feed.getQueueDxn(feedObj);
-        if (!queueDxn) {
+        const feedDXN = Feed.getQueueDxn(feedObj);
+        if (!feedDXN) {
           continue;
         }
 
         const label = Obj.getLabel(obj) ?? obj.id;
         const description = Obj.getTypename(obj);
 
-        queueChoices.push({
+        feedChoices.push({
           title: label,
-          value: queueDxn.toString(),
+          value: feedDXN.toString(),
           description,
         });
       }
     }).pipe(Effect.catchAll(() => Effect.void));
   }
 
-  if (queueChoices.length === 0) {
+  if (feedChoices.length === 0) {
     return yield* Effect.fail(new Error('No objects with queue properties found'));
   }
 
   const selected = yield* Prompt.select({
     message: 'Select a queue:',
-    choices: queueChoices,
+    choices: feedChoices,
   });
 
   return String(selected);

package/src/components/AutomationPanel/AutomationPanel.stories.tsx

@@ -5,16 +5,15 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
+import { Operation, Trigger } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 import { useSpaces } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withTheme } from '@dxos/react-ui/testing';
 
 import { functions } from '#testing';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
 import { AutomationPanel } from './AutomationPanel';
 
 const DefaultStory = () => {
@@ -40,7 +39,13 @@ const meta = {
       types: [Operation.PersistentOperation, Trigger.Trigger],
       onCreateSpace: ({ space }) => {
         for (const fn of functions) {
-          space.db.add(Obj.make(Operation.PersistentOperation, { ...fn, version: fn.version ?? '0.1.0' }));
+          const { key, version, ...data } = fn;
+          space.db.add(
+            Obj.make(Operation.PersistentOperation, {
+              [Obj.Meta]: { key, version: version ?? '0.1.0' },
+              ...data,
+            }),
+          );
         }
       },
     }),

package/src/components/AutomationPanel/AutomationPanel.tsx

@@ -9,12 +9,12 @@ import * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo, useState } from 'react';
 
 import { useTypeOptions } from '@dxos/app-toolkit/ui';
+import { Script, Trigger } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
-import { Filter, Obj, Tag } from '@dxos/echo';
-import { Script, Trigger } from '@dxos/functions';
+import { Filter, Obj, Query, Tag } from '@dxos/echo';
 import { KEY_QUEUE_CURSOR } from '@dxos/functions-runtime';
 import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
-import { Operation } from '@dxos/operation';
 import { type Client, useClient } from '@dxos/react-client';
 import { type Space, useObject, useQuery } from '@dxos/react-client/echo';
 import { Clipboard, IconButton, type IconButtonProps, Input, Separator, useTranslation } from '@dxos/react-ui';
@@ -43,13 +43,16 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
   const client = useClient();
   const functionsServiceClient = useMemo(() => FunctionsServiceClient.fromClient(client), [client]);
   const functions = useQuery(space.db, Filter.type(Operation.PersistentOperation));
-  const triggers = useQuery(space.db, Filter.type(Trigger.Trigger));
+  const triggers = useQuery(
+    space.db,
+    Query.select(Filter.type(Trigger.Trigger)).debugLabel('plugin-automation.AutomationPanel'),
+  );
   const filteredTriggers = useMemo(() => {
     return object ? triggers.filter(triggerMatch(object)) : triggers;
   }, [object, triggers]);
   const tags = useQuery(space.db, Filter.type(Tag.Tag));
   const types = useTypeOptions({
-    space,
+    db: space.db,
     annotation: {
       location: ['database', 'runtime'],
       kind: ['user'],
@@ -77,8 +80,8 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
 
   const handleSave: TriggerEditorProps['onSave'] = (trigger) => {
     if (selected) {
-      Obj.change(selected, (mutable) => {
-        Object.assign(mutable, trigger);
+      Obj.update(selected, (selected) => {
+        Object.assign(selected, trigger);
       });
     } else {
       space.db.add(Trigger.make(trigger));
@@ -99,8 +102,8 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
   };
 
   const handleResetCursor = async (trigger: Trigger.Trigger) => {
-    Obj.change(trigger, (obj) => {
-      Obj.deleteKeys(obj, KEY_QUEUE_CURSOR);
+    Obj.update(trigger, (trigger) => {
+      Obj.deleteKeys(trigger, KEY_QUEUE_CURSOR);
     });
     await space.db.flush({ indexes: true });
   };
@@ -123,32 +126,34 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
 
   return (
     <Settings.Panel>
-      {filteredTriggers.length > 0 && (
-        <List.Root<Trigger.Trigger>
-          items={filteredTriggers}
-          isItem={Schema.is(Trigger.Trigger)}
-          getId={(field) => field.id}
-        >
-          {({ items: filteredTriggers }) => (
-            <div role='list' className='flex flex-col w-full'>
-              {filteredTriggers?.map((trigger) => (
-                <TriggerListItem
-                  key={trigger.id}
-                  trigger={trigger}
-                  functions={functions}
-                  onSelect={handleSelect}
-                  onDelete={handleDelete}
-                  onResetCursor={handleResetCursor}
-                  onForceRun={handleForceRunTrigger}
-                />
-              ))}
-            </div>
-          )}
-        </List.Root>
-      )}
-
-      {filteredTriggers.length > 0 && <Separator classNames='my-4' />}
-      <IconButton icon='ph--plus--regular' label={t('new-trigger.label')} onClick={handleAdd} />
+      <Clipboard.Provider>
+        {filteredTriggers.length > 0 && (
+          <List.Root<Trigger.Trigger>
+            items={filteredTriggers}
+            isItem={Schema.is(Trigger.Trigger)}
+            getId={(field) => field.id}
+          >
+            {({ items: filteredTriggers }) => (
+              <div role='list' className='flex flex-col w-full'>
+                {filteredTriggers?.map((trigger) => (
+                  <TriggerListItem
+                    key={trigger.id}
+                    trigger={trigger}
+                    functions={functions}
+                    onSelect={handleSelect}
+                    onDelete={handleDelete}
+                    onResetCursor={handleResetCursor}
+                    onForceRun={handleForceRunTrigger}
+                  />
+                ))}
+              </div>
+            )}
+          </List.Root>
+        )}
+
+        {filteredTriggers.length > 0 && <Separator classNames='my-4' />}
+        <IconButton icon='ph--plus--regular' label={t('new-trigger.label')} onClick={handleAdd} />
+      </Clipboard.Provider>
     </Settings.Panel>
   );
 };

package/src/components/FunctionsPanel/FunctionsPanel.tsx

@@ -7,10 +7,10 @@ import React, { useCallback, useMemo } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { LayoutOperation, getObjectPathFromObject } from '@dxos/app-toolkit';
-import { Script } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
+import { Operation, Script } from '@dxos/compute';
+import { Filter } from '@dxos/echo';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { type Space, useQuery } from '@dxos/react-client/echo';
 import { IconButton, useTranslation } from '@dxos/react-ui';
 import { Settings } from '@dxos/react-ui-form';
 import { List } from '@dxos/react-ui-list';

package/src/components/FunctionsRegistry/FunctionsRegistry.tsx

@@ -6,11 +6,12 @@ import * as Schema from 'effect/Schema';
 import { useState } from 'react';
 import React, { useCallback } from 'react';
 
+import * as OperationModule from '@dxos/compute';
 import { Context } from '@dxos/context';
+import { Filter, Obj } from '@dxos/echo';
 import { getDeployedFunctions } from '@dxos/functions-runtime/edge';
-import * as OperationModule from '@dxos/operation';
 import { useClient } from '@dxos/react-client';
-import { Filter, Query, type Space, useQuery } from '@dxos/react-client/echo';
+import { type Space, useQuery } from '@dxos/react-client/echo';
 import { IconButton, useAsyncEffect, useTranslation } from '@dxos/react-ui';
 import { Settings } from '@dxos/react-ui-form';
 import { List } from '@dxos/react-ui-list';
@@ -33,11 +34,12 @@ export const FunctionsRegistry = ({ space }: FunctionsRegistryProps) => {
   const dbFunctions = useQuery(space.db, Filter.type(OperationModule.Operation.PersistentOperation));
 
   const state = (func: OperationModule.Operation.PersistentOperation) => {
-    const dbFunction = dbFunctions.find((f) => f.key === func.key);
+    const funcKey = Obj.getMeta(func).key;
+    const dbFunction = dbFunctions.find((f) => Obj.getMeta(f).key === funcKey);
     if (!dbFunction) {
       return 'import';
     }
-    if (dbFunction.version === func.version && dbFunction.updated === func.updated) {
+    if (Obj.getMeta(dbFunction).version === Obj.getMeta(func).version && dbFunction.updated === func.updated) {
       return 'none';
     }
     return 'update';
@@ -52,9 +54,12 @@ export const FunctionsRegistry = ({ space }: FunctionsRegistryProps) => {
 
   const hanleImportOrUpdate = useCallback(
     async (func: OperationModule.Operation.PersistentOperation) => {
-      const functions = await space.db
-        .query(Query.type(OperationModule.Operation.PersistentOperation, { key: func.key }))
-        .run();
+      const funcKey = Obj.getMeta(func).key;
+      const functions = funcKey
+        ? await space.db
+            .query(Filter.and(Filter.type(OperationModule.Operation.PersistentOperation), Filter.key(funcKey)))
+            .run()
+        : [];
       const [existingFunc] = functions;
       if (!existingFunc) {
         space.db.add(func);
@@ -83,10 +88,10 @@ export const FunctionsRegistry = ({ space }: FunctionsRegistryProps) => {
                 >
                   <div className='flex flex-col truncate'>
                     <List.ItemTitle classNames='truncate'>{func.name}</List.ItemTitle>
-                    <div className='text-xs text-description truncate'>{func.key}</div>
+                    <div className='text-xs text-description truncate'>{Obj.getMeta(func).key}</div>
                   </div>
                   <div className='flex flex-col truncate'>
-                    <div className='text-xs text-description truncate'>{func.version}</div>
+                    <div className='text-xs text-description truncate'>{Obj.getMeta(func).version}</div>
                     <div className='text-xs text-description truncate'>
                       {func.updated ? `Uploaded ${new Date(func.updated).toLocaleString()}` : ''}
                     </div>

package/src/components/TriggerEditor/FunctionInputEditor.tsx

@@ -5,9 +5,9 @@
 import type * as SchemaAST from 'effect/SchemaAST';
 import React, { useCallback, useMemo } from 'react';
 
+import { type Operation } from '@dxos/compute';
 import { type Database, JsonSchema, Obj, Ref } from '@dxos/echo';
 import { type JsonPath } from '@dxos/echo/internal';
-import { type Operation } from '@dxos/operation';
 import { useOnTransition, useTranslation } from '@dxos/react-ui';
 import { Form, type FormFieldStateProps, type FormRootProps, useFormValues } from '@dxos/react-ui-form';
 

package/src/components/TriggerEditor/SpecSelector.tsx

@@ -4,8 +4,8 @@
 
 import React, { useCallback, useMemo } from 'react';
 
+import { Trigger } from '@dxos/compute';
 import { Filter, Query } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
 import { useTranslation } from '@dxos/react-ui';
 import { type FormFieldComponentProps, SelectField, useFormFieldState } from '@dxos/react-ui-form';
 
@@ -22,20 +22,15 @@ export const SpecSelector = (props: SpecSelectorProps) => {
       const getDefaultTriggerSpec = (kind: string) => {
         switch (kind) {
           case 'timer':
-            return { kind: 'timer', cron: '' };
+            return Trigger.specTimer('');
           case 'subscription':
-            return {
-              kind: 'subscription',
-              query: {
-                ast: Query.select(Filter.nothing()).ast,
-              },
-            };
+            return Trigger.specSubscription(Query.select(Filter.nothing()));
           case 'queue':
-            return { kind: 'queue', queue: 'dxn:queue:default' };
+            return Trigger.specQueue('dxn:queue:default');
           case 'email':
-            return { kind: 'email' };
+            return Trigger.specEmail();
           case 'webhook':
-            return { kind: 'webhook' };
+            return Trigger.specWebhook();
           default:
             return undefined;
         }

package/src/components/TriggerEditor/TriggerEditor.stories.tsx

@@ -6,21 +6,20 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 import { expect, userEvent, within } from 'storybook/test';
 
+import { Operation, Trigger } from '@dxos/compute';
 import { Filter, Obj, Ref, Tag, Type } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 import { random } from '@dxos/random';
 import { useQuery } from '@dxos/react-client/echo';
 import { TestSchema, useClientStory, withClientProvider } from '@dxos/react-client/testing';
 import { useAsyncEffect } from '@dxos/react-ui';
-import { translations as formTranslations } from '@dxos/react-ui-form';
+import { translations as formTranslations } from '@dxos/react-ui-form/translations';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Employer, Organization, Person, Pipeline } from '@dxos/types';
 
 import { functions } from '#testing';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
 import { TriggerEditor, type TriggerEditorProps } from './TriggerEditor';
 
 const types = [
@@ -42,12 +41,12 @@ const DefaultStory = (props: Partial<TriggerEditorProps>) => {
     }
 
     const functions = await space.db.query(Filter.type(Operation.PersistentOperation)).run();
-    const fn = functions.find((fn) => fn.name === 'example.com/function/forex');
+    const fn = functions.find((fn) => fn.name === 'com.example.function.forex');
     invariant(fn);
     const trigger = space.db.add(
       Trigger.make({
         function: Ref.make(fn),
-        spec: { kind: 'webhook' },
+        spec: Trigger.specWebhook(),
         input: {
           from: 'USD',
           to: 'JPY',
@@ -92,7 +91,13 @@ const meta = {
 
         // Functions.
         functions.forEach((fn) => {
-          space.db.add(Obj.make(Operation.PersistentOperation, { ...fn, version: fn.version ?? '0.1.0' }));
+          const { key, version, ...data } = fn;
+          space.db.add(
+            Obj.make(Operation.PersistentOperation, {
+              [Obj.Meta]: { key, version: version ?? '0.1.0' },
+              ...data,
+            }),
+          );
         });
 
         // Objects.

package/src/components/TriggerEditor/TriggerEditor.tsx

@@ -4,11 +4,10 @@
 
 import React, { useCallback, useMemo } from 'react';
 
+import { Operation, Script, Trigger } from '@dxos/compute';
 import { ComputeGraph } from '@dxos/conductor';
-import { DXN, type Database, Entity, Feed, Obj, type Query } from '@dxos/echo';
-import { Script, Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
-import { Filter, Ref, useQuery } from '@dxos/react-client/echo';
+import { type Database, DXN, Entity, Feed, Filter, Obj, type Query, Ref } from '@dxos/echo';
+import { useQuery } from '@dxos/react-client/echo';
 import { Input } from '@dxos/react-ui';
 import { QueryForm, type QueryFormProps } from '@dxos/react-ui-components';
 import {
@@ -41,8 +40,8 @@ export const TriggerEditor = ({ db, types, tags, readonlySpec, trigger, ...formP
 
   const handleValuesChanged = useCallback(
     (newValues: Partial<TriggerFormSchema>) => {
-      Obj.change(trigger, (obj) => {
-        Object.assign(obj, newValues);
+      Obj.update(trigger, (trigger) => {
+        Object.assign(trigger, newValues);
       });
     },
     [trigger],
@@ -158,12 +157,12 @@ const getFunctionOptions = (scripts: Script.Script[], functions: Operation.Persi
 
 const getFeedQueueOptions = (feeds: Feed.Feed[]) => {
   return feeds.flatMap((feed) => {
-    const queueDxn = Feed.getQueueDxn(feed);
-    if (!queueDxn) {
+    const queueDXN = Feed.getQueueDxn(feed);
+    if (!queueDXN) {
       return [];
     }
     const parent = Obj.getParent(feed);
     const label = parent ? Entity.getLabel(parent) : Entity.getLabel(feed);
-    return [{ label: label ?? feed.id, value: queueDxn.toString() }];
+    return [{ label: label ?? feed.id, value: queueDXN.toString() }];
   });
 };