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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-wnfs",
-  "version": "0.8.4-main.abd8ff62ef",
+  "version": "0.8.4-main.bc2380dfbc",
   "description": "WNFS file management plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,49 +8,77 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "type": "module",
   "imports": {
-    "#capabilities": "./src/capabilities/index.ts",
-    "#components": "./src/components/index.ts",
-    "#containers": "./src/containers/index.ts",
-    "#meta": "./src/meta.ts",
-    "#operations": "./src/operations/index.ts",
+    "#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": {
-      "browser": "./src/WnfsPlugin.tsx",
-      "node": "./src/WnfsPlugin.node.ts",
-      "default": "./src/WnfsPlugin.tsx"
+      "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": "./src/translations.ts",
-    "#types": "./src/types/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": {
     ".": {
       "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./helpers": {
-      "source": "./src/helpers/index.ts",
-      "browser": "./dist/lib/browser/helpers/index.mjs",
-      "types": "./dist/types/src/helpers/index.d.ts"
-    },
-    "./operations": {
-      "source": "./src/operations/index.ts",
-      "browser": "./dist/lib/browser/operations/index.mjs",
-      "types": "./dist/types/src/operations/index.d.ts"
+    "./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",
-      "browser": "./dist/lib/browser/translations.mjs",
-      "node": "./dist/lib/node-esm/translations.mjs"
-    },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "types": "./dist/types/src/types/index.d.ts"
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -61,7 +89,7 @@
   "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",
     "blockstore-core": "^5.0.1",
     "blockstore-idb": "^2.0.0",
@@ -74,46 +102,44 @@
     "react-dropzone": "^14.2.3",
     "uint8arrays": "^5.1.0",
     "wnfs": "0.2.2",
-    "@dxos/app-toolkit": "0.8.4-main.abd8ff62ef",
-    "@dxos/compute": "0.8.4-main.abd8ff62ef",
-    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
-    "@dxos/crypto": "0.8.4-main.abd8ff62ef",
-    "@dxos/echo": "0.8.4-main.abd8ff62ef",
-    "@dxos/invariant": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-client": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-space": "0.8.4-main.abd8ff62ef",
-    "@dxos/log": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-markdown": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-client": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-editor": "0.8.4-main.abd8ff62ef",
-    "@dxos/effect": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-form": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-stack": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-mosaic": "0.8.4-main.abd8ff62ef",
-    "@dxos/schema": "0.8.4-main.abd8ff62ef",
-    "@dxos/util": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-editor": "0.8.4-main.abd8ff62ef"
+    "@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.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^8.0.10",
-    "@dxos/random": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-testing": "0.8.4-main.abd8ff62ef",
-    "@dxos/storybook-utils": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
+    "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.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc"
   }
 }

package/src/WnfsPlugin.node.ts

@@ -2,45 +2,17 @@
 // Copyright 2024 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
-
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/compute';
-import { Annotation } from '@dxos/echo';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { type CreateObject } from '@dxos/plugin-space/types';
 
-import { OperationHandler } from '#capabilities';
+import { CreateObject, OperationHandler } from '#capabilities';
 import { meta } from '#meta';
-import { WnfsOperation } from '#operations';
-import { WnfsAction, WnfsFile } from '#types';
+import { WnfsFile } from '#types';
 
 export const WnfsPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: WnfsFile.File.typename,
-      metadata: {
-        // TODO(wittjosiah): Would be nice if icon could change based on the type of the file.
-        icon: Annotation.IconAnnotation.get(WnfsFile.File).pipe(Option.getOrThrow).icon,
-        iconHue: Annotation.IconAnnotation.get(WnfsFile.File).pipe(Option.getOrThrow).hue ?? 'white',
-        inputSchema: WnfsAction.UploadFileSchema,
-        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,
-            });
-          })) satisfies CreateObject,
-      },
-    },
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
-  AppPlugin.addSchemaModule({ schema: [WnfsFile.File] }),
+  AppPlugin.addSchemaModule({ schema: [WnfsFile.WnfsFile] }),
   Plugin.make,
 );
 

package/src/WnfsPlugin.test.ts

@@ -4,7 +4,7 @@
 
 import { describe, test } from 'vitest';
 
-import { ClientPlugin } from '@dxos/plugin-client';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
 import { createComposerTestApp } from '@dxos/plugin-testing/harness';
 
 import { WnfsPlugin } from '#plugin';
@@ -19,9 +19,9 @@ describe('WnfsPlugin', () => {
       plugins: [ClientPlugin({}), WnfsPlugin()],
     });
 
-    // After autoStart: metadata, schema, and OperationHandler all auto-cascade.
+    // After autoStart: CreateObject, schema, and OperationHandler all auto-cascade.
     expect(harness.manager.getActive()).toEqual(
-      expect.arrayContaining([moduleId('metadata'), moduleId('schema'), moduleId('OperationHandler')]),
+      expect.arrayContaining([moduleId('CreateObject'), moduleId('schema'), moduleId('OperationHandler')]),
     );
   });
 });

package/src/WnfsPlugin.tsx

@@ -3,47 +3,21 @@
 //
 
 import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
 
 import { Capability, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/compute';
-import { Annotation } from '@dxos/echo';
-import { ClientEvents } from '@dxos/plugin-client/types';
-import { MarkdownEvents } from '@dxos/plugin-markdown/types';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { type CreateObject } from '@dxos/plugin-space/types';
+import { ClientEvents } from '@dxos/plugin-client';
+import { MarkdownEvents } from '@dxos/plugin-markdown';
 
-import { Blockstore, FileUploader, Markdown, OperationHandler, ReactSurface } from '#capabilities';
+import { Blockstore, CreateObject, FileUploader, Markdown, OperationHandler, ReactSurface } from '#capabilities';
 import { meta } from '#meta';
-import { WnfsOperation } from '#operations';
 import { translations } from '#translations';
-import { WnfsAction, WnfsCapabilities, WnfsFile } from '#types';
+import { WnfsCapabilities, WnfsFile } from '#types';
 
 export const WnfsPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: WnfsFile.File.typename,
-      metadata: {
-        // TODO(wittjosiah): Would be nice if icon could change based on the type of the file.
-        icon: Annotation.IconAnnotation.get(WnfsFile.File).pipe(Option.getOrThrow).icon,
-        iconHue: Annotation.IconAnnotation.get(WnfsFile.File).pipe(Option.getOrThrow).hue ?? 'white',
-        inputSchema: WnfsAction.UploadFileSchema,
-        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,
-            });
-          })) satisfies CreateObject,
-      },
-    },
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
-  AppPlugin.addSchemaModule({ schema: [WnfsFile.File] }),
+  AppPlugin.addSchemaModule({ schema: [WnfsFile.WnfsFile] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({

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/capabilities/blockstore.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { WnfsCapabilities } from '#types';
 

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

@@ -7,9 +7,9 @@ import * as Effect from 'effect/Effect';
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { runAndForwardErrors } from '@dxos/effect';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { SpaceOperation } from '@dxos/plugin-space';
 
-import { WnfsOperation } from '#operations';
+import { WnfsOperation } from '#types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {

package/src/capabilities/index.ts

@@ -6,6 +6,7 @@ import { Capability } from '@dxos/app-framework';
 import { OperationHandlerSet } from '@dxos/compute';
 
 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>(

package/src/capabilities/markdown.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { type MarkdownExtensionProvider, MarkdownCapabilities } from '@dxos/plugin-markdown/types';
+import { type MarkdownExtensionProvider, MarkdownCapabilities } from '@dxos/plugin-markdown';
 import { getSpace } from '@dxos/react-client/echo';
 
 import { WnfsCapabilities } from '#types';

package/src/capabilities/react-surface.tsx

@@ -14,7 +14,7 @@ import { findAnnotation } from '@dxos/effect';
 import { type FormFieldComponentProps } from '@dxos/react-ui-form';
 
 import { FileInput } from '#components';
-import { FileContainer } from '#containers';
+import { FileArticle } from '#containers';
 import { WnfsAction, WnfsFile } from '#types';
 
 export default Capability.makeModule(() =>
@@ -24,11 +24,11 @@ export default Capability.makeModule(() =>
         id: 'article',
         // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
         filter: AppSurface.oneOf(
-          AppSurface.object(AppSurface.Article, WnfsFile.File),
-          AppSurface.object(AppSurface.Section, WnfsFile.File),
-          AppSurface.object(AppSurface.Slide, WnfsFile.File),
+          AppSurface.object(AppSurface.Article, WnfsFile.WnfsFile),
+          AppSurface.object(AppSurface.Section, WnfsFile.WnfsFile),
+          AppSurface.object(AppSurface.Slide, WnfsFile.WnfsFile),
         ),
-        component: ({ data, role }) => <FileContainer role={role} subject={data.subject} />,
+        component: ({ data, role }) => <FileArticle role={role} subject={data.subject} />,
       }),
       Surface.create({
         id: 'create-form',

package/src/containers/{FileContainer/FileContainer.tsx → FileArticle/FileArticle.tsx}

@@ -15,9 +15,9 @@ import { WnfsCapabilities, type WnfsFile } from '#types';
 
 import { filePath, getBlobUrl, loadWnfs, wnfsUrl } from '../../helpers';
 
-export type FileContainerProps = AppSurface.ObjectArticleProps<WnfsFile.File>;
+export type FileArticleProps = AppSurface.ObjectArticleProps<WnfsFile.WnfsFile>;
 
-export const FileContainer = ({ role, subject: file }: FileContainerProps) => {
+export const FileArticle = ({ role, subject: file }: FileArticleProps) => {
   const blockstore = useCapability(WnfsCapabilities.Blockstore);
   const instances = useCapability(WnfsCapabilities.Instances);
   const [blobUrl, setBlobUrl] = useState<string>();
@@ -54,4 +54,4 @@ export const FileContainer = ({ role, subject: file }: FileContainerProps) => {
   );
 };
 
-export default FileContainer;
+export default FileArticle;

package/src/containers/FileArticle/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { FileArticle as default } from './FileArticle';

package/src/containers/index.ts

@@ -4,4 +4,4 @@
 
 import { type ComponentType, lazy } from 'react';
 
-export const FileContainer: ComponentType<any> = lazy(() => import('./FileContainer'));
+export const FileArticle: ComponentType<any> = lazy(() => import('./FileArticle'));

package/src/index.ts

@@ -2,12 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
-
-import { meta } from './meta';
-
-export const WnfsPlugin = Plugin.lazy(meta, () => import('#plugin'));
-
+export * from './helpers';
 export * from './meta';
-
-export { WnfsCapabilities } from './types';
+export * from './types';

package/src/operations/create-file.ts

@@ -7,13 +7,12 @@ import * as Effect from 'effect/Effect';
 import { Capability } from '@dxos/app-framework';
 import { Operation } from '@dxos/compute';
 import { invariant } from '@dxos/invariant';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { upload } from '../helpers';
-import { WnfsCapabilities, WnfsFile } from '../types';
-import { CreateFile } from './definitions';
+import { WnfsCapabilities, WnfsFile, WnfsOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof CreateFile> = CreateFile.pipe(
+const handler: Operation.WithHandler<typeof WnfsOperation.CreateFile> = WnfsOperation.CreateFile.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ file, db }) {
       const client = yield* Capability.get(ClientCapabilities.Client);

package/src/operations/create.ts

@@ -6,10 +6,9 @@ import * as Effect from 'effect/Effect';
 
 import { Operation } from '@dxos/compute';
 
-import { WnfsFile } from '../types';
-import { Create } from './definitions';
+import { WnfsFile, WnfsOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof Create> = Create.pipe(
+const handler: Operation.WithHandler<typeof WnfsOperation.Create> = WnfsOperation.Create.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ name, type, cid }) {
       return {

package/src/operations/index.ts

@@ -4,8 +4,6 @@
 
 import { OperationHandlerSet } from '@dxos/compute';
 
-export * as WnfsOperation from './definitions';
-
 export const WnfsOperationHandlerSet = OperationHandlerSet.lazy(
   () => import('./create'),
   () => import('./create-file'),

package/src/operations/upload.ts

@@ -7,13 +7,12 @@ import * as Effect from 'effect/Effect';
 import { Capability } from '@dxos/app-framework';
 import { Operation } from '@dxos/compute';
 import { invariant } from '@dxos/invariant';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { upload } from '../helpers';
-import { WnfsCapabilities } from '../types';
-import { Upload } from './definitions';
+import { WnfsCapabilities, WnfsOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof Upload> = Upload.pipe(
+const handler: Operation.WithHandler<typeof WnfsOperation.Upload> = WnfsOperation.Upload.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ file, db }) {
       const client = yield* Capability.get(ClientCapabilities.Client);

package/src/plugin.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const WnfsPlugin = Plugin.lazy(meta, () => import('#plugin'));
+
+export { WnfsOperationHandlerSet } from './operations';

package/src/translations.ts

@@ -10,7 +10,7 @@ import { WnfsFile } from '#types';
 export const translations = [
   {
     'en-US': {
-      [WnfsFile.File.typename]: {
+      [WnfsFile.WnfsFile.typename]: {
         'typename.label': 'File',
         'typename.label_zero': 'Files',
         'typename.label_one': 'File',

package/src/types/WnfsCapabilities.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// @import-as-namespace
+
+import { type Blockstore as BlockstoreInterface } from 'interface-blockstore';
+import { type PrivateDirectory, type PrivateForest } from 'wnfs';
+
+import { Capability } from '@dxos/app-framework';
+import { type SpaceId } from '@dxos/keys';
+
+import { meta } from '#meta';
+
+export const Blockstore = Capability.make<BlockstoreInterface>(`${meta.id}.capability.blockstore`);
+
+export type Instances = Record<SpaceId, { directory: PrivateDirectory; forest: PrivateForest }>;
+export const Instances = Capability.make<Instances>(`${meta.id}.capability.instances`);

package/src/types/{File.ts → WnfsFile.ts}

@@ -2,12 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
+// @import-as-namespace
+
 import * as Schema from 'effect/Schema';
 
 import { Annotation, Obj, Type } from '@dxos/echo';
 import { FormInputAnnotation } from '@dxos/echo/internal';
 
-export const File = Schema.Struct({
+export const WnfsFile = Schema.Struct({
   name: Schema.String.pipe(Schema.optional),
   type: Schema.String.pipe(FormInputAnnotation.set(false)),
   cid: Schema.String.pipe(FormInputAnnotation.set(false)),
@@ -23,6 +25,6 @@ export const File = Schema.Struct({
   }),
 );
 
-export type File = Schema.Schema.Type<typeof File>;
+export type WnfsFile = Schema.Schema.Type<typeof WnfsFile>;
 
-export const make = (props: Obj.MakeProps<typeof File>) => Obj.make(File, props);
+export const make = (props: Obj.MakeProps<typeof WnfsFile>) => Obj.make(WnfsFile, props);