@dxos/plugin-sheet 0.8.4-main.abd8ff62ef → 0.8.4-main.bc2380dfbc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.8.4-main.abd8ff62ef",
+  "version": "0.8.4-main.bc2380dfbc",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,49 +8,74 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
     "#plugin": {
-      "browser": "./src/SheetPlugin.tsx",
-      "node": "./src/SheetPlugin.node.ts",
-      "default": "./src/SheetPlugin.tsx"
+      "source": {
+        "workerd": "./src/SheetPlugin.workerd.ts",
+        "node": "./src/SheetPlugin.node.ts",
+        "default": "./src/SheetPlugin.tsx"
+      },
+      "types": "./dist/types/src/SheetPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/SheetPlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/SheetPlugin.node.mjs",
+      "default": "./dist/lib/neutral/SheetPlugin.mjs"
     },
-    "#capabilities": "./src/capabilities/index.ts",
-    "#components": "./src/components/index.ts",
-    "#containers": "./src/containers/index.ts",
-    "#meta": "./src/meta.ts",
-    "#operations": "./src/operations/index.ts",
     "#testing": "./src/testing/index.ts",
-    "#translations": "./src/translations.ts",
-    "#types": "./src/types/index.ts"
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./operations": {
-      "source": "./src/operations/index.ts",
-      "browser": "./dist/lib/browser/operations/index.mjs",
-      "node": "./dist/lib/node-esm/operations/index.mjs",
-      "types": "./dist/types/src/operations/index.d.ts"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
     },
     "./translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "browser": "./dist/lib/browser/translations.mjs",
-      "node": "./dist/lib/node-esm/translations.mjs"
-    },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs",
-      "types": "./dist/types/src/types/index.d.ts"
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -62,7 +87,7 @@
     "@codemirror/autocomplete": "^6.19.0",
     "@codemirror/language": "^6.11.3",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/modifiers": "^6.0.0",
     "@dnd-kit/sortable": "^7.0.1",
@@ -78,45 +103,46 @@
     "re-resizable": "^6.9.17",
     "react-markdown": "^10.1.0",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
-    "@dxos/async": "0.8.4-main.abd8ff62ef",
-    "@dxos/app-toolkit": "0.8.4-main.abd8ff62ef",
-    "@dxos/client": "0.8.4-main.abd8ff62ef",
-    "@dxos/compute": "0.8.4-main.abd8ff62ef",
-    "@dxos/context": "0.8.4-main.abd8ff62ef",
-    "@dxos/compute-hyperformula": "0.8.4-main.abd8ff62ef",
-    "@dxos/debug": "0.8.4-main.abd8ff62ef",
-    "@dxos/echo": "0.8.4-main.abd8ff62ef",
-    "@dxos/crypto": "0.8.4-main.abd8ff62ef",
-    "@dxos/echo-db": "0.8.4-main.abd8ff62ef",
-    "@dxos/invariant": "0.8.4-main.abd8ff62ef",
-    "@dxos/lit-grid": "0.8.4-main.abd8ff62ef",
-    "@dxos/keys": "0.8.4-main.abd8ff62ef",
-    "@dxos/log": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-client": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-automation": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-deck": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-graph": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-script": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-markdown": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-space": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-attention": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-stack": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-client": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-hooks": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-attention": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-editor": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-form": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-grid": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-thread": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-list": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-menu": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-stack": "0.8.4-main.abd8ff62ef",
-    "@dxos/schema": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-mosaic": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-editor": "0.8.4-main.abd8ff62ef",
-    "@dxos/types": "0.8.4-main.abd8ff62ef",
-    "@dxos/util": "0.8.4-main.abd8ff62ef"
+    "@dxos/app-framework": "0.8.4-main.bc2380dfbc",
+    "@dxos/app-toolkit": "0.8.4-main.bc2380dfbc",
+    "@dxos/async": "0.8.4-main.bc2380dfbc",
+    "@dxos/client": "0.8.4-main.bc2380dfbc",
+    "@dxos/compute": "0.8.4-main.bc2380dfbc",
+    "@dxos/compute-hyperformula": "0.8.4-main.bc2380dfbc",
+    "@dxos/crypto": "0.8.4-main.bc2380dfbc",
+    "@dxos/debug": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-db": "0.8.4-main.bc2380dfbc",
+    "@dxos/context": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo-react": "0.8.4-main.bc2380dfbc",
+    "@dxos/keys": "0.8.4-main.bc2380dfbc",
+    "@dxos/invariant": "0.8.4-main.bc2380dfbc",
+    "@dxos/lit-grid": "0.8.4-main.bc2380dfbc",
+    "@dxos/log": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-automation": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-attention": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-deck": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-markdown": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-graph": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-stack": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-script": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-space": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-thread": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-hooks": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-attention": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-editor": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-form": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-list": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-grid": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-menu": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-stack": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-mosaic": "0.8.4-main.bc2380dfbc",
+    "@dxos/schema": "0.8.4-main.bc2380dfbc",
+    "@dxos/types": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-editor": "0.8.4-main.bc2380dfbc",
+    "@dxos/util": "0.8.4-main.bc2380dfbc"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -129,17 +155,17 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^8.0.10",
-    "@dxos/lit-grid": "0.8.4-main.abd8ff62ef",
-    "@dxos/echo-generator": "0.8.4-main.abd8ff62ef",
-    "@dxos/random": "0.8.4-main.abd8ff62ef",
-    "@dxos/plugin-testing": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
-    "@dxos/storybook-utils": "0.8.4-main.abd8ff62ef",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.abd8ff62ef",
-    "@dxos/test-utils": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-types": "0.8.4-main.abd8ff62ef"
+    "vite": "^8.0.13",
+    "@dxos/echo-generator": "0.8.4-main.bc2380dfbc",
+    "@dxos/lit-grid": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-testing": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/storybook-utils": "0.8.4-main.bc2380dfbc",
+    "@dxos/test-utils": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-types": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc",
+    "@dxos/random": "0.8.4-main.bc2380dfbc"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -147,8 +173,8 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
-    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc"
   },
   "publishConfig": {
     "access": "public"

package/src/SheetPlugin.node.ts

@@ -2,31 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Option from 'effect/Option';
-
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
-import { Annotation } from '@dxos/echo';
 
-import { OperationHandler, UndoMappings } from '#capabilities';
+import { CommentConfig, CreateObject, OperationHandler, UndoMappings } from '#capabilities';
 import { meta } from '#meta';
 import { Sheet } from '#types';
 
-import { serializer } from './serializer';
-
 export const SheetPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: Sheet.Sheet.typename,
-      metadata: {
-        label: (object: Sheet.Sheet) => object.name,
-        icon: Annotation.IconAnnotation.get(Sheet.Sheet).pipe(Option.getOrThrow).icon,
-        iconHue: Annotation.IconAnnotation.get(Sheet.Sheet).pipe(Option.getOrThrow).hue ?? 'white',
-        serializer,
-        comments: 'anchored',
-      },
-    },
-  }),
+  AppPlugin.addCommentConfigModule({ activate: CommentConfig }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addUndoMappingsModule({ activate: UndoMappings }),
   AppPlugin.addSchemaModule({ schema: [Sheet.Sheet] }),

package/src/SheetPlugin.test.ts

@@ -5,7 +5,7 @@
 import { describe, test } from 'vitest';
 
 import { ActivationEvents } from '@dxos/app-framework';
-import { ClientPlugin } from '@dxos/plugin-client';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
 import { createComposerTestApp } from '@dxos/plugin-testing/harness';
 
 import { SheetPlugin } from '#plugin';
@@ -20,7 +20,7 @@ describe('SheetPlugin', () => {
       plugins: [ClientPlugin({}), SheetPlugin()],
     });
 
-    expect(harness.manager.getActive()).toEqual(expect.arrayContaining([moduleId('metadata'), moduleId('schema')]));
+    expect(harness.manager.getActive()).toEqual(expect.arrayContaining([moduleId('CreateObject'), moduleId('schema')]));
 
     await harness.fire(ActivationEvents.SetupOperationHandler);
     expect(harness.manager.getActive()).toEqual(

package/src/SheetPlugin.tsx

@@ -2,22 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
-
 import { ActivationEvent, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/compute';
-import { Annotation } from '@dxos/echo';
-import { AutomationEvents } from '@dxos/plugin-automation/types';
-import { ClientEvents } from '@dxos/plugin-client/types';
-import { MarkdownEvents } from '@dxos/plugin-markdown/types';
-import { SpaceOperation } from '@dxos/plugin-space/operations';
-import { type CreateObject } from '@dxos/plugin-space/types';
+import { AutomationEvents } from '@dxos/plugin-automation';
+import { ClientEvents } from '@dxos/plugin-client';
+import { MarkdownEvents } from '@dxos/plugin-markdown';
 
 import {
   AnchorSort,
+  CommentConfig,
   ComputeGraphRegistry,
+  CreateObject,
   Markdown,
   OperationHandler,
   UndoMappings,
@@ -25,36 +20,12 @@ import {
   SheetState,
 } from '#capabilities';
 import { meta } from '#meta';
-import { SheetOperation } from '#operations';
 import { translations } from '#translations';
 import { Sheet } from '#types';
 
-import { serializer } from './serializer';
-
 export const SheetPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: Sheet.Sheet.typename,
-      metadata: {
-        label: (object: Sheet.Sheet) => object.name,
-        icon: Annotation.IconAnnotation.get(Sheet.Sheet).pipe(Option.getOrThrow).icon,
-        iconHue: Annotation.IconAnnotation.get(Sheet.Sheet).pipe(Option.getOrThrow).hue ?? 'white',
-        serializer,
-        comments: 'anchored',
-        createObject: ((props, options) =>
-          Effect.gen(function* () {
-            const object = Sheet.make(props);
-            return yield* Operation.invoke(SpaceOperation.AddObject, {
-              object,
-              target: options.target,
-              hidden: true,
-              targetNodeId: options.targetNodeId,
-            });
-          })) satisfies CreateObject,
-        scrollToAnchor: SheetOperation.ScrollToAnchor,
-      },
-    },
-  }),
+  AppPlugin.addCommentConfigModule({ activate: CommentConfig }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addUndoMappingsModule({ activate: UndoMappings }),
   AppPlugin.addSchemaModule({ schema: [Sheet.Sheet] }),

package/src/SheetPlugin.workerd.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+import { Sheet } from '#types';
+
+export const SheetPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [Sheet.Sheet] }),
+  Plugin.make,
+);
+
+export default SheetPlugin;

package/src/capabilities/comment-config.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Operation } from '@dxos/compute';
+
+import { SheetOperation } from '#types';
+import { Sheet } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const config: AppCapabilities.CommentConfig = {
+      id: Sheet.Sheet.typename,
+      comments: 'anchored',
+      scrollToAnchor: SheetOperation.ScrollToAnchor,
+    };
+    return Capability.contributes(AppCapabilities.CommentConfig, config);
+  }),
+);

package/src/capabilities/compute-graph-registry.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { AutomationCapabilities } from '@dxos/plugin-automation/types';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
 
 import { SheetCapabilities } from '#types';
 

package/src/capabilities/create-object.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+
+import { Sheet } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+      id: Sheet.Sheet.typename,
+      createObject: (props, options) =>
+        Effect.gen(function* () {
+          const object = Sheet.make(props);
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId,
+          });
+        }),
+    });
+  }),
+);

package/src/capabilities/index.ts

@@ -3,10 +3,14 @@
 //
 
 import { Capability } from '@dxos/app-framework';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Operation } from '@dxos/compute';
 import { OperationHandlerSet } from '@dxos/compute';
 
 export const AnchorSort = Capability.lazy('AnchorSort', () => import('./anchor-sort'));
+export const CommentConfig = Capability.lazy('CommentConfig', () => import('./comment-config'));
 export const ComputeGraphRegistry = Capability.lazy('ComputeGraphRegistry', () => import('./compute-graph-registry'));
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
 export const Markdown = Capability.lazy('Markdown', () => import('./markdown'));
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
   'OperationHandler',

package/src/capabilities/markdown.ts

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { getSpace } from '@dxos/client/echo';
-import { MarkdownCapabilities } from '@dxos/plugin-markdown/types';
+import { MarkdownCapabilities } from '@dxos/plugin-markdown';
 
 import { SheetCapabilities } from '#types';
 

package/src/capabilities/react-surface.tsx

@@ -11,7 +11,7 @@ import { AppSurface } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { getSpace } from '@dxos/react-client/echo';
 
-import { RangeList, SheetContainer } from '#containers';
+import { RangeList, SheetArticle } from '#containers';
 import { Sheet, SheetCapabilities } from '#types';
 
 export default Capability.makeModule(() =>
@@ -24,12 +24,12 @@ export default Capability.makeModule(() =>
         filter: (data): data is { attendableId: string; subject: Sheet.Sheet } =>
           typeof data.attendableId === 'string' &&
           Obj.instanceOf(Sheet.Sheet, data.subject) &&
-          !!getSpace(data.subject),
+          !!Obj.getDatabase(data.subject),
         component: ({ data, role }) => {
           const computeGraphRegistry = useCapability(SheetCapabilities.ComputeGraphRegistry);
 
           return (
-            <SheetContainer
+            <SheetArticle
               role={role}
               subject={data.subject}
               attendableId={data.attendableId}

package/src/capabilities/state.ts

@@ -6,10 +6,10 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 
-import { type GridEntry, type GridRegistry, SheetCapabilities } from '#types';
+import { SheetCapabilities } from '#types';
 
-const createGridRegistry = (): GridRegistry => {
-  const grids = new Map<string, GridEntry>();
+const createGridRegistry = (): SheetCapabilities.GridRegistry => {
+  const grids = new Map<string, SheetCapabilities.GridEntry>();
   return {
     register: (attendableId, grid, setActiveRefs) => {
       grids.set(attendableId, { grid, setActiveRefs });

package/src/capabilities/undo-mappings.ts

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 import { Capabilities, Capability, UndoMapping } from '@dxos/app-framework';
 
 import { meta } from '#meta';
-import { SheetOperation } from '#operations';
+import { SheetOperation } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(

package/src/components/ComputeGraph/compute-graph.stories.tsx

@@ -7,8 +7,7 @@ import React, { useEffect, useRef, useState } from 'react';
 
 import { Operation } from '@dxos/compute';
 import { testFunctionPlugins } from '@dxos/compute-hyperformula/testing';
-import { Filter } from '@dxos/echo';
-import { Obj } from '@dxos/echo';
+import { Filter, Obj } from '@dxos/echo';
 import { useSpaces } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Button, Input, Toolbar } from '@dxos/react-ui';
@@ -45,7 +44,13 @@ const DefaultStory = () => {
         setResult({ functions: { standard: f1.length, echo: f2.length } });
       });
 
-      space.db.add(Obj.make(Operation.PersistentOperation, { name: 'test', version: '0.0.1', binding: FUNCTION_NAME }));
+      space.db.add(
+        Obj.make(Operation.PersistentOperation, {
+          [Obj.Meta]: { version: '0.0.1' },
+          name: 'test',
+          binding: FUNCTION_NAME,
+        }),
+      );
     }
   }, [space, graph]);
 

package/src/components/SheetContent/SheetContent.stories.tsx

@@ -30,7 +30,7 @@ export const Basic = () => {
 
   return (
     <SheetRoot graph={graph} sheet={sheet} attendableId='test' ignoreAttention>
-      <div role='none' className='grid h-full w-full'>
+      <div className='grid h-full w-full'>
         <SheetContent />
       </div>
     </SheetRoot>

package/src/components/SheetContent/SheetContent.tsx

@@ -36,7 +36,7 @@ import {
 import { composable, composableProps } from '@dxos/ui-theme';
 
 import { meta } from '#meta';
-import { SheetOperation } from '#operations';
+import { SheetOperation } from '#types';
 import { DEFAULT_COLS, DEFAULT_ROWS, SheetCapabilities } from '#types';
 
 import { type RangeController, rangeExtension, sheetExtension } from '../../extensions';

package/src/containers/RangeList/RangeList.tsx

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 import React, { useCallback } from 'react';
 
 import { rangeToA1Notation } from '@dxos/compute-hyperformula';
-import { Obj } from '@dxos/echo';
+import { useObject } from '@dxos/echo-react';
 import { Input, Message, useTranslation } from '@dxos/react-ui';
 import { List } from '@dxos/react-ui-list';
 
@@ -18,18 +18,19 @@ export type RangeListProps = {
   sheet: Sheet.Sheet;
 };
 
-export const RangeList = ({ sheet }: RangeListProps) => {
+export const RangeList = ({ sheet: sheetProp }: RangeListProps) => {
   const { t } = useTranslation(meta.id);
+  const [sheet, updateSheet] = useObject(sheetProp);
   // TODO(thure): Implement similar to comments, #8121
   const handleSelectRange = (range: Sheet.Range) => {};
   const handleDeleteRange = useCallback(
     (range: Sheet.Range) => {
       const index = sheet.ranges.findIndex((sheetRange) => sheetRange === range);
-      Obj.update(sheet, (sheet) => {
+      updateSheet((sheet) => {
         sheet.ranges.splice(index, 1);
       });
     },
-    [sheet],
+    [sheet, updateSheet],
   );
   return (
     <>
@@ -48,7 +49,7 @@ export const RangeList = ({ sheet }: RangeListProps) => {
                 <List.ItemDragHandle />
                 <List.ItemTitle onClick={() => handleSelectRange(range)}>
                   {t('range.title', {
-                    position: rangeToA1Notation(rangeFromIndex(sheet, range.range)),
+                    position: rangeToA1Notation(rangeFromIndex(sheetProp, range.range)),
                     key: t(`range-key.${range.key}.label`),
                     value: t(`range-value.${range.value}.label`),
                   })}