@dxos/plugin-script 0.8.4-main.67995b8 → 0.8.4-main.f5c0578

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.f5c0578",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,22 +10,22 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts"
+      "node": "./dist/lib/node-esm/index.mjs"
     },
     "./types": {
+      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs",
-      "source": "./src/types/index.ts"
+      "node": "./dist/lib/node-esm/types/index.mjs"
     },
     "./templates": {
+      "source": "./src/templates/index.ts",
       "types": "./dist/types/src/templates/index.d.ts",
       "browser": "./dist/lib/browser/templates/index.mjs",
-      "node": "./dist/lib/node-esm/templates/index.mjs",
-      "source": "./src/templates/index.ts"
+      "node": "./dist/lib/node-esm/templates/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -63,64 +63,64 @@
     "date-fns": "^3.3.1",
     "esbuild-wasm": "^0.16.14",
     "prettier": "^3.6.2",
-    "react-syntax-highlighter": "^15.5.0",
-    "typescript": "^5.8.3",
-    "@dxos/ai": "0.8.4-main.67995b8",
-    "@dxos/app-framework": "0.8.4-main.67995b8",
-    "@dxos/assistant": "0.8.4-main.67995b8",
-    "@dxos/async": "0.8.4-main.67995b8",
-    "@dxos/blueprints": "0.8.4-main.67995b8",
-    "@dxos/client": "0.8.4-main.67995b8",
-    "@dxos/client-protocol": "0.8.4-main.67995b8",
-    "@dxos/compute": "0.8.4-main.67995b8",
-    "@dxos/debug": "0.8.4-main.67995b8",
-    "@dxos/echo": "0.8.4-main.67995b8",
-    "@dxos/devtools": "0.8.4-main.67995b8",
-    "@dxos/echo-protocol": "0.8.4-main.67995b8",
-    "@dxos/echo-schema": "0.8.4-main.67995b8",
-    "@dxos/functions": "0.8.4-main.67995b8",
-    "@dxos/invariant": "0.8.4-main.67995b8",
-    "@dxos/keys": "0.8.4-main.67995b8",
-    "@dxos/live-object": "0.8.4-main.67995b8",
-    "@dxos/local-storage": "0.8.4-main.67995b8",
-    "@dxos/plugin-client": "0.8.4-main.67995b8",
-    "@dxos/plugin-explorer": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/plugin-graph": "0.8.4-main.67995b8",
-    "@dxos/plugin-deck": "0.8.4-main.67995b8",
-    "@dxos/plugin-markdown": "0.8.4-main.67995b8",
-    "@dxos/plugin-space": "0.8.4-main.67995b8",
-    "@dxos/plugin-stack": "0.8.4-main.67995b8",
-    "@dxos/plugin-token-manager": "0.8.4-main.67995b8",
-    "@dxos/plugin-theme": "0.8.4-main.67995b8",
-    "@dxos/react-client": "0.8.4-main.67995b8",
-    "@dxos/protocols": "0.8.4-main.67995b8",
-    "@dxos/react-edge-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui-attention": "0.8.4-main.67995b8",
-    "@dxos/react-ui-editor": "0.8.4-main.67995b8",
-    "@dxos/react-ui-form": "0.8.4-main.67995b8",
-    "@dxos/react-ui-list": "0.8.4-main.67995b8",
-    "@dxos/react-ui-menu": "0.8.4-main.67995b8",
-    "@dxos/react-ui-stack": "0.8.4-main.67995b8",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.67995b8",
-    "@dxos/rpc": "0.8.4-main.67995b8",
-    "@dxos/rpc-tunnel": "0.8.4-main.67995b8",
-    "@dxos/schema": "0.8.4-main.67995b8",
-    "@dxos/util": "0.8.4-main.67995b8"
+    "react-syntax-highlighter": "^15.6.1",
+    "typescript": "^5.9.2",
+    "@dxos/ai": "0.8.4-main.f5c0578",
+    "@dxos/app-framework": "0.8.4-main.f5c0578",
+    "@dxos/assistant": "0.8.4-main.f5c0578",
+    "@dxos/async": "0.8.4-main.f5c0578",
+    "@dxos/client": "0.8.4-main.f5c0578",
+    "@dxos/client-protocol": "0.8.4-main.f5c0578",
+    "@dxos/blueprints": "0.8.4-main.f5c0578",
+    "@dxos/compute": "0.8.4-main.f5c0578",
+    "@dxos/debug": "0.8.4-main.f5c0578",
+    "@dxos/devtools": "0.8.4-main.f5c0578",
+    "@dxos/echo": "0.8.4-main.f5c0578",
+    "@dxos/echo-protocol": "0.8.4-main.f5c0578",
+    "@dxos/functions": "0.8.4-main.f5c0578",
+    "@dxos/echo-schema": "0.8.4-main.f5c0578",
+    "@dxos/invariant": "0.8.4-main.f5c0578",
+    "@dxos/keys": "0.8.4-main.f5c0578",
+    "@dxos/live-object": "0.8.4-main.f5c0578",
+    "@dxos/local-storage": "0.8.4-main.f5c0578",
+    "@dxos/log": "0.8.4-main.f5c0578",
+    "@dxos/plugin-client": "0.8.4-main.f5c0578",
+    "@dxos/plugin-deck": "0.8.4-main.f5c0578",
+    "@dxos/plugin-graph": "0.8.4-main.f5c0578",
+    "@dxos/plugin-explorer": "0.8.4-main.f5c0578",
+    "@dxos/plugin-markdown": "0.8.4-main.f5c0578",
+    "@dxos/plugin-space": "0.8.4-main.f5c0578",
+    "@dxos/plugin-stack": "0.8.4-main.f5c0578",
+    "@dxos/plugin-theme": "0.8.4-main.f5c0578",
+    "@dxos/plugin-token-manager": "0.8.4-main.f5c0578",
+    "@dxos/react-client": "0.8.4-main.f5c0578",
+    "@dxos/react-edge-client": "0.8.4-main.f5c0578",
+    "@dxos/protocols": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-attention": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-editor": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-form": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-list": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-menu": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-stack": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.f5c0578",
+    "@dxos/rpc": "0.8.4-main.f5c0578",
+    "@dxos/rpc-tunnel": "0.8.4-main.f5c0578",
+    "@dxos/schema": "0.8.4-main.f5c0578",
+    "@dxos/util": "0.8.4-main.f5c0578"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
+    "@effect/platform": "0.90.2",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
+    "effect": "3.17.7",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.67995b8",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8",
-    "@dxos/storybook-utils": "0.8.4-main.67995b8"
+    "@dxos/random": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-theme": "0.8.4-main.f5c0578",
+    "@dxos/react-ui": "0.8.4-main.f5c0578",
+    "@dxos/storybook-utils": "0.8.4-main.f5c0578"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -128,8 +128,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "@dxos/react-ui": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-theme": "0.8.4-main.f5c0578"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -4,21 +4,14 @@
 
 import { Schema } from 'effect';
 
-import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
+import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
 import { Ref } from '@dxos/echo';
 import { ScriptType } from '@dxos/functions';
 import { ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { defineObjectForm } from '@dxos/plugin-space/types';
 
-import {
-  AppGraphBuilder,
-  ArtifactDefinition,
-  Compiler,
-  IntentResolver,
-  ReactSurface,
-  ScriptSettings,
-} from './capabilities';
+import { AppGraphBuilder, Compiler, IntentResolver, ReactSurface, ScriptSettings } from './capabilities';
 import { ScriptEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
@@ -84,9 +77,4 @@ export const ScriptPlugin = () =>
       activatesOn: Events.SetupIntentResolver,
       activate: IntentResolver,
     }),
-    defineModule({
-      id: `${meta.id}/module/artifact-definition`,
-      activatesOn: Events.SetupArtifactDefinition,
-      activate: ArtifactDefinition,
-    }),
   ]);

package/src/capabilities/app-graph-builder.ts

@@ -5,10 +5,10 @@
 import { Rx } from '@effect-rx/rx-react';
 import { Option, pipe } from 'effect';
 
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
 import { ScriptType } from '@dxos/functions';
-import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
+import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { createExtension } from '@dxos/plugin-graph';
 
 import { meta } from '../meta';

package/src/capabilities/artifact-definition.ts

@@ -2,11 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
+// ISSUE(burdon): defineArtifact
+// @ts-nocheck
+
 import { Schema } from 'effect';
 
-import { createTool, ToolResult } from '@dxos/ai';
-import { Capabilities, contributes, createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { createArtifactElement, ArtifactId } from '@dxos/assistant';
+import { ToolResult, createTool } from '@dxos/ai';
+import { Capabilities, type PromiseIntentDispatcher, contributes, createIntent } from '@dxos/app-framework';
+import { ArtifactId, createArtifactElement } from '@dxos/assistant';
 import { defineArtifact } from '@dxos/blueprints';
 import { Filter, Obj, Ref } from '@dxos/echo';
 import { ScriptType } from '@dxos/functions';

package/src/capabilities/compiler.ts

@@ -8,9 +8,10 @@ import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
 import { contributes } from '@dxos/app-framework';
 import { initializeBundler } from '@dxos/functions/bundler';
 
-import { ScriptCapabilities } from './capabilities';
 import { Compiler } from '../compiler';
 
+import { ScriptCapabilities } from './capabilities';
+
 export default async () => {
   const compiler = new Compiler();
 

package/src/capabilities/index.ts

@@ -5,7 +5,6 @@
 import { lazy } from '@dxos/app-framework';
 
 export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
-export const ArtifactDefinition = lazy(() => import('./artifact-definition'));
 export const Compiler = lazy(() => import('./compiler'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));

package/src/capabilities/intent-resolver.ts

@@ -5,7 +5,7 @@
 import { Octokit } from '@octokit/core';
 import { Predicate } from 'effect';
 
-import { contributes, Capabilities, createResolver, createIntent, LayoutAction } from '@dxos/app-framework';
+import { Capabilities, LayoutAction, contributes, createIntent, createResolver } from '@dxos/app-framework';
 import { Obj, Ref } from '@dxos/echo';
 import { ScriptType } from '@dxos/functions';
 import { TokenManagerAction } from '@dxos/plugin-token-manager/types';

package/src/capabilities/react-surface.tsx

@@ -13,19 +13,20 @@ import { getSpace } from '@dxos/react-client/echo';
 import { StackItem } from '@dxos/react-ui-stack';
 import { type DataType } from '@dxos/schema';
 
-import { ScriptCapabilities } from './capabilities';
 import {
   DEPLOYMENT_DIALOG,
   DeploymentDialog,
   ScriptContainer,
-  ScriptPluginSettings,
   ScriptObjectSettings,
+  ScriptPluginSettings,
   ScriptProperties,
   TestContainer,
 } from '../components';
 import { meta } from '../meta';
 import { type ScriptSettingsProps } from '../types';
 
+import { ScriptCapabilities } from './capabilities';
+
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({

package/src/compiler/compiler.ts

@@ -3,10 +3,10 @@
 //
 
 import {
+  type VirtualTypeScriptEnvironment,
   createDefaultMapFromCDN,
   createSystem,
   createVirtualTypeScriptEnvironment,
-  type VirtualTypeScriptEnvironment,
 } from '@typescript/vfs';
 import ts from 'typescript';
 

package/src/components/DeploymentDialog/DeploymentDialog.tsx

@@ -4,7 +4,7 @@
 
 import React, { useEffect, useMemo } from 'react';
 
-import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
+import { LayoutAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { getSpace } from '@dxos/react-client/echo';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
 import { type DataType } from '@dxos/schema';
@@ -16,9 +16,9 @@ import { type Template } from '../../templates';
 export const DEPLOYMENT_DIALOG = `${SCRIPT_PLUGIN}/deployment/dialog`;
 
 // TODO(ZaymonFC):
-//   - Show activity and feedback to the user.
-//   - Only take an array of templateIds and get the name from the data.
-//   - Pending / onError states.
+//  - Show activity and feedback to the user.
+//  - Only take an array of templateIds and get the name from the data.
+//  - Pending / onError states.
 
 type DeploymentDialogProps = {
   accessToken: DataType.AccessToken;

package/src/components/DeploymentDialog/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { DeploymentDialog, DEPLOYMENT_DIALOG } from './DeploymentDialog';
+import { DEPLOYMENT_DIALOG, DeploymentDialog } from './DeploymentDialog';
 
 export { DEPLOYMENT_DIALOG };
 

package/src/components/ScriptContainer.tsx

@@ -10,11 +10,12 @@ import { useIdentity } from '@dxos/react-client/halo';
 import { createDataExtensions, listener, stackItemContentEditorClassNames } from '@dxos/react-ui-editor';
 import { StackItem } from '@dxos/react-ui-stack';
 
-import { ScriptToolbar } from './ScriptToolbar';
-import { TypescriptEditor, type TypescriptEditorProps } from './TypescriptEditor';
 import { useDeployState, useToolbarState } from '../hooks';
 import { type ScriptSettingsProps } from '../types';
 
+import { ScriptToolbar } from './ScriptToolbar';
+import { TypescriptEditor, type TypescriptEditorProps } from './TypescriptEditor';
+
 export type ScriptEditorProps = {
   role: string;
   script: ScriptType;

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

@@ -8,9 +8,10 @@ import { type Meta } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { ScriptToolbar } from './ScriptToolbar';
 import { templates } from '../../templates';
 
+import { ScriptToolbar } from './ScriptToolbar';
+
 export const Default = {
   args: {
     binding: 'example',

package/src/components/ScriptToolbar/ScriptToolbar.tsx

@@ -7,8 +7,8 @@ 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 { createGapSeparator, MenuProvider, rxFromSignal, ToolbarMenu, useMenuActions } from '@dxos/react-ui-menu';
+import { ElevationProvider, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { MenuProvider, ToolbarMenu, createGapSeparator, rxFromSignal, useMenuActions } from '@dxos/react-ui-menu';
 
 import {
   type CreateDeployOptions,

package/src/components/Settings/ScriptObjectSettings.tsx

@@ -5,11 +5,11 @@
 import { Octokit } from '@octokit/core';
 import React, { type ChangeEvent, useCallback, useEffect, useState } from 'react';
 
-import { createIntent, SettingsAction, useIntentDispatcher } from '@dxos/app-framework';
+import { SettingsAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { FunctionType, type ScriptType, getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
-import { Filter, getMeta, getSpace, Ref, useQuery } from '@dxos/react-client/echo';
+import { Filter, Ref, getMeta, getSpace, useQuery } from '@dxos/react-client/echo';
 import { Button, Clipboard, Input, useControlledState, useTranslation } from '@dxos/react-ui';
 import { DataType } from '@dxos/schema';
 

package/src/components/TestPanel/TestContainer.tsx

@@ -7,9 +7,10 @@ import React from 'react';
 import { type ScriptType } from '@dxos/functions';
 import { StackItem } from '@dxos/react-ui-stack';
 
-import { TestPanel } from './TestPanel';
 import { useDeployState, useToolbarState } from '../../hooks';
 
+import { TestPanel } from './TestPanel';
+
 export type TestContainerProps = {
   role: string;
   script: ScriptType;

package/src/components/TypescriptEditor/TypescriptEditor.stories.tsx

@@ -11,9 +11,10 @@ import { createDocAccessor, createObject } from '@dxos/react-client/echo';
 import { createDataExtensions } from '@dxos/react-ui-editor';
 import { withTheme } from '@dxos/storybook-utils';
 
-import { TypescriptEditor } from './TypescriptEditor';
 import { templates } from '../../templates';
 
+import { TypescriptEditor } from './TypescriptEditor';
+
 // TODO(burdon): Features:
 // - language support for S
 // - hierarchical editor (DND)

package/src/components/TypescriptEditor/TypescriptEditor.tsx

@@ -11,10 +11,10 @@ import { keymap } from '@codemirror/view';
 import { tags } from '@lezer/highlight';
 import { type VirtualTypeScriptEnvironment } from '@typescript/vfs';
 import { continueKeymap } from '@valtown/codemirror-continue';
-import { tsSync, tsFacet, tsLinter, tsAutocomplete, tsHover, type HoverInfo } from '@valtown/codemirror-ts';
+import { type HoverInfo, tsAutocomplete, tsFacet, tsHover, tsLinter, tsSync } from '@valtown/codemirror-ts';
 import React from 'react';
 
-import { type ThemedClassName, type ThemeMode, useThemeContext } from '@dxos/react-ui';
+import { type ThemeMode, type ThemedClassName, useThemeContext } from '@dxos/react-ui';
 import {
   type EditorInputMode,
   InputModeExtensions,
@@ -64,6 +64,7 @@ export const TypescriptEditor = ({
           lineWrapping: false,
           monospace: true,
           scrollPastEnd: true,
+          search: true,
         }),
         createThemeExtensions({ themeMode, syntaxHighlighting: true }),
         InputModeExtensions[inputMode],

package/src/hooks/deploy.ts

@@ -7,7 +7,7 @@ import { useEffect, useMemo } from 'react';
 import { FunctionType, type ScriptType, getUserFunctionUrlInMetadata } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { type Client, useClient } from '@dxos/react-client';
-import { getMeta, getSpace, Query, Ref, type Space, useQuery } from '@dxos/react-client/echo';
+import { Query, Ref, type Space, getMeta, getSpace, 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';

package/src/hooks/template.ts

@@ -4,7 +4,7 @@
 
 import { Obj } from '@dxos/echo';
 import { FUNCTIONS_PRESET_META_KEY, type ScriptType } from '@dxos/functions';
-import { createMenuItemGroup, createMenuAction } from '@dxos/react-ui-menu';
+import { createMenuAction, createMenuItemGroup } from '@dxos/react-ui-menu';
 
 import { SCRIPT_PLUGIN } from '../meta';
 import { templates } from '../templates';

package/src/hooks/useCreateAndDeployScriptTemplates.ts

@@ -55,5 +55,6 @@ export const useCreateAndDeployScriptTemplates = (space: Space | undefined, scri
     setStatus(hasErrors ? 'error' : 'success');
   }, [space, dispatch, client, scriptTemplates]);
 
+  // TODO(burdon): Return onCreateAndDeployScripts.
   return { handleCreateAndDeployScripts, status, error };
 };

package/src/templates/chess.ts

@@ -3,7 +3,7 @@
 //
 
 // @ts-ignore
-import { defineFunction, S } from 'dxos:functions';
+import { S, defineFunction } from 'dxos:functions';
 // @ts-ignore
 import { Chess } from 'https://esm.sh/chess.js@0.13.1?bundle=false';
 

package/src/templates/data-generator.ts

@@ -3,7 +3,7 @@
 //
 
 // @ts-ignore
-import { defineFunction, S, create, Expando } from 'dxos:functions';
+import { Expando, S, create, defineFunction } from 'dxos:functions';
 // @ts-ignore
 import { randText } from 'https://esm.sh/@ngneat/falso@7.1.1?bundle=false';
 
@@ -12,11 +12,15 @@ export default defineFunction({
     documentAmount: S.optional(S.Number),
     textSize: S.optional(S.Number),
     mutationAmount: S.optional(S.Number),
+    waitAfterCreation: S.optional(S.Number),
   }),
 
   outputSchema: S.Struct({}),
 
-  handler: async ({ data: { documentAmount = 1, textSize = 10, mutationAmount = 0 }, context: { space } }: any) => {
+  handler: async ({
+    data: { documentAmount = 1, textSize = 10, mutationAmount = 0, waitAfterCreation = 10_000 },
+    context: { space },
+  }: any) => {
     await space.db.graph.schemaRegistry.addSchema([Expando]);
     const result: Record<string, any> = {};
     const objects: Expando[] = [];
@@ -42,7 +46,7 @@ export default defineFunction({
 
     // Flush and wait for data to propagate.
     await space.db.flush();
-    await new Promise((resolve) => setTimeout(resolve, 10_000));
+    await new Promise((resolve) => setTimeout(resolve, waitAfterCreation));
     return { createdObjects: objects.length };
   },
 });

package/src/templates/discord.ts

@@ -3,7 +3,7 @@
 //
 
 // @ts-ignore
-import { create, defineFunction, DXN, EchoObject, Filter, ObjectId, S } from 'dxos:functions';
+import { DXN, EchoObject, Filter, ObjectId, S, create, defineFunction } from 'dxos:functions';
 // @ts-ignore
 import { FetchHttpClient } from 'https://esm.sh/@effect/platform@0.77.2?deps=effect@3.14.21&bundle=false';
 import {
@@ -13,7 +13,7 @@ import {
   // @ts-ignore
 } 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.14.21?bundle=false';
+import { Config, Effect, Redacted, Ref } from 'https://esm.sh/effect@3.14.21?bundle=false';
 
 const MessageSchema = S.Struct({
   id: ObjectId,

package/src/templates/forex-effect.ts

@@ -5,9 +5,9 @@
 // @ts-ignore
 import { S, defineFunction } from 'dxos:functions';
 import {
+  FetchHttpClient,
   HttpClient,
   HttpClientRequest,
-  FetchHttpClient,
   // @ts-ignore
 } from 'https://esm.sh/@effect/platform@0.77.2?deps=effect@3.14.21&bundle=false';
 // @ts-ignore

package/src/templates/forex.ts

@@ -3,7 +3,7 @@
 //
 
 // @ts-ignore
-import { defineFunction, S } from 'dxos:functions';
+import { S, defineFunction } from 'dxos:functions';
 
 export default defineFunction({
   description: 'Returns the exchange rate between two currencies.',

package/src/templates/gmail.ts

@@ -3,18 +3,18 @@
 //
 
 // @ts-ignore
-import { create, defineFunction, EchoObject, Filter, ObjectId, S } from 'dxos:functions';
+import { EchoObject, Filter, ObjectId, S, create, defineFunction } from 'dxos:functions';
 // @ts-ignore
 import {
+  FetchHttpClient,
   HttpClient,
   HttpClientRequest,
-  FetchHttpClient,
   // @ts-ignore
 } 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?bundle=false';
 // @ts-ignore
-import { pipe, Chunk, Effect, Ref, Schedule, Stream } from 'https://esm.sh/effect@3.14.21?bundle=false';
+import { Chunk, Effect, Ref, Schedule, Stream, pipe } from 'https://esm.sh/effect@3.14.21?bundle=false';
 
 export default defineFunction({
   inputSchema: S.Struct({

package/dist/lib/browser/ScriptContainer-Z6SIGRRC.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';\nimport { createDocAccessor, getSpace } from '@dxos/react-client/echo';\nimport { useIdentity } from '@dxos/react-client/halo';\nimport { createDataExtensions, listener, stackItemContentEditorClassNames } from '@dxos/react-ui-editor';\nimport { StackItem } from '@dxos/react-ui-stack';\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 = {\n  role: string;\n  script: ScriptType;\n  settings?: ScriptSettingsProps;\n} & Pick<TypescriptEditorProps, 'env'>;\n\nexport const ScriptContainer = ({ role, script, settings = { editorInputMode: 'vscode' }, env }: 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      script.source.target\n        ? [\n            listener({\n              onChange: (text) => {\n                if (script.source.target?.content !== text) {\n                  script.changed = true;\n                }\n              },\n            }),\n            createDataExtensions({\n              id: script.id,\n              text: createDocAccessor(script.source.target, ['content']),\n              space,\n              identity,\n            }),\n          ]\n        : [],\n    [identity, space, script, script.source.target],\n  );\n\n  return (\n    <StackItem.Content toolbar>\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        classNames={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 { Rx } from '@effect-rx/rx-react';\nimport React, { useMemo } from 'react';\n\nimport { type ScriptType } from '@dxos/functions';\nimport { fullyQualifiedId } from '@dxos/react-client/echo';\nimport { ElevationProvider, useTranslation, type ThemedClassName } from '@dxos/react-ui';\nimport { createGapSeparator, MenuProvider, rxFromSignal, ToolbarMenu, useMenuActions } from '@dxos/react-ui-menu';\n\nimport {\n  type CreateDeployOptions,\n  type ScriptToolbarState,\n  createDeploy,\n  createFormat,\n  createTemplateSelect,\n  useDeployDeps,\n} from '../../hooks';\nimport { SCRIPT_PLUGIN } from '../../meta';\n\nconst createToolbar = ({ state, script, ...options }: CreateDeployOptions) =>\n  Rx.make((get) =>\n    get(\n      rxFromSignal(() => {\n        const templateSelect = createTemplateSelect(script);\n        const format = createFormat(script);\n        const gap = createGapSeparator();\n        const deploy = createDeploy({ state, script, ...options });\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    ),\n  );\n\nexport type ScriptToolbarProps = ThemedClassName<{\n  role?: string;\n  script: ScriptType;\n  state: ScriptToolbarState;\n}>;\n\nexport const ScriptToolbar = ({ script, role, state, classNames }: ScriptToolbarProps) => {\n  const { t } = useTranslation(SCRIPT_PLUGIN);\n  const options = useDeployDeps({ script });\n  const toolbarCreator = useMemo(() => createToolbar({ state, script, t, ...options }), [state, script, options, t]);\n  const menu = useMenuActions(toolbarCreator);\n\n  return (\n    <ElevationProvider elevation={role === 'section' ? 'positioned' : 'base'}>\n      <MenuProvider {...menu} attendableId={fullyQualifiedId(script)}>\n        <ToolbarMenu classNames={classNames} />\n      </MenuProvider>\n    </ElevationProvider>\n  );\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { javascript } from '@codemirror/lang-javascript';\nimport { defaultHighlightStyle } from '@codemirror/language';\nimport { lintKeymap } from '@codemirror/lint';\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 ThemedClassName, type ThemeMode, useThemeContext } from '@dxos/react-ui';\nimport {\n  type EditorInputMode,\n  InputModeExtensions,\n  type UseTextEditorProps,\n  autocomplete,\n  createBasicExtensions,\n  createThemeExtensions,\n  folding,\n  useTextEditor,\n} from '@dxos/react-ui-editor';\nimport { mx } from '@dxos/react-ui-theme';\nimport { isNonNullable } from '@dxos/util';\n\nexport type TypescriptEditorProps = ThemedClassName<\n  {\n    id: string;\n    inputMode?: EditorInputMode;\n    toolbar?: boolean;\n    env?: VirtualTypeScriptEnvironment;\n  } & Pick<UseTextEditorProps, 'initialValue' | 'extensions' | 'scrollTo' | 'selection'>\n>;\n\nexport const TypescriptEditor = ({\n  classNames,\n  id,\n  inputMode = 'vscode',\n  toolbar,\n  env,\n  initialValue,\n  extensions,\n  scrollTo,\n  selection,\n}: TypescriptEditorProps) => {\n  const { themeMode } = useThemeContext();\n  const { parentRef, focusAttributes } = useTextEditor(\n    () => ({\n      id,\n      initialValue,\n      selection,\n      scrollTo,\n      extensions: [\n        extensions,\n        createBasicExtensions({\n          highlightActiveLine: true,\n          indentWithTab: true,\n          lineNumbers: true,\n          lineWrapping: false,\n          monospace: true,\n          scrollPastEnd: true,\n        }),\n        createThemeExtensions({ themeMode, syntaxHighlighting: true }),\n        InputModeExtensions[inputMode],\n        folding(),\n        // Continues block comments when pressing Enter.\n        Prec.high(keymap.of(continueKeymap)),\n\n        // TODO(burdon): Factor out.\n        javascript({ typescript: true }),\n        // https://github.com/val-town/codemirror-ts\n        autocomplete({ override: env ? [tsAutocomplete()] : undefined }),\n        keymap.of(lintKeymap),\n        env && [\n          tsFacet.of({ env, path: `/src/${id}.ts` }),\n          tsSync(),\n          tsLinter(),\n          tsHover({ renderTooltip: createTooltipRenderer(themeMode) }),\n        ],\n      ].filter(isNonNullable),\n    }),\n    [id, extensions, themeMode, inputMode, selection, scrollTo],\n  );\n\n  return (\n    <div\n      ref={parentRef}\n      data-toolbar={toolbar ? 'enabled' : 'disabled'}\n      className={mx(classNames)}\n      {...focusAttributes}\n    />\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", "Rx", "React", "useMemo", "fullyQualifiedId", "ElevationProvider", "useTranslation", "createGapSeparator", "MenuProvider", "rxFromSignal", "ToolbarMenu", "useMenuActions", "createToolbar", "state", "script", "options", "Rx", "make", "get", "rxFromSignal", "templateSelect", "createTemplateSelect", "format", "createFormat", "gap", "createGapSeparator", "deploy", "createDeploy", "nodes", "edges", "ScriptToolbar", "role", "classNames", "t", "useTranslation", "SCRIPT_PLUGIN", "useDeployDeps", "toolbarCreator", "useMemo", "menu", "useMenuActions", "ElevationProvider", "elevation", "MenuProvider", "attendableId", "fullyQualifiedId", "ToolbarMenu", "javascript", "defaultHighlightStyle", "lintKeymap", "Prec", "oneDarkHighlightStyle", "keymap", "tags", "continueKeymap", "tsSync", "tsFacet", "tsLinter", "tsAutocomplete", "tsHover", "React", "useThemeContext", "InputModeExtensions", "autocomplete", "createBasicExtensions", "createThemeExtensions", "folding", "useTextEditor", "mx", "isNonNullable", "TypescriptEditor", "classNames", "id", "inputMode", "toolbar", "env", "initialValue", "extensions", "scrollTo", "selection", "themeMode", "useThemeContext", "parentRef", "focusAttributes", "useTextEditor", "createBasicExtensions", "highlightActiveLine", "indentWithTab", "lineNumbers", "lineWrapping", "monospace", "scrollPastEnd", "createThemeExtensions", "syntaxHighlighting", "InputModeExtensions", "folding", "Prec", "high", "keymap", "of", "continueKeymap", "javascript", "typescript", "autocomplete", "override", "tsAutocomplete", "undefined", "lintKeymap", "tsFacet", "path", "tsSync", "tsLinter", "tsHover", "renderTooltip", "createTooltipRenderer", "filter", "isNonNullable", "React", "div", "ref", "data-toolbar", "className", "mx", "theme", "oneDarkHighlightStyle", "defaultHighlightStyle", "classFromKind", "_kind", "kind", "endsWith", "validTag", "tags", "tag", "style", "info", "document", "createElement", "quickInfo", "displayParts", "part", "span", "appendChild", "innerText", "text", "dom", "ScriptContainer", "role", "script", "settings", "editorInputMode", "env", "identity", "useIdentity", "space", "getSpace", "state", "useToolbarState", "useDeployState", "extensions", "useMemo", "source", "target", "listener", "onChange", "text", "content", "changed", "createDataExtensions", "id", "createDocAccessor", "React", "StackItem", "Content", "toolbar", "ScriptToolbar", "TypescriptEditor", "initialValue", "classNames", "stackItemContentEditorClassNames", "inputMode"]
-}