@dxos/plugin-script 0.8.4-main.3eb6e50203 → 0.8.4-main.3fbcb4aa9b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-script",
-  "version": "0.8.4-main.3eb6e50203",
+  "version": "0.8.4-main.3fbcb4aa9b",
   "description": "Braneframe notebook plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,131 +12,181 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#blueprints": {
+      "source": "./src/blueprints/index.ts",
+      "types": "./dist/types/src/blueprints/index.d.ts",
+      "default": "./dist/lib/neutral/blueprints/index.mjs"
+    },
+    "#capabilities": {
+      "source": {
+        "node": "./src/capabilities/node.ts",
+        "default": "./src/capabilities/index.ts"
+      },
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "node": "./dist/lib/neutral/capabilities/node.mjs",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "node": "./src/ScriptPlugin.node.ts",
+        "default": "./src/ScriptPlugin.tsx"
+      },
+      "types": "./dist/types/src/ScriptPlugin.d.ts",
+      "node": "./dist/lib/neutral/ScriptPlugin.node.mjs",
+      "default": "./dist/lib/neutral/ScriptPlugin.mjs"
+    },
+    "#testing": "./src/testing/index.ts",
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
+  },
   "exports": {
     ".": {
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
       "source": "./src/index.ts",
-      "types": "./dist/types/src/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./blueprints": {
-      "browser": "./dist/lib/browser/blueprints/index.mjs",
-      "node": "./dist/lib/node-esm/blueprints/index.mjs",
-      "source": "./src/blueprints/index.ts",
-      "types": "./dist/types/src/blueprints/index.d.ts"
+    "./containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
     },
     "./templates": {
-      "browser": "./dist/lib/browser/templates/index.mjs",
-      "node": "./dist/lib/node-esm/templates/index.mjs",
       "source": "./src/templates/index.ts",
-      "types": "./dist/types/src/templates/index.d.ts"
+      "types": "./dist/types/src/templates/index.d.ts",
+      "default": "./dist/lib/neutral/templates/index.mjs"
     },
-    "./types": {
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs",
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts"
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "blueprints": [
-        "dist/types/src/blueprints/index.d.ts"
-      ],
-      "templates": [
-        "dist/types/src/templates/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
+    "@automerge/automerge": "3.2.6",
     "@codemirror/autocomplete": "^6.19.0",
     "@codemirror/lang-javascript": "^6.2.4",
     "@codemirror/language": "^6.11.3",
     "@codemirror/lint": "6.8.5",
     "@codemirror/state": "^6.5.2",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
     "@lezer/common": "^1.2.2",
     "@lezer/highlight": "^1.2.1",
-    "@octokit/core": "^4.0.4",
+    "@octokit/core": "^7.0.6",
+    "@radix-ui/react-compose-refs": "1.1.1",
     "@typescript/vfs": "^1.6.0",
     "@valtown/codemirror-continue": "^2.3.1",
     "@valtown/codemirror-ts": "^2.3.1",
     "codemirror": "^6.0.1",
-    "date-fns": "^3.3.1",
+    "date-fns": "^3.6.0",
     "esbuild-wasm": "^0.16.14",
     "prettier": "^3.6.2",
     "react-syntax-highlighter": "^15.6.1",
-    "typescript": "^5.9.3",
-    "@dxos/ai": "0.8.4-main.3eb6e50203",
-    "@dxos/app-framework": "0.8.4-main.3eb6e50203",
-    "@dxos/app-toolkit": "0.8.4-main.3eb6e50203",
-    "@dxos/assistant-toolkit": "0.8.4-main.3eb6e50203",
-    "@dxos/assistant": "0.8.4-main.3eb6e50203",
-    "@dxos/async": "0.8.4-main.3eb6e50203",
-    "@dxos/blueprints": "0.8.4-main.3eb6e50203",
-    "@dxos/client": "0.8.4-main.3eb6e50203",
-    "@dxos/client-protocol": "0.8.4-main.3eb6e50203",
-    "@dxos/compute": "0.8.4-main.3eb6e50203",
-    "@dxos/debug": "0.8.4-main.3eb6e50203",
-    "@dxos/config": "0.8.4-main.3eb6e50203",
-    "@dxos/devtools": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-db": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-protocol": "0.8.4-main.3eb6e50203",
-    "@dxos/echo": "0.8.4-main.3eb6e50203",
-    "@dxos/functions": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-query": "0.8.4-main.3eb6e50203",
-    "@dxos/functions-runtime": "0.8.4-main.3eb6e50203",
-    "@dxos/effect": "0.8.4-main.3eb6e50203",
-    "@dxos/invariant": "0.8.4-main.3eb6e50203",
-    "@dxos/functions-simulator-cloudflare": "0.8.4-main.3eb6e50203",
-    "@dxos/log": "0.8.4-main.3eb6e50203",
-    "@dxos/keys": "0.8.4-main.3eb6e50203",
-    "@dxos/operation": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-assistant": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-automation": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-client": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-explorer": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-graph": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-deck": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-stack": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-markdown": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-theme": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-space": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-token-manager": "0.8.4-main.3eb6e50203",
-    "@dxos/react-client": "0.8.4-main.3eb6e50203",
-    "@dxos/protocols": "0.8.4-main.3eb6e50203",
-    "@dxos/react-edge-client": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-attention": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-components": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-editor": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-form": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-menu": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-list": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-mosaic": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-stack": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3eb6e50203",
-    "@dxos/schema": "0.8.4-main.3eb6e50203",
-    "@dxos/rpc-tunnel": "0.8.4-main.3eb6e50203",
-    "@dxos/types": "0.8.4-main.3eb6e50203",
-    "@dxos/rpc": "0.8.4-main.3eb6e50203",
-    "@dxos/ui": "0.8.4-main.3eb6e50203",
-    "@dxos/util": "0.8.4-main.3eb6e50203",
-    "@dxos/vendor-quickjs": "0.8.4-main.3eb6e50203",
-    "@dxos/ui-editor": "0.8.4-main.3eb6e50203"
+    "typescript": "^6.0.3",
+    "@dxos/ai": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/app-framework": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/app-toolkit": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/assistant": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/assistant-toolkit": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/client-protocol": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/async": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/config": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/context": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/compute": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/debug": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/devtools": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo-db": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo-protocol": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/effect": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo-query": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/functions": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/functions-runtime": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/functions-simulator-cloudflare": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/invariant": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/keys": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-assistant": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-automation": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/log": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-explorer": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-deck": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-graph": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-game": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-space": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-markdown": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-integration": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-stack": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-theme": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/protocols": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-edge-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-attention": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-components": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-form": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-list": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-menu": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-mosaic": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-stack": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/rpc": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/rpc-tunnel": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/schema": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/util": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/types": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/vendor-quickjs": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-editor": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui-editor": "0.8.4-main.3fbcb4aa9b"
   },
   "devDependencies": {
-    "@automerge/automerge": "3.2.3",
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/ai": "0.33.2",
     "@effect/ai-anthropic": "0.23.0",
@@ -144,28 +194,27 @@
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "chess.js": "^1.0.0",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/config": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-db": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-automation": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-testing": "0.8.4-main.3eb6e50203",
-    "@dxos/random": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-chess": "0.8.4-main.3eb6e50203",
-    "@dxos/storybook-utils": "0.8.4-main.3eb6e50203",
-    "@dxos/ui-theme": "0.8.4-main.3eb6e50203"
+    "vite": "^8.0.10",
+    "@dxos/config": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-chess": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-testing": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/random": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-automation": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/storybook-utils": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
-    "@dxos/ui-theme": "0.8.4-main.3eb6e50203"
+    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b"
   },
   "publishConfig": {
     "access": "public"

package/src/ScriptPlugin.node.ts

@@ -0,0 +1,21 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Script } from '@dxos/compute';
+
+import { AppGraphBuilder, BlueprintDefinition, CreateObject, OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const ScriptPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [Script.Script] }),
+  Plugin.make,
+);
+
+export default ScriptPlugin;

package/src/ScriptPlugin.test.ts

@@ -0,0 +1,31 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { AppActivationEvents } from '@dxos/app-toolkit';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { ScriptPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('ScriptPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), ScriptPlugin()],
+    });
+
+    // After autoStart: AppGraphBuilder, CreateObject, schema all auto-cascade.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('CreateObject'), moduleId('schema')]),
+    );
+
+    await harness.fire(AppActivationEvents.SetupArtifactDefinition);
+    expect(harness.manager.getActive()).toContain(moduleId('BlueprintDefinition'));
+  });
+});

package/src/ScriptPlugin.tsx

@@ -2,62 +2,28 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-
 import { Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Ref } from '@dxos/echo';
-import { Script } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
-import { type CreateObject } from '@dxos/plugin-space/types';
+import { Script } from '@dxos/compute';
 
 import {
   AppGraphBuilder,
   BlueprintDefinition,
   Compiler,
-  OperationResolver,
+  CreateObject,
+  OperationHandler,
   ReactSurface,
   ScriptSettings,
-} from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { ScriptEvents } from './types';
-import { Notebook, ScriptOperation } from './types';
+} from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { ScriptEvents } from '#types';
 
 export const ScriptPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
-  AppPlugin.addMetadataModule({
-    metadata: [
-      {
-        id: Script.Script.typename,
-        metadata: {
-          icon: 'ph--code--regular',
-          iconHue: 'sky',
-          // TODO(wittjosiah): Move out of metadata.
-          loadReferences: async (script: Script.Script) => await Ref.Array.loadAll([script.source]),
-          inputSchema: ScriptOperation.ScriptProps,
-          createObject: ((props) =>
-            Effect.gen(function* () {
-              const { object } = yield* Operation.invoke(ScriptOperation.CreateScript, props);
-              return object;
-            })) satisfies CreateObject,
-          addToCollectionOnCreate: true,
-        },
-      },
-      {
-        id: Notebook.Notebook.typename,
-        metadata: {
-          icon: 'ph--notebook--regular',
-          iconHue: 'sky',
-          inputSchema: ScriptOperation.NotebookProps,
-          createObject: ((props) => Effect.sync(() => Notebook.make(props))) satisfies CreateObject,
-          addToCollectionOnCreate: true,
-        },
-      },
-    ],
-  }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({ schema: [Script.Script] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
@@ -71,3 +37,5 @@ export const ScriptPlugin = Plugin.define(meta).pipe(
   }),
   Plugin.make,
 );
+
+export default ScriptPlugin;

package/src/blueprints/functions/create.ts

@@ -0,0 +1,47 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Script, Operation } from '@dxos/compute';
+import { Database, Obj, Ref } from '@dxos/echo';
+import { CollectionModel } from '@dxos/schema';
+
+import { Create } from './definitions';
+
+export default Create.pipe(
+  Operation.withHandler(
+    Effect.fn(function* ({ name, source, templateId }) {
+      let scriptSource = source ?? '';
+
+      if (templateId) {
+        const template = yield* findTemplate(templateId);
+        if (template) {
+          scriptSource = template.source;
+        }
+      }
+
+      const script = Script.make({ name, source: scriptSource });
+      const { db } = yield* Database.Service;
+      db.add(script);
+
+      const fn = Obj.make(Operation.PersistentOperation, {
+        name,
+        version: '0.0.0',
+        source: Ref.make(script),
+      });
+      yield* CollectionModel.add({ object: fn });
+
+      return {
+        function: Obj.getDXN(fn).toString(),
+      };
+    }),
+  ),
+);
+
+const findTemplate = (templateId: string) =>
+  Effect.promise(async () => {
+    const { templates } = await import('../../templates');
+    return templates.find((template) => template.id === templateId);
+  });