@dxos/plugin-script 0.8.2-main.36232bc → 0.8.2-main.5ca3450

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/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,

package/src/templates/gmail.ts

@@ -3,7 +3,8 @@
 //
 
 // @ts-ignore
-import { create, defineFunction, EchoObject, Filter, ObjectId, S } from 'dxos:functions';
+import { create, defineFunction, Filter, ObjectId, S } from 'dxos:functions';
+// @ts-ignore
 import {
   HttpClient,
   HttpClientRequest,
@@ -11,19 +12,22 @@ import {
   // @ts-ignore
 } from 'https://esm.sh/@effect/platform@0.77.2?deps=effect@3.13.3';
 // @ts-ignore
+import { format, subDays } from 'https://esm.sh/date-fns@3.3.1';
+// @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 { Type } from '@dxos/echo';
 
 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({
@@ -31,10 +35,10 @@ export default defineFunction({
   }),
 
   handler: ({
+    context: { space },
     event: {
-      data: { mailboxId, userId = 'me', after = DEFAULT_AFTER, pageSize = 100 },
+      data: { mailboxId, userId, after, pageSize },
     },
-    context: { space },
   }: any) =>
     Effect.gen(function* () {
       const { token } = yield* Effect.tryPromise({
@@ -42,9 +46,10 @@ export default defineFunction({
         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 +59,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 +139,14 @@ 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 ?? {}).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,15 +163,14 @@ 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;
 const ActorRole = S.Literal(...ActorRoles);
-type ActorRole = S.Schema.Type<typeof ActorRole>;
+type ActorRole = S.S.Type<typeof ActorRole>;
 
 const ActorSchema = S.Struct({
   identityKey: S.optional(S.String),
@@ -173,7 +182,7 @@ const ActorSchema = S.Struct({
 const AbstractContentBlock = S.Struct({
   pending: S.optional(S.Boolean),
 });
-type AbstractContentBlock = S.Schema.Type<typeof AbstractContentBlock>;
+type AbstractContentBlock = S.S.Type<typeof AbstractContentBlock>;
 const TextContentBlock = S.extend(
   AbstractContentBlock,
   S.Struct({
@@ -182,7 +191,7 @@ const TextContentBlock = S.extend(
     text: S.String,
   }),
 ).pipe(S.mutable);
-type TextContentBlock = S.Schema.Type<typeof TextContentBlock>;
+type TextContentBlock = S.S.Type<typeof TextContentBlock>;
 const JsonContentBlock = S.extend(
   AbstractContentBlock,
   S.Struct({
@@ -191,7 +200,7 @@ const JsonContentBlock = S.extend(
     data: S.String,
   }),
 ).pipe(S.mutable);
-type JsonContentBlock = S.Schema.Type<typeof JsonContentBlock>;
+type JsonContentBlock = S.S.Type<typeof JsonContentBlock>;
 const Base64ImageSource = S.Struct({
   type: S.Literal('base64'),
   mediaType: S.String,
@@ -202,7 +211,7 @@ const HttpImageSource = S.Struct({
   url: S.String,
 }).pipe(S.mutable);
 const ImageSource = S.Union(Base64ImageSource, HttpImageSource);
-type ImageSource = S.Schema.Type<typeof ImageSource>;
+type ImageSource = S.S.Type<typeof ImageSource>;
 const ImageContentBlock = S.extend(
   AbstractContentBlock,
   S.Struct({
@@ -211,7 +220,7 @@ const ImageContentBlock = S.extend(
     source: S.optional(ImageSource),
   }),
 ).pipe(S.mutable);
-type ImageContentBlock = S.Schema.Type<typeof ImageContentBlock>;
+type ImageContentBlock = S.S.Type<typeof ImageContentBlock>;
 const ReferenceContentBlock = S.extend(
   AbstractContentBlock,
   S.Struct({
@@ -219,7 +228,7 @@ const ReferenceContentBlock = S.extend(
     reference: S.Any,
   }),
 ).pipe(S.mutable);
-type ReferenceContentBlock = S.Schema.Type<typeof ReferenceContentBlock>;
+type ReferenceContentBlock = S.S.Type<typeof ReferenceContentBlock>;
 const MessageContentBlock = S.Union(TextContentBlock, JsonContentBlock, ImageContentBlock, ReferenceContentBlock);
 
 const MessageType = S.Struct({
@@ -240,5 +249,10 @@ const MessageType = S.Struct({
       }),
     ),
   ),
-}).pipe(EchoObject({ typename: 'dxos.org/type/Message', version: '0.1.0' }));
-type MessageType = S.Schema.Type<typeof MessageType>;
+}).pipe(
+  Type.def({
+    typename: 'dxos.org/type/Message',
+    version: '0.1.0',
+  }),
+);
+type MessageType = S.S.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, SchemaAST } 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({ [SchemaAST.TitleAnnotationId]: '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';
 

package/dist/lib/browser/ScriptContainer-ATBYTIFH.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/components/ScriptContainer.tsx", "../../../src/components/ScriptToolbar/ScriptToolbar.tsx", "../../../src/components/TypescriptEditor/TypescriptEditor.tsx"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport React, { useMemo } from 'react';\n\nimport { type ScriptType } from '@dxos/functions/types';\nimport { createDocAccessor, getSpace } from '@dxos/react-client/echo';\nimport { useIdentity } from '@dxos/react-client/halo';\nimport { type ThemedClassName } from '@dxos/react-ui';\nimport { createDataExtensions, listener, stackItemContentEditorClassNames } from '@dxos/react-ui-editor';\nimport { StackItem } from '@dxos/react-ui-stack';\nimport { mx } from '@dxos/react-ui-theme';\n\nimport { ScriptToolbar } from './ScriptToolbar';\nimport { TypescriptEditor, type TypescriptEditorProps } from './TypescriptEditor';\nimport { useDeployState, useToolbarState } from '../hooks';\nimport { type ScriptSettingsProps } from '../types';\n\nexport type ScriptEditorProps = ThemedClassName<\n  {\n    role?: string;\n    script: ScriptType;\n    settings?: ScriptSettingsProps;\n  } & Pick<TypescriptEditorProps, 'env'>\n>;\n\nexport const ScriptContainer = ({\n  classNames,\n  role,\n  script,\n  settings = { editorInputMode: 'vscode' },\n  env,\n}: ScriptEditorProps) => {\n  const identity = useIdentity();\n  const space = getSpace(script);\n  const state = useToolbarState();\n  useDeployState({ state, script });\n\n  const extensions = useMemo(\n    () => [\n      listener({\n        onChange: (text) => {\n          if (script.source.target && script.source.target.content !== text) {\n            script.changed = true;\n          }\n        },\n      }),\n      createDataExtensions({\n        id: script.id,\n        text: script.source.target && createDocAccessor(script.source.target, ['content']),\n        space,\n        identity,\n      }),\n    ],\n    [identity, space, script, script.source.target],\n  );\n\n  return (\n    <StackItem.Content toolbar classNames='divide-y divide-separator'>\n      <ScriptToolbar state={state} role={role} script={script} />\n      <TypescriptEditor\n        id={script.id}\n        env={env}\n        initialValue={script.source?.target?.content}\n        extensions={extensions}\n        className={mx(stackItemContentEditorClassNames(role))}\n        inputMode={settings.editorInputMode}\n        toolbar\n      />\n    </StackItem.Content>\n  );\n};\n\nexport default ScriptContainer;\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport React, { useCallback } from 'react';\n\nimport { type ScriptType } from '@dxos/functions/types';\nimport { fullyQualifiedId } from '@dxos/react-client/echo';\nimport { ElevationProvider, type ThemedClassName } from '@dxos/react-ui';\nimport { stackItemContentToolbarClassNames } from '@dxos/react-ui-editor';\nimport { createGapSeparator, MenuProvider, ToolbarMenu, useMenuActions } from '@dxos/react-ui-menu';\n\nimport {\n  type ScriptToolbarState,\n  createDeploy,\n  createFormat,\n  createTemplateSelect,\n  useToolbarAction,\n} from '../../hooks';\n\nexport type ScriptToolbarProps = ThemedClassName<{\n  role?: string;\n  script: ScriptType;\n  state: ScriptToolbarState;\n}>;\n\nconst createToolbar = (state: ScriptToolbarState) => {\n  const templateSelect = createTemplateSelect();\n  const format = createFormat();\n  const gap = createGapSeparator();\n  const deploy = createDeploy(state);\n  return {\n    nodes: [...templateSelect.nodes, ...format.nodes, ...gap.nodes, ...deploy.nodes],\n    edges: [...templateSelect.edges, ...format.edges, ...gap.edges, ...deploy.edges],\n  };\n};\n\nexport const ScriptToolbar = ({ script, role, state, classNames }: ScriptToolbarProps) => {\n  const handleAction = useToolbarAction({ state, script });\n  const toolbarCreator = useCallback(() => createToolbar(state), [state]);\n  const menu = useMenuActions(toolbarCreator);\n\n  return (\n    <div role='none' className={stackItemContentToolbarClassNames(role)}>\n      <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>\n        <MenuProvider {...menu} onAction={handleAction} attendableId={fullyQualifiedId(script)}>\n          <ToolbarMenu classNames={classNames} />\n        </MenuProvider>\n      </ElevationProvider>\n    </div>\n  );\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { javascript } from '@codemirror/lang-javascript';\nimport { defaultHighlightStyle } from '@codemirror/language';\nimport { Prec } from '@codemirror/state';\nimport { oneDarkHighlightStyle } from '@codemirror/theme-one-dark';\nimport { keymap } from '@codemirror/view';\nimport { tags } from '@lezer/highlight';\nimport { type VirtualTypeScriptEnvironment } from '@typescript/vfs';\nimport { continueKeymap } from '@valtown/codemirror-continue';\nimport { tsSync, tsFacet, tsLinter, tsAutocomplete, tsHover, type HoverInfo } from '@valtown/codemirror-ts';\nimport React from 'react';\n\nimport { type ThemeMode, useThemeContext } from '@dxos/react-ui';\nimport {\n  autocomplete,\n  createBasicExtensions,\n  createThemeExtensions,\n  editorFullWidth,\n  type EditorInputMode,\n  editorMonospace,\n  EditorView,\n  folding,\n  InputModeExtensions,\n  useTextEditor,\n  type UseTextEditorProps,\n} from '@dxos/react-ui-editor';\nimport { isNonNullable } from '@dxos/util';\n\nexport type TypescriptEditorProps = {\n  id: string;\n  inputMode?: EditorInputMode;\n  env?: VirtualTypeScriptEnvironment;\n  toolbar?: boolean;\n} & Pick<UseTextEditorProps, 'className' | 'initialValue' | 'extensions' | 'scrollTo' | 'selection'>;\n\nexport const TypescriptEditor = ({\n  id,\n  env,\n  className,\n  initialValue,\n  extensions,\n  scrollTo,\n  selection,\n  toolbar,\n  inputMode = 'vscode',\n}: TypescriptEditorProps) => {\n  const { themeMode } = useThemeContext();\n  const { parentRef, focusAttributes } = useTextEditor(\n    () => ({\n      id,\n      initialValue,\n      extensions: [\n        extensions,\n        createBasicExtensions({\n          highlightActiveLine: true,\n          indentWithTab: true,\n          lineNumbers: true,\n          lineWrapping: false,\n          scrollPastEnd: true,\n        }),\n        createThemeExtensions({\n          themeMode,\n          syntaxHighlighting: true,\n          slots: {\n            content: { className: editorFullWidth },\n          },\n        }),\n        // NOTE: Not using default editor gutter because folding for code works best right beside text.\n        EditorView.theme({\n          '.cm-gutters': {\n            // Match margin from content.\n            marginTop: '16px',\n            background: 'var(--dx-baseSurface)',\n          },\n        }),\n        InputModeExtensions[inputMode],\n        folding(),\n        // Continues block comments when you hit Enter.\n        Prec.high(keymap.of(continueKeymap)),\n        // TODO(burdon): Factor out.\n        [\n          editorMonospace,\n          javascript({ typescript: true }),\n          // https://github.com/val-town/codemirror-ts\n          autocomplete({ override: env ? [tsAutocomplete()] : [] }),\n          env\n            ? [\n                tsFacet.of({ env, path: `/src/${id}.ts` }),\n                tsSync(),\n                tsLinter(),\n                tsHover({ renderTooltip: createTooltipRenderer(themeMode) }),\n              ]\n            : [],\n        ],\n      ].filter(isNonNullable),\n      selection,\n      scrollTo,\n    }),\n    [id, extensions, themeMode, inputMode, selection, scrollTo],\n  );\n\n  return (\n    <div ref={parentRef} data-toolbar={toolbar ? 'enabled' : 'disabled'} className={className} {...focusAttributes} />\n  );\n};\n\nconst createTooltipRenderer = (themeMode: ThemeMode) => {\n  const theme = themeMode === 'dark' ? oneDarkHighlightStyle : defaultHighlightStyle;\n\n  const classFromKind = (_kind: string) => {\n    // E.g., localName, methodName, parameterName, etc.\n    const kind = _kind.endsWith('Name') ? 'name' : _kind;\n    const validTag = kind in tags;\n    if (!validTag) {\n      return '';\n    }\n\n    const tag = tags[kind as keyof typeof tags];\n    if (typeof tag === 'function') {\n      return '';\n    }\n\n    return theme.style([tag]) ?? '';\n  };\n\n  return (info: HoverInfo) => {\n    const div = document.createElement('div');\n    div.className = 'p-1 rounded border border-separator bg-baseSurface xs:max-w-80 max-w-lg';\n\n    if (info.quickInfo?.displayParts) {\n      for (const part of info.quickInfo.displayParts) {\n        const span = div.appendChild(document.createElement('span'));\n        span.className = classFromKind(part.kind);\n        span.innerText = part.text;\n      }\n    }\n\n    return { dom: div };\n  };\n};\n\nexport default TypescriptEditor;\n"],
-  "mappings": "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",
-  "names": ["React", "useMemo", "createDocAccessor", "getSpace", "useIdentity", "createDataExtensions", "listener", "stackItemContentEditorClassNames", "StackItem", "mx", "React", "useCallback", "fullyQualifiedId", "ElevationProvider", "stackItemContentToolbarClassNames", "createGapSeparator", "MenuProvider", "ToolbarMenu", "useMenuActions", "createToolbar", "state", "templateSelect", "createTemplateSelect", "format", "createFormat", "gap", "createGapSeparator", "deploy", "createDeploy", "nodes", "edges", "ScriptToolbar", "script", "role", "classNames", "handleAction", "useToolbarAction", "toolbarCreator", "useCallback", "menu", "useMenuActions", "div", "className", "stackItemContentToolbarClassNames", "ElevationProvider", "elevation", "MenuProvider", "onAction", "attendableId", "fullyQualifiedId", "ToolbarMenu", "javascript", "defaultHighlightStyle", "Prec", "oneDarkHighlightStyle", "keymap", "tags", "continueKeymap", "tsSync", "tsFacet", "tsLinter", "tsAutocomplete", "tsHover", "React", "useThemeContext", "autocomplete", "createBasicExtensions", "createThemeExtensions", "editorFullWidth", "editorMonospace", "EditorView", "folding", "InputModeExtensions", "useTextEditor", "isNonNullable", "TypescriptEditor", "id", "env", "className", "initialValue", "extensions", "scrollTo", "selection", "toolbar", "inputMode", "themeMode", "useThemeContext", "parentRef", "focusAttributes", "useTextEditor", "createBasicExtensions", "highlightActiveLine", "indentWithTab", "lineNumbers", "lineWrapping", "scrollPastEnd", "createThemeExtensions", "syntaxHighlighting", "slots", "content", "editorFullWidth", "EditorView", "theme", "marginTop", "background", "InputModeExtensions", "folding", "Prec", "high", "keymap", "of", "continueKeymap", "editorMonospace", "javascript", "typescript", "autocomplete", "override", "tsAutocomplete", "tsFacet", "path", "tsSync", "tsLinter", "tsHover", "renderTooltip", "createTooltipRenderer", "filter", "isNonNullable", "React", "div", "ref", "data-toolbar", "oneDarkHighlightStyle", "defaultHighlightStyle", "classFromKind", "_kind", "kind", "endsWith", "validTag", "tags", "tag", "style", "info", "document", "createElement", "quickInfo", "displayParts", "part", "span", "appendChild", "innerText", "text", "dom", "ScriptContainer", "classNames", "role", "script", "settings", "editorInputMode", "env", "identity", "useIdentity", "space", "getSpace", "state", "useToolbarState", "useDeployState", "extensions", "useMemo", "listener", "onChange", "text", "source", "target", "content", "changed", "createDataExtensions", "id", "createDocAccessor", "React", "StackItem", "Content", "toolbar", "ScriptToolbar", "TypescriptEditor", "initialValue", "className", "mx", "stackItemContentEditorClassNames", "inputMode"]
-}