@dxos/plugin-wnfs 0.8.4-main.72ec0f3 → 0.8.4-main.7ace549

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-wnfs",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.7ace549",
   "description": "WNFS file management plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -48,22 +48,22 @@
     "react-dropzone": "^14.2.3",
     "uint8arrays": "^5.1.0",
     "wnfs": "0.2.2",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/crypto": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/effect": "0.8.4-main.72ec0f3",
-    "@dxos/local-storage": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-client": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-markdown": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-space": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-editor": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-form": "0.8.4-main.72ec0f3"
+    "@dxos/app-framework": "0.8.4-main.7ace549",
+    "@dxos/crypto": "0.8.4-main.7ace549",
+    "@dxos/echo": "0.8.4-main.7ace549",
+    "@dxos/effect": "0.8.4-main.7ace549",
+    "@dxos/invariant": "0.8.4-main.7ace549",
+    "@dxos/local-storage": "0.8.4-main.7ace549",
+    "@dxos/log": "0.8.4-main.7ace549",
+    "@dxos/plugin-client": "0.8.4-main.7ace549",
+    "@dxos/plugin-space": "0.8.4-main.7ace549",
+    "@dxos/plugin-markdown": "0.8.4-main.7ace549",
+    "@dxos/react-client": "0.8.4-main.7ace549",
+    "@dxos/react-ui-editor": "0.8.4-main.7ace549",
+    "@dxos/react-ui-form": "0.8.4-main.7ace549",
+    "@dxos/util": "0.8.4-main.7ace549",
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-stack": "0.8.4-main.7ace549"
   },
   "devDependencies": {
     "@types/react": "~19.2.2",
@@ -71,16 +71,16 @@
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3"
+    "@dxos/random": "0.8.4-main.7ace549",
+    "@dxos/storybook-utils": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549"
   },
   "publishConfig": {
     "access": "public"

package/src/WnfsPlugin.tsx

@@ -13,10 +13,9 @@ import {
   defineModule,
   definePlugin,
 } from '@dxos/app-framework';
-import { ClientEvents } from '@dxos/plugin-client';
+import { ClientCapabilities, 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 CreateObjectIntent } from '@dxos/plugin-space/types';
 
 import { Blockstore, FileUploader, IntentResolver, Markdown, ReactSurface, WnfsCapabilities } from './capabilities';
 import { meta } from './meta';
@@ -52,25 +51,20 @@ export const WnfsPlugin = definePlugin(meta, () => [
           // 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,
+          createObjectIntent: ((props, options) =>
+            Function.pipe(
+              createIntent(WnfsAction.Upload, { ...props, space: options.space }),
+              chain(WnfsAction.Create, {}),
+            )) satisfies CreateObjectIntent,
+          addToCollectionOnCreate: true,
         },
       }),
   }),
   defineModule({
-    id: `${meta.id}/module/object-form`,
+    id: `${meta.id}/module/schema`,
     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, {}),
-            ),
-        }),
-      ),
+    activate: () => contributes(ClientCapabilities.Schema, [WnfsFile.File]),
   }),
   defineModule({
     id: `${meta.id}/module/file-uploader`,

package/src/translations.ts

@@ -15,10 +15,10 @@ export const translations = [
         'object name placeholder': 'New file',
         'rename object label': 'Rename file',
         'delete object label': 'Delete file',
+        'object deleted label': 'File deleted',
       },
       [meta.id]: {
         'plugin name': 'Files',
-        'delete object label': 'Delete',
         'file input placeholder': 'Drop a file here, or click to select a file',
       },
     },

package/src/types/File.ts

@@ -5,13 +5,13 @@
 import * as Schema from 'effect/Schema';
 
 import { Obj, Type } from '@dxos/echo';
-import { FormAnnotation } from '@dxos/echo/internal';
+import { FormInputAnnotation } 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),
+  type: Schema.String.pipe(FormInputAnnotation.set(false)),
+  cid: Schema.String.pipe(FormInputAnnotation.set(false)),
+  timestamp: Schema.String.pipe(FormInputAnnotation.set(false), Schema.optional),
 }).pipe(
   Type.Obj({
     typename: 'dxos.org/type/File',

package/dist/lib/browser/chunk-CWMKN2F6.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/types/File.ts", "../../../src/types/types.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { Obj, Type } from '@dxos/echo';\nimport { FormAnnotation } from '@dxos/echo/internal';\n\nexport const File = Schema.Struct({\n  name: Schema.String.pipe(Schema.optional),\n  type: Schema.String.pipe(FormAnnotation.set(false)),\n  cid: Schema.String.pipe(FormAnnotation.set(false)),\n  timestamp: Schema.String.pipe(FormAnnotation.set(false), Schema.optional),\n}).pipe(\n  Type.Obj({\n    typename: 'dxos.org/type/File',\n    version: '0.1.0',\n  }),\n);\n\nexport type File = Schema.Schema.Type<typeof File>;\n\nexport const make = (props: Obj.MakeProps<typeof File>) => Obj.make(File, props);\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { FileInfoSchema } from '@dxos/app-framework';\nimport { SpaceSchema } from '@dxos/react-client/echo';\n\nimport { meta } from '../meta';\n\nimport * as File from './File';\n\nexport namespace WnfsAction {\n  export class Create extends Schema.TaggedClass<Create>()(`${meta.id}/action/create`, {\n    input: FileInfoSchema.pick('name', 'type', 'cid').pipe(Schema.required),\n    output: Schema.Struct({\n      object: File.File,\n    }),\n  }) {}\n\n  export const UploadAnnotationId = Symbol.for(`${meta.id}/annotation/upload`);\n\n  export const UploadFileSchema = Schema.Struct({\n    file: Schema.instanceOf(File.File).annotations({\n      [UploadAnnotationId]: {\n        // Accept file types.\n        'image/*': ['.jpg', '.jpeg', '.png', '.gif'],\n        'application/pdf': ['.pdf'],\n        // TODO(wittjosiah): Add more file types.\n      },\n    }),\n  });\n\n  export type UploadFileForm = Schema.Schema.Type<typeof UploadFileSchema>;\n\n  export class Upload extends Schema.TaggedClass<Upload>()(`${meta.id}/action/upload`, {\n    input: Schema.extend(UploadFileSchema, Schema.Struct({ space: SpaceSchema })),\n    output: Schema.required(FileInfoSchema),\n  }) {}\n}\n"],
-  "mappings": ";;;;;;AAAA;;;;;AAIA,YAAYA,YAAY;AAExB,SAASC,KAAKC,YAAY;AAC1B,SAASC,sBAAsB;AAExB,IAAMC,OAAcC,cAAO;EAChCC,MAAaC,cAAOC,KAAYC,eAAQ;EACxCC,MAAaH,cAAOC,KAAKG,eAAeC,IAAI,KAAA,CAAA;EAC5CC,KAAYN,cAAOC,KAAKG,eAAeC,IAAI,KAAA,CAAA;EAC3CE,WAAkBP,cAAOC,KAAKG,eAAeC,IAAI,KAAA,GAAeH,eAAQ;AAC1E,CAAA,EAAGD,KACDO,KAAKC,IAAI;EACPC,UAAU;EACVC,SAAS;AACX,CAAA,CAAA;AAKK,IAAMC,OAAO,CAACC,UAAsCJ,IAAIG,KAAKf,MAAMgB,KAAAA;;;ACnB1E,YAAYC,aAAY;AAExB,SAASC,sBAAsB;AAC/B,SAASC,mBAAmB;UAMXC,aAAAA;EACR,MAAMC,eAAsBC,oBAAW,EAAW,GAAGC,KAAKC,EAAE,kBAAkB;IACnFC,OAAOC,eAAeC,KAAK,QAAQ,QAAQ,KAAA,EAAOC,KAAYC,gBAAQ;IACtEC,QAAeC,eAAO;MACpBC,QAAaC;IACf,CAAA;EACF,CAAA,EAAA;EAAI;cALSZ,SAAAA;cAOAa,qBAAqBC,OAAOC,IAAI,GAAGb,KAAKC,EAAE,oBAAoB;cAE9Da,mBAA0BN,eAAO;IAC5CO,MAAaC,mBAAgBN,IAAI,EAAEO,YAAY;MAC7C,CAAApB,YAACc,kBAAAA,GAAqB;;QAEpB,WAAW;UAAC;UAAQ;UAAS;UAAQ;;QACrC,mBAAmB;UAAC;;MAEtB;IACF,CAAA;EACF,CAAA;EAIO,MAAMO,eAAsBnB,oBAAW,EAAW,GAAGC,KAAKC,EAAE,kBAAkB;IACnFC,OAAciB,eAAMtB,YAACiB,kBAAyBN,eAAO;MAAEY,OAAOC;IAAY,CAAA,CAAA;IAC1Ed,QAAeD,iBAASH,cAAAA;EAC1B,CAAA,EAAA;EAAI;cAHSe,SAAAA;AAIf,GA3BiBrB,eAAAA,aAAAA,CAAAA,EAAAA;;",
-  "names": ["Schema", "Obj", "Type", "FormAnnotation", "File", "Struct", "name", "String", "pipe", "optional", "type", "FormAnnotation", "set", "cid", "timestamp", "Type", "Obj", "typename", "version", "make", "props", "Schema", "FileInfoSchema", "SpaceSchema", "WnfsAction", "Create", "TaggedClass", "meta", "id", "input", "FileInfoSchema", "pick", "pipe", "required", "output", "Struct", "object", "File", "UploadAnnotationId", "Symbol", "for", "UploadFileSchema", "file", "instanceOf", "annotations", "Upload", "extend", "space", "SpaceSchema"]
-}