@dxos/plugin-script 0.8.2-main.fbd8ed0 → 0.8.2-staging.4d6ad0f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.2-main.fbd8ed0",
+  "version": "0.8.2-staging.4d6ad0f",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -43,74 +43,74 @@
     "@lezer/common": "^1.2.2",
     "@lezer/highlight": "^1.2.1",
     "@octokit/core": "^4.0.4",
-    "@preact/signals-core": "^1.6.0",
+    "@preact-signals/safe-react": "^0.9.0",
+    "@preact/signals-core": "^1.9.0",
     "@typescript/vfs": "^1.6.0",
     "@valtown/codemirror-continue": "^2.3.1",
     "@valtown/codemirror-ts": "^2.2.0",
     "codemirror": "^6.0.1",
     "date-fns": "^3.3.1",
     "esbuild-wasm": "^0.16.14",
-    "lodash.get": "^4.4.2",
     "prettier": "^3.2.4",
     "react-syntax-highlighter": "^15.5.0",
     "typescript": "^5.8.3",
-    "@dxos/app-framework": "0.8.2-main.fbd8ed0",
-    "@dxos/artifact": "0.8.2-main.fbd8ed0",
-    "@dxos/assistant": "0.8.2-main.fbd8ed0",
-    "@dxos/client": "0.8.2-main.fbd8ed0",
-    "@dxos/client-protocol": "0.8.2-main.fbd8ed0",
-    "@dxos/async": "0.8.2-main.fbd8ed0",
-    "@dxos/debug": "0.8.2-main.fbd8ed0",
-    "@dxos/compute": "0.8.2-main.fbd8ed0",
-    "@dxos/echo": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-protocol": "0.8.2-main.fbd8ed0",
-    "@dxos/devtools": "0.8.2-main.fbd8ed0",
-    "@dxos/functions": "0.8.2-main.fbd8ed0",
-    "@dxos/invariant": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
-    "@dxos/keys": "0.8.2-main.fbd8ed0",
-    "@dxos/live-object": "0.8.2-main.fbd8ed0",
-    "@dxos/local-storage": "0.8.2-main.fbd8ed0",
-    "@dxos/log": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-client": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-deck": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-explorer": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-markdown": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-space": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-stack": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-theme": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-token-manager": "0.8.2-main.fbd8ed0",
-    "@dxos/protocols": "0.8.2-main.fbd8ed0",
-    "@dxos/plugin-graph": "0.8.2-main.fbd8ed0",
-    "@dxos/react-client": "0.8.2-main.fbd8ed0",
-    "@dxos/react-edge-client": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-attention": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-editor": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-form": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-list": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-stack": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-menu": "0.8.2-main.fbd8ed0",
-    "@dxos/rpc": "0.8.2-main.fbd8ed0",
-    "@dxos/rpc-tunnel": "0.8.2-main.fbd8ed0",
-    "@dxos/schema": "0.8.2-main.fbd8ed0",
-    "@dxos/util": "0.8.2-main.fbd8ed0"
+    "@dxos/ai": "0.8.2-staging.4d6ad0f",
+    "@dxos/artifact": "0.8.2-staging.4d6ad0f",
+    "@dxos/assistant": "0.8.2-staging.4d6ad0f",
+    "@dxos/async": "0.8.2-staging.4d6ad0f",
+    "@dxos/app-framework": "0.8.2-staging.4d6ad0f",
+    "@dxos/client": "0.8.2-staging.4d6ad0f",
+    "@dxos/client-protocol": "0.8.2-staging.4d6ad0f",
+    "@dxos/debug": "0.8.2-staging.4d6ad0f",
+    "@dxos/compute": "0.8.2-staging.4d6ad0f",
+    "@dxos/echo": "0.8.2-staging.4d6ad0f",
+    "@dxos/echo-protocol": "0.8.2-staging.4d6ad0f",
+    "@dxos/devtools": "0.8.2-staging.4d6ad0f",
+    "@dxos/echo-schema": "0.8.2-staging.4d6ad0f",
+    "@dxos/invariant": "0.8.2-staging.4d6ad0f",
+    "@dxos/keys": "0.8.2-staging.4d6ad0f",
+    "@dxos/functions": "0.8.2-staging.4d6ad0f",
+    "@dxos/local-storage": "0.8.2-staging.4d6ad0f",
+    "@dxos/log": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-client": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-deck": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-explorer": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-graph": "0.8.2-staging.4d6ad0f",
+    "@dxos/live-object": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-space": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-markdown": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-stack": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-token-manager": "0.8.2-staging.4d6ad0f",
+    "@dxos/plugin-theme": "0.8.2-staging.4d6ad0f",
+    "@dxos/protocols": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-edge-client": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-attention": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-editor": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-client": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-form": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-list": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-menu": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-stack": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-staging.4d6ad0f",
+    "@dxos/rpc-tunnel": "0.8.2-staging.4d6ad0f",
+    "@dxos/util": "0.8.2-staging.4d6ad0f",
+    "@dxos/schema": "0.8.2-staging.4d6ad0f",
+    "@dxos/rpc": "0.8.2-staging.4d6ad0f"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
     "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
-    "@types/lodash.get": "^4.4.7",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/storybook-utils": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
-    "@dxos/random": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0"
+    "@dxos/random": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui": "0.8.2-staging.4d6ad0f",
+    "@dxos/storybook-utils": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-theme": "0.8.2-staging.4d6ad0f"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -119,8 +119,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
-    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0"
+    "@dxos/react-ui": "0.8.2-staging.4d6ad0f",
+    "@dxos/react-ui-theme": "0.8.2-staging.4d6ad0f"
   },
   "publishConfig": {
     "access": "public"

package/src/capabilities/artifact-definition.ts

@@ -4,13 +4,14 @@
 
 import { Schema } from 'effect';
 
+import { createTool, ToolResult } from '@dxos/ai';
 import { Capabilities, contributes, createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { defineArtifact, defineTool, ToolResult } from '@dxos/artifact';
+import { ArtifactId, defineArtifact } from '@dxos/artifact';
 import { createArtifactElement } from '@dxos/assistant';
 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 { Filter, live, makeRef, type Space } from '@dxos/react-client/echo';
 import { DataType } from '@dxos/schema';
 
 import { meta } from '../meta';
@@ -140,7 +141,7 @@ export default () => {
   `,
     schema: ScriptType,
     tools: [
-      defineTool(meta.id, {
+      createTool(meta.id, {
         name: 'create',
         description: 'Create a new script. Returns the artifact definition for the script',
         caption: 'Creating script...',
@@ -173,18 +174,17 @@ export default () => {
           return ToolResult.Success(createArtifactElement(script.id));
         },
       }),
-      defineTool(meta.id, {
+      createTool(meta.id, {
         name: 'inspect',
         description: 'Inspect a script. Returns the artifact definition for the script',
         caption: 'Inspecting script...',
         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' }),
+          id: ArtifactId,
         }),
         execute: async ({ id }, { extensions }) => {
           invariant(extensions?.space, 'No space');
 
-          const script = (await extensions.space.db.query({ id }).first()) as ScriptType;
+          const script = (await extensions.space.db.query(Filter.ids(id)).first()) as ScriptType;
           const { content } = await script.source.load();
 
           return ToolResult.Success({
@@ -193,13 +193,12 @@ export default () => {
           });
         },
       }),
-      defineTool(meta.id, {
+      createTool(meta.id, {
         name: 'update',
         description: 'Update a script. Returns the artifact definition for the script',
         caption: 'Updating script...',
         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' }),
+          id: ArtifactId,
           code: Schema.String.annotations({
             description: 'The full code of the script in JavaScript or TypeScript. Must be valid executable code.',
           }),
@@ -207,7 +206,7 @@ export default () => {
         execute: async ({ id, code }, { extensions }) => {
           invariant(extensions?.space, 'No space');
 
-          const script = (await extensions.space.db.query({ id }).first()) as ScriptType;
+          const script = (await extensions.space.db.query(Filter.ids(id)).first()) as ScriptType;
           const source = await script.source.load();
           if (!source) {
             return ToolResult.Error('Script not found');

package/src/compiler/compiler.ts

@@ -23,7 +23,7 @@ export class Compiler {
 
   constructor(private readonly _options: ts.CompilerOptions = defaultOptions) {}
 
-  async initialize() {
+  async initialize(): Promise<void> {
     if (this._env) {
       return;
     }
@@ -40,12 +40,12 @@ export class Compiler {
     return this._env;
   }
 
-  setFile(fileName: string, content: string) {
+  setFile(fileName: string, content: string): void {
     invariant(this._fsMap, 'File system map not initialized.');
     this.environment.createFile(fileName, content);
   }
 
-  compile(fileName: string) {
+  compile(fileName: string): ts.EmitOutput {
     return this.environment.languageService.getEmitOutput(fileName);
   }
 }

package/src/components/ScriptToolbar/ScriptToolbar.tsx

@@ -2,13 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+import { Rx } from '@effect-rx/rx-react';
+import React, { useMemo } from 'react';
 
 import { type ScriptType } from '@dxos/functions';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
 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 { createGapSeparator, MenuProvider, rxFromSignal, ToolbarMenu, useMenuActions } from '@dxos/react-ui-menu';
 
 import {
   type CreateDeployOptions,
@@ -26,24 +27,26 @@ export type ScriptToolbarProps = ThemedClassName<{
   state: ScriptToolbarState;
 }>;
 
-const createToolbar = ({ state, script, ...options }: CreateDeployOptions) => {
-  const templateSelect = createTemplateSelect(script);
-  const format = createFormat(script);
-  const gap = createGapSeparator();
-  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],
-  };
-};
+const createToolbar = ({ state, script, ...options }: CreateDeployOptions) =>
+  Rx.make((get) =>
+    get(
+      rxFromSignal(() => {
+        const templateSelect = createTemplateSelect(script);
+        const format = createFormat(script);
+        const gap = createGapSeparator();
+        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],
+        };
+      }),
+    ),
+  );
 
 export const ScriptToolbar = ({ script, role, state, classNames }: ScriptToolbarProps) => {
   const { t } = useTranslation(SCRIPT_PLUGIN);
   const options = useDeployDeps({ script });
-  const toolbarCreator = useCallback(
-    () => createToolbar({ state, script, t, ...options }),
-    [state, script, options, t],
-  );
+  const toolbarCreator = useMemo(() => createToolbar({ state, script, t, ...options }), [state, script, options, t]);
   const menu = useMenuActions(toolbarCreator);
 
   return (

package/src/components/TypescriptEditor/TypescriptEditor.tsx

@@ -18,7 +18,6 @@ import {
   autocomplete,
   createBasicExtensions,
   createThemeExtensions,
-  editorFullWidth,
   type EditorInputMode,
   editorMonospace,
   EditorView,
@@ -64,15 +63,10 @@ export const TypescriptEditor = ({
         createThemeExtensions({
           themeMode,
           syntaxHighlighting: true,
-          slots: {
-            content: { className: editorFullWidth },
-          },
         }),
         // NOTE: Not using default editor gutter because folding for code works best right beside text.
         EditorView.theme({
           '.cm-gutters': {
-            // Match margin from content.
-            marginTop: '16px',
             background: 'var(--dx-baseSurface)',
           },
         }),

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,7 +3,7 @@
 //
 
 // @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.

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.',

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({

package/src/templates/discord.ts

@@ -4,14 +4,16 @@
 
 // @ts-ignore
 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: ObjectId,

package/src/templates/forex-effect.ts

@@ -9,9 +9,9 @@ import {
   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.',

package/src/templates/gmail.ts

@@ -10,11 +10,11 @@ import {
   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 { format, subDays } from 'https://esm.sh/date-fns@3.3.1';
+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.13.3';
+import { pipe, Chunk, Effect, Ref, Schedule, Stream } from 'https://esm.sh/effect@3.14.21?bundle=false';
 
 export default defineFunction({
   inputSchema: S.Struct({
@@ -136,7 +136,9 @@ 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));
+  Object.entries(params ?? {})
+    .filter(([_, value]) => value != null)
+    .forEach(([key, value]) => api.searchParams.set(key, value));
   return api.toString();
 };
 

package/src/types.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema, SchemaAST } from 'effect';
+import { Schema } from 'effect';
 
 import { SpaceSchema } from '@dxos/client/echo';
 import { ScriptType } from '@dxos/functions';
@@ -19,7 +19,7 @@ export namespace ScriptAction {
   export const CreateScriptSchema = Schema.Struct({
     name: Schema.optional(Schema.String),
     // TODO(wittjosiah): Placeholder annotation?
-    gistUrl: Schema.optional(Schema.String.annotations({ [SchemaAST.TitleAnnotationId]: 'Import from Gist (url)' })),
+    gistUrl: Schema.optional(Schema.String.annotations({ title: 'Import from Gist (url)' })),
     initialTemplateId: Schema.optional(Schema.String),
   });
 

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

@@ -1,12 +0,0 @@
-import {
-  DEPLOYMENT_DIALOG,
-  DeploymentDialog_default
-} from "./chunk-YNOCAJYT.mjs";
-import "./chunk-INL55MFV.mjs";
-import "./chunk-6MLJJI73.mjs";
-import "./chunk-KJMVDGRB.mjs";
-export {
-  DEPLOYMENT_DIALOG,
-  DeploymentDialog_default as default
-};
-//# sourceMappingURL=DeploymentDialog-W7PY33VN.mjs.map