@dxos/plugin-script 0.8.4-main.406dc2a → 0.8.4-main.4f23b4e393

package/src/components/NotebookContainer.tsx

@@ -1,124 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React, { useCallback, useMemo } from 'react';
-
-import { Ref } from '@dxos/echo';
-import { invariant } from '@dxos/invariant';
-import { Assistant } from '@dxos/plugin-assistant';
-import { getSpace } from '@dxos/react-client/echo';
-import { DropdownMenu, IconButton, Toolbar, useTranslation } from '@dxos/react-ui';
-import { StackItem } from '@dxos/react-ui-stack';
-import { DataType } from '@dxos/schema';
-
-import { meta } from '../meta';
-import { ComputeGraph } from '../notebook';
-import { type Notebook } from '../types';
-
-import { NotebookMenu, NotebookStack, type NotebookStackProps } from './NotebookStack';
-import { type TypescriptEditorProps } from './TypescriptEditor';
-
-// TODO(burdon): Support calling named deployed functions (as with sheet).
-
-export type NotebookContainerProps = {
-  role?: string;
-  notebook?: Notebook.Notebook;
-} & Pick<TypescriptEditorProps, 'env'>;
-
-export const NotebookContainer = ({ notebook, env }: NotebookContainerProps) => {
-  const { t } = useTranslation(meta.id);
-  const space = getSpace(notebook);
-  const graph = useMemo(() => notebook && new ComputeGraph(notebook), [notebook]);
-
-  // TODO(burdon): Cache values in context (preserve when switched).
-  const handleCompute = useCallback(() => {
-    graph?.evaluate();
-  }, [graph]);
-
-  const handleRearrange = useCallback<NonNullable<NotebookStackProps['onRearrange']>>(
-    (source, target) => {
-      invariant(notebook);
-      const from = notebook.cells.findIndex((cell) => cell.id === source.id);
-      const to = notebook.cells.findIndex((cell) => cell.id === target.id);
-      if (from != null && to != null) {
-        const cell = notebook.cells.splice(from, 1)[0];
-        if (cell) {
-          notebook.cells.splice(to, 0, cell);
-        }
-      }
-    },
-    [notebook],
-  );
-
-  const handleCellInsert = useCallback<NonNullable<NotebookStackProps['onCellInsert']>>(
-    (type, after) => {
-      invariant(notebook);
-      const cell: Notebook.Cell = { id: crypto.randomUUID(), type };
-      switch (type) {
-        case 'markdown':
-        case 'script':
-        case 'query': {
-          cell.script = Ref.make(DataType.makeText());
-          break;
-        }
-
-        case 'prompt': {
-          if (space) {
-            cell.chat = Ref.make(Assistant.makeChat({ queue: space.queues.create() }));
-          }
-          break;
-        }
-      }
-
-      const idx = after ? notebook.cells.findIndex((cell) => cell.id === after) : notebook.cells.length;
-      notebook.cells.splice(idx, 0, cell);
-    },
-    [space, notebook],
-  );
-
-  const handleCellDelete = useCallback<NonNullable<NotebookStackProps['onCellDelete']>>(
-    (id) => {
-      invariant(notebook);
-      const idx = notebook.cells.findIndex((cell) => cell.id === id);
-      if (idx !== -1) {
-        notebook.cells.splice(idx, 1);
-      }
-    },
-    [notebook],
-  );
-
-  return (
-    <StackItem.Content toolbar>
-      <Toolbar.Root textBlockWidth>
-        <DropdownMenu.Root>
-          <DropdownMenu.Trigger asChild>
-            <IconButton icon='ph--plus--regular' iconOnly label={t('notebook cell insert label')} />
-          </DropdownMenu.Trigger>
-          <NotebookMenu onCellInsert={handleCellInsert} />
-        </DropdownMenu.Root>
-        <Toolbar.IconButton
-          icon='ph--play--fill'
-          iconOnly
-          label={t('compute label')}
-          classNames='text-green-500'
-          onClick={handleCompute}
-        />
-      </Toolbar.Root>
-      <div role='none' className='flex bs-full overflow-hidden -mis-[1px] -mie-[1px]'>
-        <NotebookStack
-          classNames='container-max-width border-l border-r border-subduedSeparator'
-          space={space}
-          notebook={notebook}
-          graph={graph}
-          env={env}
-          onRearrange={handleRearrange}
-          onCellInsert={handleCellInsert}
-          onCellDelete={handleCellDelete}
-        />
-      </div>
-    </StackItem.Content>
-  );
-};
-
-export default NotebookContainer;

package/src/components/ScriptContainer.tsx

@@ -1,69 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import React, { useMemo } from 'react';
-
-import { type ScriptType } from '@dxos/functions';
-import { createDocAccessor, getSpace } from '@dxos/react-client/echo';
-import { useIdentity } from '@dxos/react-client/halo';
-import { createDataExtensions, listener, stackItemContentEditorClassNames } from '@dxos/react-ui-editor';
-import { StackItem } from '@dxos/react-ui-stack';
-
-import { useDeployState, useToolbarState } from '../hooks';
-import { type ScriptSettings } from '../types';
-
-import { ScriptToolbar } from './ScriptToolbar';
-import { TypescriptEditor, type TypescriptEditorProps } from './TypescriptEditor';
-
-export type ScriptEditorProps = {
-  role: string;
-  script: ScriptType;
-  settings?: ScriptSettings;
-} & Pick<TypescriptEditorProps, 'env'>;
-
-export const ScriptContainer = ({ role, script, settings = { editorInputMode: 'vscode' }, env }: ScriptEditorProps) => {
-  const identity = useIdentity();
-  const space = getSpace(script);
-  const state = useToolbarState();
-  useDeployState({ state, script });
-
-  const extensions = useMemo(
-    () =>
-      script.source.target
-        ? [
-            listener({
-              onChange: (text) => {
-                if (script.source.target?.content !== text) {
-                  script.changed = true;
-                }
-              },
-            }),
-            createDataExtensions({
-              id: script.id,
-              text: createDocAccessor(script.source.target, ['content']),
-              space,
-              identity,
-            }),
-          ]
-        : [],
-    [identity, space, script, script.source.target],
-  );
-
-  return (
-    <StackItem.Content toolbar>
-      <ScriptToolbar state={state} role={role} script={script} />
-      <TypescriptEditor
-        id={script.id}
-        env={env}
-        initialValue={script.source?.target?.content}
-        extensions={extensions}
-        classNames={stackItemContentEditorClassNames(role)}
-        inputMode={settings.editorInputMode}
-        toolbar
-      />
-    </StackItem.Content>
-  );
-};
-
-export default ScriptContainer;

package/src/components/Settings/ScriptObjectSettings.tsx

@@ -1,286 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { Octokit } from '@octokit/core';
-import React, { type ChangeEvent, useCallback, useState } from 'react';
-
-import { ToolId } from '@dxos/ai';
-import { SettingsAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
-import { Blueprint, Template } from '@dxos/blueprints';
-import { FunctionType, type ScriptType, getInvocationUrl, getUserFunctionIdInMetadata } from '@dxos/functions';
-import { log } from '@dxos/log';
-import { useClient } from '@dxos/react-client';
-import { Filter, Ref, getMeta, getSpace, useQuery } from '@dxos/react-client/echo';
-import { Button, Clipboard, Input, useAsyncEffect, useControlledState, useTranslation } from '@dxos/react-ui';
-import { DataType } from '@dxos/schema';
-import { kebabize } from '@dxos/util';
-
-import { meta } from '../../meta';
-
-export type ScriptObjectSettingsProps = {
-  object: ScriptType;
-};
-
-export const ScriptObjectSettings = ({ object }: ScriptObjectSettingsProps) => {
-  return (
-    <>
-      <Binding object={object} />
-      <BlueprintEditor object={object} />
-      <Publishing object={object} />
-    </>
-  );
-};
-
-export const ScriptProperties = ({ object }: ScriptObjectSettingsProps) => {
-  const { t } = useTranslation(meta.id);
-  return (
-    <Input.Root>
-      <Input.Label>{t('description label')}</Input.Label>
-      <Input.TextInput
-        placeholder={t('description placeholder')}
-        value={object.description ?? ''}
-        onChange={(event) => {
-          object.description = event.target.value;
-        }}
-      />
-    </Input.Root>
-  );
-};
-
-const BlueprintEditor = ({ object }: ScriptObjectSettingsProps) => {
-  const { t } = useTranslation(meta.id);
-  const space = getSpace(object);
-  const [fn] = useQuery(space, Filter.type(FunctionType, { source: Ref.make(object) }));
-  const blueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
-
-  const [creating, setCreating] = useState(false);
-  const [instructions, setInstructions] = useState<string>(`You can run the script "${object.name ?? 'script'}".`);
-  const blueprintKey = `dxos.org/blueprint/${kebabize(object.name ?? 'script')}`;
-  const existingBlueprint = blueprints.find((bp) => bp.key === blueprintKey);
-
-  useAsyncEffect(async () => {
-    if (!existingBlueprint) {
-      return;
-    }
-    const source = await existingBlueprint.instructions.source.load();
-    setInstructions(source.content ?? '');
-  }, [existingBlueprint]);
-
-  const handleSave = useCallback(async () => {
-    if (!space) {
-      return;
-    }
-
-    setCreating(true);
-    try {
-      if (existingBlueprint) {
-        const text = await existingBlueprint.instructions.source.load();
-        text.content = instructions;
-        if (fn?.key) {
-          const toolId = ToolId.make(fn.key);
-          if (!existingBlueprint.tools?.includes(toolId)) {
-            existingBlueprint.tools = [...(existingBlueprint.tools ?? []), toolId];
-          }
-        }
-      } else if (fn?.key) {
-        space.db.add(
-          Blueprint.make({
-            key: blueprintKey,
-            name: object.name ?? 'Script',
-            instructions: Template.make({
-              source: instructions,
-            }),
-            tools: [ToolId.make(fn.key)],
-          }),
-        );
-      }
-      await space.db.flush();
-    } finally {
-      setCreating(false);
-    }
-  }, [space, existingBlueprint, fn, blueprintKey, object.name, instructions]);
-
-  return (
-    <div className='flex flex-col gap-4 mlb-cardSpacingBlock'>
-      <div>
-        <h2>{t('blueprint editor label', { default: 'Blueprint' })}</h2>
-        <p className='text-description text-sm'>
-          {t('blueprint editor description', { default: 'Create a blueprint that exposes this script as a tool.' })}
-        </p>
-      </div>
-      <Input.Root>
-        <div role='none' className='flex flex-col gap-1'>
-          <Input.Label>{t('blueprint instructions label', { default: 'Instructions' })}</Input.Label>
-          <Input.TextArea
-            placeholder={t('blueprint instructions placeholder', { default: 'Describe how this tool should be used.' })}
-            rows={6}
-            value={instructions}
-            onChange={(event) => setInstructions(event.target.value)}
-            classNames='resize-y'
-          />
-        </div>
-      </Input.Root>
-      <div className='flex justify-end gap-2'>
-        <Button disabled={(!existingBlueprint && !fn?.key) || creating} onClick={handleSave}>
-          {t(creating ? 'creating label' : 'create blueprint label', {
-            default: creating ? 'Creating…' : 'Create blueprint',
-          })}
-        </Button>
-      </div>
-    </div>
-  );
-};
-
-const Binding = ({ object }: ScriptObjectSettingsProps) => {
-  const { t } = useTranslation(meta.id);
-  const client = useClient();
-  const space = getSpace(object);
-  const [fn] = useQuery(space, Filter.type(FunctionType, { source: Ref.make(object) }));
-
-  const functionId = fn && getUserFunctionIdInMetadata(getMeta(fn));
-  const functionUrl =
-    functionId &&
-    getInvocationUrl(functionId, client.config.values.runtime?.services?.edge?.url ?? '', {
-      spaceId: space?.id,
-    });
-
-  const [binding, setBinding] = useControlledState(fn?.binding ?? '');
-  const handleBindingChange = useCallback(
-    (event: ChangeEvent<HTMLInputElement>) => {
-      setBinding(event.target.value);
-    },
-    [setBinding],
-  );
-
-  const handleBindingBlur = useCallback(() => {
-    fn.binding = binding;
-  }, [fn, binding]);
-
-  if (!fn || !functionUrl) {
-    return null;
-  }
-
-  // TODO(burdon): Use form.
-  return (
-    <div role='form' className='flex flex-col gap-2 mlb-cardSpacingBlock'>
-      <h2>{t('remote function settings heading')}</h2>
-      <Input.Root>
-        <div role='none' className='flex flex-col gap-1'>
-          <Input.Label>{t('function url label')}</Input.Label>
-          <div role='none' className='flex gap-1'>
-            <Input.TextInput
-              disabled
-              value={functionUrl}
-              onChange={(event) => {
-                fn.name = event.target.value;
-              }}
-            />
-            <Clipboard.IconButton value={functionUrl} />
-          </div>
-        </div>
-      </Input.Root>
-      <Input.Root>
-        <div role='none' className='flex flex-col gap-1'>
-          <Input.Label>{t('function binding label')}</Input.Label>
-          <Input.TextInput
-            placeholder={t('function binding placeholder')}
-            value={binding}
-            onChange={handleBindingChange}
-            onBlur={handleBindingBlur}
-          />
-        </div>
-      </Input.Root>
-    </div>
-  );
-};
-
-// TODO(burdon): Move to separate tab?
-const Publishing = ({ object }: ScriptObjectSettingsProps) => {
-  const { t } = useTranslation(meta.id);
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const space = getSpace(object);
-  const [githubToken] = useQuery(space, Filter.type(DataType.AccessToken, { source: 'github.com' }));
-  const gistKey = getMeta(object).keys.find(({ source }) => source === 'github.com');
-  const [gistUrl, setGistUrl] = useState<string | undefined>();
-
-  useAsyncEffect(async () => {
-    const token = githubToken?.token;
-    const gistId = gistKey?.id;
-    if (!token || !gistId) {
-      setGistUrl(undefined);
-      return;
-    }
-
-    try {
-      const octokit = new Octokit({ auth: githubToken.token });
-      const response = await octokit.request('GET /gists/{gist_id}', {
-        gist_id: gistId,
-      });
-      setGistUrl(response.data.html_url);
-    } catch (err) {
-      log.catch(err);
-      setGistUrl(undefined);
-    }
-  }, [githubToken, gistKey]);
-
-  const handleOpenTokenManager = useCallback(
-    () => dispatch(createIntent(SettingsAction.Open, { plugin: 'dxos.org/plugin/token-manager' })),
-    [],
-  );
-
-  const [publishing, setPublishing] = useState(false);
-  const handlePublish = useCallback(async () => {
-    setPublishing(true);
-    const octokit = new Octokit({ auth: githubToken.token });
-    const source = await object.source.load();
-    const filename = object.name ? kebabize(object.name) : 'composer-script';
-    const files = { [`${filename}.ts`]: { content: source.content } };
-
-    try {
-      // TODO(wittjosiah): Factor out to intent.
-      const meta = getMeta(object);
-      const githubKey = meta.keys.find(({ source }) => source === 'github.com');
-      const gistId = githubKey?.id;
-      if (gistId) {
-        await octokit.request('PATCH /gists/{gist_id}', {
-          gist_id: gistId,
-          files,
-        });
-      } else {
-        const response = await octokit.request('POST /gists', {
-          public: true,
-          files,
-        });
-        if (response.data.id) {
-          meta.keys.push({ source: 'github.com', id: response.data.id });
-        }
-      }
-    } finally {
-      setPublishing(false);
-    }
-  }, [object, githubToken]);
-
-  return (
-    <div className='flex flex-col gap-4 mlb-cardSpacingBlock'>
-      <div>
-        <h2>{t('script publish settings label')}</h2>
-        <p className='text-description text-sm'>{t('script publish settings description')}</p>
-      </div>
-      {!githubToken && (
-        <div className='flex flex-col gap-2'>
-          <span>{t('no github token label')}</span>
-          <Button onClick={handleOpenTokenManager}>{t('open token manager label')}</Button>
-        </div>
-      )}
-      {githubToken && (
-        <div className='flex justify-end gap-2'>
-          {gistUrl && <Clipboard.IconButton value={gistUrl} />}
-          <Button disabled={publishing} onClick={handlePublish}>
-            {t(publishing ? 'publishing label' : 'publish label')}
-          </Button>
-        </div>
-      )}
-    </div>
-  );
-};

package/src/components/Settings/ScriptPluginSettings.tsx

@@ -1,61 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import React from 'react';
-
-import { useClient } from '@dxos/react-client';
-import { Button, Select, useTranslation } from '@dxos/react-ui';
-import { type EditorInputMode, EditorInputModes } from '@dxos/react-ui-editor';
-import { ControlGroup, ControlItemInput, ControlPage, ControlSection } from '@dxos/react-ui-form';
-
-import { meta } from '../../meta';
-import { type ScriptSettings } from '../../types';
-import { getAccessCredential } from '../../util';
-
-export const ScriptPluginSettings = ({ settings }: { settings: ScriptSettings }) => {
-  const { t } = useTranslation(meta.id);
-  const client = useClient();
-
-  // TODO(burdon): Check token.
-  const handleAuthenticate = async () => {
-    const { identityKey } = client.halo.identity.get()!;
-    await client.halo.writeCredentials([getAccessCredential(identityKey)]);
-  };
-
-  return (
-    <ControlPage>
-      <ControlSection title={t('settings title', { ns: meta.id })}>
-        <ControlGroup>
-          {/* TODO(wittjosiah): Hide outside of dev environments. */}
-          <ControlItemInput title={t('authenticate action label')}>
-            <Button onClick={handleAuthenticate}>{t('authenticate button label')}</Button>
-          </ControlItemInput>
-
-          <ControlItemInput title={t('editor input mode label')}>
-            <Select.Root
-              value={settings.editorInputMode ?? 'default'}
-              onValueChange={(value) => {
-                settings.editorInputMode = value as EditorInputMode;
-              }}
-            >
-              <Select.TriggerButton placeholder={t('select editor input mode placeholder')} />
-              <Select.Portal>
-                <Select.Content>
-                  <Select.Viewport>
-                    {EditorInputModes.map((mode) => (
-                      <Select.Option key={mode} value={mode}>
-                        {t(`settings editor input mode ${mode} label`)}
-                      </Select.Option>
-                    ))}
-                  </Select.Viewport>
-                  <Select.Arrow />
-                </Select.Content>
-              </Select.Portal>
-            </Select.Root>
-          </ControlItemInput>
-        </ControlGroup>
-      </ControlSection>
-    </ControlPage>
-  );
-};

package/src/components/Settings/index.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-export * from './ScriptObjectSettings';
-export * from './ScriptPluginSettings';

package/src/components/TestPanel/TestContainer.tsx

@@ -1,27 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React from 'react';
-
-import { type ScriptType } from '@dxos/functions';
-import { StackItem } from '@dxos/react-ui-stack';
-
-import { useDeployState, useToolbarState } from '../../hooks';
-
-import { TestPanel } from './TestPanel';
-
-export type TestContainerProps = {
-  role: string;
-  script: ScriptType;
-};
-
-export const TestContainer = ({ script }: TestContainerProps) => {
-  const state = useToolbarState();
-  useDeployState({ state, script });
-  return (
-    <StackItem.Content>
-      <TestPanel functionUrl={state.functionUrl} />
-    </StackItem.Content>
-  );
-};

package/src/events.ts

@@ -1,11 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { defineEvent } from '@dxos/app-framework';
-
-import { meta } from './meta';
-
-export namespace ScriptEvents {
-  export const SetupCompiler = defineEvent(`${meta.id}/event/setup-compiler`);
-}

package/src/notebook/notebook.test.ts

@@ -1,70 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, expect, test } from 'vitest';
-
-import { createNotebook } from '../testing';
-
-import { ComputeGraph } from './notebook';
-
-describe('notebook', () => {
-  test('parse dependency graph', () => {
-    const notebook = createNotebook();
-    const computer = new ComputeGraph(notebook);
-    const result = computer.parse();
-
-    const getId = (i: number) => notebook.cells[i].id;
-
-    // Check dependencies.
-    expect(result.dependencyGraph).toMatchObject({
-      [getId(0)]: [getId(1), getId(2)],
-      [getId(3)]: [getId(1)],
-      [getId(4)]: [getId(0), getId(3)],
-    });
-
-    // Compute values.
-    const values = computer.evaluate();
-    expect(values).toEqual({
-      [getId(0)]: 300,
-      [getId(2)]: 200,
-      [getId(3)]: 200,
-      [getId(4)]: 500,
-    });
-  });
-
-  test('evalScript blocks access to window and document', () => {
-    const notebook = createNotebook();
-    // Replace one of the cells with code that tries to access window/document.
-    if (notebook.cells[2].script?.target) {
-      notebook.cells[2].script.target.content = 'b = typeof window';
-    }
-
-    const computer = new ComputeGraph(notebook);
-    computer.parse();
-    const values = computer.evaluate();
-
-    // Should evaluate to 'undefined' since window is blocked.
-    expect(values[notebook.cells[2].id]).toBe('undefined');
-
-    // Test document access.
-    if (notebook.cells[2].script?.target) {
-      notebook.cells[2].script.target.content = 'b = typeof document';
-    }
-    computer.parse();
-    const values2 = computer.evaluate();
-
-    // Should evaluate to 'undefined' since document is blocked.
-    expect(values2[notebook.cells[2].id]).toBe('undefined');
-
-    // Test that safe globals still work.
-    if (notebook.cells[2].script?.target) {
-      notebook.cells[2].script.target.content = 'b = Math.max(100, 200)';
-    }
-    computer.parse();
-    const values3 = computer.evaluate();
-
-    // Should evaluate correctly.
-    expect(values3[notebook.cells[2].id]).toBe(200);
-  });
-});