@dxos/plugin-wnfs 0.8.4-main.ae835ea → 0.8.4-main.bc2380dfbc

package/package.json

@@ -1,32 +1,87 @@
 {
   "name": "@dxos/plugin-wnfs",
-  "version": "0.8.4-main.ae835ea",
+  "version": "0.8.4-main.bc2380dfbc",
   "description": "WNFS file management plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "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"
+    },
+    "#helpers": {
+      "source": "./src/helpers/index.ts",
+      "types": "./dist/types/src/helpers/index.d.ts",
+      "default": "./dist/lib/neutral/helpers/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": {
+        "workerd": "./src/WnfsPlugin.workerd.ts",
+        "node": "./src/WnfsPlugin.node.ts",
+        "default": "./src/WnfsPlugin.tsx"
+      },
+      "types": "./dist/types/src/WnfsPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/WnfsPlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/WnfsPlugin.node.mjs",
+      "default": "./dist/lib/neutral/WnfsPlugin.mjs"
+    },
+    "#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": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./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": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
@@ -34,13 +89,12 @@
   "dependencies": {
     "@codemirror/language": "^6.11.3",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@ipld/car": "^5.3.3",
-    "@preact-signals/safe-react": "^0.9.0",
     "blockstore-core": "^5.0.1",
     "blockstore-idb": "^2.0.0",
     "debounce": "^2.2.0",
-    "effect": "3.18.3",
+    "effect": "3.20.0",
     "idb-keyval": "^6.2.1",
     "interface-blockstore": "^5.2.10",
     "it-all": "^3.0.6",
@@ -48,41 +102,44 @@
     "react-dropzone": "^14.2.3",
     "uint8arrays": "^5.1.0",
     "wnfs": "0.2.2",
-    "@dxos/app-framework": "0.8.4-main.ae835ea",
-    "@dxos/invariant": "0.8.4-main.ae835ea",
-    "@dxos/echo": "0.8.4-main.ae835ea",
-    "@dxos/local-storage": "0.8.4-main.ae835ea",
-    "@dxos/log": "0.8.4-main.ae835ea",
-    "@dxos/crypto": "0.8.4-main.ae835ea",
-    "@dxos/plugin-client": "0.8.4-main.ae835ea",
-    "@dxos/plugin-markdown": "0.8.4-main.ae835ea",
-    "@dxos/plugin-space": "0.8.4-main.ae835ea",
-    "@dxos/react-client": "0.8.4-main.ae835ea",
-    "@dxos/react-ui": "0.8.4-main.ae835ea",
-    "@dxos/react-ui-editor": "0.8.4-main.ae835ea",
-    "@dxos/react-ui-form": "0.8.4-main.ae835ea",
-    "@dxos/react-ui-stack": "0.8.4-main.ae835ea",
-    "@dxos/effect": "0.8.4-main.ae835ea",
-    "@dxos/util": "0.8.4-main.ae835ea"
+    "@dxos/app-framework": "0.8.4-main.bc2380dfbc",
+    "@dxos/app-toolkit": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo": "0.8.4-main.bc2380dfbc",
+    "@dxos/invariant": "0.8.4-main.bc2380dfbc",
+    "@dxos/crypto": "0.8.4-main.bc2380dfbc",
+    "@dxos/effect": "0.8.4-main.bc2380dfbc",
+    "@dxos/compute": "0.8.4-main.bc2380dfbc",
+    "@dxos/keys": "0.8.4-main.bc2380dfbc",
+    "@dxos/log": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-markdown": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-space": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-editor": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-form": "0.8.4-main.bc2380dfbc",
+    "@dxos/schema": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-stack": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-mosaic": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-editor": "0.8.4-main.bc2380dfbc",
+    "@dxos/util": "0.8.4-main.bc2380dfbc"
   },
   "devDependencies": {
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.ae835ea",
-    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
-    "@dxos/storybook-utils": "0.8.4-main.ae835ea"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.13",
+    "@dxos/plugin-testing": "0.8.4-main.bc2380dfbc",
+    "@dxos/random": "0.8.4-main.bc2380dfbc",
+    "@dxos/storybook-utils": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.ae835ea",
-    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
-  },
-  "publishConfig": {
-    "access": "public"
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc"
   }
 }

package/src/WnfsPlugin.node.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { CreateObject, OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+import { WnfsFile } from '#types';
+
+export const WnfsPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [WnfsFile.WnfsFile] }),
+  Plugin.make,
+);
+
+export default WnfsPlugin;

package/src/WnfsPlugin.test.ts

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

package/src/WnfsPlugin.tsx

@@ -2,94 +2,49 @@
 // Copyright 2024 DXOS.org
 //
 
-import * as Function from 'effect/Function';
+import * as Effect from 'effect/Effect';
 
-import {
-  Capabilities,
-  Events,
-  chain,
-  contributes,
-  createIntent,
-  defineModule,
-  definePlugin,
-} from '@dxos/app-framework';
+import { Capability, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 import { ClientEvents } from '@dxos/plugin-client';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
 
-import { Blockstore, FileUploader, IntentResolver, Markdown, ReactSurface, WnfsCapabilities } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { WnfsAction, WnfsFile } from './types';
+import { Blockstore, CreateObject, FileUploader, Markdown, OperationHandler, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { WnfsCapabilities, WnfsFile } from '#types';
 
-export const WnfsPlugin = definePlugin(meta, () => [
-  defineModule({
-    id: `${meta.id}/module/blockstore`,
+export const WnfsPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [WnfsFile.WnfsFile] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    id: 'blockstore',
     activatesOn: ClientEvents.ClientReady,
     activate: Blockstore,
   }),
-  defineModule({
-    id: `${meta.id}/module/instances`,
+  Plugin.addModule({
+    id: 'instances',
     activatesOn: ClientEvents.ClientReady,
-    activate: () => {
-      const instances: WnfsCapabilities.Instances = {};
-      return contributes(WnfsCapabilities.Instances, instances);
-    },
-  }),
-  defineModule({
-    id: `${meta.id}/module/translations`,
-    activatesOn: Events.SetupTranslations,
-    activate: () => contributes(Capabilities.Translations, translations),
-  }),
-  defineModule({
-    id: `${meta.id}/module/metadata`,
-    activatesOn: Events.SetupMetadata,
     activate: () =>
-      contributes(Capabilities.Metadata, {
-        id: WnfsFile.File.typename,
-        metadata: {
-          // TODO(wittjosiah): Would be nice if icon could change based on the type of the file.
-          icon: 'ph--file--regular',
-          iconHue: 'teal',
-        },
+      Effect.sync(() => {
+        const instances: WnfsCapabilities.Instances = {};
+        return Capability.contributes(WnfsCapabilities.Instances, instances);
       }),
   }),
-  defineModule({
-    id: `${meta.id}/module/object-form`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () =>
-      contributes(
-        SpaceCapabilities.ObjectForm,
-        defineObjectForm({
-          objectSchema: WnfsFile.File,
-          formSchema: WnfsAction.UploadFileSchema,
-          getIntent: (props, options) =>
-            Function.pipe(
-              createIntent(WnfsAction.Upload, { ...props, space: options.space }),
-              chain(WnfsAction.Create, {}),
-            ),
-        }),
-      ),
-  }),
-  defineModule({
-    id: `${meta.id}/module/file-uploader`,
+  Plugin.addModule({
+    id: 'file-uploader',
     activatesOn: ClientEvents.ClientReady,
     activate: FileUploader,
   }),
-  defineModule({
-    id: `${meta.id}/module/markdown`,
+  Plugin.addModule({
+    id: 'markdown',
     activatesOn: MarkdownEvents.SetupExtensions,
     activate: Markdown,
   }),
-  defineModule({
-    id: `${meta.id}/module/react-surface`,
-    activatesOn: Events.SetupReactSurface,
-    activate: ReactSurface,
-  }),
-  defineModule({
-    id: `${meta.id}/module/intent-resolver`,
-    activatesOn: Events.SetupIntentResolver,
-    activate: IntentResolver,
-  }),
-]);
+  Plugin.make,
+);
+
+export default WnfsPlugin;

package/src/WnfsPlugin.workerd.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+import { WnfsFile } from '#types';
+
+export const WnfsPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [WnfsFile.WnfsFile] }),
+  Plugin.make,
+);
+
+export default WnfsPlugin;

package/src/blockstore.ts

@@ -145,7 +145,7 @@ export class MixedBlockstore extends BaseBlockstore {
 
   // QUEUE
 
-  readonly queueCacheName = `${storeName()}/state/queue`;
+  readonly queueCacheName = `${storeName()}.state.queue`;
 
   async #addToQueue(key: CID): Promise<void> {
     await this.#saveQueue([...this.#queue, key.toString()]);

package/src/capabilities/blockstore.ts

@@ -2,18 +2,22 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type PluginContext, contributes } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
-import * as Blockstore from '../blockstore';
+import { WnfsCapabilities } from '#types';
 
-import { WnfsCapabilities } from './capabilities';
+import * as Blockstore from '../blockstore';
 
-export default async (context: PluginContext) => {
-  const client = context.getCapability(ClientCapabilities.Client);
-  const apiHost = client.config.values.runtime?.services?.edge?.url || 'http://localhost:8787';
-  const blockstore = Blockstore.create(apiHost);
-  await blockstore.open();
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const client = yield* Capability.get(ClientCapabilities.Client);
+    const apiHost = client.config.values.runtime?.services?.edge?.url || 'http://localhost:8787';
+    const blockstore = Blockstore.create(apiHost);
+    yield* Effect.tryPromise(() => blockstore.open());
 
-  return contributes(WnfsCapabilities.Blockstore, blockstore);
-};
+    return Capability.contributes(WnfsCapabilities.Blockstore, blockstore);
+  }),
+);

package/src/capabilities/create-object.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+
+import { WnfsOperation } from '#types';
+import { WnfsAction, WnfsFile } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+      id: WnfsFile.WnfsFile.typename,
+      inputSchema: WnfsAction.UploadFileSchema,
+      // TODO(wittjosiah): Would be nice if icon could change based on the type of the file.
+      createObject: (props, options) =>
+        Effect.gen(function* () {
+          const { object } = yield* Operation.invoke(WnfsOperation.CreateFile, { ...props, db: options.db });
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId,
+          });
+        }),
+    });
+  }),
+);

package/src/capabilities/file-uploader.ts

@@ -3,25 +3,32 @@
 //
 
 import * as Effect from 'effect/Effect';
-import * as Function from 'effect/Function';
 
-import { Capabilities, type PluginContext, chain, contributes, createIntent } from '@dxos/app-framework';
-import { SpaceAction } from '@dxos/plugin-space/types';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { runAndForwardErrors } from '@dxos/effect';
+import { SpaceOperation } from '@dxos/plugin-space';
 
-import { WnfsAction } from '../types';
+import { WnfsOperation } from '#types';
 
-export default (context: PluginContext) => {
-  return contributes(Capabilities.FileUploader, (space, file) => {
-    const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-    const program = Effect.gen(function* () {
-      const fileInfo = yield* dispatch(createIntent(WnfsAction.Upload, { space, file }));
-      yield* dispatch(
-        Function.pipe(createIntent(WnfsAction.Create, fileInfo), chain(SpaceAction.AddObject, { target: space })),
-      );
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // Get context for lazy capability access in callbacks.
+    const capabilities = yield* Capability.Service;
 
-      return fileInfo;
-    });
+    return Capability.contributes(AppCapabilities.FileUploader, (db, file) => {
+      const { invoke } = capabilities.get(Capabilities.OperationInvoker);
+      const program = Effect.gen(function* () {
+        const fileInfo = yield* invoke(WnfsOperation.Upload, { db, file });
+        const createResult = yield* invoke(WnfsOperation.Create, fileInfo);
+        if (createResult?.object) {
+          yield* invoke(SpaceOperation.AddObject, { target: db, object: createResult.object });
+        }
+
+        return fileInfo;
+      });
 
-    return Effect.runPromise(program);
-  });
-};
+      return runAndForwardErrors(program);
+    });
+  }),
+);

package/src/capabilities/index.ts

@@ -2,12 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/compute';
 
-export const Blockstore = lazy(() => import('./blockstore'));
-export const FileUploader = lazy(() => import('./file-uploader'));
-export const IntentResolver = lazy(() => import('./intent-resolver'));
-export const Markdown = lazy(() => import('./markdown'));
-export const ReactSurface = lazy(() => import('./react-surface'));
-
-export * from './capabilities';
+export const Blockstore = Capability.lazy('Blockstore', () => import('./blockstore'));
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
+export const FileUploader = Capability.lazy('FileUploader', () => import('./file-uploader'));
+export const Markdown = Capability.lazy('Markdown', () => import('./markdown'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/markdown.ts

@@ -2,25 +2,37 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type PluginContext, contributes } from '@dxos/app-framework';
-import { MarkdownCapabilities } from '@dxos/plugin-markdown';
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { type MarkdownExtensionProvider, MarkdownCapabilities } from '@dxos/plugin-markdown';
 import { getSpace } from '@dxos/react-client/echo';
 
+import { WnfsCapabilities } from '#types';
+
 import { image } from '../extensions';
 
-import { WnfsCapabilities } from './capabilities';
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // Get context for lazy capability access in callbacks.
+    const capabilities = yield* Capability.Service;
 
-export default (context: PluginContext) =>
-  contributes(MarkdownCapabilities.Extensions, [
-    ({ document }) => {
-      const blockstore = context.getCapability(WnfsCapabilities.Blockstore);
-      const instances = context.getCapability(WnfsCapabilities.Instances);
+    const provider: MarkdownExtensionProvider = ({ document, viewMode }) => {
+      if (viewMode === 'source') {
+        return undefined;
+      }
+
+      const blockstore = capabilities.get(WnfsCapabilities.Blockstore);
+      const instances = capabilities.get(WnfsCapabilities.Instances);
 
       if (document) {
         const space = getSpace(document);
-        return space ? [image({ blockstore, instances, space })] : [];
+        return space ? [image({ blockstore, instances, space })] : undefined;
       }
 
-      return [];
-    },
-  ]);
+      return undefined;
+    };
+
+    return Capability.contributes(MarkdownCapabilities.Extensions, [provider]);
+  }),
+);

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/compute';
+
+import { WnfsOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, WnfsOperationHandlerSet);
+  }),
+);