@dxos/plugin-wnfs 0.8.4-main.c1de068 → 0.8.4-main.c4373fc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-wnfs",
-  "version": "0.8.4-main.c1de068",
+  "version": "0.8.4-main.c4373fc",
   "description": "WNFS file management plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -9,10 +9,12 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
     },
     "./types": {
+      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs"
     }
@@ -30,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.0",
+    "effect": "3.18.3",
     "idb-keyval": "^6.2.1",
     "interface-blockstore": "^5.2.10",
     "it-all": "^3.0.6",
@@ -46,40 +48,39 @@
     "react-dropzone": "^14.2.3",
     "uint8arrays": "^5.1.0",
     "wnfs": "0.2.2",
-    "@dxos/app-framework": "0.8.4-main.c1de068",
-    "@dxos/echo": "0.8.4-main.c1de068",
-    "@dxos/crypto": "0.8.4-main.c1de068",
-    "@dxos/echo-schema": "0.8.4-main.c1de068",
-    "@dxos/effect": "0.8.4-main.c1de068",
-    "@dxos/invariant": "0.8.4-main.c1de068",
-    "@dxos/local-storage": "0.8.4-main.c1de068",
-    "@dxos/log": "0.8.4-main.c1de068",
-    "@dxos/plugin-client": "0.8.4-main.c1de068",
-    "@dxos/plugin-markdown": "0.8.4-main.c1de068",
-    "@dxos/react-client": "0.8.4-main.c1de068",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/plugin-space": "0.8.4-main.c1de068",
-    "@dxos/react-ui-editor": "0.8.4-main.c1de068",
-    "@dxos/react-ui-form": "0.8.4-main.c1de068",
-    "@dxos/react-ui-stack": "0.8.4-main.c1de068",
-    "@dxos/util": "0.8.4-main.c1de068"
+    "@dxos/app-framework": "0.8.4-main.c4373fc",
+    "@dxos/crypto": "0.8.4-main.c4373fc",
+    "@dxos/echo": "0.8.4-main.c4373fc",
+    "@dxos/effect": "0.8.4-main.c4373fc",
+    "@dxos/invariant": "0.8.4-main.c4373fc",
+    "@dxos/log": "0.8.4-main.c4373fc",
+    "@dxos/local-storage": "0.8.4-main.c4373fc",
+    "@dxos/plugin-client": "0.8.4-main.c4373fc",
+    "@dxos/plugin-space": "0.8.4-main.c4373fc",
+    "@dxos/plugin-markdown": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-editor": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-form": "0.8.4-main.c4373fc",
+    "@dxos/react-ui": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-stack": "0.8.4-main.c4373fc",
+    "@dxos/util": "0.8.4-main.c4373fc",
+    "@dxos/react-client": "0.8.4-main.c4373fc"
   },
   "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/random": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
-    "@dxos/storybook-utils": "0.8.4-main.c1de068"
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.1",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/random": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-theme": "0.8.4-main.c4373fc",
+    "@dxos/storybook-utils": "0.8.4-main.c4373fc"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.c4373fc",
+    "@dxos/react-ui-theme": "0.8.4-main.c4373fc"
   },
   "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,
@@ -23,71 +23,73 @@ import { meta } from './meta';
 import { translations } from './translations';
 import { FileType, WnfsAction } 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: 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) =>
+            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/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,7 +138,7 @@ export class MixedBlockstore extends BaseBlockstore {
         headers: {
           'Content-Type': 'application/vnd.ipld.car',
         },
-        body: car,
+        body: car as Uint8Array<ArrayBuffer>,
       });
     }
   }

package/src/capabilities/blockstore.ts

@@ -2,12 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginContext } from '@dxos/app-framework';
+import { type PluginContext, contributes } from '@dxos/app-framework';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
-import { WnfsCapabilities } from './capabilities';
 import * as Blockstore from '../blockstore';
 
+import { WnfsCapabilities } from './capabilities';
+
 export default async (context: PluginContext) => {
   const client = context.getCapability(ClientCapabilities.Client);
   const apiHost = client.config.values.runtime?.services?.edge?.url || 'http://localhost:8787';

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,9 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect, pipe } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
 
-import { Capabilities, chain, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, type PluginContext, chain, contributes, createIntent } from '@dxos/app-framework';
 import { SpaceAction } from '@dxos/plugin-space/types';
 
 import { WnfsAction } from '../types';
@@ -15,7 +16,9 @@ export default (context: PluginContext) => {
 
     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 })));
+      yield* dispatch(
+        Function.pipe(createIntent(WnfsAction.Create, fileInfo), chain(SpaceAction.AddObject, { target: space })),
+      );
       return fileInfo;
     });
 

package/src/capabilities/intent-resolver.ts

@@ -2,13 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, Capabilities, createResolver, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, type PluginContext, contributes, createResolver } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
 
-import { WnfsCapabilities } from './capabilities';
 import { upload } from '../helpers';
 import { FileType, WnfsAction } from '../types';
 
+import { WnfsCapabilities } from './capabilities';
+
 export default (context: PluginContext) =>
   contributes(Capabilities.IntentResolver, [
     // TODO(wittjosiah): Deleting the object doesn't delete the wnfs blob.

package/src/capabilities/markdown.ts

@@ -2,13 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginContext } from '@dxos/app-framework';
+import { type PluginContext, contributes } from '@dxos/app-framework';
 import { MarkdownCapabilities } from '@dxos/plugin-markdown';
 import { getSpace } from '@dxos/react-client/echo';
 
-import { WnfsCapabilities } from './capabilities';
 import { image } from '../extensions';
 
+import { WnfsCapabilities } from './capabilities';
+
 export default (context: PluginContext) =>
   contributes(MarkdownCapabilities.Extensions, [
     ({ document }) => {

package/src/capabilities/react-surface.tsx

@@ -2,28 +2,28 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 import React, { useCallback } from 'react';
 
-import { contributes, Capabilities, createSurface } from '@dxos/app-framework';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
 import { findAnnotation } from '@dxos/effect';
 import { type InputProps } from '@dxos/react-ui-form';
 
 import { FileContainer, FileInput } from '../components';
-import { WNFS_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { FileType, WnfsAction } 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),
       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

@@ -2,18 +2,20 @@
 // Copyright 2023 DXOS.org
 //
 
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 
 import { useCapability } from '@dxos/app-framework';
 import { invariant } from '@dxos/invariant';
 import { getSpace } from '@dxos/react-client/echo';
+import { useAsyncEffect } from '@dxos/react-ui';
 import { StackItem } from '@dxos/react-ui-stack';
 
-import { FilePreview } from './FilePreview';
 import { WnfsCapabilities } from '../capabilities';
 import { filePath, getBlobUrl, loadWnfs, wnfsUrl } from '../helpers';
 import { type FileType } from '../types';
 
+import { FilePreview } from './FilePreview';
+
 export type FileContainerProps = {
   role: string;
   file: FileType;
@@ -24,17 +26,13 @@ export const FileContainer = ({ file }: FileContainerProps) => {
   const instances = useCapability(WnfsCapabilities.Instances);
   const [blobUrl, setBlobUrl] = useState<string>();
 
-  useEffect(() => {
-    const timeout = setTimeout(async () => {
-      const space = getSpace(file);
-      invariant(space);
-      const { directory, forest } = await loadWnfs({ blockstore, instances, space });
-      const path = filePath(file.cid.toString(), space);
-      const url = await getBlobUrl({ wnfsUrl: wnfsUrl(path), blockstore, directory, forest, type: file.type });
-      setBlobUrl(url);
-    });
-
-    return () => clearTimeout(timeout);
+  useAsyncEffect(async () => {
+    const space = getSpace(file);
+    invariant(space);
+    const { directory, forest } = await loadWnfs({ blockstore, instances, space });
+    const path = filePath(file.cid.toString(), space);
+    const url = await getBlobUrl({ wnfsUrl: wnfsUrl(path), blockstore, directory, forest, type: file.type });
+    setBlobUrl(url);
   }, [file]);
 
   if (!blobUrl) {

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,7 @@
 // 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';
 
@@ -11,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,
@@ -19,17 +19,17 @@ import {
   processEditorPayload,
   useTextEditor,
 } from '@dxos/react-ui-editor';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
 
-import { image } from './image';
 import { create as createBlockstore } from '../blockstore';
 import { upload } from '../helpers';
 
+import { image } from './image';
+
 faker.seed(1);
 const initialValue = faker.lorem.paragraphs(100);
 const instances = {};
 
-const Story = () => {
+const DefaultStory = () => {
   const { themeMode } = useThemeContext();
   const space = useSpace();
   const [blockstore, setBlockstore] = useState<Blockstore>();
@@ -54,7 +54,7 @@ const Story = () => {
       initialValue,
       extensions: [
         createBasicExtensions(),
-        createMarkdownExtensions({ themeMode }),
+        createMarkdownExtensions(),
         createThemeExtensions({ themeMode, syntaxHighlighting: true }),
         blockstore && space ? [image({ blockstore, instances, space })] : [],
         decorateMarkdown(),
@@ -91,10 +91,14 @@ const Story = () => {
   );
 };
 
-export default {
+const meta = {
   title: 'plugins/plugin-wnfs/image',
-  render: Story,
-  decorators: [withClientProvider({ createIdentity: true, createSpace: true }), withTheme, withLayout()],
-};
+  render: DefaultStory,
+  decorators: [withTheme, withClientProvider({ createIdentity: true, createSpace: true })],
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
 
-export const Default = {};
+export const Default: Story = {};

package/src/extensions/image.tsx

@@ -3,7 +3,7 @@
 //
 
 import { syntaxTree } from '@codemirror/language';
-import { type EditorState, type Extension, StateField, type Range } from '@codemirror/state';
+import { type EditorState, type Extension, type Range, StateField } from '@codemirror/state';
 import { Decoration, EditorView, WidgetType } from '@codemirror/view';
 import type { Blockstore } from 'interface-blockstore';
 import React from 'react';
@@ -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/helpers/load.ts

@@ -5,13 +5,14 @@
 import type { Blockstore } from 'interface-blockstore';
 import { CID } from 'multiformats';
 import * as Uint8Arrays from 'uint8arrays';
-import { AccessKey, PrivateForest, PrivateDirectory, PrivateNode } from 'wnfs';
+import { AccessKey, PrivateDirectory, PrivateForest, PrivateNode } from 'wnfs';
 
 import { type Space } from '@dxos/react-client/echo';
 
-import { Rng, store } from './common';
 import { type WnfsCapabilities } from '../capabilities';
 
+import { Rng, store } from './common';
+
 //
 // LOAD
 //

package/src/helpers/upload.ts

@@ -10,10 +10,11 @@ import { sha256 } from 'multiformats/hashes/sha2';
 import type { Space } from '@dxos/client/echo';
 import { log } from '@dxos/log';
 
+import { type WnfsCapabilities } from '../capabilities';
+
 import { Rng, filePath, store } from './common';
 import { loadWnfs } from './load';
 import { wnfsUrl } from './wnfs-url';
-import { type WnfsCapabilities } from '../capabilities';
 
 export const upload = async ({
   file,

package/src/meta.ts

@@ -4,10 +4,8 @@
 
 import { type PluginMeta } from '@dxos/app-framework';
 
-export const WNFS_PLUGIN = 'dxos.org/plugin/wnfs';
-
 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).',
   icon: 'ph--file-cloud--regular',

package/src/types/file.ts

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { TypedObject } from '@dxos/echo-schema';
+import { TypedObject } from '@dxos/echo/internal';
 
 export class FileType extends TypedObject({
   typename: 'dxos.org/type/File',