@dxos/plugin-wnfs 0.8.4-main.67995b8 → 0.8.4-main.6fa680abb7

package/package.json

@@ -1,22 +1,26 @@
 {
   "name": "@dxos/plugin-wnfs",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.6fa680abb7",
   "description": "WNFS file management plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/types/src/index.d.ts",
+      "source": "./src/index.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "source": "./src/index.ts"
+      "types": "./dist/types/src/index.d.ts"
     },
     "./types": {
-      "types": "./dist/types/src/types/index.d.ts",
+      "source": "./src/types/index.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
-      "source": "./src/types/index.ts"
+      "types": "./dist/types/src/types/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -32,15 +36,14 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
     "@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.17.0",
+    "effect": "3.19.16",
     "idb-keyval": "^6.2.1",
     "interface-blockstore": "^5.2.10",
     "it-all": "^3.0.6",
@@ -48,40 +51,43 @@
     "react-dropzone": "^14.2.3",
     "uint8arrays": "^5.1.0",
     "wnfs": "0.2.2",
-    "@dxos/app-framework": "0.8.4-main.67995b8",
-    "@dxos/crypto": "0.8.4-main.67995b8",
-    "@dxos/echo": "0.8.4-main.67995b8",
-    "@dxos/echo-schema": "0.8.4-main.67995b8",
-    "@dxos/effect": "0.8.4-main.67995b8",
-    "@dxos/invariant": "0.8.4-main.67995b8",
-    "@dxos/local-storage": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/plugin-client": "0.8.4-main.67995b8",
-    "@dxos/plugin-markdown": "0.8.4-main.67995b8",
-    "@dxos/plugin-space": "0.8.4-main.67995b8",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui-editor": "0.8.4-main.67995b8",
-    "@dxos/react-ui-form": "0.8.4-main.67995b8",
-    "@dxos/react-ui-stack": "0.8.4-main.67995b8",
-    "@dxos/util": "0.8.4-main.67995b8"
+    "@dxos/app-framework": "0.8.4-main.6fa680abb7",
+    "@dxos/app-toolkit": "0.8.4-main.6fa680abb7",
+    "@dxos/crypto": "0.8.4-main.6fa680abb7",
+    "@dxos/echo": "0.8.4-main.6fa680abb7",
+    "@dxos/log": "0.8.4-main.6fa680abb7",
+    "@dxos/operation": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-client": "0.8.4-main.6fa680abb7",
+    "@dxos/react-client": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-form": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-editor": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-stack": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-mosaic": "0.8.4-main.6fa680abb7",
+    "@dxos/schema": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-editor": "0.8.4-main.6fa680abb7",
+    "@dxos/util": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-space": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-markdown": "0.8.4-main.6fa680abb7",
+    "@dxos/invariant": "0.8.4-main.6fa680abb7",
+    "@dxos/effect": "0.8.4-main.6fa680abb7"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8",
-    "@dxos/random": "0.8.4-main.67995b8",
-    "@dxos/storybook-utils": "0.8.4-main.67995b8"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/random": "0.8.4-main.6fa680abb7",
+    "@dxos/storybook-utils": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
   },
   "publishConfig": {
     "access": "public"

package/src/WnfsPlugin.tsx

@@ -2,92 +2,64 @@
 // Copyright 2024 DXOS.org
 //
 
-import { pipe } from 'effect';
+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 { Operation } from '@dxos/operation';
 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 { type CreateObject } from '@dxos/plugin-space/types';
 
-import { Blockstore, FileUploader, IntentResolver, Markdown, ReactSurface, WnfsCapabilities } from './capabilities';
+import { Blockstore, FileUploader, Markdown, OperationResolver, ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
-import { FileType, WnfsAction } from './types';
+import { WnfsAction, WnfsCapabilities, WnfsFile, WnfsOperation } from './types';
 
-export const WnfsPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/blockstore`,
-      activatesOn: ClientEvents.ClientReady,
-      activate: Blockstore,
-    }),
-    defineModule({
-      id: `${meta.id}/module/instances`,
-      activatesOn: ClientEvents.ClientReady,
-      activate: () => {
-        const instances: WnfsCapabilities.Instances = {};
-        return contributes(WnfsCapabilities.Instances, instances);
+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: 'ph--file--regular',
+        iconHue: 'teal',
+        inputSchema: WnfsAction.UploadFileSchema,
+        createObject: ((props, { db }) =>
+          Effect.gen(function* () {
+            const { object } = yield* Operation.invoke(WnfsOperation.CreateFile, { ...props, db });
+            return object;
+          })) satisfies CreateObject,
       },
-    }),
-    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: FileType.typename,
-          metadata: {
-            label: (object: any) => (object instanceof FileType ? object.name : undefined),
-            // TODO(wittjosiah): Would be nice if icon could change based on the type of the file.
-            icon: 'ph--file--regular',
-          },
-        }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: FileType,
-            formSchema: WnfsAction.UploadFileSchema,
-            getIntent: (props, options) =>
-              pipe(createIntent(WnfsAction.Upload, { ...props, space: options.space }), chain(WnfsAction.Create, {})),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/file-uploader`,
-      activatesOn: ClientEvents.ClientReady,
-      activate: FileUploader,
-    }),
-    defineModule({
-      id: `${meta.id}/module/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,
-    }),
-  ]);
+    },
+  }),
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addSchemaModule({ schema: [WnfsFile.File] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    id: 'blockstore',
+    activatesOn: ClientEvents.ClientReady,
+    activate: Blockstore,
+  }),
+  Plugin.addModule({
+    id: 'instances',
+    activatesOn: ClientEvents.ClientReady,
+    activate: () =>
+      Effect.sync(() => {
+        const instances: WnfsCapabilities.Instances = {};
+        return Capability.contributes(WnfsCapabilities.Instances, instances);
+      }),
+  }),
+  Plugin.addModule({
+    id: 'file-uploader',
+    activatesOn: ClientEvents.ClientReady,
+    activate: FileUploader,
+  }),
+  Plugin.addModule({
+    id: 'markdown',
+    activatesOn: MarkdownEvents.SetupExtensions,
+    activate: Markdown,
+  }),
+  Plugin.make,
+);

package/src/blockstore.ts

@@ -126,7 +126,7 @@ export class MixedBlockstore extends BaseBlockstore {
     if (this.#apiHost) {
       await fetch(this.url(this.#apiHost, key), {
         method: 'POST',
-        body: val,
+        body: val as Uint8Array<ArrayBuffer>,
       });
     }
   }
@@ -138,14 +138,14 @@ export class MixedBlockstore extends BaseBlockstore {
         headers: {
           'Content-Type': 'application/vnd.ipld.car',
         },
-        body: car,
+        body: car as Uint8Array<ArrayBuffer>,
       });
     }
   }
 
   // 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/blockstore.ts

@@ -0,0 +1,22 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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';
+
+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 Capability.contributes(WnfsCapabilities.Blockstore, blockstore);
+  }),
+);

package/src/capabilities/blockstore/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const Blockstore = Capability.lazy('Blockstore', () => import('./blockstore'));

package/src/capabilities/file-uploader/file-uploader.ts

@@ -0,0 +1,34 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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/types';
+
+import { WnfsOperation } from '../../types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // Get context for lazy capability access in callbacks.
+    const capabilities = yield* Capability.Service;
+
+    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 runAndForwardErrors(program);
+    });
+  }),
+);

package/src/capabilities/file-uploader/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const FileUploader = Capability.lazy('FileUploader', () => import('./file-uploader'));

package/src/capabilities/index.ts

@@ -2,12 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
-
-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 * from './blockstore';
+export * from './file-uploader';
+export * from './markdown';
+export * from './operation-resolver';
+export * from './react-surface';

package/src/capabilities/markdown/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const Markdown = Capability.lazy('Markdown', () => import('./markdown'));

package/src/capabilities/markdown/markdown.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { MarkdownCapabilities } from '@dxos/plugin-markdown';
+import { getSpace } from '@dxos/react-client/echo';
+
+import { image } from '../../extensions';
+import { WnfsCapabilities } from '../../types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // Get context for lazy capability access in callbacks.
+    const capabilities = yield* Capability.Service;
+
+    return Capability.contributes(MarkdownCapabilities.Extensions, [
+      ({ document }: { document?: any }) => {
+        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 [];
+      },
+    ]);
+  }),
+);

package/src/capabilities/operation-resolver/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const OperationResolver = Capability.lazy('OperationResolver', () => import('./operation-resolver'));

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -0,0 +1,51 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { invariant } from '@dxos/invariant';
+import { OperationResolver } from '@dxos/operation';
+import { ClientCapabilities } from '@dxos/plugin-client';
+
+import { upload } from '../../helpers';
+import { WnfsCapabilities, WnfsFile, WnfsOperation } from '../../types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationResolver, [
+      OperationResolver.make({
+        operation: WnfsOperation.Create,
+        handler: ({ name, type, cid }) =>
+          Effect.succeed({
+            object: WnfsFile.make({ name, type, cid }),
+          }),
+      }),
+      OperationResolver.make({
+        operation: WnfsOperation.Upload,
+        handler: Effect.fnUntraced(function* ({ file, db }) {
+          const client = yield* Capability.get(ClientCapabilities.Client);
+          const blockstore = yield* Capability.get(WnfsCapabilities.Blockstore);
+          const space = client.spaces.get(db.spaceId);
+          invariant(space, 'Space not found');
+          const info = yield* Effect.promise(() => upload({ file, blockstore, space }));
+          return info;
+        }),
+      }),
+      OperationResolver.make({
+        operation: WnfsOperation.CreateFile,
+        handler: Effect.fnUntraced(function* ({ file, db }) {
+          const client = yield* Capability.get(ClientCapabilities.Client);
+          const blockstore = yield* Capability.get(WnfsCapabilities.Blockstore);
+          const space = client.spaces.get(db.spaceId);
+          invariant(space, 'Space not found');
+          const info = yield* Effect.promise(() => upload({ file, blockstore, space }));
+          return {
+            object: WnfsFile.make({ name: info.name, type: info.type, cid: info.cid }),
+          };
+        }),
+      }),
+    ]);
+  }),
+);

package/src/capabilities/react-surface/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface/react-surface.tsx

@@ -0,0 +1,51 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import type * as Schema from 'effect/Schema';
+import React, { useCallback } from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { Obj } from '@dxos/echo';
+import { findAnnotation } from '@dxos/effect';
+import { type FormFieldComponentProps } from '@dxos/react-ui-form';
+
+import { FileInput } from '../../components';
+import { FileContainer } from '../../containers';
+import { meta } from '../../meta';
+import { WnfsAction, WnfsFile } from '../../types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: `${meta.id}.article`,
+        role: ['article', 'section', 'slide'],
+        filter: (data): data is { subject: WnfsFile.File } => Obj.instanceOf(WnfsFile.File, data.subject),
+        component: ({ data, role }) => <FileContainer role={role} subject={data.subject} />,
+      }),
+      Surface.create({
+        id: `${meta.id}.create-form`,
+        role: 'form-input',
+        filter: (data): data is { prop: string; schema: Schema.Schema.Any } => {
+          const annotation = findAnnotation<boolean>(
+            (data.schema as Schema.Schema.All).ast,
+            WnfsAction.UploadAnnotationId,
+          );
+          return !!annotation;
+        },
+        component: ({ data: { schema }, ...props }) => {
+          const inputProps = props as unknown as FormFieldComponentProps;
+          const handleChange = useCallback(
+            (file: File) => inputProps.onValueChange?.(inputProps.type, file),
+            [inputProps.type, inputProps.onValueChange],
+          );
+
+          return <FileInput schema={schema} onChange={handleChange} />;
+        },
+      }),
+    ]),
+  ),
+);

package/src/components/{FileInput.tsx → FileInput/FileInput.tsx}

@@ -2,16 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 import React, { useCallback } from 'react';
 import { useDropzone } from 'react-dropzone';
 
 import { findAnnotation } from '@dxos/effect';
 import { useTranslation } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
-import { WNFS_PLUGIN } from '../meta';
-import { WnfsAction } from '../types';
+import { meta } from '../../meta';
+import { WnfsAction } from '../../types';
 
 export type FileInputProps = {
   schema: Schema.Schema.Any;
@@ -19,7 +19,7 @@ export type FileInputProps = {
 };
 
 export const FileInput = ({ schema, onChange }: FileInputProps) => {
-  const { t } = useTranslation(WNFS_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const accept = findAnnotation<Record<string, string[]>>(schema.ast, WnfsAction.UploadAnnotationId);
 
   const onDropAccepted = useCallback((files: File[]) => onChange?.(files[0]), [onChange]);
@@ -36,8 +36,8 @@ export const FileInput = ({ schema, onChange }: FileInputProps) => {
       className={mx(
         'flex flex-col items-center p-8 border border-separator',
         isFocused && 'focus-ring',
-        isDragAccept && 'bg-attention',
-        isDragReject && 'border-error',
+        isDragAccept && 'bg-attention-surface',
+        isDragReject && 'border-rose-fill',
       )}
     >
       <input {...getInputProps()} />

package/src/components/FileInput/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './FileInput';

package/src/components/{FilePreview.tsx → FilePreview/FilePreview.tsx}

@@ -5,7 +5,7 @@
 import React from 'react';
 
 import { type ThemedClassName } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 export type FilePreviewProps = ThemedClassName<{ type: string; url: string }>;
 

package/src/components/FilePreview/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export * from './FilePreview';

package/src/components/index.ts

@@ -2,8 +2,5 @@
 // Copyright 2023 DXOS.org
 //
 
-import { lazy } from 'react';
-
-export const FileContainer = lazy(() => import('./FileContainer'));
-
 export * from './FileInput';
+export * from './FilePreview';