@dxos/plugin-script 0.8.2-main.5885341 → 0.8.2-main.600d381

package/src/capabilities/artifact-definition.ts

@@ -2,15 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Schema } from 'effect';
+
 import { Capabilities, contributes, createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
 import { defineArtifact, defineTool, ToolResult } from '@dxos/artifact';
 import { createArtifactElement } from '@dxos/assistant';
-import { ObjectId, S } from '@dxos/echo-schema';
-import { ScriptType } from '@dxos/functions/types';
+import { ScriptType } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { SpaceAction } from '@dxos/plugin-space/types';
 import { live, makeRef, type Space } from '@dxos/react-client/echo';
-import { TextType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 import { meta } from '../meta';
 // TODO(burdon): Factor out.
@@ -71,28 +72,28 @@ export default () => {
       <apis>
         export function defineFunction(params: { 
           description: string, 
-          inputSchema: S.Schema, 
-          outputSchema: S.Schema, 
+          inputSchema: Schema.Schema, 
+          outputSchema: Schema.Schema, 
           handler: (params: { event: { data: TInput } }) => Promise<TOutput> 
         }): FunctionDefinition
         /**
          * Effect Schema
          */
-        export const S; 
+        export const Schema; 
 
         // Examples: 
 
-        S.String
-        S.Number
-        S.Boolean
-        S.Struct({
-          from: S.String.annotations({ description: 'The source currency' }),
-          to: S.String.annotations({ description: 'The target currency' }),
+        Schema.String
+        Schema.Number
+        Schema.Boolean
+        Schema.Struct({
+          from: Schema.String.annotations({ description: 'The source currency' }),
+          to: Schema.String.annotations({ description: 'The target currency' }),
         })
-        S.Array(S.String)
-        S.Union(S.String, S.Number)
-        S.optional(S.String)
-        S.String.annotations({ description: 'The source currency' })
+        Schema.Array(Schema.String)
+        Schema.Union(Schema.String, Schema.Number)
+        Schema.optional(Schema.String)
+        Schema.String.annotations({ description: 'The source currency' })
       </apis>
 
       <handler_function>
@@ -113,13 +114,13 @@ export default () => {
         export default defineFunction({
           description: 'Returns the exchange rate between two currencies.',
 
-          inputSchema: S.Struct({
-            from: S.String.annotations({ description: 'The source currency' }),
-            to: S.String.annotations({ description: 'The target currency' }),
+          inputSchema: Schema.Struct({
+            from: Schema.String.annotations({ description: 'The source currency' }),
+            to: Schema.String.annotations({ description: 'The target currency' }),
           }),
 
-          outputSchema: S.Struct({
-            rate: S.String.annotations({ description: 'The exchange rate' }),
+          outputSchema: Schema.Struct({
+            rate: Schema.String.annotations({ description: 'The exchange rate' }),
           }),
 
           handler: async ({
@@ -143,9 +144,9 @@ export default () => {
         name: 'create',
         description: 'Create a new script. Returns the artifact definition for the script',
         caption: 'Creating script...',
-        schema: S.Struct({
-          name: S.String.annotations({ description: 'The name of the script' }),
-          code: S.String.annotations({
+        schema: Schema.Struct({
+          name: Schema.String.annotations({ description: 'The name of the script' }),
+          code: Schema.String.annotations({
             description: 'The full code of the script in JavaScript or TypeScript. Must be valid executable code.',
           }),
         }),
@@ -155,7 +156,7 @@ export default () => {
           const script = live(ScriptType, {
             name,
             source: makeRef(
-              live(TextType, {
+              live(DataType.Text, {
                 content: code,
               }),
             ),
@@ -176,8 +177,9 @@ export default () => {
         name: 'inspect',
         description: 'Inspect a script. Returns the artifact definition for the script',
         caption: 'Inspecting script...',
-        schema: S.Struct({
-          id: ObjectId,
+        schema: Schema.Struct({
+          // TODO(wittjosiah): ObjectId schema should be used here but it's not working.
+          id: Schema.String.annotations({ description: 'The ID of the script' }),
         }),
         execute: async ({ id }, { extensions }) => {
           invariant(extensions?.space, 'No space');
@@ -195,9 +197,10 @@ export default () => {
         name: 'update',
         description: 'Update a script. Returns the artifact definition for the script',
         caption: 'Updating script...',
-        schema: S.Struct({
-          id: ObjectId,
-          code: S.String.annotations({
+        schema: Schema.Struct({
+          // TODO(wittjosiah): ObjectId schema should be used here but it's not working.
+          id: Schema.String.annotations({ description: 'The ID of the script to update' }),
+          code: Schema.String.annotations({
             description: 'The full code of the script in JavaScript or TypeScript. Must be valid executable code.',
           }),
         }),

package/src/capabilities/intent-resolver.ts

@@ -3,13 +3,13 @@
 //
 
 import { Octokit } from '@octokit/core';
-import { isNotNullable } from 'effect/Predicate';
+import { Predicate } from 'effect';
 
 import { contributes, Capabilities, createResolver, createIntent, LayoutAction } from '@dxos/app-framework';
-import { ScriptType } from '@dxos/functions/types';
+import { ScriptType } from '@dxos/functions';
 import { live, makeRef } from '@dxos/live-object';
 import { TokenManagerAction } from '@dxos/plugin-token-manager/types';
-import { TextType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 import { DEPLOYMENT_DIALOG } from '../components';
 import { defaultScriptsForIntegration } from '../meta';
@@ -49,7 +49,7 @@ export default () =>
           data: {
             object: live(ScriptType, {
               name,
-              source: makeRef(live(TextType, { content })),
+              source: makeRef(live(DataType.Text, { content })),
             }),
           },
         };
@@ -60,7 +60,7 @@ export default () =>
       resolve: async ({ accessToken }) => {
         const scriptTemplates = (defaultScriptsForIntegration[accessToken.source] ?? [])
           .map((id) => templates.find((t) => t.id === id))
-          .filter(isNotNullable);
+          .filter(Predicate.isNotNullable);
 
         if (scriptTemplates.length > 0) {
           return {

package/src/capabilities/react-surface.tsx

@@ -7,11 +7,11 @@ import React from 'react';
 import { Capabilities, contributes, createSurface, useCapability } from '@dxos/app-framework';
 import { InvocationTracePanel } from '@dxos/devtools';
 import { isInstanceOf } from '@dxos/echo-schema';
-import { ScriptType } from '@dxos/functions/types';
+import { ScriptType } from '@dxos/functions';
 import { SettingsStore } from '@dxos/local-storage';
 import { getSpace } from '@dxos/react-client/echo';
 import { StackItem } from '@dxos/react-ui-stack';
-import { type AccessTokenType } from '@dxos/schema';
+import { type DataType } from '@dxos/schema';
 
 import { ScriptCapabilities } from './capabilities';
 import {
@@ -92,7 +92,7 @@ export default () =>
     createSurface({
       id: DEPLOYMENT_DIALOG,
       role: 'dialog',
-      filter: (data): data is { props: { accessToken: AccessTokenType; scriptTemplates: any } } =>
+      filter: (data): data is { props: { accessToken: DataType.AccessToken; scriptTemplates: any } } =>
         data.component === DEPLOYMENT_DIALOG,
       component: ({ data }) => <DeploymentDialog {...data.props} />,
     }),

package/src/components/DeploymentDialog/DeploymentDialog.stories.tsx

@@ -33,7 +33,7 @@ const meta: Meta = {
   title: 'plugins/plugin-script/DeploymentDialog',
   component: DeploymentDialog,
   parameters: { translations },
-  decorators: [withTheme, withLayout({ tooltips: true })],
+  decorators: [withTheme, withLayout()],
 };
 
 export default meta;

package/src/components/DeploymentDialog/DeploymentDialog.tsx

@@ -7,7 +7,7 @@ import React, { useEffect, useMemo } from 'react';
 import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
 import { getSpace } from '@dxos/react-client/echo';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
-import { type AccessTokenType } from '@dxos/schema';
+import { type DataType } from '@dxos/schema';
 
 import { useCreateAndDeployScriptTemplates } from '../../hooks/useCreateAndDeployScriptTemplates';
 import { SCRIPT_PLUGIN } from '../../meta';
@@ -21,7 +21,7 @@ export const DEPLOYMENT_DIALOG = `${SCRIPT_PLUGIN}/deployment/dialog`;
 //   - Pending / onError states.
 
 type DeploymentDialogProps = {
-  accessToken: AccessTokenType;
+  accessToken: DataType.AccessToken;
   scriptTemplates: Template[];
 };
 

package/src/components/ScriptContainer.tsx

@@ -4,7 +4,7 @@
 
 import React, { useMemo } from 'react';
 
-import { type ScriptType } from '@dxos/functions/types';
+import { type ScriptType } from '@dxos/functions';
 import { createDocAccessor, getSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { type ThemedClassName } from '@dxos/react-ui';

package/src/components/ScriptToolbar/ScriptToolbar.stories.tsx

@@ -24,7 +24,7 @@ export const Default = {
 const meta: Meta = {
   title: 'plugins/plugin-script/Toolbar',
   component: ScriptToolbar,
-  decorators: [withTheme, withLayout({ tooltips: true })],
+  decorators: [withTheme, withLayout()],
 };
 
 export default meta;

package/src/components/ScriptToolbar/ScriptToolbar.tsx

@@ -4,19 +4,21 @@
 
 import React, { useCallback } from 'react';
 
-import { type ScriptType } from '@dxos/functions/types';
+import { type ScriptType } from '@dxos/functions';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
-import { ElevationProvider, type ThemedClassName } from '@dxos/react-ui';
+import { ElevationProvider, useTranslation, type ThemedClassName } from '@dxos/react-ui';
 import { stackItemContentToolbarClassNames } from '@dxos/react-ui-editor';
 import { createGapSeparator, MenuProvider, ToolbarMenu, useMenuActions } from '@dxos/react-ui-menu';
 
 import {
+  type CreateDeployOptions,
   type ScriptToolbarState,
   createDeploy,
   createFormat,
   createTemplateSelect,
-  useToolbarAction,
+  useDeployDeps,
 } from '../../hooks';
+import { SCRIPT_PLUGIN } from '../../meta';
 
 export type ScriptToolbarProps = ThemedClassName<{
   role?: string;
@@ -24,11 +26,11 @@ export type ScriptToolbarProps = ThemedClassName<{
   state: ScriptToolbarState;
 }>;
 
-const createToolbar = (state: ScriptToolbarState) => {
-  const templateSelect = createTemplateSelect();
-  const format = createFormat();
+const createToolbar = ({ state, script, ...options }: CreateDeployOptions) => {
+  const templateSelect = createTemplateSelect(script);
+  const format = createFormat(script);
   const gap = createGapSeparator();
-  const deploy = createDeploy(state);
+  const deploy = createDeploy({ state, script, ...options });
   return {
     nodes: [...templateSelect.nodes, ...format.nodes, ...gap.nodes, ...deploy.nodes],
     edges: [...templateSelect.edges, ...format.edges, ...gap.edges, ...deploy.edges],
@@ -36,14 +38,18 @@ const createToolbar = (state: ScriptToolbarState) => {
 };
 
 export const ScriptToolbar = ({ script, role, state, classNames }: ScriptToolbarProps) => {
-  const handleAction = useToolbarAction({ state, script });
-  const toolbarCreator = useCallback(() => createToolbar(state), [state]);
+  const { t } = useTranslation(SCRIPT_PLUGIN);
+  const options = useDeployDeps({ script });
+  const toolbarCreator = useCallback(
+    () => createToolbar({ state, script, t, ...options }),
+    [state, script, options, t],
+  );
   const menu = useMenuActions(toolbarCreator);
 
   return (
     <div role='none' className={stackItemContentToolbarClassNames(role)}>
       <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>
-        <MenuProvider {...menu} onAction={handleAction} attendableId={fullyQualifiedId(script)}>
+        <MenuProvider {...menu} attendableId={fullyQualifiedId(script)}>
           <ToolbarMenu classNames={classNames} />
         </MenuProvider>
       </ElevationProvider>

package/src/components/Settings/ScriptObjectSettings.tsx

@@ -6,12 +6,12 @@ import { Octokit } from '@octokit/core';
 import React, { type ChangeEvent, useCallback, useEffect, useState } from 'react';
 
 import { createIntent, SettingsAction, useIntentDispatcher } from '@dxos/app-framework';
-import { FunctionType, type ScriptType, getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions/types';
+import { FunctionType, type ScriptType, getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
 import { Filter, getMeta, getSpace, useQuery } from '@dxos/react-client/echo';
 import { Button, Clipboard, Input, useControlledState, useTranslation } from '@dxos/react-ui';
-import { AccessTokenType } from '@dxos/schema';
+import { DataType } from '@dxos/schema';
 
 import { SCRIPT_PLUGIN } from '../../meta';
 
@@ -112,7 +112,7 @@ const Publishing = ({ object }: ScriptObjectSettingsProps) => {
   const { t } = useTranslation(SCRIPT_PLUGIN);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const space = getSpace(object);
-  const [githubToken] = useQuery(space, Filter.schema(AccessTokenType, { source: 'github.com' }));
+  const [githubToken] = useQuery(space, Filter.schema(DataType.AccessToken, { source: 'github.com' }));
   const gistKey = getMeta(object).keys.find(({ source }) => source === 'github.com');
   const [gistUrl, setGistUrl] = useState<string | undefined>();
 

package/src/hooks/deploy.ts

@@ -2,13 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useCallback, useEffect, useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 
 import { FunctionType, type ScriptType, getUserFunctionUrlInMetadata } from '@dxos/functions';
 import { log } from '@dxos/log';
-import { useClient } from '@dxos/react-client';
-import { Filter, getMeta, getSpace, useQuery } from '@dxos/react-client/echo';
-import { useTranslation } from '@dxos/react-ui';
+import { type Client, useClient } from '@dxos/react-client';
+import { Filter, getMeta, getSpace, type Space, useQuery } from '@dxos/react-client/echo';
+import { type TFunction } from '@dxos/react-ui';
 import { createMenuAction } from '@dxos/react-ui-menu';
 import { errorMessageColors } from '@dxos/react-ui-theme';
 
@@ -24,28 +24,68 @@ export type DeployState = {
   error: string;
 };
 
-export const createDeploy = (state: Partial<DeployState>) => {
-  const errorItem = createMenuAction('error', {
+export type CreateDeployOptions = {
+  state: Partial<DeployState>;
+  script: ScriptType;
+  fn: FunctionType;
+  space?: Space;
+  existingFunctionUrl?: string;
+  client: Client;
+  t: TFunction;
+};
+
+export const createDeploy = ({ state, script, space, fn, client, existingFunctionUrl, t }: CreateDeployOptions) => {
+  // TODO(wittjosiah): Should this be an action?
+  const errorItem = createMenuAction('error', () => {}, {
     label: state.error ?? ['no error label', { ns: SCRIPT_PLUGIN }],
     icon: 'ph--warning-circle--regular',
     hidden: !state.error,
     classNames: state.error && errorMessageColors,
   });
 
-  const deployAction = createMenuAction<DeployActionProperties>('deploy', {
-    type: 'deploy',
-    label: [state.deploying ? 'pending label' : 'deploy label', { ns: SCRIPT_PLUGIN }],
-    icon: state.deploying ? 'ph--spinner-gap--regular' : 'ph--cloud-arrow-up--regular',
-    disabled: state.deploying,
-    classNames: state.deploying ? '[&_svg]:animate-spin' : '',
-  });
-
-  const copyAction = createMenuAction<DeployActionProperties>('copy', {
-    type: 'copy',
-    label: ['copy link label', { ns: SCRIPT_PLUGIN }],
-    icon: 'ph--link--regular',
-    disabled: !state.functionUrl,
-  });
+  const deployAction = createMenuAction<DeployActionProperties>(
+    'deploy',
+    async () => {
+      if (!script.source || !space) {
+        return;
+      }
+
+      state.error = undefined;
+      state.deploying = true;
+
+      const result = await deployScript({ script, client, space, fn, existingFunctionUrl });
+
+      if (!result.success) {
+        log.catch(result.error);
+        state.error = t('upload failed label');
+      }
+
+      state.deploying = false;
+    },
+    {
+      type: 'deploy',
+      label: [state.deploying ? 'pending label' : 'deploy label', { ns: SCRIPT_PLUGIN }],
+      icon: state.deploying ? 'ph--spinner-gap--regular' : 'ph--cloud-arrow-up--regular',
+      disabled: state.deploying,
+      classNames: state.deploying ? '[&_svg]:animate-spin' : '',
+    },
+  );
+
+  const copyAction = createMenuAction<DeployActionProperties>(
+    'copy',
+    async () => {
+      if (!state.functionUrl) {
+        return;
+      }
+      await navigator.clipboard.writeText(state.functionUrl);
+    },
+    {
+      type: 'copy',
+      label: ['copy link label', { ns: SCRIPT_PLUGIN }],
+      icon: 'ph--link--regular',
+      disabled: !state.functionUrl,
+    },
+  );
 
   return {
     nodes: [errorItem, deployAction, copyAction],
@@ -83,37 +123,3 @@ export const useDeployDeps = ({ script }: { script: ScriptType }) => {
   const existingFunctionUrl = useMemo(() => fn && getUserFunctionUrlInMetadata(getMeta(fn)), [fn]);
   return { space, fn, client, existingFunctionUrl };
 };
-
-/**
- * Manage EDGE function deployment.
- */
-export const useDeployHandler = ({ state, script }: { state: Partial<DeployState>; script: ScriptType }) => {
-  const { space, fn, client, existingFunctionUrl } = useDeployDeps({ script });
-  const { t } = useTranslation(SCRIPT_PLUGIN);
-
-  return useCallback(async () => {
-    if (!script.source || !space) {
-      return;
-    }
-
-    state.error = undefined;
-    state.deploying = true;
-
-    const result = await deployScript({ script, client, space, fn, existingFunctionUrl });
-
-    if (!result.success) {
-      log.catch(result.error);
-      state.error = t('upload failed label');
-    }
-
-    state.deploying = false;
-  }, [fn, client, t, existingFunctionUrl, script, space]);
-};
-
-export const useCopyHandler = ({ state }: { state: Partial<DeployState> }) =>
-  useCallback(async () => {
-    if (!state.functionUrl) {
-      return;
-    }
-    await navigator.clipboard.writeText(state.functionUrl);
-  }, [state.functionUrl]);

package/src/hooks/format.ts

@@ -5,9 +5,8 @@
 import { format } from 'prettier';
 import prettierPluginEstree from 'prettier/plugins/estree';
 import prettierPluginTypescript from 'prettier/plugins/typescript';
-import { useCallback } from 'react';
 
-import { type ScriptType } from '@dxos/functions/types';
+import { type ScriptType } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { createMenuAction } from '@dxos/react-ui-menu';
 
@@ -15,33 +14,34 @@ import { SCRIPT_PLUGIN } from '../meta';
 
 export type FormatActionProperties = { type: 'format' };
 
-export const createFormat = () => {
-  const formatAction = createMenuAction('format', {
-    label: ['format label', { ns: SCRIPT_PLUGIN }],
-    icon: 'ph--magic-wand--regular',
-  });
+export const createFormat = (script: ScriptType) => {
+  const formatAction = createMenuAction(
+    'format',
+    async () => {
+      if (!script.source) {
+        return;
+      }
+
+      try {
+        script.source.target!.content = await format(script.source.target!.content, {
+          parser: 'typescript',
+          plugins: [prettierPluginEstree, prettierPluginTypescript],
+          semi: true,
+          singleQuote: true,
+        });
+      } catch (err: any) {
+        // TODO(wittjosiah): Show error in UI.
+        log.catch(err);
+      }
+    },
+    {
+      label: ['format label', { ns: SCRIPT_PLUGIN }],
+      icon: 'ph--magic-wand--regular',
+    },
+  );
 
   return {
     nodes: [formatAction],
     edges: [{ source: 'root', target: 'format' }],
   };
 };
-
-export const useFormatHandler = ({ script }: { script: ScriptType }) =>
-  useCallback(async () => {
-    if (!script.source) {
-      return;
-    }
-
-    try {
-      script.source.target!.content = await format(script.source.target!.content, {
-        parser: 'typescript',
-        plugins: [prettierPluginEstree, prettierPluginTypescript],
-        semi: true,
-        singleQuote: true,
-      });
-    } catch (err: any) {
-      // TODO(wittjosiah): Show error in UI.
-      log.catch(err);
-    }
-  }, [script.source]);

package/src/hooks/index.ts

@@ -7,5 +7,4 @@ export * from './format';
 export * from './template';
 
 export * from './useCreateAndDeployScriptTemplates';
-export * from './useToolbarAction';
 export * from './useToolbarState';

package/src/hooks/template.ts

@@ -2,9 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useCallback } from 'react';
-
-import { FUNCTIONS_PRESET_META_KEY, type ScriptType } from '@dxos/functions/types';
+import { FUNCTIONS_PRESET_META_KEY, type ScriptType } from '@dxos/functions';
 import { getMeta } from '@dxos/live-object';
 import { createMenuItemGroup, createMenuAction } from '@dxos/react-ui-menu';
 
@@ -20,19 +18,34 @@ const createTemplateSelectGroup = () => {
   });
 };
 
-const createTemplateSelectActions = () => {
+const createTemplateSelectActions = (script: ScriptType) => {
   return templates.map((template) => {
-    return createMenuAction<TemplateActionProperties>(`template--${template.id}`, {
-      label: template.name,
-      value: template.id,
-      type: 'template',
-    });
+    return createMenuAction<TemplateActionProperties>(
+      `template--${template.id}`,
+      () => {
+        script.name = template.name;
+        script.source!.target!.content = template.source;
+        const metaKeys = getMeta(script).keys;
+        const oldPresetIndex = metaKeys.findIndex((key) => key.source === FUNCTIONS_PRESET_META_KEY);
+        if (oldPresetIndex >= 0) {
+          metaKeys.splice(oldPresetIndex, 1);
+        }
+        if (template.presetId) {
+          metaKeys.push({ source: FUNCTIONS_PRESET_META_KEY, id: template.presetId });
+        }
+      },
+      {
+        label: template.name,
+        value: template.id,
+        type: 'template',
+      },
+    );
   });
 };
 
-export const createTemplateSelect = () => {
+export const createTemplateSelect = (script: ScriptType) => {
   const templateSelectGroup = createTemplateSelectGroup();
-  const templateSelectActions = createTemplateSelectActions();
+  const templateSelectActions = createTemplateSelectActions(script);
   return {
     nodes: [templateSelectGroup, ...templateSelectActions],
     edges: [
@@ -41,24 +54,3 @@ export const createTemplateSelect = () => {
     ],
   };
 };
-
-export const useTemplateSelectHandler = ({ script }: { script: ScriptType }) => {
-  return useCallback(
-    (templateId: string) => {
-      const template = templates.find((template) => template.id === templateId);
-      if (template) {
-        script.name = template.name;
-        script.source!.target!.content = template.source;
-        const metaKeys = getMeta(script).keys;
-        const oldPresetIndex = metaKeys.findIndex((key) => key.source === FUNCTIONS_PRESET_META_KEY);
-        if (oldPresetIndex >= 0) {
-          metaKeys.splice(oldPresetIndex, 1);
-        }
-        if (template.presetId) {
-          metaKeys.push({ source: FUNCTIONS_PRESET_META_KEY, id: template.presetId });
-        }
-      }
-    },
-    [script],
-  );
-};

package/src/templates/discord.ts

@@ -3,7 +3,7 @@
 //
 
 // @ts-ignore
-import { create, EchoObject, defineFunction, DXN, Filter, ObjectId, S } from 'dxos:functions';
+import { create, defineFunction, DXN, Filter, ObjectId, S } from 'dxos:functions';
 import {
   FetchHttpClient,
   // @ts-ignore
@@ -13,13 +13,20 @@ import { DiscordConfig, DiscordREST, DiscordRESTMemoryLive } from 'https://esm.s
 // @ts-ignore
 import { Effect, Config, Redacted, Ref } from 'https://esm.sh/effect@3.13.3';
 
+import { Type } from '@dxos/echo';
+
 const MessageSchema = S.Struct({
-  id: S.String,
+  id: ObjectId,
   foreignId: S.Any, // bigint?
   from: S.String,
   created: S.String,
   content: S.String,
-}).pipe(EchoObject({ typename: 'example.com/type/Message', version: '0.1.0' }));
+}).pipe(
+  Type.def({
+    typename: 'example.com/type/Message',
+    version: '0.1.0',
+  }),
+);
 
 const DEFAULT_AFTER = 1704067200; // 2024-01-01
 

package/src/templates/forex-effect.ts

@@ -3,7 +3,7 @@
 //
 
 // @ts-ignore
-import { defineFunction, S } from 'dxos:functions';
+import { S, defineFunction } from 'dxos:functions';
 import {
   HttpClient,
   HttpClientRequest,