@dxos/plugin-wnfs 0.8.4-main.9735255 → 0.8.4-main.9be5663bfe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-wnfs",
-  "version": "0.8.4-main.9735255",
+  "version": "0.8.4-main.9be5663bfe",
   "description": "WNFS file management plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -11,15 +11,28 @@
   "license": "MIT",
   "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",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
-      "browser": "./dist/lib/browser/index.mjs",
       "source": "./src/index.ts",
+      "browser": "./dist/lib/browser/index.mjs",
       "types": "./dist/types/src/index.d.ts"
     },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "types": "./dist/types/src/operations/index.d.ts"
+    },
     "./types": {
-      "browser": "./dist/lib/browser/types/index.mjs",
       "source": "./src/types/index.ts",
+      "browser": "./dist/lib/browser/types/index.mjs",
       "types": "./dist/types/src/types/index.d.ts"
     }
   },
@@ -28,6 +41,9 @@
     "*": {
       "types": [
         "dist/types/src/types/index.d.ts"
+      ],
+      "operations": [
+        "dist/types/src/operations/index.d.ts"
       ]
     }
   },
@@ -43,7 +59,7 @@
     "blockstore-core": "^5.0.1",
     "blockstore-idb": "^2.0.0",
     "debounce": "^2.2.0",
-    "effect": "3.19.11",
+    "effect": "3.20.0",
     "idb-keyval": "^6.2.1",
     "interface-blockstore": "^5.2.10",
     "it-all": "^3.0.6",
@@ -51,42 +67,43 @@
     "react-dropzone": "^14.2.3",
     "uint8arrays": "^5.1.0",
     "wnfs": "0.2.2",
-    "@dxos/crypto": "0.8.4-main.9735255",
-    "@dxos/app-framework": "0.8.4-main.9735255",
-    "@dxos/echo": "0.8.4-main.9735255",
-    "@dxos/effect": "0.8.4-main.9735255",
-    "@dxos/invariant": "0.8.4-main.9735255",
-    "@dxos/log": "0.8.4-main.9735255",
-    "@dxos/operation": "0.8.4-main.9735255",
-    "@dxos/plugin-client": "0.8.4-main.9735255",
-    "@dxos/plugin-space": "0.8.4-main.9735255",
-    "@dxos/plugin-markdown": "0.8.4-main.9735255",
-    "@dxos/react-client": "0.8.4-main.9735255",
-    "@dxos/react-ui": "0.8.4-main.9735255",
-    "@dxos/react-ui-editor": "0.8.4-main.9735255",
-    "@dxos/react-ui-mosaic": "0.8.4-main.9735255",
-    "@dxos/react-ui-stack": "0.8.4-main.9735255",
-    "@dxos/react-ui-form": "0.8.4-main.9735255",
-    "@dxos/schema": "0.8.4-main.9735255",
-    "@dxos/ui-editor": "0.8.4-main.9735255",
-    "@dxos/util": "0.8.4-main.9735255"
+    "@dxos/app-toolkit": "0.8.4-main.9be5663bfe",
+    "@dxos/crypto": "0.8.4-main.9be5663bfe",
+    "@dxos/effect": "0.8.4-main.9be5663bfe",
+    "@dxos/echo": "0.8.4-main.9be5663bfe",
+    "@dxos/invariant": "0.8.4-main.9be5663bfe",
+    "@dxos/log": "0.8.4-main.9be5663bfe",
+    "@dxos/app-framework": "0.8.4-main.9be5663bfe",
+    "@dxos/operation": "0.8.4-main.9be5663bfe",
+    "@dxos/plugin-markdown": "0.8.4-main.9be5663bfe",
+    "@dxos/plugin-space": "0.8.4-main.9be5663bfe",
+    "@dxos/react-client": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-editor": "0.8.4-main.9be5663bfe",
+    "@dxos/plugin-client": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-form": "0.8.4-main.9be5663bfe",
+    "@dxos/schema": "0.8.4-main.9be5663bfe",
+    "@dxos/ui-editor": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-stack": "0.8.4-main.9be5663bfe",
+    "@dxos/util": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui-mosaic": "0.8.4-main.9be5663bfe"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.9735255",
-    "@dxos/storybook-utils": "0.8.4-main.9735255",
-    "@dxos/ui-theme": "0.8.4-main.9735255"
+    "vite": "^7.1.11",
+    "@dxos/random": "0.8.4-main.9be5663bfe",
+    "@dxos/storybook-utils": "0.8.4-main.9be5663bfe",
+    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
   },
   "peerDependencies": {
-    "effect": "3.19.11",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.9735255",
-    "@dxos/ui-theme": "0.8.4-main.9735255"
+    "@dxos/ui-theme": "0.8.4-main.9be5663bfe",
+    "@dxos/react-ui": "0.8.4-main.9be5663bfe"
   },
   "publishConfig": {
     "access": "public"

package/src/WnfsPlugin.tsx

@@ -3,20 +3,50 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-import { Capability, Common, Plugin } from '@dxos/app-framework';
+import { Capability, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Annotation } from '@dxos/echo';
 import { Operation } from '@dxos/operation';
-import { ClientEvents } from '@dxos/plugin-client';
+import { ClientEvents } from '@dxos/plugin-client/types';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
-import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
 import { type CreateObject } from '@dxos/plugin-space/types';
 
-import { Blockstore, FileUploader, Markdown, OperationResolver, ReactSurface } from './capabilities';
-import { meta } from './meta';
+import { Blockstore, FileUploader, Markdown, OperationHandler, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { WnfsOperation } from '#operations';
+import { WnfsAction, WnfsCapabilities, WnfsFile } from '#types';
+
 import { translations } from './translations';
-import { WnfsAction, WnfsCapabilities, WnfsFile, WnfsOperation } 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.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [WnfsFile.File] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
     id: 'blockstore',
     activatesOn: ClientEvents.ClientReady,
@@ -31,34 +61,6 @@ export const WnfsPlugin = Plugin.define(meta).pipe(
         return Capability.contributes(WnfsCapabilities.Instances, instances);
       }),
   }),
-  Common.Plugin.addTranslationsModule({ translations }),
-  Common.Plugin.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,
-      },
-    },
-  }),
-  Common.Plugin.addSchemaModule({ schema: [WnfsFile.File] }),
-  Plugin.addModule({
-    id: 'on-space-created',
-    activatesOn: SpaceEvents.SpaceCreated,
-    activate: () =>
-      Effect.succeed(
-        Capability.contributes(SpaceCapabilities.OnCreateSpace, (params) =>
-          Operation.invoke(WnfsOperation.OnCreateSpace, params),
-        ),
-      ),
-  }),
   Plugin.addModule({
     id: 'file-uploader',
     activatesOn: ClientEvents.ClientReady,
@@ -69,7 +71,5 @@ export const WnfsPlugin = Plugin.define(meta).pipe(
     activatesOn: MarkdownEvents.SetupExtensions,
     activate: Markdown,
   }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
   Plugin.make,
 );

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

@@ -5,10 +5,11 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { ClientCapabilities } from '@dxos/plugin-client';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
 
-import * as Blockstore from '../../blockstore';
-import { WnfsCapabilities } from '../../types';
+import { WnfsCapabilities } from '#types';
+
+import * as Blockstore from '../blockstore';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {

package/src/capabilities/{file-uploader/file-uploader.ts → file-uploader.ts}

@@ -4,19 +4,20 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+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 { SpaceOperation } from '@dxos/plugin-space/operations';
 
-import { WnfsOperation } from '../../types';
+import { WnfsOperation } from '#operations';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     // Get context for lazy capability access in callbacks.
     const capabilities = yield* Capability.Service;
 
-    return Capability.contributes(Common.Capability.FileUploader, (db, file) => {
-      const { invoke } = capabilities.get(Common.Capability.OperationInvoker);
+    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);

package/src/capabilities/index.ts

@@ -2,8 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './blockstore';
-export * from './file-uploader';
-export * from './markdown';
-export * from './operation-resolver';
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
+
+export const Blockstore = Capability.lazy('Blockstore', () => import('./blockstore'));
+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/markdown.ts → markdown.ts}

@@ -8,8 +8,9 @@ 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';
+import { WnfsCapabilities } from '#types';
+
+import { image } from '../extensions';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {

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/operation';
+
+import { WnfsOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, WnfsOperationHandlerSet);
+  }),
+);

package/src/capabilities/{react-surface/react-surface.tsx → react-surface.tsx}

@@ -6,26 +6,28 @@ import * as Effect from 'effect/Effect';
 import type * as Schema from 'effect/Schema';
 import React, { useCallback } from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { Obj } from '@dxos/echo';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { findAnnotation } from '@dxos/effect';
 import { type FormFieldComponentProps } from '@dxos/react-ui-form';
 
-import { FileContainer, FileInput } from '../../components';
-import { meta } from '../../meta';
-import { WnfsAction, WnfsFile } from '../../types';
+import { FileInput } from '#components';
+import { FileContainer } from '#containers';
+import { WnfsAction, WnfsFile } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
-        id: `${meta.id}/article`,
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'article',
+        // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
         role: ['article', 'section', 'slide'],
-        filter: (data): data is { subject: WnfsFile.File } => Obj.instanceOf(WnfsFile.File, data.subject),
+        filter: AppSurface.objectArticle(WnfsFile.File),
         component: ({ data, role }) => <FileContainer role={role} subject={data.subject} />,
       }),
-      Common.createSurface({
-        id: `${meta.id}/create-form`,
+      Surface.create({
+        id: 'create-form',
         role: 'form-input',
         filter: (data): data is { prop: string; schema: Schema.Schema.Any } => {
           const annotation = findAnnotation<boolean>(

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

@@ -10,8 +10,8 @@ import { findAnnotation } from '@dxos/effect';
 import { useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/ui-theme';
 
-import { meta } from '../meta';
-import { WnfsAction } from '../types';
+import { meta } from '#meta';
+import { WnfsAction } from '#types';
 
 export type FileInputProps = {
   schema: Schema.Schema.Any;
@@ -36,12 +36,12 @@ 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-roseFill',
+        isDragAccept && 'bg-attention-surface',
+        isDragReject && 'border-rose-fill',
       )}
     >
       <input {...getInputProps()} />
-      {acceptedFiles[0] ? <p>{acceptedFiles[0].name}</p> : <p>{t('file input placeholder')}</p>}
+      {acceptedFiles[0] ? <p>{acceptedFiles[0].name}</p> : <p>{t('file-input.placeholder')}</p>}
     </div>
   );
 };

package/src/components/FileInput/index.ts

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

package/src/components/FilePreview/FilePreview.tsx

@@ -0,0 +1,43 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import React, { ForwardedRef } from 'react';
+
+import { composable, composableProps } from '@dxos/ui-theme';
+
+export type FilePreviewProps = { type: string; url: string };
+
+/**
+ * File/content preview iframe.
+ */
+export const FilePreview = composable<HTMLElement, FilePreviewProps>(
+  ({ type, url, children, ...props }, forwardedRef) => {
+    if (type.startsWith('image/')) {
+      return (
+        <img
+          {...composableProps(props, { classNames: 'h-full w-full object-contain' })}
+          src={url}
+          ref={forwardedRef as ForwardedRef<HTMLImageElement>}
+        />
+      );
+    } else if (type.startsWith('video/')) {
+      return (
+        <video
+          {...composableProps(props, { classNames: 'h-full w-full object-contain' })}
+          src={url}
+          controls
+          ref={forwardedRef as ForwardedRef<HTMLVideoElement>}
+        />
+      );
+    } else {
+      return (
+        <iframe
+          {...composableProps(props, { classNames: 'h-full w-full overflow-auto' })}
+          src={url}
+          ref={forwardedRef as ForwardedRef<HTMLIFrameElement>}
+        />
+      );
+    }
+  },
+);

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';

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

@@ -4,19 +4,18 @@
 
 import React, { useState } from 'react';
 
-import { type SurfaceComponentProps, useCapability } from '@dxos/app-framework/react';
+import { useCapability } from '@dxos/app-framework/ui';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { invariant } from '@dxos/invariant';
 import { getSpace } from '@dxos/react-client/echo';
-import { useAsyncEffect } from '@dxos/react-ui';
-import { Layout } from '@dxos/react-ui-mosaic';
+import { Panel, useAsyncEffect } from '@dxos/react-ui';
 
-import { filePath, getBlobUrl, loadWnfs, wnfsUrl } from '../helpers';
-import { WnfsCapabilities } from '../types';
-import { type WnfsFile } from '../types';
+import { FilePreview } from '#components';
+import { WnfsCapabilities, type WnfsFile } from '#types';
 
-import { FilePreview } from './FilePreview';
+import { filePath, getBlobUrl, loadWnfs, wnfsUrl } from '../../helpers';
 
-export type FileContainerProps = SurfaceComponentProps<WnfsFile.File>;
+export type FileContainerProps = AppSurface.ObjectArticleProps<WnfsFile.File>;
 
 export const FileContainer = ({ role, subject: file }: FileContainerProps) => {
   const blockstore = useCapability(WnfsCapabilities.Blockstore);
@@ -47,9 +46,11 @@ export const FileContainer = ({ role, subject: file }: FileContainerProps) => {
   }
 
   return (
-    <Layout.Main role={role}>
-      <FilePreview type={file.type} url={blobUrl} />
-    </Layout.Main>
+    <Panel.Root role={role} className='dx-document'>
+      <Panel.Content asChild>
+        <FilePreview type={file.type} url={blobUrl} />
+      </Panel.Content>
+    </Panel.Root>
   );
 };
 

package/src/containers/FileContainer/index.ts

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

package/src/containers/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export const FileContainer: ComponentType<any> = lazy(() => import('./FileContainer'));

package/src/extensions/image.stories.tsx

@@ -6,12 +6,12 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import type { Blockstore } from 'interface-blockstore';
 import React, { type ChangeEvent, useEffect, useState } from 'react';
 
-import { faker } from '@dxos/random';
-import { useSpace } from '@dxos/react-client/echo';
+import { random } from '@dxos/random';
+import { useSpaces } 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 { useTextEditor } from '@dxos/react-ui-editor';
+import { withTheme } from '@dxos/react-ui/testing';
 import {
   createBasicExtensions,
   createMarkdownExtensions,
@@ -22,16 +22,15 @@ import {
 
 import { create as createBlockstore } from '../blockstore';
 import { upload } from '../helpers';
-
 import { image } from './image';
 
-faker.seed(1);
-const initialValue = faker.lorem.paragraphs(100);
+random.seed(1);
+const initialValue = random.lorem.paragraphs(100);
 const instances = {};
 
 const DefaultStory = () => {
   const { themeMode } = useThemeContext();
-  const space = useSpace();
+  const [space] = useSpaces();
   const [blockstore, setBlockstore] = useState<Blockstore>();
 
   useEffect(() => {
@@ -86,15 +85,15 @@ const DefaultStory = () => {
       <div className='mb-2'>
         <input type='file' accept='image/*' onChange={onFileChange} />
       </div>
-      <div className='is-[50rem]' ref={parentRef} {...focusAttributes} />
+      <div className='w-[50rem]' ref={parentRef} {...focusAttributes} />
     </>
   );
 };
 
 const meta = {
-  title: 'plugins/plugin-wnfs/image',
+  title: 'plugins/plugin-wnfs/extensions/image',
   render: DefaultStory,
-  decorators: [withTheme, withClientProvider({ createIdentity: true, createSpace: true })],
+  decorators: [withTheme(), withClientProvider({ createIdentity: true, createSpace: true })],
 } satisfies Meta<typeof DefaultStory>;
 
 export default meta;

package/src/extensions/image.tsx

@@ -15,8 +15,9 @@ import { focusField } from '@dxos/ui-editor';
 import { defaultTx } from '@dxos/ui-theme';
 import { type MaybePromise } from '@dxos/util';
 
+import { type WnfsCapabilities } from '#types';
+
 import { getBlobUrl, getPathFromUrl, loadWnfs } from '../helpers';
-import { type WnfsCapabilities } from '../types';
 
 const WAIT_UNTIL_LOADER = 1500;
 

package/src/helpers/load.ts

@@ -10,7 +10,7 @@ import { AccessKey, PrivateDirectory, PrivateForest, PrivateNode } from 'wnfs';
 import { Obj } from '@dxos/echo';
 import { type Space } from '@dxos/react-client/echo';
 
-import { type WnfsCapabilities } from '../types';
+import { type WnfsCapabilities } from '#types';
 
 import { Rng, store } from './common';
 
@@ -30,9 +30,9 @@ export const loadWnfs = async ({
   // TODO(wittjosiah): Remove.
   // Delete old properties if they exist.
   if (space.properties.wnfs_access_key !== undefined && space.properties.wnfs_private_forest_cid !== undefined) {
-    Obj.change(space.properties, (p) => {
-      delete p['wnfs_access_key'];
-      delete p['wnfs_private_forest_cid'];
+    Obj.change(space.properties, (obj) => {
+      delete obj['wnfs_access_key'];
+      delete obj['wnfs_private_forest_cid'];
     });
   }
 
@@ -68,8 +68,8 @@ const createWnfsDir = async (blockstore: Blockstore, space: Space) => {
 
   const cidBytes = await newForest.store(wnfsStore);
 
-  Obj.change(space.properties, (p) => {
-    p.wnfs = {
+  Obj.change(space.properties, (obj) => {
+    obj.wnfs = {
       accessKey: Uint8Arrays.toString(accessKeyRaw.toBytes(), 'base64'),
       privateForestCid: CID.decode(cidBytes).toString(),
     };

package/src/helpers/upload.ts

@@ -11,7 +11,7 @@ import type { Space } from '@dxos/client/echo';
 import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 
-import { type WnfsCapabilities } from '../types';
+import { type WnfsCapabilities } from '#types';
 
 import { Rng, filePath, store } from './common';
 import { loadWnfs } from './load';
@@ -47,8 +47,8 @@ export const upload = async ({
   const cidBytes = await updatedForest.store(wnfsStore);
 
   // Update the forest pointer on the associated space.
-  Obj.change(space.properties, (p) => {
-    p.wnfs.privateForestCid = CID.decode(cidBytes).toString();
+  Obj.change(space.properties, (obj) => {
+    obj.wnfs.privateForestCid = CID.decode(cidBytes).toString();
   });
 
   // Generate `wnfs://` URL & return the info.