@dxos/plugin-script 0.8.2-main.f11618f → 0.8.2-staging.42af850

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

@@ -12,8 +12,8 @@ export const meta: PluginMeta = {
   description:
     'Scripts in Composer allow you to deploy custom functions that run on the edge. These functions can be referenced by your AI agent and called inside of cells in any Sheet. Use scripts to interact with API’s or external data inside of Composer.',
   icon: 'ph--code--regular',
-  source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/experimental/plugin-explorer',
-  tags: ['experimental'],
+  source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-explorer',
+  tags: ['labs'],
   screenshots: ['https://dxos.network/plugin-details-scripts-dark.png'],
 };
 

package/src/templates/chat.ts

@@ -3,21 +3,15 @@
 //
 
 // @ts-ignore
-import { transformServerSentEvents } from 'https://esm.sh/@dxos/script-toolbox';
+import { transformServerSentEvents } from 'https://esm.sh/@dxos/script-toolbox?bundle=false';
 
 /**
  * Chatbot that answers questions based on the context data.
  */
-export default async ({
-  event: {
-    data: { request },
-  },
-  context: { space, ai },
-}: any) => {
-  const textBody = await request.text();
+export default async ({ data: { bodyText }, context: { space, ai } }: any) => {
   let parsedRequest: any;
   try {
-    parsedRequest = JSON.parse(textBody);
+    parsedRequest = JSON.parse(bodyText);
   } catch (err) {
     const answer = await ai.run('@cf/meta/llama-3.1-8b-instruct', {
       stream: true,
@@ -29,7 +23,7 @@ export default async ({
      ${await getContext({ space })}
 
      QUESTION:
-     ${textBody}
+     ${bodyText}
     `,
     });
     return new Response(transformServerSentEvents(answer));

package/src/templates/chess.ts

@@ -5,7 +5,7 @@
 // @ts-ignore
 import { defineFunction, S } from 'dxos:functions';
 // @ts-ignore
-import { Chess } from 'https://esm.sh/chess.js@0.13.1';
+import { Chess } from 'https://esm.sh/chess.js@0.13.1?bundle=false';
 
 export default defineFunction({
   description: 'Plays a random move in a chess game.',
@@ -25,12 +25,7 @@ export default defineFunction({
     }),
   }),
 
-  handler: async ({
-    event: {
-      data: { changedObjectId, player = 'b' },
-    },
-    context: { space },
-  }: any) => {
+  handler: async ({ data: { changedObjectId, player = 'b' }, context: { space } }: any) => {
     const { pgn } = await space.db.query({ id: changedObjectId }).first();
     const game = new Chess();
     game.load_pgn(pgn);

package/src/templates/data-generator.ts

@@ -5,7 +5,7 @@
 // @ts-ignore
 import { defineFunction, S, create, Expando } from 'dxos:functions';
 // @ts-ignore
-import { randText } from 'https://esm.sh/@ngneat/falso@7.1.1';
+import { randText } from 'https://esm.sh/@ngneat/falso@7.1.1?bundle=false';
 
 export default defineFunction({
   inputSchema: S.Struct({
@@ -16,12 +16,7 @@ export default defineFunction({
 
   outputSchema: S.Struct({}),
 
-  handler: async ({
-    event: {
-      data: { documentAmount = 1, textSize = 10, mutationAmount = 0 },
-    },
-    context: { space },
-  }: any) => {
+  handler: async ({ data: { documentAmount = 1, textSize = 10, mutationAmount = 0 }, context: { space } }: any) => {
     await space.db.graph.schemaRegistry.addSchema([Expando]);
     const result: Record<string, any> = {};
     const objects: Expando[] = [];

package/src/templates/discord.ts

@@ -3,23 +3,30 @@
 //
 
 // @ts-ignore
-import { create, EchoObject, defineFunction, DXN, Filter, ObjectId, S } from 'dxos:functions';
+import { create, defineFunction, DXN, EchoObject, Filter, ObjectId, S } from 'dxos:functions';
+// @ts-ignore
+import { FetchHttpClient } from 'https://esm.sh/@effect/platform@0.77.2?deps=effect@3.14.21&bundle=false';
 import {
-  FetchHttpClient,
+  DiscordConfig,
+  DiscordREST,
+  DiscordRESTMemoryLive,
   // @ts-ignore
-} from 'https://esm.sh/@effect/platform@0.77.2?deps=effect@3.13.3';
-// @ts-ignore
-import { DiscordConfig, DiscordREST, DiscordRESTMemoryLive } from 'https://esm.sh/dfx@0.113.0?deps=effect@3.13.3';
+} from 'https://esm.sh/dfx@0.113.0?deps=effect@3.14.21&bundle=false';
 // @ts-ignore
-import { Effect, Config, Redacted, Ref } from 'https://esm.sh/effect@3.13.3';
+import { Effect, Config, Redacted, Ref } from 'https://esm.sh/effect@3.14.21?bundle=false';
 
 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(
+  EchoObject({
+    typename: 'example.com/type/Message',
+    version: '0.1.0',
+  }),
+);
 
 const DEFAULT_AFTER = 1704067200; // 2024-01-01
 
@@ -42,12 +49,7 @@ export default defineFunction({
     newMessages: S.Number,
   }),
 
-  handler: ({
-    event: {
-      data: { channelId, queueId, after = DEFAULT_AFTER, pageSize = 5 },
-    },
-    context: { space },
-  }: any) =>
+  handler: ({ data: { channelId, queueId, after = DEFAULT_AFTER, pageSize = 5 }, context: { space } }: any) =>
     Effect.gen(function* () {
       const { token } = yield* Effect.tryPromise({
         try: () => space.db.query(Filter.typename('dxos.org/type/AccessToken', { source: 'discord.com' })).first(),

package/src/templates/echo.ts

@@ -5,15 +5,4 @@
 /**
  * Echos the request data.
  */
-export default async ({
-  event: {
-    data: { request },
-  },
-}: any) => {
-  const data = await request.json();
-  return new Response(JSON.stringify(data ?? {}), {
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-};
+export default async ({ data }: any) => data;

package/src/templates/email.ts

@@ -6,15 +6,9 @@
  * Appends a message to the end of a Document configured through a trigger.
  * Trigger must have a targetDocumentId field set in Meta.
  */
-export default async ({
-  event: {
-    data: { request },
-  },
-  context: { space },
-}: any) => {
-  const { data, trigger } = (await request.json()) as RequestPayload;
+export default async ({ data: { bodyText }, context: { space } }: any) => {
+  const { email, targetDocumentId: documentId } = JSON.parse(bodyText) as RequestPayload;
 
-  const documentId = trigger.meta.targetDocumentId;
   const document = await space.db.query({ id: documentId }, { format: 'plain' }).first();
 
   const contentId = document.content['/'].split(':')[3];
@@ -23,11 +17,11 @@ export default async ({
     documentContent.content,
     '',
     '---',
-    `**From:** ${data.from}`,
-    `**Subject:** ${data.subject}`,
-    `**Date:** ${data.created}`,
+    `**From:** ${email.from}`,
+    `**Subject:** ${email.subject}`,
+    `**Date:** ${email.created}`,
     '',
-    data.body,
+    email.body,
   ].join('\n');
 
   await space.db.update({ id: contentId }, { content: modifiedContent });
@@ -36,6 +30,6 @@ export default async ({
 };
 
 type RequestPayload = {
-  data: { from: string; subject: string; created: string; body: string };
-  trigger: { meta: { targetDocumentId: string } };
+  email: { from: string; subject: string; created: string; body: string };
+  targetDocumentId: string;
 };

package/src/templates/forex-effect.ts

@@ -3,15 +3,15 @@
 //
 
 // @ts-ignore
-import { defineFunction, S } from 'dxos:functions';
+import { S, defineFunction } from 'dxos:functions';
 import {
   HttpClient,
   HttpClientRequest,
   FetchHttpClient,
   // @ts-ignore
-} from 'https://esm.sh/@effect/platform@0.77.2?deps=effect@3.13.3';
+} from 'https://esm.sh/@effect/platform@0.77.2?deps=effect@3.14.21&bundle=false';
 // @ts-ignore
-import { Effect, Schedule } from 'https://esm.sh/effect@3.13.3';
+import { Effect, Schedule } from 'https://esm.sh/effect@3.14.21?bundle=false';
 
 export default defineFunction({
   description: 'Returns the exchange rate between two currencies.',
@@ -23,11 +23,7 @@ export default defineFunction({
 
   outputSchema: S.String.annotations({ description: 'The exchange rate between the two currencies' }),
 
-  handler: async ({
-    event: {
-      data: { from, to },
-    },
-  }: any) =>
+  handler: async ({ data: { from, to } }: any) =>
     Effect.gen(function* () {
       const res = yield* HttpClientRequest.get(`https://free.ratesdb.com/v1/rates?from=${from}&to=${to}`).pipe(
         HttpClient.execute,

package/src/templates/forex.ts

@@ -13,11 +13,7 @@ export default defineFunction({
     to: S.String.annotations({ description: 'The target currency' }),
   }),
 
-  handler: async ({
-    event: {
-      data: { from, to },
-    },
-  }: any) => {
+  handler: async ({ data: { from, to } }: any) => {
     const res = await fetch(`https://free.ratesdb.com/v1/rates?from=${from}&to=${to}`);
     const {
       data: { rates },

package/src/templates/gmail.ts

@@ -4,47 +4,45 @@
 
 // @ts-ignore
 import { create, defineFunction, EchoObject, Filter, ObjectId, S } from 'dxos:functions';
+// @ts-ignore
 import {
   HttpClient,
   HttpClientRequest,
   FetchHttpClient,
   // @ts-ignore
-} from 'https://esm.sh/@effect/platform@0.77.2?deps=effect@3.13.3';
+} from 'https://esm.sh/@effect/platform@0.77.2?deps=effect@3.14.21&bundle=false';
 // @ts-ignore
-import { pipe, Chunk, Effect, Ref, Schedule, Stream } from 'https://esm.sh/effect@3.13.3';
-
-// TODO(ZaymonFC): Calculate this dynamically and expose a parameter.
-const DEFAULT_AFTER = '2025-01-01';
+import { format, subDays } from 'https://esm.sh/date-fns@3.3.1?bundle=false';
+// @ts-ignore
+import { pipe, Chunk, Effect, Ref, Schedule, Stream } from 'https://esm.sh/effect@3.14.21?bundle=false';
 
 export default defineFunction({
   inputSchema: S.Struct({
+    mailboxId: S.String,
+    userId: S.optional(S.String).pipe(S.withDecodingDefault(() => 'me')),
+    after: S.optional(S.Union(S.Number, S.String)).pipe(
+      S.withDecodingDefault(() => format(subDays(new Date(), 30), 'yyyy-MM-dd')),
+    ),
+    pageSize: S.optional(S.Number).pipe(S.withDecodingDefault(() => 100)),
     // TODO(wittjosiah): Remove. This is used to provide a terminal for a cron trigger.
     tick: S.optional(S.String),
-    userId: S.optional(S.String),
-    after: S.optional(S.Union(S.Number, S.String)),
-    pageSize: S.optional(S.Number),
-    mailboxId: S.String,
   }),
 
   outputSchema: S.Struct({
     newMessages: S.Number,
   }),
 
-  handler: ({
-    event: {
-      data: { mailboxId, userId = 'me', after = DEFAULT_AFTER, pageSize = 100 },
-    },
-    context: { space },
-  }: any) =>
+  handler: ({ context: { space }, data: { mailboxId, userId, after, pageSize } }: any) =>
     Effect.gen(function* () {
       const { token } = yield* Effect.tryPromise({
         try: () => space.db.query(Filter.typename('dxos.org/type/AccessToken', { source: 'gmail.com' })).first(),
         catch: (e: any) => e,
       });
 
-      const makeRequest = (path: string) =>
+      // NOTE: Google API bundles size is v. large and caused runtime issues.
+      const makeRequest = (url: string) =>
         pipe(
-          path,
+          url,
           HttpClientRequest.get,
           HttpClientRequest.setHeaders({ Authorization: `Bearer ${token}`, Accept: 'application/json' }),
           HttpClient.execute,
@@ -54,13 +52,10 @@ export default defineFunction({
           Effect.scoped,
         );
 
-      const listMessages = (userId: string, q: string, pageSize: number, pageToken: string | null) => {
-        const url = `https://gmail.googleapis.com/gmail/v1/users/${userId}/messages?maxResults=${pageSize}&q=${q}`;
-        return makeRequest(pageToken ? `${url}&pageToken=${pageToken}` : url);
-      };
+      const listMessages = (userId: string, q: string, pageSize: number, pageToken: string | null) =>
+        makeRequest(getUrl(userId, undefined, { q, pageSize, pageToken }));
 
-      const getMessage = (userId: string, id: string) =>
-        makeRequest(`https://gmail.googleapis.com/gmail/v1/users/${userId}/messages/${id}`);
+      const getMessage = (userId: string, messageId: string) => makeRequest(getUrl(userId, messageId));
 
       const mailbox = yield* Effect.tryPromise({
         try: () => space.db.query({ id: mailboxId }).first(),
@@ -137,6 +132,16 @@ export default defineFunction({
     }).pipe(Effect.provide(FetchHttpClient.layer)),
 });
 
+const getUrl = (userId: string, messageId?: string, params?: Record<string, any>) => {
+  const api = new URL(
+    [`https://gmail.googleapis.com/gmail/v1/users/${userId}/messages`, messageId].filter(Boolean).join('/'),
+  );
+  Object.entries(params ?? {})
+    .filter(([_, value]) => value != null)
+    .forEach(([key, value]) => api.searchParams.set(key, value));
+  return api.toString();
+};
+
 /**
  * Parses an email string in the format "Name <email@example.com>" into separate name and email components.
  */
@@ -153,10 +158,9 @@ const parseEmailString = (emailString: string): { name?: string; email: string }
   return undefined;
 };
 
-// TODO(wittjosiah): These schemas should be imported from @dxos/schema.
-
 //
 // Schemas
+// TODO(wittjosiah): These schemas should be imported from @dxos/S.
 //
 
 const ActorRoles = ['user', 'assistant'] as const;
@@ -240,5 +244,10 @@ const MessageType = S.Struct({
       }),
     ),
   ),
-}).pipe(EchoObject({ typename: 'dxos.org/type/Message', version: '0.1.0' }));
+}).pipe(
+  EchoObject({
+    typename: 'dxos.org/type/Message',
+    version: '0.1.0',
+  }),
+);
 type MessageType = S.Schema.Type<typeof MessageType>;

package/src/translations.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { ScriptType } from '@dxos/functions/types';
+import { ScriptType } from '@dxos/functions';
 
 import { SCRIPT_PLUGIN } from './meta';
 

package/src/types.ts

@@ -2,11 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import { TitleAnnotationId } from 'effect/SchemaAST';
+import { Schema } from 'effect';
 
 import { SpaceSchema } from '@dxos/client/echo';
-import { S } from '@dxos/echo-schema';
-import { ScriptType } from '@dxos/functions/types';
+import { ScriptType } from '@dxos/functions';
 import { EditorInputMode } from '@dxos/react-ui-editor';
 
 import { SCRIPT_PLUGIN } from './meta';
@@ -17,27 +16,27 @@ export { SCRIPT_PLUGIN };
 export namespace ScriptAction {
   const SCRIPT_ACTION = `${SCRIPT_PLUGIN}/action`;
 
-  export const CreateScriptSchema = S.Struct({
-    name: S.optional(S.String),
+  export const CreateScriptSchema = Schema.Struct({
+    name: Schema.optional(Schema.String),
     // TODO(wittjosiah): Placeholder annotation?
-    gistUrl: S.optional(S.String.annotations({ [TitleAnnotationId]: 'Import from Gist (url)' })),
-    initialTemplateId: S.optional(S.String),
+    gistUrl: Schema.optional(Schema.String.annotations({ title: 'Import from Gist (url)' })),
+    initialTemplateId: Schema.optional(Schema.String),
   });
 
-  export type CreateScriptProps = S.Schema.Type<typeof CreateScriptSchema>;
+  export type CreateScriptProps = Schema.Schema.Type<typeof CreateScriptSchema>;
 
-  export class Create extends S.TaggedClass<Create>()(`${SCRIPT_ACTION}/create`, {
-    input: S.extend(CreateScriptSchema, S.Struct({ space: SpaceSchema })),
-    output: S.Struct({
+  export class Create extends Schema.TaggedClass<Create>()(`${SCRIPT_ACTION}/create`, {
+    input: Schema.extend(CreateScriptSchema, Schema.Struct({ space: SpaceSchema })),
+    output: Schema.Struct({
       object: ScriptType,
     }),
   }) {}
 }
 
-export const ScriptSettingsSchema = S.mutable(
-  S.Struct({
+export const ScriptSettingsSchema = Schema.mutable(
+  Schema.Struct({
     editorInputMode: EditorInputMode,
   }),
 );
 
-export type ScriptSettingsProps = S.Schema.Type<typeof ScriptSettingsSchema>;
+export type ScriptSettingsProps = Schema.Schema.Type<typeof ScriptSettingsSchema>;

package/src/util/deploy.ts

@@ -7,12 +7,11 @@ import {
   FunctionType,
   type ScriptType,
   getUserFunctionUrlInMetadata,
-  incrementSemverPatch,
   makeFunctionUrl,
   setUserFunctionUrlInMetadata,
-  uploadWorkerFunction,
 } from '@dxos/functions';
 import { Bundler } from '@dxos/functions/bundler';
+import { incrementSemverPatch, uploadWorkerFunction } from '@dxos/functions/edge';
 import { log } from '@dxos/log';
 import { live, getMeta, makeRef, type Space } from '@dxos/react-client/echo';
 
@@ -58,7 +57,7 @@ export const deployScript = async ({
 
     const { functionId, version, meta } = await uploadWorkerFunction({
       client,
-      spaceId: space.id,
+      ownerPublicKey: space.key,
       version: fn ? incrementSemverPatch(fn.version) : '0.0.1',
       functionId: existingFunctionId,
       source: bundle,
@@ -72,7 +71,7 @@ export const deployScript = async ({
     script.changed = false;
     updateFunctionMetadata(script, storedFunction, meta, functionId);
 
-    const functionUrl = makeFunctionUrl(space.id, { functionId });
+    const functionUrl = makeFunctionUrl({ functionId });
     setUserFunctionUrlInMetadata(getMeta(storedFunction), functionUrl);
 
     return { success: true, functionUrl };

package/dist/lib/browser/DeploymentDialog-QEKJ54ZB.mjs

@@ -1,12 +0,0 @@
-import {
-  DEPLOYMENT_DIALOG,
-  DeploymentDialog_default
-} from "./chunk-OZEMT3NO.mjs";
-import "./chunk-SXS6PUU5.mjs";
-import "./chunk-ZFTDU4WS.mjs";
-import "./chunk-KJMVDGRB.mjs";
-export {
-  DEPLOYMENT_DIALOG,
-  DeploymentDialog_default as default
-};
-//# sourceMappingURL=DeploymentDialog-QEKJ54ZB.mjs.map