@dxos/plugin-script 0.7.2-staging.6d26b2a → 0.7.3-main.2dd075e

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

@@ -1,5 +1,48 @@
 declare const _default: {
     'en-US': {
+        [x: string]: {
+            'typename label': string;
+            'plugin name'?: undefined;
+            'object title placeholder'?: undefined;
+            'create object label'?: undefined;
+            'create stack section label'?: undefined;
+            'binding placeholder'?: undefined;
+            'function request placeholder'?: undefined;
+            'deploy label'?: undefined;
+            'deployed label'?: undefined;
+            'upload failed label'?: undefined;
+            'copy link label'?: undefined;
+            'format label'?: undefined;
+            'toggle details label'?: undefined;
+            'authenticate action label'?: undefined;
+            'authenticate button label'?: undefined;
+            'name label'?: undefined;
+            'remote function settings heading'?: undefined;
+            'function url label'?: undefined;
+            'function binding label'?: undefined;
+            'function binding placeholder'?: undefined;
+        } | {
+            'plugin name': string;
+            'object title placeholder': string;
+            'create object label': string;
+            'create stack section label': string;
+            'binding placeholder': string;
+            'function request placeholder': string;
+            'deploy label': string;
+            'deployed label': string;
+            'upload failed label': string;
+            'copy link label': string;
+            'format label': string;
+            'toggle details label': string;
+            'authenticate action label': string;
+            'authenticate button label': string;
+            'name label': string;
+            'remote function settings heading': string;
+            'function url label': string;
+            'function binding label': string;
+            'function binding placeholder': string;
+            'typename label'?: undefined;
+        };
         "dxos.org/plugin/script": {
             'plugin name': string;
             'object title placeholder': string;

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

@@ -1 +1 @@
-{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAMA,wBA0BE"}
+{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,wBA6BE"}

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

@@ -39,14 +39,14 @@ declare const FunctionType_base: import("@dxos/echo-schema").AbstractTypedObject
     } & {
         id: string;
     }>;
-    version: number;
+    version: string;
     inputSchema?: JsonSchemaType | undefined;
     binding?: string | undefined;
 } & {
     id: string;
 }, S.Struct.Encoded<{
     name: typeof S.NonEmptyString;
-    version: typeof S.Number;
+    version: typeof S.String;
     source: S.optional<ref<{
         name?: string | undefined;
         description?: string | undefined;

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

@@ -1,9 +1,8 @@
 import type { GraphBuilderProvides, IntentResolverProvides, MetadataRecordsProvides, SettingsProvides, SurfaceProvides, TranslationsProvides } from '@dxos/app-framework';
-import { type SchemaProvides } from '@dxos/plugin-client';
-import { type SpaceInitProvides } from '@dxos/plugin-space';
+import { type SchemaProvides } from '@dxos/plugin-space';
 export declare enum ScriptAction {
     CREATE = "dxos.org/plugin/script/create"
 }
 export type ScriptSettingsProps = {};
-export type ScriptPluginProvides = GraphBuilderProvides & IntentResolverProvides & MetadataRecordsProvides & SchemaProvides & SettingsProvides<ScriptSettingsProps> & SpaceInitProvides & SurfaceProvides & TranslationsProvides;
+export type ScriptPluginProvides = GraphBuilderProvides & IntentResolverProvides & MetadataRecordsProvides & SchemaProvides & SettingsProvides<ScriptSettingsProps> & 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,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"}
+{"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,oBAAoB,CAAC;AAIzD,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,eAAe,GACf,oBAAoB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.7.2-staging.6d26b2a",
+  "version": "0.7.3-main.2dd075e",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -67,32 +67,34 @@
     "prettier": "^3.2.4",
     "react-syntax-highlighter": "^15.5.0",
     "typescript": "^5.6.2",
-    "@dxos/app-framework": "0.7.2-staging.6d26b2a",
-    "@dxos/client-protocol": "0.7.2-staging.6d26b2a",
-    "@dxos/async": "0.7.2-staging.6d26b2a",
-    "@dxos/debug": "0.7.2-staging.6d26b2a",
-    "@dxos/client": "0.7.2-staging.6d26b2a",
-    "@dxos/invariant": "0.7.2-staging.6d26b2a",
-    "@dxos/echo-schema": "0.7.2-staging.6d26b2a",
-    "@dxos/crypto": "0.7.2-staging.6d26b2a",
-    "@dxos/keys": "0.7.2-staging.6d26b2a",
-    "@dxos/log": "0.7.2-staging.6d26b2a",
-    "@dxos/plugin-explorer": "0.7.2-staging.6d26b2a",
-    "@dxos/plugin-client": "0.7.2-staging.6d26b2a",
-    "@dxos/plugin-markdown": "0.7.2-staging.6d26b2a",
-    "@dxos/plugin-space": "0.7.2-staging.6d26b2a",
-    "@dxos/plugin-graph": "0.7.2-staging.6d26b2a",
-    "@dxos/plugin-stack": "0.7.2-staging.6d26b2a",
-    "@dxos/plugin-theme": "0.7.2-staging.6d26b2a",
-    "@dxos/protocols": "0.7.2-staging.6d26b2a",
-    "@dxos/react-client": "0.7.2-staging.6d26b2a",
-    "@dxos/react-ui-attention": "0.7.2-staging.6d26b2a",
-    "@dxos/react-ui-form": "0.7.2-staging.6d26b2a",
-    "@dxos/react-ui-editor": "0.7.2-staging.6d26b2a",
-    "@dxos/react-ui-syntax-highlighter": "0.7.2-staging.6d26b2a",
-    "@dxos/rpc": "0.7.2-staging.6d26b2a",
-    "@dxos/rpc-tunnel": "0.7.2-staging.6d26b2a",
-    "@dxos/util": "0.7.2-staging.6d26b2a"
+    "@dxos/app-framework": "0.7.3-main.2dd075e",
+    "@dxos/async": "0.7.3-main.2dd075e",
+    "@dxos/client-protocol": "0.7.3-main.2dd075e",
+    "@dxos/crypto": "0.7.3-main.2dd075e",
+    "@dxos/client": "0.7.3-main.2dd075e",
+    "@dxos/debug": "0.7.3-main.2dd075e",
+    "@dxos/edge-client": "0.7.3-main.2dd075e",
+    "@dxos/echo-schema": "0.7.3-main.2dd075e",
+    "@dxos/invariant": "0.7.3-main.2dd075e",
+    "@dxos/keys": "0.7.3-main.2dd075e",
+    "@dxos/live-object": "0.7.3-main.2dd075e",
+    "@dxos/log": "0.7.3-main.2dd075e",
+    "@dxos/plugin-explorer": "0.7.3-main.2dd075e",
+    "@dxos/plugin-client": "0.7.3-main.2dd075e",
+    "@dxos/plugin-markdown": "0.7.3-main.2dd075e",
+    "@dxos/plugin-stack": "0.7.3-main.2dd075e",
+    "@dxos/plugin-graph": "0.7.3-main.2dd075e",
+    "@dxos/plugin-space": "0.7.3-main.2dd075e",
+    "@dxos/plugin-theme": "0.7.3-main.2dd075e",
+    "@dxos/protocols": "0.7.3-main.2dd075e",
+    "@dxos/react-client": "0.7.3-main.2dd075e",
+    "@dxos/react-ui-attention": "0.7.3-main.2dd075e",
+    "@dxos/react-ui-editor": "0.7.3-main.2dd075e",
+    "@dxos/react-ui-form": "0.7.3-main.2dd075e",
+    "@dxos/react-ui-syntax-highlighter": "0.7.3-main.2dd075e",
+    "@dxos/rpc": "0.7.3-main.2dd075e",
+    "@dxos/rpc-tunnel": "0.7.3-main.2dd075e",
+    "@dxos/util": "0.7.3-main.2dd075e"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -102,20 +104,19 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-generator": "0.7.2-staging.6d26b2a",
-    "@dxos/random": "0.7.2-staging.6d26b2a",
-    "@dxos/react-ui": "0.7.2-staging.6d26b2a",
-    "@dxos/react-ui-mosaic": "0.7.2-staging.6d26b2a",
-    "@dxos/react-ui-theme": "0.7.2-staging.6d26b2a",
-    "@dxos/storybook-utils": "0.7.2-staging.6d26b2a"
+    "@dxos/random": "0.7.3-main.2dd075e",
+    "@dxos/react-ui": "0.7.3-main.2dd075e",
+    "@dxos/react-ui-theme": "0.7.3-main.2dd075e",
+    "@dxos/react-ui-mosaic": "0.7.3-main.2dd075e",
+    "@dxos/storybook-utils": "0.7.3-main.2dd075e"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-mosaic": "0.7.2-staging.6d26b2a",
-    "@dxos/react-ui": "0.7.2-staging.6d26b2a",
-    "@dxos/react-ui-theme": "0.7.2-staging.6d26b2a"
+    "@dxos/react-ui": "0.7.3-main.2dd075e",
+    "@dxos/react-ui-mosaic": "0.7.3-main.2dd075e",
+    "@dxos/react-ui-theme": "0.7.3-main.2dd075e"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.tsx

@@ -7,7 +7,7 @@ import wasmUrl from 'esbuild-wasm/esbuild.wasm?url';
 import React from 'react';
 
 import { NavigationAction, parseIntentPlugin, type PluginDefinition, resolvePlugin } from '@dxos/app-framework';
-import { create } from '@dxos/echo-schema';
+import { create } from '@dxos/live-object';
 import { parseClientPlugin } from '@dxos/plugin-client';
 import { type ActionGroup, createExtension, isActionGroup } from '@dxos/plugin-graph';
 import { TextType } from '@dxos/plugin-markdown/types';
@@ -57,13 +57,8 @@ export const ScriptPlugin = (): PluginDefinition<ScriptPluginProvides> => {
       },
       translations,
       echo: {
-        schema: [ScriptType, FunctionType],
-      },
-      space: {
-        onSpaceCreate: {
-          label: ['create object label', { ns: SCRIPT_PLUGIN }],
-          action: ScriptAction.CREATE,
-        },
+        schema: [ScriptType],
+        system: [FunctionType],
       },
       graph: {
         builder: (plugins) => {

package/src/components/AutomationPanel/AutomationPanel.tsx

@@ -8,9 +8,10 @@ import { type ReactiveEchoObject } from '@dxos/client/echo';
 import { failUndefined } from '@dxos/debug';
 import { useClient } from '@dxos/react-client';
 import { Filter, getMeta, getSpace, useQuery } from '@dxos/react-client/echo';
-import { Select } from '@dxos/react-ui';
+import { Select, useTranslation } from '@dxos/react-ui';
 
 import { getInvocationUrl, getUserFunctionUrlInMetadata } from '../../edge';
+import { SCRIPT_PLUGIN } from '../../meta';
 import { FunctionType, ScriptType } from '../../types';
 import { DebugPanel } from '../DebugPanel';
 
@@ -19,17 +20,21 @@ export interface AutomationPanelProps {
 }
 
 export const AutomationPanel = ({ subject }: AutomationPanelProps) => {
+  const { t } = useTranslation(SCRIPT_PLUGIN);
   const space = getSpace(subject);
 
   // TODO(dmaretskyi): Parametric query.
   const functions = useQuery(
     space ?? undefined,
-    Filter.schema(FunctionType, (fn) => (subject instanceof ScriptType ? fn.source === subject : fn.binding != null)),
+    subject instanceof ScriptType
+      ? Filter.schema(FunctionType, { source: subject })
+      : Filter.schema(FunctionType, (fn) => fn.binding != null),
     {},
     [subject],
   );
+
   const [selectedFunction, setSelectedFunction] = useState<FunctionType | null>(null);
-  const functionToChatWith = subject instanceof ScriptType ? functions[0] : selectedFunction;
+  const chatFunction = subject instanceof ScriptType ? functions[0] : selectedFunction;
 
   return (
     <div className='h-full flex flex-col'>
@@ -40,8 +45,8 @@ export const AutomationPanel = ({ subject }: AutomationPanelProps) => {
           functions={functions}
         />
       )}
-      {functionToChatWith && <ChatPanel fn={functionToChatWith} subject={subject} />}
-      {subject instanceof ScriptType && functions.length === 0 && <p>Deploy function to interact with it.</p>}
+      {chatFunction && <ChatPanel fn={chatFunction} subject={subject} />}
+      {subject instanceof ScriptType && functions.length === 0 && <div className='p-1'>{t('not deployed')}</div>}
     </div>
   );
 };

package/src/components/DebugPanel/DebugPanel.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { useEffect, useRef, useState } from 'react';
+import React, { forwardRef, useEffect, useRef, useState } from 'react';
 
 import { log } from '@dxos/log';
 import { Avatar, Icon, Input, type ThemedClassName, Toolbar, useTranslation } from '@dxos/react-ui';
@@ -159,12 +159,10 @@ export const DebugPanel = ({ classNames, functionUrl }: DebugPanelProps) => {
 
   return (
     <div className={mx('flex flex-col h-full overflow-hidden', classNames)}>
-      {/* TODO(burdon): Replace with Thread? */}
-      <div ref={scrollerRef} className='flex flex-col gap-6 h-full p-2 overflow-x-hidden overflow-y-auto'>
-        <MessageThread state={state} result={result} history={history} />
-      </div>
+      {/* TODO(burdon): Replace with Thread. */}
+      <MessageThread ref={scrollerRef} state={state} result={result} history={history} />
 
-      <Toolbar.Root classNames='p-2'>
+      <Toolbar.Root classNames='p-1'>
         <Input.Root>
           <Input.TextInput
             ref={inputRef}
@@ -189,32 +187,45 @@ export const DebugPanel = ({ classNames, functionUrl }: DebugPanelProps) => {
 // TODO(burdon): Replace with thread?
 // TODO(burdon): Button to delete individual messages.
 // 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-[2rem_1fr_2rem]'>
-          <div className='p-1'>{message.type === 'response' && <RobotAvatar />}</div>
-          <div className='overflow-auto'>
-            <MessageItem message={message} />
-          </div>
-        </div>
-      ))}
-      {result?.length > 0 && (
-        <div className='grid grid-cols-[2rem_1fr_2rem]'>
-          <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]' />
-            )}
+type MessageThreadProps = {
+  state: State | null;
+  history: Message[];
+  result: string;
+};
+
+const MessageThread = forwardRef<HTMLDivElement, MessageThreadProps>(
+  ({ state, history, result }: MessageThreadProps, forwardedRef) => {
+    if (!history.length && !result.length) {
+      return null;
+    }
+
+    return (
+      <div ref={forwardedRef} className='flex flex-col gap-6 h-full p-2 overflow-x-hidden overflow-y-auto'>
+        {history.map((message, i) => (
+          <div key={i} className='grid grid-cols-[2rem_1fr_2rem]'>
+            <div className='p-1'>{message.type === 'response' && <RobotAvatar />}</div>
+            <div className='overflow-auto'>
+              <MessageItem message={message} />
+            </div>
           </div>
-          <div className='overflow-auto'>
-            <MessageItem message={{ type: 'response', text: result }} />
+        ))}
+
+        {result?.length > 0 && (
+          <div className='grid grid-cols-[2rem_1fr_2rem]'>
+            <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>
-      )}
-    </>
-  );
-};
+        )}
+      </div>
+    );
+  },
+);
 
 const MessageItem = ({ classNames, message }: ThemedClassName<{ message: Message }>) => {
   const { type, text, data, error } = message;

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

@@ -5,12 +5,10 @@
 import '@dxos-theme';
 
 import { type Meta } from '@storybook/react';
-import React, { useEffect, useMemo } from 'react';
+import React, { useMemo } from 'react';
 
-import { createSpaceObjectGenerator, TestSchemaType } from '@dxos/echo-generator';
 import { TextType } from '@dxos/plugin-markdown/types';
-import { useClient } from '@dxos/react-client';
-import { create, createObject, useSpaces } from '@dxos/react-client/echo';
+import { create, createObject } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
@@ -19,6 +17,8 @@ import { ScriptType } from '../../types';
 // @ts-ignore
 import mainUrl from '../FrameContainer/frame?url';
 
+const typename = 'example.com/type/contact';
+
 const code = [
   "import { Filter, useQuery, useSpaces} from '@dxos/react-client/echo';",
   "import { Chart, Explorer, Globe } from '@dxos/plugin-explorer';",
@@ -26,32 +26,12 @@ const code = [
   'export default () => {',
   '  const spaces = useSpaces();',
   '  const space = spaces[1]',
-  "  const objects = useQuery(space, Filter.typename('example.com/type/contact'));",
+  `  const objects = useQuery(space, Filter.typename('${typename}'));`,
   '  return <Chart items={objects} accessor={object => ({ x: object.lat, y: object.lng })} />',
   '}',
 ].join('\n');
 
 const DefaultStory = () => {
-  const client = useClient();
-  const spaces = useSpaces();
-  console.log(spaces.length);
-
-  useEffect(() => {
-    try {
-      // TODO(burdon): Default not set.
-      const generator = createSpaceObjectGenerator(client.spaces.default);
-      generator.addSchemas();
-      void generator
-        .createObjects({
-          [TestSchemaType.organization]: 20,
-          [TestSchemaType.contact]: 50,
-        })
-        .catch(() => {});
-    } catch (err) {
-      console.log(err);
-    }
-  }, [client]);
-
   // TODO(burdon): Review what's the right way to create automerge-backed objects.
   const object = useMemo(() => createObject(create(ScriptType, { source: create(TextType, { content: code }) })), []);
 

package/src/components/ScriptBlock/ScriptBlock.tsx

@@ -8,7 +8,6 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { createDocAccessor, DocAccessor } from '@dxos/react-client/echo';
 import { Toolbar, Button, Icon } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
 
 import { Bundler, type BundlerResult, initializeBundler } from '../../bundler';
 import { type ScriptType } from '../../types';
@@ -28,10 +27,6 @@ const PROVIDED_MODULES = [
 export type ScriptBlockProps = {
   script: ScriptType;
   hideSelector?: boolean;
-  classes?: {
-    root?: string;
-    toolbar?: string;
-  };
 
   // Url to the page used to host the script in the iframe.
   containerUrl: string;
@@ -41,7 +36,7 @@ export type ScriptBlockProps = {
  * @deprecated
  */
 // TODO(burdon): Cache compiled results in context.
-export const ScriptBlock = ({ script, hideSelector, classes, containerUrl }: ScriptBlockProps) => {
+export const ScriptBlock = ({ script, hideSelector, containerUrl }: ScriptBlockProps) => {
   const source = useMemo(() => script.source && createDocAccessor(script.source, ['content']), [script.source]);
   const [result, setResult] = useState<BundlerResult>();
   const bundler = useMemo(
@@ -78,9 +73,9 @@ export const ScriptBlock = ({ script, hideSelector, classes, containerUrl }: Scr
   );
 
   return (
-    <div className={mx('flex flex-col grow overflow-hidden', classes?.root)}>
+    <div className='flex flex-col grow overflow-hidden'>
       {!hideSelector && (
-        <Toolbar.Root classNames={mx('mb-2', classes?.toolbar)}>
+        <Toolbar.Root>
           <div className='grow' />
           {result?.bundle && !result?.error && (
             <div title={String(result.error)}>

package/src/components/ScriptEditor.tsx

@@ -2,7 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type DID } from 'iso-did/types';
 import { format } from 'prettier';
 import prettierPluginEstree from 'prettier/plugins/estree';
 import prettierPluginTypescript from 'prettier/plugins/typescript';
@@ -23,10 +22,10 @@ import { Bundler } from '../bundler';
 import {
   getInvocationUrl,
   getUserFunctionUrlInMetadata,
-  publicKeyToDid,
   setUserFunctionUrlInMetadata,
   uploadWorkerFunction,
-  USERFUNCTIONS_PRESET_META_KEY,
+  FUNCTIONS_PRESET_META_KEY,
+  incrementSemverPatch,
 } from '../edge';
 import { SCRIPT_PLUGIN } from '../meta';
 import { templates } from '../templates';
@@ -42,11 +41,7 @@ export const ScriptEditor = ({ classNames, script, env }: ScriptEditorProps) =>
   const client = useClient();
   const identity = useIdentity();
   const space = getSpace(script);
-  // TODO(dmaretskyi): Parametric query.
-  const [fn] = useQuery(
-    space,
-    Filter.schema(FunctionType, (fn) => fn.source === script),
-  );
+  const [fn] = useQuery(space, Filter.schema(FunctionType, { source: script }));
 
   const extensions = useMemo(
     () => [
@@ -95,12 +90,12 @@ export const ScriptEditor = ({ classNames, script, env }: ScriptEditorProps) =>
       script.name = template.name;
       script.source!.content = template.source;
       const metaKeys = getMeta(script).keys;
-      const oldPresetIndex = metaKeys.findIndex((key) => key.source === USERFUNCTIONS_PRESET_META_KEY);
+      const oldPresetIndex = metaKeys.findIndex((key) => key.source === FUNCTIONS_PRESET_META_KEY);
       if (oldPresetIndex >= 0) {
         metaKeys.splice(oldPresetIndex, 1);
       }
       if (template.presetId) {
-        metaKeys.push({ source: USERFUNCTIONS_PRESET_META_KEY, id: template.presetId });
+        metaKeys.push({ source: FUNCTIONS_PRESET_META_KEY, id: template.presetId });
       }
     }
   };
@@ -114,7 +109,6 @@ export const ScriptEditor = ({ classNames, script, env }: ScriptEditorProps) =>
 
     try {
       const existingFunctionId = existingFunctionUrl?.split('/').at(-1);
-      const ownerDid = (existingFunctionUrl?.split('/').at(-2) as DID) ?? publicKeyToDid(identity.identityKey);
 
       const bundler = new Bundler({ platform: 'browser', sandboxedModules: [], remoteModules: {} });
       const buildResult = await bundler.bundle(script.source.content);
@@ -122,24 +116,23 @@ export const ScriptEditor = ({ classNames, script, env }: ScriptEditorProps) =>
         throw buildResult.error;
       }
 
-      const { result, functionId, functionVersionNumber, errorMessage, meta } = await uploadWorkerFunction({
-        clientConfig: client.config,
-        halo: client.halo,
-        ownerDid,
+      const { functionId, version, meta } = await uploadWorkerFunction({
+        client,
+        spaceId: space.id,
+        version: fn ? incrementSemverPatch(fn.version) : '0.0.1',
         functionId: existingFunctionId,
         source: buildResult.bundle,
       });
-      if (result !== 'success' || functionId === undefined || functionVersionNumber === undefined) {
-        throw new Error(errorMessage);
+      if (functionId === undefined || version === undefined) {
+        throw new Error(`Upload didn't return expected data: functionId=${functionId}, version=${version}`);
       }
 
-      log.info('function uploaded', { functionId, functionVersionNumber });
+      log.info('function uploaded', { functionId, version });
       if (fn) {
-        fn.version = functionVersionNumber;
+        fn.version = version;
       }
 
-      const deployedFunction =
-        fn ?? space.db.add(create(FunctionType, { name: functionId, version: functionVersionNumber, source: script }));
+      const deployedFunction = fn ?? space.db.add(create(FunctionType, { name: functionId, version, source: script }));
 
       script.changed = false;
 
@@ -149,14 +142,14 @@ export const ScriptEditor = ({ classNames, script, env }: ScriptEditorProps) =>
         log.verbose('no input schema in function metadata', { functionId });
       }
 
-      setUserFunctionUrlInMetadata(getMeta(deployedFunction), `/${ownerDid}/${functionId}`);
+      setUserFunctionUrlInMetadata(getMeta(deployedFunction), `/${space.id}/${functionId}`);
 
       setView('split');
     } catch (err: any) {
       log.catch(err);
       setError(t('upload failed label'));
     }
-  }, [fn, existingFunctionUrl, script, script.name, script.source]);
+  }, [fn, existingFunctionUrl, script, script.name, script.source, space?.id ?? null]);
 
   const functionUrl = useMemo(() => {
     if (!existingFunctionUrl) {

package/src/components/ScriptSettingsPanel.tsx

@@ -20,11 +20,7 @@ export const ScriptSettingsPanel = ({ script }: ScriptSettingsPanelProps) => {
   const { t } = useTranslation(SCRIPT_PLUGIN);
   const client = useClient();
   const space = getSpace(script);
-  // TODO(dmaretskyi): Parametric query.
-  const [fn] = useQuery(
-    space,
-    Filter.schema(FunctionType, (fn) => fn.source === script),
-  );
+  const [fn] = useQuery(space, Filter.schema(FunctionType, { source: script }));
 
   const handleNameChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => {