@dxos/plugin-sheet 0.8.4-main.2e9d522 → 0.8.4-main.548089c

package/src/components/SheetToolbar/SheetToolbar.stories.tsx

@@ -2,28 +2,34 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { SheetToolbar } from './SheetToolbar';
 import { translations } from '../../translations';
 
+import { SheetToolbar } from './SheetToolbar';
+
 const DefaultStory = () => {
-  return <SheetToolbar id='test' />;
+  // TODO(wittjosiah): Depends on SheetProvider.
+  // return <SheetToolbar id='test' />;
+  return <>TODO</>;
 };
 
-export const Default = {};
-
-const meta: Meta = {
+const meta = {
   title: 'plugins/plugin-sheet/Toolbar',
-  component: SheetToolbar,
+  component: SheetToolbar as any,
   render: DefaultStory,
-  decorators: [withTheme, withLayout()],
-  parameters: { translations, layout: 'fullscreen' },
-};
+  decorators: [withTheme],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/SheetToolbar/SheetToolbar.tsx

@@ -2,60 +2,56 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
+import { Atom } from '@effect-atom/atom-react';
 import React, { type PropsWithChildren, useMemo } from 'react';
 
-import { useAppGraph } from '@dxos/app-framework';
+import { useAppGraph } from '@dxos/app-framework/react';
 import { type CompleteCellRange } from '@dxos/compute';
-import { type ThemedClassName } from '@dxos/react-ui';
 import {
-  type ActionGraphEdges,
-  type ActionGraphNodes,
   type ActionGraphProps,
-  createGapSeparator,
   MenuProvider,
-  rxFromSignal,
   ToolbarMenu,
+  createGapSeparator,
+  rxFromSignal,
   useMenuActions,
 } from '@dxos/react-ui-menu';
 
-import { createAlign, useAlignState } from './align';
-import { createStyle, useStyleState } from './style';
-import { type ToolbarState, useToolbarState } from './useToolbarState';
 import { type SheetModel } from '../../model';
 import { useSheetContext } from '../SheetContext';
 
-//
-// Root
-//
-
-export type SheetToolbarProps = ThemedClassName<PropsWithChildren<{ id: string }>>;
+import { createAlign, useAlignState } from './align';
+import { createStyle, useStyleState } from './style';
+import { type ToolbarState, useToolbarState } from './useToolbarState';
 
 const createToolbarActions = (
   model: SheetModel,
   state: ToolbarState,
   cursorFallbackRange?: CompleteCellRange,
-  customActions?: Rx.Rx<ActionGraphProps>,
-) => {
-  return Rx.make((get) => {
+  customActions?: Atom.Atom<ActionGraphProps>,
+): Atom.Atom<ActionGraphProps> => {
+  return Atom.make((get) => {
     const align = get(rxFromSignal(() => createAlign(model, state, cursorFallbackRange)));
     const style = get(rxFromSignal(() => createStyle(model, state, cursorFallbackRange)));
     const gap = createGapSeparator();
-    const nodes: ActionGraphNodes = [...align.nodes, ...style.nodes, ...gap.nodes];
-    const edges: ActionGraphEdges = [...align.edges, ...style.edges, ...gap.edges];
+
+    const graph: ActionGraphProps = {
+      nodes: [...align.nodes, ...style.nodes, ...gap.nodes],
+      edges: [...align.edges, ...style.edges, ...gap.edges],
+    };
+
     if (customActions) {
       const custom = get(customActions);
-      nodes.push(...custom.nodes);
-      edges.push(...custom.edges);
+      graph.nodes.push(...custom.nodes);
+      graph.edges.push(...custom.edges);
     }
-    return {
-      nodes,
-      edges,
-    };
+
+    return graph;
   });
 };
 
-export const SheetToolbar = ({ id, classNames }: SheetToolbarProps) => {
+export type SheetToolbarProps = PropsWithChildren<{ id: string }>;
+
+export const SheetToolbar = ({ id }: SheetToolbarProps) => {
   const { model, cursorFallbackRange } = useSheetContext();
   const state = useToolbarState({});
   useAlignState(state);
@@ -63,10 +59,13 @@ export const SheetToolbar = ({ id, classNames }: SheetToolbarProps) => {
 
   const { graph } = useAppGraph();
   const customActions = useMemo(() => {
-    return Rx.make((get) => {
+    return Atom.make((get) => {
       const actions = get(graph.actions(id));
       const nodes = actions.filter((action) => action.properties.disposition === 'toolbar');
-      return { nodes, edges: nodes.map((node) => ({ source: 'root', target: node.id })) };
+      return {
+        nodes,
+        edges: nodes.map((node) => ({ source: 'root', target: node.id })),
+      };
     });
   }, [graph]);
 
@@ -78,7 +77,7 @@ export const SheetToolbar = ({ id, classNames }: SheetToolbarProps) => {
 
   return (
     <MenuProvider {...menu} attendableId={id}>
-      <ToolbarMenu classNames={classNames} />
+      <ToolbarMenu />
     </MenuProvider>
   );
 };

package/src/components/SheetToolbar/align.ts

@@ -5,14 +5,15 @@
 import { useEffect } from 'react';
 
 import { type CompleteCellRange, inRange } from '@dxos/compute';
-import { createMenuAction, createMenuItemGroup, type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
+import { type ToolbarMenuActionGroupProperties, createMenuAction, createMenuItemGroup } from '@dxos/react-ui-menu';
 
-import { type ToolbarState } from './useToolbarState';
-import { SHEET_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 import { type SheetModel } from '../../model';
-import { type AlignKey, alignKey, type AlignValue, rangeFromIndex, rangeToIndex } from '../../types';
+import { type AlignKey, type AlignValue, alignKey, rangeFromIndex, rangeToIndex } from '../../types';
 import { useSheetContext } from '../SheetContext';
 
+import { type ToolbarState } from './useToolbarState';
+
 export type AlignAction = { key: AlignKey; value: AlignValue };
 
 export type AlignState = { [alignKey]: AlignValue | undefined };
@@ -39,7 +40,7 @@ export const useAlignState = (state: Partial<AlignState>) => {
 
 const createAlignGroupAction = (value?: AlignValue) =>
   createMenuItemGroup('align', {
-    label: ['align label', { ns: SHEET_PLUGIN }],
+    label: ['align label', { ns: meta.id }],
     variant: 'toggleGroup',
     selectCardinality: 'single',
     value: `${alignKey}--${value}`,
@@ -78,7 +79,7 @@ const createAlignActions = (model: SheetModel, state: ToolbarState, cursorFallba
         key: alignKey,
         value: alignValue as AlignValue,
         checked: state[alignKey] === alignValue,
-        label: [`range value ${alignValue} label`, { ns: SHEET_PLUGIN }],
+        label: [`range value ${alignValue} label`, { ns: meta.id }],
         icon,
         testId: `grid.toolbar.${alignKey}.${alignValue}`,
       },

package/src/components/SheetToolbar/style.ts

@@ -5,11 +5,11 @@
 import { useEffect } from 'react';
 
 import { type CompleteCellRange, inRange } from '@dxos/compute';
-import { createMenuAction, createMenuItemGroup, type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
+import { type ToolbarMenuActionGroupProperties, createMenuAction, createMenuItemGroup } from '@dxos/react-ui-menu';
 
-import { SHEET_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 import { type SheetModel } from '../../model';
-import { rangeFromIndex, rangeToIndex, type StyleKey, type StyleValue } from '../../types';
+import { type StyleKey, type StyleValue, rangeFromIndex, rangeToIndex } from '../../types';
 import { useSheetContext } from '../SheetContext';
 
 export type StyleState = Partial<Record<StyleValue, boolean>>;
@@ -89,7 +89,7 @@ const createStyleActions = (model: SheetModel, state: StyleState, cursorFallback
         key: 'style',
         value: styleValue as StyleValue,
         icon,
-        label: [`range value ${styleValue} label`, { ns: SHEET_PLUGIN }],
+        label: [`range value ${styleValue} label`, { ns: meta.id }],
         checked: !!state[styleValue as StyleValue],
       },
     );

package/src/extensions/compute.stories.tsx

@@ -2,15 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useMemo } from 'react';
 
+import { IntentPlugin } from '@dxos/app-framework';
+import { withPluginManager } from '@dxos/app-framework/testing';
 import { PublicKey } from '@dxos/keys';
 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,14 +20,14 @@ import {
   documentId,
   useTextEditor,
 } from '@dxos/react-ui-editor';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
 import { isNonNullable } from '@dxos/util';
 
-import { compute, computeGraphFacet } from './compute';
 import { GridSheet, SheetProvider, useComputeGraph } from '../components';
 import { useSheetModel } from '../model';
 import { useTestSheet, withComputeGraphDecorator } from '../testing';
-import { SheetType } from '../types';
+import { Sheet } from '../types';
+
+import { compute, computeGraphFacet } from './compute';
 
 const str = (...lines: string[]) => lines.join('\n');
 
@@ -41,7 +42,7 @@ type EditorProps = {
 
 const SHEET_NAME = 'Test Sheet';
 
-const EditorStory = ({ text }: EditorProps) => {
+const DefaultStory = ({ text }: EditorProps) => {
   const id = useMemo(() => PublicKey.random(), []);
   const { themeMode } = useThemeContext();
   const space = useSpace();
@@ -51,7 +52,7 @@ const EditorStory = ({ text }: EditorProps) => {
       initialValue: text,
       extensions: [
         createBasicExtensions(),
-        createMarkdownExtensions({ themeMode }),
+        createMarkdownExtensions(),
         createThemeExtensions({ themeMode, syntaxHighlighting: true }),
         documentId.of(id.toHex()),
         computeGraph && computeGraphFacet.of(computeGraph),
@@ -92,15 +93,31 @@ const Grid = () => {
 const GraphStory = (props: EditorProps) => {
   return (
     <div className='grid grid-rows-2'>
-      <EditorStory {...props} />
+      <DefaultStory {...props} />
       <Grid />
     </div>
   );
 };
 
+const meta = {
+  title: 'plugins/plugin-sheet/extensions',
+  decorators: [
+    withTheme,
+    withClientProvider({ types: [Sheet.Sheet], createIdentity: true, createSpace: true }),
+    // TODO(wittjosiah): Try to write story which does not depend on plugin manager.
+    withPluginManager({ plugins: [IntentPlugin()] }),
+    withComputeGraphDecorator(),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta;
+
+export default meta;
+
 // TODO(burdon): Inline formulae.
-export const Default = {
-  render: EditorStory,
+export const Default: StoryObj<typeof DefaultStory> = {
+  render: DefaultStory,
   args: {
     text: str(
       //
@@ -123,7 +140,7 @@ export const Default = {
   },
 };
 
-export const Graph = {
+export const Graph: StoryObj<typeof GraphStory> = {
   render: GraphStory,
   args: {
     text: str(
@@ -140,16 +157,3 @@ export const Graph = {
     ),
   },
 };
-
-const meta: Meta = {
-  title: 'plugins/plugin-sheet/extensions',
-  decorators: [
-    withClientProvider({ types: [SheetType], createIdentity: true, createSpace: true }),
-    withComputeGraphDecorator(),
-    withTheme,
-    withLayout({ fullscreen: true, classNames: 'justify-center' }),
-  ],
-  parameters: { layout: 'fullscreen' },
-};
-
-export default meta;

package/src/extensions/compute.ts

@@ -16,11 +16,11 @@ import { Decoration, EditorView, ViewPlugin, WidgetType } from '@codemirror/view
 
 import { type CleanupFn, debounce } from '@dxos/async';
 import {
-  createSheetName,
   type CellAddress,
   type CellScalarValue,
   type ComputeGraph,
   type ComputeNode,
+  createSheetName,
 } from '@dxos/compute';
 import { invariant } from '@dxos/invariant';
 import { documentId, singleValueFacet } from '@dxos/react-ui-editor';
@@ -34,7 +34,7 @@ export const computeGraphFacet = singleValueFacet<ComputeGraph>();
 
 export type ComputeOptions = {};
 
-export const compute = (options: ComputeOptions = {}): Extension => {
+export const compute = (_options: ComputeOptions = {}): Extension => {
   let computeNode: ComputeNode | undefined;
 
   const update = (state: EditorState, current?: RangeSet<Decoration>) => {
@@ -53,7 +53,6 @@ export const compute = (options: ComputeOptions = {}): Extension => {
                   const text = node.node.getChild('CodeText');
                   if (type === LANGUAGE_TAG && text) {
                     const formula = state.sliceDoc(text.from, text.to);
-
                     const iter = current?.iter(node.node.from);
                     if (iter?.value && iter?.value.spec.formula === formula) {
                       // Add existing widget.

package/src/extensions/editor/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './extension';
+export * from './sheet-extension';

package/src/extensions/editor/{extension.test.ts → sheet-extension.test.ts}

@@ -10,7 +10,7 @@ import { describe, expect, test } from 'vitest';
 
 import { defaultFunctions } from '@dxos/compute';
 
-import { sheetExtension } from './extension';
+import { sheetExtension } from './sheet-extension';
 
 describe('formula parser', () => {
   const {

package/src/integrations/thread-ranges.ts

@@ -2,28 +2,23 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Schema from 'effect/Schema';
 import { useCallback, useEffect, useMemo } from 'react';
 
-import {
-  createIntent,
-  createResolver,
-  LayoutAction,
-  useIntentResolver,
-  useIntentDispatcher,
-  chain,
-} from '@dxos/app-framework';
+import { LayoutAction, chain, createIntent, createResolver } from '@dxos/app-framework';
+import { useIntentDispatcher, useIntentResolver } from '@dxos/app-framework/react';
 import { debounce } from '@dxos/async';
 import { type CellAddress, type CompleteCellRange, inRange } from '@dxos/compute';
 import { Obj, Relation } from '@dxos/echo';
 import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
-import { ThreadAction, ThreadType } from '@dxos/plugin-thread/types';
-import { Filter, fullyQualifiedId, getSpace, Query, useQuery } from '@dxos/react-client/echo';
+import { Thread, ThreadAction } from '@dxos/plugin-thread/types';
+import { Filter, Query, getSpace, useQuery } from '@dxos/react-client/echo';
 import { type DxGridElement, type GridContentProps } from '@dxos/react-ui-grid';
-import { AnchoredTo } from '@dxos/schema';
+import { AnchoredTo } from '@dxos/types';
 
 import { useSheetContext } from '../components';
-import { SHEET_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 export const completeCellRangeToThreadCursor = (range: CompleteCellRange): string => {
   return `${range.from.col},${range.from.row},${range.to.col},${range.to.row}`;
@@ -60,7 +55,7 @@ export const useUpdateFocusedCellOnThreadSelection = (grid: DxGridElement | null
             return false;
           }
 
-          return data.subject === fullyQualifiedId(model.sheet) && !!data.options?.cursor;
+          return data.subject === Obj.getDXN(model.sheet).toString() && !!data.options?.cursor;
         },
         resolve: ({ options: { cursor, ref } }) => {
           setActiveRefs(ref);
@@ -72,7 +67,7 @@ export const useUpdateFocusedCellOnThreadSelection = (grid: DxGridElement | null
     [model.sheet, setActiveRefs],
   );
 
-  useIntentResolver(SHEET_PLUGIN, scrollIntoViewResolver);
+  useIntentResolver(meta.id, scrollIntoViewResolver);
 };
 
 export const useSelectThreadOnCellFocus = () => {
@@ -80,7 +75,7 @@ export const useSelectThreadOnCellFocus = () => {
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const space = getSpace(model.sheet);
-  const anchors = useQuery(space, Query.select(Filter.ids(model.sheet.id)).targetOf(AnchoredTo));
+  const anchors = useQuery(space, Query.select(Filter.ids(model.sheet.id)).targetOf(AnchoredTo.AnchoredTo));
 
   const selectClosestThread = useCallback(
     (cellAddress: CellAddress) => {
@@ -90,7 +85,7 @@ export const useSelectThreadOnCellFocus = () => {
 
       const closestThread = anchors.find((anchor) => {
         const source = Relation.getSource(anchor);
-        if (anchor.anchor && Obj.instanceOf(ThreadType, source)) {
+        if (anchor.anchor && Obj.instanceOf(Thread.Thread, source)) {
           const range = parseThreadAnchorAsCellRange(anchor.anchor);
           return range ? inRange(range, cellAddress) : false;
         } else {
@@ -99,9 +94,9 @@ export const useSelectThreadOnCellFocus = () => {
       });
 
       if (closestThread) {
-        const primary = fullyQualifiedId(model.sheet);
-        const intent = pipe(
-          createIntent(ThreadAction.Select, { current: fullyQualifiedId(closestThread) }),
+        const primary = Obj.getDXN(model.sheet).toString();
+        const intent = Function.pipe(
+          createIntent(ThreadAction.Select, { current: Obj.getDXN(closestThread).toString() }),
           chain(DeckAction.ChangeCompanion, { primary, companion: `${primary}${ATTENDABLE_PATH_SEPARATOR}comments` }),
         );
         void dispatch(intent);

package/src/meta.ts

@@ -3,15 +3,17 @@
 //
 
 import { type PluginMeta } from '@dxos/app-framework';
-
-export const SHEET_PLUGIN = 'dxos.org/plugin/sheet';
+import { trim } from '@dxos/util';
 
 export const meta: PluginMeta = {
-  id: SHEET_PLUGIN,
+  id: 'dxos.org/plugin/sheet',
   name: 'Sheet',
-  description:
-    'Sheets in Composer are simple spreadsheets which allow you to leverage custom functions inside of cell grids. Leverage more than 400 pre-built formulas like Sum, Average, Count, Max, Min along with many others. You can also deploy your own custom functions using the Scripts plugin. ',
+  description: trim`
+    Full-featured spreadsheet application with over 400 built-in formulas for calculations and data analysis.
+    Create custom JavaScript functions and integrate with AI agents for advanced automation.
+  `,
   icon: 'ph--grid-nine--regular',
+  iconHue: 'indigo',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-sheet',
   screenshots: ['https://dxos.network/plugin-details-sheet-dark.png'],
 };

package/src/model/sheet-model.test.ts

@@ -7,17 +7,18 @@ import { afterEach, beforeEach, describe, expect, onTestFinished, test } from 'v
 import { Trigger } from '@dxos/async';
 import { type CellScalarValue, addressFromA1Notation, isFormula } from '@dxos/compute';
 import { TestBuilder, testFunctionPlugins } from '@dxos/compute/testing';
-import { FunctionType } from '@dxos/functions';
+import { Function } from '@dxos/functions';
 import { log } from '@dxos/log';
 
+import { Sheet, mapFormulaIndicesToRefs, mapFormulaRefsToIndices } from '../types';
+
 import { SheetModel } from './sheet-model';
 import { createTestGrid } from './testing';
-import { createSheet, mapFormulaIndicesToRefs, mapFormulaRefsToIndices } from '../types';
 
 describe('SheetModel', () => {
   let testBuilder: TestBuilder;
   beforeEach(async () => {
-    testBuilder = new TestBuilder({ types: [FunctionType], plugins: testFunctionPlugins });
+    testBuilder = new TestBuilder({ types: [Function.Function], plugins: testFunctionPlugins });
     await testBuilder.open();
   });
   afterEach(async () => {
@@ -30,7 +31,7 @@ describe('SheetModel', () => {
     await graph.open();
 
     // TODO(burdon): Create via factory.
-    const sheet = createSheet({ rows: 5, columns: 5 });
+    const sheet = Sheet.make({ rows: 5, columns: 5 });
     const model = new SheetModel(graph, sheet);
     await model.open();
     testBuilder.ctx.onDispose(() => model.close());

package/src/model/sheet-model.ts

@@ -4,10 +4,6 @@
 
 import { Event } from '@dxos/async';
 import {
-  addressFromA1Notation,
-  addressToA1Notation,
-  createSheetName,
-  isFormula,
   type CellAddress,
   type CellRange,
   type CellScalarValue,
@@ -16,14 +12,18 @@ import {
   type ComputeNodeEvent,
   DetailedCellError,
   ExportedCellChange,
-  type SimpleCellRange,
   type SimpleCellAddress,
+  type SimpleCellRange,
   type SimpleDate,
   type SimpleDateTime,
+  addressFromA1Notation,
+  addressToA1Notation,
+  createSheetName,
+  isFormula,
 } from '@dxos/compute';
 import { Resource } from '@dxos/context';
 import { Obj } from '@dxos/echo';
-import { FormatEnum, TypeEnum } from '@dxos/echo-schema';
+import { FormatEnum, TypeEnum } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -39,7 +39,7 @@ import {
   mapFormulaIndicesToRefs,
   mapFormulaRefsToIndices,
 } from '../types';
-import { type SheetAction, type CellValue, type SheetType } from '../types';
+import { type Sheet, type SheetAction } from '../types';
 
 // TODO(burdon): Move to compute.
 // Map sheet types to system types.
@@ -92,7 +92,7 @@ export class SheetModel extends Resource {
 
   constructor(
     private readonly _graph: ComputeGraph,
-    private readonly _sheet: SheetType,
+    private readonly _sheet: Sheet.Sheet,
     private readonly _options: SheetModelOptions = {},
   ) {
     super();
@@ -414,7 +414,7 @@ export class SheetModel extends Resource {
   /**
    * Sets values from a simple map.
    */
-  setValues(values: Record<string, CellValue>): void {
+  setValues(values: Record<string, Sheet.CellValue>): void {
     Object.entries(values).forEach(([key, { value }]) => {
       this.setValue(addressFromA1Notation(key), value);
     });

package/src/model/testing.ts

@@ -4,14 +4,14 @@
 
 import { addressToA1Notation } from '@dxos/compute';
 
-import { type CellValue, type SheetType, createSheet } from '../types';
+import { Sheet } from '../types';
 
 // TODO(burdon): Create testing endpoint.
 // TODO(burdon): Move to react-ui-sheet.
-export const createTestGrid = ({ cols = 4, rows = 10 }: { cols: number; rows: number }): SheetType => {
+export const createTestGrid = ({ cols = 4, rows = 10 }: { cols: number; rows: number }): Sheet.Sheet => {
   const year = new Date().getFullYear();
 
-  const cells: Record<string, CellValue> = {};
+  const cells: Record<string, Sheet.CellValue> = {};
   for (let col = 1; col <= cols; col++) {
     for (let row = 1; row <= 10; row++) {
       const cell = addressToA1Notation({ col, row });
@@ -27,7 +27,7 @@ export const createTestGrid = ({ cols = 4, rows = 10 }: { cols: number; rows: nu
     }
   }
 
-  const sheet = createSheet({
+  const sheet = Sheet.make({
     name: 'Test',
     cells,
   });

package/src/model/useSheetModel.ts

@@ -7,7 +7,7 @@ import { useEffect, useState } from 'react';
 import { type ComputeGraph } from '@dxos/compute';
 
 import { SheetModel } from '../model';
-import { type SheetType } from '../types';
+import { type Sheet } from '../types';
 
 export type UseSheetModelOptions = {
   readonly?: boolean;
@@ -15,7 +15,7 @@ export type UseSheetModelOptions = {
 
 export const useSheetModel = (
   graph?: ComputeGraph,
-  sheet?: SheetType,
+  sheet?: Sheet.Sheet,
   { readonly }: UseSheetModelOptions = {},
 ): SheetModel | undefined => {
   const [model, setModel] = useState<SheetModel>();

package/src/playwright/sheet-manager.ts

@@ -5,7 +5,7 @@
 import { type Locator, type Page } from '@playwright/test';
 
 import { DxGridManager } from '@dxos/lit-grid/testing';
-import { type DxGridPosition, type DxGridAxis } from '@dxos/react-ui-grid';
+import { type DxGridAxis, type DxGridPosition } from '@dxos/react-ui-grid';
 
 /**
  * Test helper for managing dx-grid interactions and assertions in Playwright tests.

package/src/playwright/sheet.spec.ts

@@ -2,7 +2,7 @@
 // Copyright 2021 DXOS.org
 //
 
-import { expect, test, type Page } from '@playwright/test';
+import { type Page, expect, test } from '@playwright/test';
 
 import { faker } from '@dxos/random';
 import { setupPage, storybookUrl } from '@dxos/test-utils/playwright';