@dxos/plugin-script 0.7.1 → 0.7.2-main.f1adc9f

package/dist/types/src/components/ScriptBlock/ScriptBlock.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScriptBlock.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScriptBlock/ScriptBlock.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAwD7C,eAAO,MAAM,OAAO,IAAK,CAAC;AAE1B,QAAA,MAAM,IAAI,EAAE,IAKX,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"ScriptBlock.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/ScriptBlock/ScriptBlock.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAoC7C,eAAO,MAAM,OAAO,IAAK,CAAC;AAE1B,QAAA,MAAM,IAAI,EAAE,IAKX,CAAC;AAEF,eAAe,IAAI,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"ScriptEditor.d.ts","sourceRoot":"","sources":["../../../../src/components/ScriptEditor.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAM9D,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMtE,OAAO,EAAoB,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAYlF,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAEzD,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;IAC9C,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC,GACA,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;AAErC,eAAO,MAAM,YAAY,gCAAiC,iBAAiB,sBA6J1E,CAAC"}
+{"version":3,"file":"ScriptEditor.d.ts","sourceRoot":"","sources":["../../../../src/components/ScriptEditor.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAM9D,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMtE,OAAO,EAAoB,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAYlF,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAEzD,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;IAC9C,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC,GACA,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;AAErC,eAAO,MAAM,YAAY,gCAAiC,iBAAiB,sBA8J1E,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../../../src/edge/functions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAS1C,eAAO,MAAM,6BAA6B,qCAAqC,CAAC;AAIhF,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,cAAc,CAAC;KAC9B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,GAAG,CAAC;IACd,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAeF,eAAO,MAAM,oBAAoB,uFAQ9B,iBAAiB,sCAwBnB,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,UAAU,uBAE5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,UAAU,eAAe,MAAM,SASjF,CAAC;AAoCF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBAAiB,MAAM,WAAW,MAAM,YAAW,iBAAiB,WAUhG,CAAC"}
+{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../../../src/edge/functions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAS1C,eAAO,MAAM,6BAA6B,qCAAqC,CAAC;AAIhF,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,cAAc,CAAC;KAC9B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,GAAG,CAAC;IACd,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AA0BF,eAAO,MAAM,oBAAoB,uFAQ9B,iBAAiB,sCAwBnB,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,UAAU,uBAE5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,UAAU,eAAe,MAAM,SASjF,CAAC;AAoCF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBAAiB,MAAM,WAAW,MAAM,YAAW,iBAAiB,WAUhG,CAAC"}

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

@@ -2,23 +2,23 @@ import { JsonSchemaType, ref, S } from '@dxos/echo-schema';
 declare const ScriptType_base: import("@dxos/echo-schema").AbstractTypedObject<{
     name?: string | undefined;
     description?: string | undefined;
+    changed?: boolean | undefined;
     source: import("@dxos/echo-schema").Ref<{
         content: string;
     } & {
         id: string;
     }>;
-    changed?: boolean | undefined;
 } & {
     id: string;
 }, S.Struct.Encoded<{
     name: S.optional<typeof S.String>;
     description: S.optional<typeof S.String>;
+    changed: S.optional<typeof S.Boolean>;
     source: ref<{
         content: string;
     } & {
         id: string;
     }>;
-    changed: S.optional<typeof S.Boolean>;
 }>>;
 /**
  * Source script.
@@ -26,41 +26,41 @@ declare const ScriptType_base: import("@dxos/echo-schema").AbstractTypedObject<{
 export declare class ScriptType extends ScriptType_base {
 }
 declare const FunctionType_base: import("@dxos/echo-schema").AbstractTypedObject<{
-    name?: string | undefined;
+    name: string;
     source?: import("@dxos/echo-schema").Ref<{
         name?: string | undefined;
         description?: string | undefined;
+        changed?: boolean | undefined;
         source: import("@dxos/echo-schema").Ref<{
             content: string;
         } & {
             id: string;
         }>;
-        changed?: boolean | undefined;
     } & {
         id: string;
     }>;
     version: number;
-    binding?: string | undefined;
     inputSchema?: JsonSchemaType | undefined;
+    binding?: string | undefined;
 } & {
     id: string;
 }, S.Struct.Encoded<{
-    name: S.optional<typeof S.String>;
+    name: typeof S.NonEmptyString;
     version: typeof S.Number;
-    binding: S.optional<typeof S.String>;
     source: S.optional<ref<{
         name?: string | undefined;
         description?: string | undefined;
+        changed?: boolean | undefined;
         source: import("@dxos/echo-schema").Ref<{
             content: string;
         } & {
             id: string;
         }>;
-        changed?: boolean | undefined;
     } & {
         id: string;
     }>>;
     inputSchema: S.optional<S.Schema<JsonSchemaType, JsonSchemaType, never>>;
+    binding: S.optional<typeof S.String>;
 }>>;
 /**
  * Function deployment.

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/types/schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,EAAe,MAAM,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;AAGxE;;GAEG;AACH,qBAAa,UAAW,SAAQ,eAW9B;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAahC;CAAG"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/types/schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,EAAe,MAAM,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;AAGxE;;GAEG;AACH,qBAAa,UAAW,SAAQ,eAW9B;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;GAEG;AAEH,qBAAa,YAAa,SAAQ,iBAgBhC;CAAG"}

package/package.json

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

package/src/components/AutomationPanel/AutomationPanel.tsx

@@ -4,21 +4,23 @@
 
 import React, { useMemo, useState } from 'react';
 
-import { type EchoReactiveObject } from '@dxos/client/echo';
+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';
 
 export interface AutomationPanelProps {
-  subject: EchoReactiveObject<any>;
+  subject: ReactiveEchoObject<any>;
 }
 
 export const AutomationPanel = ({ subject }: AutomationPanelProps) => {
+  const { t } = useTranslation(SCRIPT_PLUGIN);
   const space = getSpace(subject);
 
   // TODO(dmaretskyi): Parametric query.
@@ -28,8 +30,9 @@ export const AutomationPanel = ({ subject }: AutomationPanelProps) => {
     {},
     [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,15 +43,15 @@ 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>
   );
 };
 
 export interface ChatPanelProps {
   fn: FunctionType;
-  subject: EchoReactiveObject<any>;
+  subject: ReactiveEchoObject<any>;
 }
 
 const ChatPanel = ({ fn, subject }: ChatPanelProps) => {

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

@@ -68,7 +68,6 @@ export const ScriptEditor = ({ classNames, script, env }: ScriptEditorProps) =>
   );
 
   const [view, setView] = useState<ViewType>('editor');
-  const initialValue = useMemo(() => script.source?.content, [script.source]);
   const existingFunctionUrl = fn && getUserFunctionUrlInMetadata(getMeta(fn));
   const [error, setError] = useState<string>();
 
@@ -140,7 +139,8 @@ export const ScriptEditor = ({ classNames, script, env }: ScriptEditorProps) =>
       }
 
       const deployedFunction =
-        fn ?? space.db.add(create(FunctionType, { version: functionVersionNumber, source: script }));
+        fn ?? space.db.add(create(FunctionType, { name: functionId, version: functionVersionNumber, source: script }));
+
       script.changed = false;
 
       if (meta.inputSchema) {
@@ -148,6 +148,7 @@ export const ScriptEditor = ({ classNames, script, env }: ScriptEditorProps) =>
       } else {
         log.verbose('no input schema in function metadata', { functionId });
       }
+
       setUserFunctionUrlInMetadata(getMeta(deployedFunction), `/${ownerDid}/${functionId}`);
 
       setView('split');
@@ -185,7 +186,7 @@ export const ScriptEditor = ({ classNames, script, env }: ScriptEditorProps) =>
         <TypescriptEditor
           id={script.id}
           env={env}
-          initialValue={initialValue}
+          initialValue={script.source?.content}
           extensions={extensions}
           className='flex is-full bs-full overflow-hidden ch-focus-ring-inset-over-all'
         />

package/src/components/TypescriptEditor/TypescriptEditor.tsx

@@ -70,7 +70,7 @@ export const TypescriptEditor = ({
       selection,
       scrollTo,
     }),
-    [id, initialValue, extensions, themeMode, selection, scrollTo],
+    [id, extensions, themeMode, selection, scrollTo],
   );
 
   return <div ref={parentRef} className={className} {...focusAttributes} />;

package/src/edge/functions.ts

@@ -48,7 +48,18 @@ const defaultUserFunctionsBaseUrl = 'https://edge-main.dxos.workers.dev/function
 const getBaseUrl = (config: Config) => {
   if (config.values.runtime?.services?.edge?.url) {
     const url = new URL('/functions', config.values.runtime?.services?.edge?.url);
-    url.protocol = 'https';
+    switch (url.protocol) {
+      case 'http:':
+      case 'ws:':
+        url.protocol = 'http';
+        break;
+      case 'https:':
+      case 'wss:':
+        url.protocol = 'https';
+        break;
+      default:
+        throw new Error(`Invalid protocol: ${url.protocol}`);
+    }
     return url.toString();
   } else {
     return defaultUserFunctionsBaseUrl;

package/src/types/schema.ts

@@ -15,26 +15,30 @@ export class ScriptType extends TypedObject({
   // TODO(burdon): Change to URI?
   name: S.optional(S.String),
   description: S.optional(S.String),
-  source: ref(TextType),
   // TODO(burdon): Change to hash of deployed content.
   // Whether source has changed since last deploy.
   changed: S.optional(S.Boolean),
+  source: ref(TextType),
 }) {}
 
 /**
  * Function deployment.
  */
+// TODO(burdon): Move to core/functions.
 export class FunctionType extends TypedObject({
   typename: 'dxos.org/type/Function',
   version: '0.1.0',
 })({
-  // TODO(burdon): Change to id?
-  name: S.optional(S.String),
+  // TODO(burdon): Rename to id/uri?
+  name: S.NonEmptyString,
   version: S.Number,
-  // Local binding to a function name.
-  // TODO(burdon): Move binding to inner type.
-  binding: S.optional(S.String),
+
   // Reference to a source script if it exists within ECHO.
+  // TODO(burdon): Don't ref ScriptType directly (core).
   source: S.optional(ref(ScriptType)),
+
   inputSchema: S.optional(JsonSchemaType),
+
+  // Local binding to a function name.
+  binding: S.optional(S.String),
 }) {}

package/dist/lib/browser/AutomationPanel-RYJJQ5QX.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/components/AutomationPanel/AutomationPanel.tsx", "../../../src/components/AutomationPanel/index.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport React, { useMemo, useState } from 'react';\n\nimport { type EchoReactiveObject } from '@dxos/client/echo';\nimport { failUndefined } from '@dxos/debug';\nimport { useClient } from '@dxos/react-client';\nimport { Filter, getMeta, getSpace, useQuery } from '@dxos/react-client/echo';\nimport { Select } from '@dxos/react-ui';\n\nimport { getInvocationUrl, getUserFunctionUrlInMetadata } from '../../edge';\nimport { FunctionType, ScriptType } from '../../types';\nimport { DebugPanel } from '../DebugPanel';\n\nexport interface AutomationPanelProps {\n  subject: EchoReactiveObject<any>;\n}\n\nexport const AutomationPanel = ({ subject }: AutomationPanelProps) => {\n  const space = getSpace(subject);\n\n  // TODO(dmaretskyi): Parametric query.\n  const functions = useQuery(\n    space ?? undefined,\n    Filter.schema(FunctionType, (fn) => (subject instanceof ScriptType ? fn.source === subject : fn.binding != null)),\n    {},\n    [subject],\n  );\n  const [selectedFunction, setSelectedFunction] = useState<FunctionType | null>(null);\n  const functionToChatWith = subject instanceof ScriptType ? functions[0] : selectedFunction;\n\n  return (\n    <div className='h-full flex flex-col'>\n      {!(subject instanceof ScriptType) && (\n        <BindingSelect\n          selectedFunction={selectedFunction}\n          setSelectedFunction={setSelectedFunction}\n          functions={functions}\n        />\n      )}\n      {functionToChatWith && <ChatPanel fn={functionToChatWith} subject={subject} />}\n      {subject instanceof ScriptType && functions.length === 0 && <p>Deploy function to interact with it.</p>}\n    </div>\n  );\n};\n\nexport interface ChatPanelProps {\n  fn: FunctionType;\n  subject: EchoReactiveObject<any>;\n}\n\nconst ChatPanel = ({ fn, subject }: ChatPanelProps) => {\n  const client = useClient();\n  const space = getSpace(fn);\n  const existingFunctionUrl = getUserFunctionUrlInMetadata(getMeta(fn));\n  const functionUrl = useMemo(() => {\n    if (!existingFunctionUrl) {\n      return;\n    }\n\n    return getInvocationUrl(existingFunctionUrl, client.config.values.runtime?.services?.edge?.url ?? '', {\n      spaceId: space?.id,\n      subjectId: subject?.id,\n    });\n  }, [existingFunctionUrl, space, subject]);\n\n  return <DebugPanel functionUrl={functionUrl} classNames='flex-1' />;\n};\n\nexport interface BindingSelectProps {\n  selectedFunction: FunctionType | null;\n  setSelectedFunction: (fn: FunctionType) => void;\n  functions: FunctionType[];\n}\n\nconst BindingSelect = ({ selectedFunction, setSelectedFunction, functions }: BindingSelectProps) => {\n  return (\n    <Select.Root\n      value={selectedFunction?.id}\n      onValueChange={(id) => setSelectedFunction(functions.find((fn) => fn.id === id) ?? failUndefined())}\n    >\n      <Select.TriggerButton placeholder='Select value' />\n      <Select.Portal>\n        <Select.Content>\n          <Select.ScrollUpButton />\n          <Select.Viewport>\n            {functions.map(({ id, binding }) => (\n              <Select.Option key={id} value={id}>\n                {binding}\n              </Select.Option>\n            ))}\n          </Select.Viewport>\n          <Select.ScrollDownButton />\n          <Select.Arrow />\n        </Select.Content>\n      </Select.Portal>\n    </Select.Root>\n  );\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AutomationPanel } from './AutomationPanel';\n\nexport * from './AutomationPanel';\n\nexport default AutomationPanel;\n"],
-  "mappings": ";;;;;;;;;;;;;;AAIA,OAAOA,SAASC,SAASC,gBAAgB;AAGzC,SAASC,qBAAqB;AAC9B,SAASC,iBAAiB;AAC1B,SAASC,QAAQC,SAASC,UAAUC,gBAAgB;AACpD,SAASC,cAAc;AAUhB,IAAMC,kBAAkB,CAAC,EAAEC,QAAO,MAAwB;AAC/D,QAAMC,QAAQC,SAASF,OAAAA;AAGvB,QAAMG,YAAYC,SAChBH,SAASI,QACTC,OAAOC,OAAOC,cAAc,CAACC,OAAQT,mBAAmBU,aAAaD,GAAGE,WAAWX,UAAUS,GAAGG,WAAW,IAAA,GAC3G,CAAC,GACD;IAACZ;GAAQ;AAEX,QAAM,CAACa,kBAAkBC,mBAAAA,IAAuBC,SAA8B,IAAA;AAC9E,QAAMC,qBAAqBhB,mBAAmBU,aAAaP,UAAU,CAAA,IAAKU;AAE1E,SACE,sBAAA,cAACI,OAAAA;IAAIC,WAAU;KACZ,EAAElB,mBAAmBU,eACpB,sBAAA,cAACS,eAAAA;IACCN;IACAC;IACAX;MAGHa,sBAAsB,sBAAA,cAACI,WAAAA;IAAUX,IAAIO;IAAoBhB;MACzDA,mBAAmBU,cAAcP,UAAUkB,WAAW,KAAK,sBAAA,cAACC,KAAAA,MAAE,sCAAA,CAAA;AAGrE;AAOA,IAAMF,YAAY,CAAC,EAAEX,IAAIT,QAAO,MAAkB;AAChD,QAAMuB,SAASC,UAAAA;AACf,QAAMvB,QAAQC,SAASO,EAAAA;AACvB,QAAMgB,sBAAsBC,6BAA6BC,QAAQlB,EAAAA,CAAAA;AACjE,QAAMmB,cAAcC,QAAQ,MAAA;AAC1B,QAAI,CAACJ,qBAAqB;AACxB;IACF;AAEA,WAAOK,iBAAiBL,qBAAqBF,OAAOQ,OAAOC,OAAOC,SAASC,UAAUC,MAAMC,OAAO,IAAI;MACpGC,SAASpC,OAAOqC;MAChBC,WAAWvC,SAASsC;IACtB,CAAA;EACF,GAAG;IAACb;IAAqBxB;IAAOD;GAAQ;AAExC,SAAO,sBAAA,cAACwC,YAAAA;IAAWZ;IAA0Ba,YAAW;;AAC1D;AAQA,IAAMtB,gBAAgB,CAAC,EAAEN,kBAAkBC,qBAAqBX,UAAS,MAAsB;AAC7F,SACE,sBAAA,cAACuC,OAAOC,MAAI;IACVC,OAAO/B,kBAAkByB;IACzBO,eAAe,CAACP,OAAOxB,oBAAoBX,UAAU2C,KAAK,CAACrC,OAAOA,GAAG6B,OAAOA,EAAAA,KAAOS,cAAAA,CAAAA;KAEnF,sBAAA,cAACL,OAAOM,eAAa;IAACC,aAAY;MAClC,sBAAA,cAACP,OAAOQ,QAAM,MACZ,sBAAA,cAACR,OAAOS,SAAO,MACb,sBAAA,cAACT,OAAOU,gBAAc,IAAA,GACtB,sBAAA,cAACV,OAAOW,UAAQ,MACblD,UAAUmD,IAAI,CAAC,EAAEhB,IAAI1B,QAAO,MAC3B,sBAAA,cAAC8B,OAAOa,QAAM;IAACC,KAAKlB;IAAIM,OAAON;KAC5B1B,OAAAA,CAAAA,CAAAA,GAIP,sBAAA,cAAC8B,OAAOe,kBAAgB,IAAA,GACxB,sBAAA,cAACf,OAAOgB,OAAK,IAAA,CAAA,CAAA,CAAA;AAKvB;;;AC5FA,IAAA,0BAAeC;",
-  "names": ["React", "useMemo", "useState", "failUndefined", "useClient", "Filter", "getMeta", "getSpace", "useQuery", "Select", "AutomationPanel", "subject", "space", "getSpace", "functions", "useQuery", "undefined", "Filter", "schema", "FunctionType", "fn", "ScriptType", "source", "binding", "selectedFunction", "setSelectedFunction", "useState", "functionToChatWith", "div", "className", "BindingSelect", "ChatPanel", "length", "p", "client", "useClient", "existingFunctionUrl", "getUserFunctionUrlInMetadata", "getMeta", "functionUrl", "useMemo", "getInvocationUrl", "config", "values", "runtime", "services", "edge", "url", "spaceId", "id", "subjectId", "DebugPanel", "classNames", "Select", "Root", "value", "onValueChange", "find", "failUndefined", "TriggerButton", "placeholder", "Portal", "Content", "ScrollUpButton", "Viewport", "map", "Option", "key", "ScrollDownButton", "Arrow", "AutomationPanel"]
-}