@dxos/plugin-script 0.6.12 → 0.6.13-main.09887cd

package/dist/types/src/types/script.d.ts

@@ -1,12 +1,12 @@
 import { ref, S } from '@dxos/echo-schema';
 declare const ScriptType_base: import("@dxos/echo-schema").AbstractTypedObject<{
     name?: string | undefined;
+    description?: string | undefined;
     source: import("@dxos/echo-schema").Ref<{
         content: string;
     } & {
         id: string;
     }>;
-    description?: string | undefined;
     changed?: boolean | undefined;
 } & {
     id: string;
@@ -27,19 +27,19 @@ export declare class ScriptType extends ScriptType_base {
 }
 declare const FunctionType_base: import("@dxos/echo-schema").AbstractTypedObject<{
     name?: string | undefined;
-    version: number;
     source?: import("@dxos/echo-schema").Ref<{
         name?: string | undefined;
+        description?: string | undefined;
         source: import("@dxos/echo-schema").Ref<{
             content: string;
         } & {
             id: string;
         }>;
-        description?: string | undefined;
         changed?: boolean | undefined;
     } & {
         id: string;
     }>;
+    version: number;
     binding?: string | undefined;
 } & {
     id: string;
@@ -49,12 +49,12 @@ declare const FunctionType_base: import("@dxos/echo-schema").AbstractTypedObject
     binding: S.optional<typeof S.String>;
     source: S.optional<ref<{
         name?: string | undefined;
+        description?: string | undefined;
         source: import("@dxos/echo-schema").Ref<{
             content: string;
         } & {
             id: string;
         }>;
-        description?: string | undefined;
         changed?: boolean | undefined;
     } & {
         id: string;

package/dist/types/src/types/types.d.ts

@@ -1,8 +1,9 @@
-import type { GraphBuilderProvides, IntentResolverProvides, MetadataRecordsProvides, SurfaceProvides, TranslationsProvides } from '@dxos/app-framework';
+import type { GraphBuilderProvides, IntentResolverProvides, MetadataRecordsProvides, SettingsProvides, SurfaceProvides, TranslationsProvides } from '@dxos/app-framework';
 import { type SchemaProvides } from '@dxos/plugin-client';
-import { type StackProvides } from '@dxos/plugin-stack';
+import { type SpaceInitProvides } from '@dxos/plugin-space';
 export declare enum ScriptAction {
     CREATE = "dxos.org/plugin/script/create"
 }
-export type ScriptPluginProvides = SurfaceProvides & IntentResolverProvides & GraphBuilderProvides & MetadataRecordsProvides & TranslationsProvides & SchemaProvides & StackProvides;
+export type ScriptSettingsProps = {};
+export type ScriptPluginProvides = GraphBuilderProvides & IntentResolverProvides & MetadataRecordsProvides & SchemaProvides & SettingsProvides<ScriptSettingsProps> & SpaceInitProvides & SurfaceProvides & TranslationsProvides;
 //# sourceMappingURL=types.d.ts.map

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,eAAe,EACf,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD,oBAAY,YAAY;IACtB,MAAM,kCAA4B;CACnC;AAED,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAChD,sBAAsB,GACtB,oBAAoB,GACpB,uBAAuB,GACvB,oBAAoB,GACpB,cAAc,GACd,aAAa,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAI5D,oBAAY,YAAY;IACtB,MAAM,kCAA4B;CACnC;AAED,MAAM,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAErC,MAAM,MAAM,oBAAoB,GAAG,oBAAoB,GACrD,sBAAsB,GACtB,uBAAuB,GACvB,cAAc,GACd,gBAAgB,CAAC,mBAAmB,CAAC,GACrC,iBAAiB,GACjB,eAAe,GACf,oBAAoB,CAAC"}

package/package.json

@@ -1,37 +1,41 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.6.12",
+  "version": "0.6.13-main.09887cd",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
   "exports": {
-    ".": {
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": {
-        "default": "./dist/lib/node/index.cjs"
-      },
-      "types": "./dist/types/src/index.d.ts"
-    },
     "./edge": {
       "browser": "./dist/lib/browser/edge/index.mjs",
       "node": {
-        "default": "./dist/lib/node/edge/index.cjs"
+        "require": "./dist/lib/node/edge/index.cjs",
+        "default": "./dist/lib/node-esm/edge/index.mjs"
       },
       "types": "./dist/types/src/edge/index.d.ts"
     },
+    ".": {
+      "browser": "./dist/lib/browser/index.mjs",
+      "node": {
+        "require": "./dist/lib/node/index.cjs",
+        "default": "./dist/lib/node-esm/index.mjs"
+      },
+      "types": "./dist/types/src/index.d.ts"
+    },
     "./meta": {
       "browser": "./dist/lib/browser/meta.mjs",
       "node": {
-        "default": "./dist/lib/node/meta.cjs"
+        "require": "./dist/lib/node/meta.cjs",
+        "default": "./dist/lib/node-esm/meta.mjs"
       },
       "types": "./dist/types/src/meta.d.ts"
     },
     "./types": {
       "browser": "./dist/lib/browser/types/index.mjs",
       "node": {
-        "default": "./dist/lib/node/types/index.cjs"
+        "require": "./dist/lib/node/types/index.cjs",
+        "default": "./dist/lib/node-esm/types/index.mjs"
       },
       "types": "./dist/types/src/types/index.d.ts"
     }
@@ -55,14 +59,15 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.0",
+    "@codemirror/autocomplete": "^6.18.1",
     "@codemirror/lang-javascript": "^6.2.2",
-    "@codemirror/language": "^6.10.2",
-    "@codemirror/lint": "^6.8.1",
+    "@codemirror/language": "^6.10.3",
+    "@codemirror/lint": "^6.8.2",
     "@codemirror/state": "^6.4.1",
     "@codemirror/theme-one-dark": "^6.1.2",
-    "@codemirror/view": "^6.29.1",
-    "@lezer/common": "^1.2.1",
+    "@codemirror/view": "^6.34.1",
+    "@effect/schema": "^0.75.1",
+    "@lezer/common": "^1.2.2",
     "@preact/signals-core": "^1.6.0",
     "@typescript/vfs": "^1.6.0",
     "@valtown/codemirror-ts": "^2.2.0",
@@ -72,32 +77,33 @@
     "lodash.get": "^4.4.2",
     "prettier": "^3.2.4",
     "react-syntax-highlighter": "^15.5.0",
-    "typescript": "^5.5.4",
-    "@dxos/app-framework": "0.6.12",
-    "@dxos/client-protocol": "0.6.12",
-    "@dxos/async": "0.6.12",
-    "@dxos/crypto": "0.6.12",
-    "@dxos/client": "0.6.12",
-    "@dxos/debug": "0.6.12",
-    "@dxos/invariant": "0.6.12",
-    "@dxos/keys": "0.6.12",
-    "@dxos/echo-schema": "0.6.12",
-    "@dxos/log": "0.6.12",
-    "@dxos/plugin-client": "0.6.12",
-    "@dxos/plugin-graph": "0.6.12",
-    "@dxos/plugin-explorer": "0.6.12",
-    "@dxos/plugin-markdown": "0.6.12",
-    "@dxos/plugin-space": "0.6.12",
-    "@dxos/plugin-stack": "0.6.12",
-    "@dxos/protocols": "0.6.12",
-    "@dxos/react-client": "0.6.12",
-    "@dxos/react-ui-attention": "0.6.12",
-    "@dxos/plugin-theme": "0.6.12",
-    "@dxos/react-ui-syntax-highlighter": "0.6.12",
-    "@dxos/rpc": "0.6.12",
-    "@dxos/react-ui-editor": "0.6.12",
-    "@dxos/util": "0.6.12",
-    "@dxos/rpc-tunnel": "0.6.12"
+    "typescript": "^5.6.2",
+    "@dxos/app-framework": "0.6.13-main.09887cd",
+    "@dxos/client": "0.6.13-main.09887cd",
+    "@dxos/async": "0.6.13-main.09887cd",
+    "@dxos/client-protocol": "0.6.13-main.09887cd",
+    "@dxos/crypto": "0.6.13-main.09887cd",
+    "@dxos/debug": "0.6.13-main.09887cd",
+    "@dxos/invariant": "0.6.13-main.09887cd",
+    "@dxos/echo-schema": "0.6.13-main.09887cd",
+    "@dxos/keys": "0.6.13-main.09887cd",
+    "@dxos/log": "0.6.13-main.09887cd",
+    "@dxos/plugin-client": "0.6.13-main.09887cd",
+    "@dxos/plugin-explorer": "0.6.13-main.09887cd",
+    "@dxos/plugin-graph": "0.6.13-main.09887cd",
+    "@dxos/plugin-markdown": "0.6.13-main.09887cd",
+    "@dxos/plugin-settings": "0.6.13-main.09887cd",
+    "@dxos/plugin-space": "0.6.13-main.09887cd",
+    "@dxos/plugin-stack": "0.6.13-main.09887cd",
+    "@dxos/plugin-theme": "0.6.13-main.09887cd",
+    "@dxos/protocols": "0.6.13-main.09887cd",
+    "@dxos/react-client": "0.6.13-main.09887cd",
+    "@dxos/react-ui-attention": "0.6.13-main.09887cd",
+    "@dxos/react-ui-editor": "0.6.13-main.09887cd",
+    "@dxos/react-ui-syntax-highlighter": "0.6.13-main.09887cd",
+    "@dxos/rpc": "0.6.13-main.09887cd",
+    "@dxos/rpc-tunnel": "0.6.13-main.09887cd",
+    "@dxos/util": "0.6.13-main.09887cd"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -106,21 +112,21 @@
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "^5.3.4",
-    "@dxos/echo-generator": "0.6.12",
-    "@dxos/random": "0.6.12",
-    "@dxos/react-ui": "0.6.12",
-    "@dxos/react-ui-theme": "0.6.12",
-    "@dxos/react-ui-mosaic": "0.6.12",
-    "@dxos/storybook-utils": "0.6.12"
+    "vite": "5.4.7",
+    "@dxos/echo-generator": "0.6.13-main.09887cd",
+    "@dxos/random": "0.6.13-main.09887cd",
+    "@dxos/react-ui": "0.6.13-main.09887cd",
+    "@dxos/react-ui-theme": "0.6.13-main.09887cd",
+    "@dxos/react-ui-mosaic": "0.6.13-main.09887cd",
+    "@dxos/storybook-utils": "0.6.13-main.09887cd"
   },
-  "optionalDependencies": {
+  "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "@dxos/react-ui": "0.6.12",
-    "@dxos/react-ui-mosaic": "0.6.12",
-    "@dxos/react-ui-theme": "0.6.12"
+    "react": "~18.2.0",
+    "react-dom": "~18.2.0",
+    "@dxos/react-ui-mosaic": "0.6.13-main.09887cd",
+    "@dxos/react-ui-theme": "0.6.13-main.09887cd",
+    "@dxos/react-ui": "0.6.13-main.09887cd"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -2,7 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Code, type IconProps } from '@phosphor-icons/react';
 // @ts-ignore
 import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
 import React from 'react';
@@ -17,8 +16,9 @@ import { loadObjectReferences } from '@dxos/react-client/echo';
 
 import { initializeBundler } from './bundler';
 import { Compiler } from './compiler';
-import { ScriptEditor } from './components';
+import { ScriptContainer, ScriptSettings } from './components';
 import meta, { SCRIPT_PLUGIN } from './meta';
+import { templates } from './templates';
 import translations from './translations';
 import { FunctionType, ScriptType } from './types';
 import { ScriptAction, type ScriptPluginProvides } from './types';
@@ -45,12 +45,12 @@ export const ScriptPlugin = (): PluginDefinition<ScriptPluginProvides> => {
       await initializeBundler({ wasmUrl });
     },
     provides: {
+      settings: {},
       metadata: {
         records: {
           [ScriptType.typename]: {
             placeholder: ['object title placeholder', { ns: SCRIPT_PLUGIN }],
-            icon: (props: IconProps) => <Code {...props} />,
-            iconSymbol: 'ph--code--regular',
+            icon: 'ph--code--regular',
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (script: ScriptType) => loadObjectReferences(script, (script) => [script.source]),
           },
@@ -60,6 +60,12 @@ export const ScriptPlugin = (): PluginDefinition<ScriptPluginProvides> => {
       echo: {
         schema: [ScriptType, FunctionType],
       },
+      space: {
+        onSpaceCreate: {
+          label: ['create object label', { ns: SCRIPT_PLUGIN }],
+          action: ScriptAction.CREATE,
+        },
+      },
       graph: {
         builder: (plugins) => {
           const client = resolvePlugin(plugins, parseClientPlugin)?.provides.client;
@@ -93,8 +99,7 @@ export const ScriptPlugin = (): PluginDefinition<ScriptPluginProvides> => {
                   },
                   properties: {
                     label: ['create object label', { ns: SCRIPT_PLUGIN }],
-                    icon: (props: IconProps) => <Code {...props} />,
-                    iconSymbol: 'ph--code--regular',
+                    icon: 'ph--code--regular',
                     testId: 'scriptPlugin.createObject',
                   },
                 },
@@ -103,29 +108,19 @@ export const ScriptPlugin = (): PluginDefinition<ScriptPluginProvides> => {
           });
         },
       },
-      stack: {
-        creators: [
-          {
-            id: 'create-stack-section-script',
-            testId: 'scriptPlugin.createSection',
-            type: ['plugin name', { ns: SCRIPT_PLUGIN }],
-            label: ['create stack section label', { ns: SCRIPT_PLUGIN }],
-            icon: (props: any) => <Code {...props} />,
-            intent: {
-              plugin: SCRIPT_PLUGIN,
-              action: ScriptAction.CREATE,
-            },
-          },
-        ],
-      },
       surface: {
         component: ({ data, role }) => {
-          if (role && !['article', 'section'].includes(role)) {
-            return null;
-          }
+          switch (role) {
+            case 'settings': {
+              return data.plugin === meta.id ? <ScriptSettings settings={{}} /> : null;
+            }
 
-          if (data.object instanceof ScriptType) {
-            return <ScriptEditor env={compiler.environment} script={data.object} role={role} />;
+            case 'article': {
+              if (data.object instanceof ScriptType) {
+                return <ScriptContainer script={data.object} env={compiler.environment} />;
+              }
+              break;
+            }
           }
 
           return null;
@@ -135,7 +130,7 @@ export const ScriptPlugin = (): PluginDefinition<ScriptPluginProvides> => {
         resolver: (intent) => {
           switch (intent.action) {
             case ScriptAction.CREATE: {
-              return { data: create(ScriptType, { source: create(TextType, { content: example }) }) };
+              return { data: create(ScriptType, { source: create(TextType, { content: templates[0].source }) }) };
             }
           }
         },
@@ -143,14 +138,3 @@ export const ScriptPlugin = (): PluginDefinition<ScriptPluginProvides> => {
     },
   };
 };
-
-// TODO(burdon): Import.
-const example = [
-  'export default async ({ ',
-  '  event: { data: { request } },',
-  '  context: { space, ai } ',
-  '}: any) => {',
-  "  return new Response('Hello DXOS!');",
-  '};',
-  '',
-].join('\n');

package/src/bundler/bundler.test.ts

@@ -2,11 +2,21 @@
 // Copyright 2022 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+// @ts-ignore
+import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
+import { beforeAll, describe, expect, test } from 'vitest';
 
-import { Bundler } from './bundler';
+import { isNode } from '@dxos/util';
+
+import { Bundler, initializeBundler } from './bundler';
 
 describe('Bundler', () => {
+  beforeAll(async () => {
+    if (!isNode()) {
+      await initializeBundler({ wasmUrl });
+    }
+  });
+
   test('Basic', async () => {
     const bundler = new Bundler({ platform: 'node', sandboxedModules: [], remoteModules: {} });
     const result = await bundler.bundle('const x = 100'); // TODO(burdon): Test import.

package/src/components/{DebugPanel.tsx → DebugPanel/DebugPanel.tsx}

@@ -18,7 +18,7 @@ import {
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { mx } from '@dxos/react-ui-theme';
 
-import { SCRIPT_PLUGIN } from '../meta';
+import { SCRIPT_PLUGIN } from '../../meta';
 
 type State = 'pending' | 'responding';
 
@@ -47,7 +47,7 @@ export const DebugPanel = ({ classNames, functionUrl, binding: _binding, onBindi
   const [result, setResult] = useState('');
   const [state, setState] = useState<State | null>(null);
 
-  // TODO(burdon): Persistent history (non-space ECHO data?)
+  // TODO(burdon): Persistent history -- at least for session (non-space ECHO data?)
   const [history, setHistory] = useState<Message[]>([]);
 
   const scrollerRef = useRef<HTMLDivElement>(null);
@@ -215,55 +215,62 @@ export const DebugPanel = ({ classNames, functionUrl, binding: _binding, onBindi
   );
 };
 
-const RobotAvatar = () => (
-  <Avatar.Root size={6} variant='circle'>
-    <Avatar.Frame>
-      <Avatar.Icon icon='ph--robot--regular' />
-    </Avatar.Frame>
-  </Avatar.Root>
-);
-
-const MessageItem = ({ classNames, message }: ThemedClassName<{ message: Message }>) => {
-  const { text, data, error } = message;
-  if (error) {
-    return <span className={mx(classNames, 'whitespace-pre text-error')}>{String(error)}</span>;
-  } else if (data) {
-    return (
-      <SyntaxHighlighter language='json' className={mx('text-xs', classNames)}>
-        {JSON.stringify(data, null, 2)}
-      </SyntaxHighlighter>
-    );
-  }
-
-  return <span className={mx(classNames)}>{text || '\u00D8'}</span>;
-};
-
 // TODO(burdon): Replace with thread?
 // TODO(burdon): Button to delete individual messages.
-// TODO(burdon): Button to re-run question.
+// TODO(burdon): Button to edit/re-run question.
 const MessageThread = ({ state, result, history }: { state: State | null; result: string; history: Message[] }) => {
   return (
     <>
       {history.map((message, i) => (
-        <div key={i} className='grid grid-cols-[3rem_1fr]'>
-          <div>{message.type === 'response' && <RobotAvatar />}</div>
-          <div className={mx('flex', message.type === 'request' && 'justify-end')}>
-            <MessageItem
-              classNames={[message.type === 'request' && 'p-1 px-2 rounded-lg bg-hoverSurface']}
-              message={message}
-            />
+        <div key={i} className='grid grid-cols-[3rem_1fr_3rem]'>
+          <div className='p-1'>{message.type === 'response' && <RobotAvatar />}</div>
+          <div className='overflow-auto'>
+            <MessageItem message={message} />
           </div>
         </div>
       ))}
-      <div className='grid grid-cols-[3rem_1fr]'>
-        <div>
-          {(state === 'pending' && <Icon icon='ph--spinner--regular' size={6} classNames='animate-spin-slow' />) ||
-            (result.length > 0 && <RobotAvatar />)}
-        </div>
-        <div>
-          <span>{result}</span>
+      {result?.length > 0 && (
+        <div className='grid grid-cols-[3rem_1fr_3rem]'>
+          <div className='p-1'>
+            {(state === 'pending' && <Icon icon='ph--spinner--regular' size={6} classNames='animate-spin' />) || (
+              <Icon icon='ph--robot--regular' size={6} classNames='animate-[pulse_1s_ease-in-out_infinite]' />
+            )}
+          </div>
+          <div className='overflow-auto'>
+            <MessageItem message={{ type: 'response', text: result }} />
+          </div>
         </div>
-      </div>
+      )}
     </>
   );
 };
+
+const MessageItem = ({ classNames, message }: ThemedClassName<{ message: Message }>) => {
+  const { type, text, data, error } = message;
+  const wrapper = 'p-1 px-2 rounded-lg bg-hoverSurface overflow-auto';
+  return (
+    <div className={mx('flex', type === 'request' ? 'ml-[8rem] justify-end' : 'mr-[8rem]', classNames)}>
+      {error && <div className={mx(wrapper, 'whitespace-pre text-error')}>{String(error)}</div>}
+
+      {text !== undefined && (
+        <div className={mx(wrapper, type === 'request' && 'bg-primary-400 dark:bg-primary-600')}>
+          {text || '\u00D8'}
+        </div>
+      )}
+
+      {data && (
+        <SyntaxHighlighter language='json' className={mx(wrapper, 'px-8 py-2 text-xs')}>
+          {JSON.stringify(data, null, 2)}
+        </SyntaxHighlighter>
+      )}
+    </div>
+  );
+};
+
+const RobotAvatar = () => (
+  <Avatar.Root size={6} variant='circle'>
+    <Avatar.Frame>
+      <Avatar.Icon icon='ph--robot--regular' />
+    </Avatar.Frame>
+  </Avatar.Root>
+);

package/src/components/DebugPanel/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './DebugPanel';

package/src/components/{ScriptBlock/FrameContainer → FrameContainer}/FrameContainer.tsx

@@ -11,7 +11,7 @@ import { baseSurface, mx } from '@dxos/react-ui-theme';
 import { createProtoRpcPeer } from '@dxos/rpc';
 import { createIFramePort } from '@dxos/rpc-tunnel';
 
-import { type BundlerResult } from '../../../bundler';
+import { type BundlerResult } from '../../bundler';
 
 export type FrameContainerProps = {
   containerUrl: string;

package/src/components/ScriptBlock/ScriptBlock.stories.tsx

@@ -3,6 +3,7 @@
 //
 
 import '@dxos-theme';
+
 import React, { useEffect, useMemo } from 'react';
 
 import { createSpaceObjectGenerator, TestSchemaType } from '@dxos/echo-generator';
@@ -12,10 +13,10 @@ import { create, createEchoObject, useSpaces } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-// @ts-ignore
-import mainUrl from './FrameContainer/frame?url';
 import { ScriptBlock } from './ScriptBlock';
 import { ScriptType } from '../../types';
+// @ts-ignore
+import mainUrl from '../FrameContainer/frame?url';
 
 const code = [
   "import { Filter, useQuery, useSpaces} from '@dxos/react-client/echo';",
@@ -64,7 +65,7 @@ const Story = () => {
 export default {
   title: 'plugin-script/ScriptBlock',
   component: ScriptBlock,
-  decorators: [withTheme, withLayout({ fullscreen: true, tooltips: true }), withClientProvider({ createSpace: true })],
+  decorators: [withClientProvider({ createSpace: true }), withTheme, withLayout({ fullscreen: true, tooltips: true })],
   render: Story,
 };