@dxos/plugin-script 0.8.2-main.12df754 → 0.8.2-main.2f9c567

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.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.tsx

@@ -4,7 +4,7 @@
 
 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 { stackItemContentToolbarClassNames } from '@dxos/react-ui-editor';

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

@@ -7,7 +7,7 @@ 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';
 

package/src/hooks/template.ts

@@ -4,7 +4,7 @@
 
 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';
 

package/src/hooks/useToolbarAction.ts

@@ -4,7 +4,7 @@
 
 import { useCallback } from 'react';
 
-import { type ScriptType } from '@dxos/functions/types';
+import { type ScriptType } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { type MenuAction, type MenuActionHandler } from '@dxos/react-ui-menu';
 

package/src/templates/chess.ts

@@ -2,25 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Schema } from 'effect';
 // @ts-ignore
-import { defineFunction, S } from 'dxos:functions';
+import { defineFunction } from 'dxos:functions';
 // @ts-ignore
 import { Chess } from 'https://esm.sh/chess.js@0.13.1';
 
 export default defineFunction({
   description: 'Plays a random move in a chess game.',
 
-  inputSchema: S.Struct({
-    changedObjectId: S.String.annotations({
+  inputSchema: Schema.Struct({
+    changedObjectId: Schema.String.annotations({
       description: 'The objects to play the game on.',
     }),
-    player: S.optional(S.Literal('w', 'b')).annotations({
+    player: Schema.optional(Schema.Literal('w', 'b')).annotations({
       description: 'The player to play the game as.',
     }),
   }),
 
-  outputSchema: S.Struct({
-    state: S.String.annotations({
+  outputSchema: Schema.Struct({
+    state: Schema.String.annotations({
       description: 'The state of the game as an ASCII art board.',
     }),
   }),

package/src/templates/data-generator.ts

@@ -2,19 +2,20 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Schema } from 'effect';
 // @ts-ignore
 import { defineFunction, S, create, Expando } from 'dxos:functions';
 // @ts-ignore
 import { randText } from 'https://esm.sh/@ngneat/falso@7.1.1';
 
 export default defineFunction({
-  inputSchema: S.Struct({
-    documentAmount: S.optional(S.Number),
-    textSize: S.optional(S.Number),
-    mutationAmount: S.optional(S.Number),
+  inputSchema: Schema.Struct({
+    documentAmount: Schema.optional(Schema.Number),
+    textSize: Schema.optional(Schema.Number),
+    mutationAmount: Schema.optional(Schema.Number),
   }),
 
-  outputSchema: S.Struct({}),
+  outputSchema: Schema.Struct({}),
 
   handler: async ({
     event: {

package/src/templates/discord.ts

@@ -2,8 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Schema } from 'effect';
 // @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 +14,20 @@ import { DiscordConfig, DiscordREST, DiscordRESTMemoryLive } from 'https://esm.s
 // @ts-ignore
 import { Effect, Config, Redacted, Ref } from 'https://esm.sh/effect@3.13.3';
 
-const MessageSchema = S.Struct({
-  id: S.String,
-  foreignId: S.Any, // bigint?
-  from: S.String,
-  created: S.String,
-  content: S.String,
-}).pipe(EchoObject({ typename: 'example.com/type/Message', version: '0.1.0' }));
+import { Type } from '@dxos/echo';
+
+const MessageSchema = Schema.Struct({
+  id: ObjectId,
+  foreignId: Schema.Any, // bigint?
+  from: Schema.String,
+  created: Schema.String,
+  content: Schema.String,
+}).pipe(
+  Type.def({
+    typename: 'example.com/type/Message',
+    version: '0.1.0',
+  }),
+);
 
 const DEFAULT_AFTER = 1704067200; // 2024-01-01
 
@@ -29,17 +37,17 @@ const generateSnowflake = (unixTimestamp: number): bigint => {
 };
 
 export default defineFunction({
-  inputSchema: S.Struct({
+  inputSchema: Schema.Struct({
     // TODO(wittjosiah): Remove. This is used to provide a terminal for a cron trigger.
-    tick: S.optional(S.String),
-    channelId: S.String,
-    after: S.optional(S.Number),
-    pageSize: S.optional(S.Number),
-    queueId: S.String,
+    tick: Schema.optional(Schema.String),
+    channelId: Schema.String,
+    after: Schema.optional(Schema.Number),
+    pageSize: Schema.optional(Schema.Number),
+    queueId: Schema.String,
   }),
 
-  outputSchema: S.Struct({
-    newMessages: S.Number,
+  outputSchema: Schema.Struct({
+    newMessages: Schema.Number,
   }),
 
   handler: ({

package/src/templates/forex-effect.ts

@@ -2,8 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Schema } from 'effect';
 // @ts-ignore
-import { defineFunction, S } from 'dxos:functions';
+import { defineFunction } from 'dxos:functions';
 import {
   HttpClient,
   HttpClientRequest,
@@ -16,12 +17,12 @@ import { Effect, Schedule } from 'https://esm.sh/effect@3.13.3';
 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.String.annotations({ description: 'The exchange rate between the two currencies' }),
+  outputSchema: Schema.String.annotations({ description: 'The exchange rate between the two currencies' }),
 
   handler: async ({
     event: {

package/src/templates/forex.ts

@@ -2,15 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Schema } from 'effect';
 // @ts-ignore
-import { defineFunction, S } from 'dxos:functions';
+import { defineFunction } from 'dxos:functions';
 
 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' }),
   }),
 
   handler: async ({