@dxos/plugin-wnfs 0.8.4-main.5ea62a8 → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-wnfs",
-  "version": "0.8.4-main.5ea62a8",
+  "version": "0.8.4-main.ae835ea",
   "description": "WNFS file management plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -32,15 +32,15 @@
     "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.7",
+    "effect": "3.18.3",
     "idb-keyval": "^6.2.1",
     "interface-blockstore": "^5.2.10",
     "it-all": "^3.0.6",
@@ -48,40 +48,39 @@
     "react-dropzone": "^14.2.3",
     "uint8arrays": "^5.1.0",
     "wnfs": "0.2.2",
-    "@dxos/app-framework": "0.8.4-main.5ea62a8",
-    "@dxos/crypto": "0.8.4-main.5ea62a8",
-    "@dxos/echo": "0.8.4-main.5ea62a8",
-    "@dxos/effect": "0.8.4-main.5ea62a8",
-    "@dxos/invariant": "0.8.4-main.5ea62a8",
-    "@dxos/echo-schema": "0.8.4-main.5ea62a8",
-    "@dxos/log": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-client": "0.8.4-main.5ea62a8",
-    "@dxos/local-storage": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-space": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-markdown": "0.8.4-main.5ea62a8",
-    "@dxos/react-client": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-editor": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-form": "0.8.4-main.5ea62a8",
-    "@dxos/util": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-stack": "0.8.4-main.5ea62a8"
+    "@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"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "7.1.1",
-    "@dxos/random": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8",
-    "@dxos/storybook-utils": "0.8.4-main.5ea62a8"
+    "@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"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8"
+    "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"

package/src/WnfsPlugin.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { pipe } from 'effect';
+import * as Function from 'effect/Function';
 
 import {
   Capabilities,
@@ -21,73 +21,75 @@ 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 { FileType, WnfsAction } from './types';
+import { WnfsAction, WnfsFile } 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);
-      },
-    }),
-    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',
-          },
+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);
+    },
+  }),
+  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',
+        },
+      }),
+  }),
+  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/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,
-    }),
-  ]);
+      ),
+  }),
+  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,
+  }),
+]);

package/src/capabilities/capabilities.ts

@@ -8,11 +8,11 @@ import { type PrivateDirectory, type PrivateForest } from 'wnfs';
 import { defineCapability } from '@dxos/app-framework';
 import { type SpaceId } from '@dxos/keys';
 
-import { WNFS_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 export namespace WnfsCapabilities {
-  export const Blockstore = defineCapability<Blockstore>(`${WNFS_PLUGIN}/capability/blockstore`);
+  export const Blockstore = defineCapability<Blockstore>(`${meta.id}/capability/blockstore`);
 
   export type Instances = Record<SpaceId, { directory: PrivateDirectory; forest: PrivateForest }>;
-  export const Instances = defineCapability<Instances>(`${WNFS_PLUGIN}/capability/instances`);
+  export const Instances = defineCapability<Instances>(`${meta.id}/capability/instances`);
 }

package/src/capabilities/file-uploader.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, pipe } from 'effect';
+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';
@@ -10,12 +11,14 @@ import { SpaceAction } from '@dxos/plugin-space/types';
 import { WnfsAction } from '../types';
 
 export default (context: PluginContext) => {
-  return contributes(Capabilities.FileUploader, (file, space) => {
+  return contributes(Capabilities.FileUploader, (space, file) => {
     const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-
     const program = Effect.gen(function* () {
-      const fileInfo = yield* dispatch(createIntent(WnfsAction.Upload, { file, space }));
-      yield* dispatch(pipe(createIntent(WnfsAction.Create, fileInfo), chain(SpaceAction.AddObject, { target: space })));
+      const fileInfo = yield* dispatch(createIntent(WnfsAction.Upload, { space, file }));
+      yield* dispatch(
+        Function.pipe(createIntent(WnfsAction.Create, fileInfo), chain(SpaceAction.AddObject, { target: space })),
+      );
+
       return fileInfo;
     });
 

package/src/capabilities/intent-resolver.ts

@@ -3,10 +3,9 @@
 //
 
 import { Capabilities, type PluginContext, contributes, createResolver } from '@dxos/app-framework';
-import { Obj } from '@dxos/echo';
 
 import { upload } from '../helpers';
-import { FileType, WnfsAction } from '../types';
+import { WnfsAction, WnfsFile } from '../types';
 
 import { WnfsCapabilities } from './capabilities';
 
@@ -18,7 +17,7 @@ export default (context: PluginContext) =>
       intent: WnfsAction.Create,
       resolve: ({ name, type, cid }) => ({
         data: {
-          object: Obj.make(FileType, { name, type, cid }),
+          object: WnfsFile.make({ name, type, cid }),
         },
       }),
     }),

package/src/capabilities/react-surface.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 import React, { useCallback } from 'react';
 
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
@@ -11,19 +11,19 @@ import { findAnnotation } from '@dxos/effect';
 import { type InputProps } from '@dxos/react-ui-form';
 
 import { FileContainer, FileInput } from '../components';
-import { WNFS_PLUGIN } from '../meta';
-import { FileType, WnfsAction } from '../types';
+import { meta } from '../meta';
+import { WnfsAction, WnfsFile } from '../types';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
-      id: `${WNFS_PLUGIN}/article`,
+      id: `${meta.id}/article`,
       role: ['article', 'section', 'slide'],
-      filter: (data): data is { subject: FileType } => Obj.instanceOf(FileType, data.subject),
+      filter: (data): data is { subject: WnfsFile.File } => Obj.instanceOf(WnfsFile.File, data.subject),
       component: ({ data, role }) => <FileContainer role={role} file={data.subject} />,
     }),
     createSurface({
-      id: `${WNFS_PLUGIN}/create-form`,
+      id: `${meta.id}/create-form`,
       role: 'form-input',
       filter: (data): data is { prop: string; schema: Schema.Schema.Any } => {
         const annotation = findAnnotation<boolean>(

package/src/components/FileContainer.tsx

@@ -12,13 +12,13 @@ import { StackItem } from '@dxos/react-ui-stack';
 
 import { WnfsCapabilities } from '../capabilities';
 import { filePath, getBlobUrl, loadWnfs, wnfsUrl } from '../helpers';
-import { type FileType } from '../types';
+import { type WnfsFile } from '../types';
 
 import { FilePreview } from './FilePreview';
 
 export type FileContainerProps = {
   role: string;
-  file: FileType;
+  file: WnfsFile.File;
 };
 
 export const FileContainer = ({ file }: FileContainerProps) => {

package/src/components/FileInput.tsx

@@ -2,7 +2,7 @@
 // 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';
 
@@ -10,7 +10,7 @@ import { findAnnotation } from '@dxos/effect';
 import { useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
-import { WNFS_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { WnfsAction } from '../types';
 
 export type FileInputProps = {
@@ -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]);

package/src/extensions/image.stories.tsx

@@ -2,8 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import type { Blockstore } from 'interface-blockstore';
 import React, { type ChangeEvent, useEffect, useState } from 'react';
@@ -12,6 +10,7 @@ import { faker } from '@dxos/random';
 import { useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { useThemeContext } from '@dxos/react-ui';
+import { withTheme } from '@dxos/react-ui/testing';
 import {
   createBasicExtensions,
   createMarkdownExtensions,
@@ -20,7 +19,6 @@ import {
   processEditorPayload,
   useTextEditor,
 } from '@dxos/react-ui-editor';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { create as createBlockstore } from '../blockstore';
 import { upload } from '../helpers';
@@ -56,7 +54,7 @@ const DefaultStory = () => {
       initialValue,
       extensions: [
         createBasicExtensions(),
-        createMarkdownExtensions({ themeMode }),
+        createMarkdownExtensions(),
         createThemeExtensions({ themeMode, syntaxHighlighting: true }),
         blockstore && space ? [image({ blockstore, instances, space })] : [],
         decorateMarkdown(),
@@ -96,7 +94,7 @@ const DefaultStory = () => {
 const meta = {
   title: 'plugins/plugin-wnfs/image',
   render: DefaultStory,
-  decorators: [withClientProvider({ createIdentity: true, createSpace: true }), withTheme, withLayout()],
+  decorators: [withTheme, withClientProvider({ createIdentity: true, createSpace: true })],
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;

package/src/extensions/image.tsx

@@ -80,16 +80,16 @@ export const image = (options: ImageOptions): Extension[] => {
 };
 
 const buildDecorations = ({
+  state,
   from,
   to,
-  state,
   blobUrlCache,
   preload,
   options: { blockstore, instances, space },
 }: {
+  state: EditorState;
   from: number;
   to: number;
-  state: EditorState;
   blobUrlCache: Record<string, string>;
   preload: (url: string) => void;
   options: ImageOptions;

package/src/meta.ts

@@ -3,13 +3,16 @@
 //
 
 import { type PluginMeta } from '@dxos/app-framework';
-
-export const WNFS_PLUGIN = 'dxos.org/plugin/wnfs';
+import { trim } from '@dxos/util';
 
 export const meta: PluginMeta = {
-  id: WNFS_PLUGIN,
+  id: 'dxos.org/plugin/wnfs',
   name: 'WNFS',
-  description: 'Manage and view files with via the Web Native File System (WNFS).',
+  description: trim`
+    Decentralized file storage using the Web Native File System protocol.
+    Store and sync files with end-to-end encryption across devices without central servers.
+  `,
   icon: 'ph--file-cloud--regular',
+  iconHue: 'teal',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-wnfs',
 };

package/src/translations.ts

@@ -5,12 +5,12 @@
 import { type Resource } from '@dxos/react-ui';
 
 import { meta } from './meta';
-import { FileType } from './types';
+import { WnfsFile } from './types';
 
 export const translations = [
   {
     'en-US': {
-      [FileType.typename]: {
+      [WnfsFile.File.typename]: {
         'typename label': 'File',
         'object name placeholder': 'New file',
         'rename object label': 'Rename file',

package/src/types/File.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+
+import { Obj, Type } from '@dxos/echo';
+import { FormAnnotation } from '@dxos/echo/internal';
+
+export const File = Schema.Struct({
+  name: Schema.String.pipe(Schema.optional),
+  type: Schema.String.pipe(FormAnnotation.set(false)),
+  cid: Schema.String.pipe(FormAnnotation.set(false)),
+  timestamp: Schema.String.pipe(FormAnnotation.set(false), Schema.optional),
+}).pipe(
+  Type.Obj({
+    typename: 'dxos.org/type/File',
+    version: '0.1.0',
+  }),
+);
+
+export type File = Schema.Schema.Type<typeof File>;
+
+export const make = (props: Obj.MakeProps<typeof File>) => Obj.make(File, props);

package/src/types/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './file';
+export * as WnfsFile from './File';
 export * from './types';

package/src/types/types.ts

@@ -2,27 +2,27 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { FileInfoSchema } from '@dxos/app-framework';
 import { SpaceSchema } from '@dxos/react-client/echo';
 
-import { WNFS_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
-import { FileType } from './file';
+import * as File from './File';
 
 export namespace WnfsAction {
-  export class Create extends Schema.TaggedClass<Create>()(`${WNFS_PLUGIN}/action/create`, {
+  export class Create extends Schema.TaggedClass<Create>()(`${meta.id}/action/create`, {
     input: FileInfoSchema.pick('name', 'type', 'cid').pipe(Schema.required),
     output: Schema.Struct({
-      object: FileType,
+      object: File.File,
     }),
   }) {}
 
-  export const UploadAnnotationId = Symbol.for(`${WNFS_PLUGIN}/annotation/upload`);
+  export const UploadAnnotationId = Symbol.for(`${meta.id}/annotation/upload`);
 
   export const UploadFileSchema = Schema.Struct({
-    file: Schema.instanceOf(File).annotations({
+    file: Schema.instanceOf(File.File).annotations({
       [UploadAnnotationId]: {
         // Accept file types.
         'image/*': ['.jpg', '.jpeg', '.png', '.gif'],
@@ -34,7 +34,7 @@ export namespace WnfsAction {
 
   export type UploadFileForm = Schema.Schema.Type<typeof UploadFileSchema>;
 
-  export class Upload extends Schema.TaggedClass<Upload>()(`${WNFS_PLUGIN}/action/upload`, {
+  export class Upload extends Schema.TaggedClass<Upload>()(`${meta.id}/action/upload`, {
     input: Schema.extend(UploadFileSchema, Schema.Struct({ space: SpaceSchema })),
     output: Schema.required(FileInfoSchema),
   }) {}