@dxos/plugin-sheet 0.7.4 → 0.7.5-main.937ce75

package/src/{compute-graph → components/ComputeGraph}/compute-graph.stories.tsx

@@ -7,19 +7,18 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react';
 import React, { useEffect, useRef, useState } from 'react';
 
-import { FunctionType } from '@dxos/plugin-script/types';
+import { testFunctionPlugins } from '@dxos/compute/testing';
+import { FunctionType } from '@dxos/functions';
 import { create, useSpace, Filter } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Toolbar, Button, Input } from '@dxos/react-ui';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { withTheme } from '@dxos/storybook-utils';
 
-import { testFunctionPlugins } from './testing';
-import { useComputeGraph } from '../components';
-import { createSheet } from '../defs';
-import { useSheetModel } from '../model';
-import { withComputeGraphDecorator } from '../testing';
-import { SheetType } from '../types';
+import { useComputeGraph } from './ComputeGraphContextProvider';
+import { useSheetModel } from '../../model';
+import { withComputeGraphDecorator } from '../../testing';
+import { createSheet, SheetType } from '../../types';
 
 const FUNCTION_NAME = 'TEST';
 

package/src/components/FunctionEditor/FunctionEditor.tsx

@@ -4,9 +4,10 @@
 
 import React from 'react';
 
+import { addressToA1Notation, isFormula, rangeToA1Notation } from '@dxos/compute';
 import { Icon } from '@dxos/react-ui';
 
-import { addressToA1Notation, isFormula, mapFormulaIndicesToRefs, rangeToA1Notation } from '../../defs';
+import { mapFormulaIndicesToRefs } from '../../types';
 import { useSheetContext } from '../SheetContext';
 
 export const FunctionEditor = () => {

package/src/components/GridSheet/GridSheet.tsx

@@ -13,7 +13,8 @@ import React, {
   useState,
 } from 'react';
 
-import { useIntentDispatcher } from '@dxos/app-framework';
+import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { rangeToA1Notation, type CellRange } from '@dxos/compute';
 import { DropdownMenu, Icon, useTranslation } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
 import {
@@ -23,20 +24,19 @@ import {
   Grid,
   GridCellEditor,
   type DxGridElement,
+  type DxGridPosition,
+  type DxGridCellIndex,
   type EditorKeyHandler,
   type EditorBlurHandler,
   type GridContentProps,
-  type DxGridPosition,
-  type DxGridCellIndex,
   parseCellIndex,
 } from '@dxos/react-ui-grid';
 
 import { colLabelCell, rowLabelCell, useSheetModelDxGridProps } from './util';
-import { DEFAULT_COLUMNS, DEFAULT_ROWS, rangeToA1Notation, type CellRange } from '../../defs';
 import { rangeExtension, sheetExtension, type RangeController } from '../../extensions';
 import { useSelectThreadOnCellFocus, useUpdateFocusedCellOnThreadSelection } from '../../integrations';
 import { SHEET_PLUGIN } from '../../meta';
-import { SheetAction } from '../../types';
+import { DEFAULT_COLS, DEFAULT_ROWS, SheetAction } from '../../types';
 import { useSheetContext } from '../SheetContext';
 
 const inertPosition: DxGridPosition = { plane: 'grid', col: 0, row: 0 };
@@ -72,7 +72,7 @@ export const GridSheet = () => {
   // a reliable dependency for `useEffect` whereas `useLayoutEffect` does not guarantee the element will be defined.
   const [dxGrid, setDxGrid] = useState<DxGridElement | null>(null);
   const [extraplanarFocus, setExtraplanarFocus] = useState<DxGridPosition | null>(null);
-  const dispatch = useIntentDispatcher();
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
   const rangeController = useRef<RangeController>();
   const { hasAttention } = useAttention(id);
 
@@ -252,24 +252,21 @@ export const GridSheet = () => {
       switch (operation) {
         case 'insert-before':
         case 'insert-after':
-          return dispatch({
-            action: SheetAction.INSERT_AXIS,
-            data: {
+          return dispatch(
+            createIntent(SheetAction.InsertAxis, {
               model,
               axis: contextMenuAxis,
               index: contextMenuOpen![contextMenuAxis] + (operation === 'insert-before' ? 0 : 1),
-            } satisfies SheetAction.InsertAxis,
-          });
-          break;
+            }),
+          );
         case 'drop':
-          return dispatch({
-            action: SheetAction.DROP_AXIS,
-            data: {
+          return dispatch(
+            createIntent(SheetAction.DropAxis, {
               model,
               axis: contextMenuAxis,
               axisIndex: model.sheet[contextMenuAxis === 'row' ? 'rows' : 'columns'][contextMenuOpen![contextMenuAxis]],
-            } satisfies SheetAction.DropAxis,
-          });
+            }),
+          );
       }
     },
     [contextMenuAxis, contextMenuOpen, model, dispatch],
@@ -309,7 +306,7 @@ export const GridSheet = () => {
       <GridCellEditor getCellContent={getCellContent} extension={extension} onBlur={handleBlur} />
       <Grid.Content
         initialCells={initialCells}
-        limitColumns={DEFAULT_COLUMNS}
+        limitColumns={DEFAULT_COLS}
         limitRows={DEFAULT_ROWS}
         columns={columns}
         rows={rows}

package/src/components/GridSheet/SheetCellEditor.stories.tsx

@@ -9,21 +9,20 @@ import React, { useEffect, useMemo, useState } from 'react';
 
 import { Client } from '@dxos/client';
 import { createDocAccessor, type ReactiveEchoObject } from '@dxos/client/echo';
+import { defaultFunctions } from '@dxos/compute';
+import { getRegisteredFunctionNames } from '@dxos/compute/testing';
 import { automerge } from '@dxos/react-ui-editor';
 import { CellEditor, type CellEditorProps } from '@dxos/react-ui-grid';
 import { withTheme } from '@dxos/storybook-utils';
 
-import { HyperFormula } from '#hyperformula';
-import { defaultFunctions } from '../../compute-graph';
-import { createSheet } from '../../defs';
 import { sheetExtension } from '../../extensions';
-import { SheetType } from '../../types';
+import { createSheet, SheetType } from '../../types';
 
 type StoryProps = CellEditorProps;
 
 const Story = ({ value, ...props }: StoryProps) => {
   const extension = useMemo(() => {
-    const functionNames = HyperFormula.buildEmpty({ licenseKey: 'gpl-v3' }).getRegisteredFunctionNames();
+    const functionNames = getRegisteredFunctionNames();
     const functions = defaultFunctions.filter(({ name }) => functionNames.includes(name));
     return [sheetExtension({ functions })];
   }, []);
@@ -54,7 +53,7 @@ const AutomergeStory = ({ value, ...props }: StoryProps) => {
       return [];
     }
 
-    const functionNames = HyperFormula.buildEmpty({ licenseKey: 'gpl-v3' }).getRegisteredFunctionNames();
+    const functionNames = getRegisteredFunctionNames();
     const functions = defaultFunctions.filter(({ name }) => functionNames.includes(name));
     const accessor = createDocAccessor(object, ['cells', cell, 'value']);
     return [automerge(accessor), sheetExtension({ functions })];
@@ -87,8 +86,8 @@ export const Automerge = {
 const meta: Meta = {
   title: 'plugins/plugin-sheet/CellEditor',
   component: CellEditor,
-  render: (args: StoryProps) => <Story {...args} />,
   decorators: [withTheme],
+  render: (args: StoryProps) => <Story {...args} />,
 };
 
 export default meta;

package/src/components/GridSheet/util.ts

@@ -4,6 +4,7 @@
 
 import { useEffect, useState } from 'react';
 
+import { inRange } from '@dxos/compute';
 import { createDocAccessor, fullyQualifiedId } from '@dxos/react-client/echo';
 import { parseValue, cellClassesForFieldType } from '@dxos/react-ui-form';
 import {
@@ -20,9 +21,9 @@ import {
 } from '@dxos/react-ui-grid';
 import { mx } from '@dxos/react-ui-theme';
 
-import { inRange, cellClassNameForRange, rangeFromIndex } from '../../defs';
 import { parseThreadAnchorAsCellRange } from '../../integrations';
 import { type SheetModel } from '../../model';
+import { cellClassNameForRange, rangeFromIndex } from '../../types';
 
 const createDxGridColumns = (model: SheetModel): DxGridAxisMeta => {
   return model.sheet.columns.reduce(
@@ -54,7 +55,7 @@ const projectCellProps = (model: SheetModel, col: number, row: number): DxGridCe
   const ranges = model.sheet.ranges?.filter(({ range }) => inRange(rangeFromIndex(model.sheet, range), address));
   const threadRefs = model.sheet.threads
     ?.filter((thread) => {
-      const range = thread?.anchor && parseThreadAnchorAsCellRange(thread!.anchor);
+      const range = thread.target?.anchor && parseThreadAnchorAsCellRange(thread.target!.anchor);
       return thread && range ? inRange(range, address) : false;
     })
     .map((thread) => fullyQualifiedId(thread!))

package/src/components/RangeList/RangeList.tsx

@@ -4,13 +4,14 @@
 
 import React, { useCallback } from 'react';
 
+import { rangeToA1Notation } from '@dxos/compute';
 import { S } from '@dxos/echo-schema';
 import { useTranslation } from '@dxos/react-ui';
 import { List } from '@dxos/react-ui-list';
 import { ghostHover } from '@dxos/react-ui-theme';
 
-import { rangeFromIndex, rangeToA1Notation } from '../../defs';
 import { SHEET_PLUGIN } from '../../meta';
+import { rangeFromIndex } from '../../types';
 import { Range, type SheetType } from '../../types';
 
 export type RangeListProps = {

package/src/components/SheetContainer/SheetContainer.stories.tsx

@@ -7,7 +7,8 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react';
 import React from 'react';
 
-import { type Intent, IntentProvider } from '@dxos/app-framework';
+import { type AnyIntentChain, type IntentContext, IntentProvider } from '@dxos/app-framework';
+import { todo } from '@dxos/debug';
 import { useSpace, create } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withTheme, withLayout } from '@dxos/storybook-utils';
@@ -20,20 +21,18 @@ import { useComputeGraph } from '../ComputeGraph';
 import { RangeList } from '../RangeList';
 
 // TODO(thure via wittjosiah):  stories/components should be written such that the dependency on intents is external and provided via callback and then the story can implement it differently.
-const storybookIntentValue = create({
-  dispatch: async (intents: Intent | Intent[]) => {
-    const intent = Array.isArray(intents) ? intents[0] : intents;
-    switch (intent.action) {
-      case SheetAction.DROP_AXIS: {
-        if (!intent.undo) {
-          const { model, axis, axisIndex } = intent.data as SheetAction.DropAxis;
-          model[axis === 'col' ? 'dropColumn' : 'dropRow'](axisIndex);
-        }
+const storybookIntentValue = create<IntentContext>({
+  dispatch: () => todo(),
+  dispatchPromise: async (intentChain: AnyIntentChain): Promise<any> => {
+    switch (intentChain.first.action) {
+      case SheetAction.DropAxis._tag: {
+        const { model, axis, axisIndex } = intentChain.first.data as SheetAction.DropAxis['input'];
+        model[axis === 'col' ? 'dropColumn' : 'dropRow'](axisIndex);
       }
     }
   },
-  undo: async () => ({}),
-  history: [],
+  undo: () => todo(),
+  undoPromise: () => todo(),
   registerResolver: () => () => {},
 });
 

package/src/components/SheetContext/SheetContext.tsx

@@ -4,6 +4,7 @@
 
 import React, { type PropsWithChildren, createContext, useCallback, useContext, useState } from 'react';
 
+import { type ComputeGraph, type CellAddress, type CellRange, type CompleteCellRange } from '@dxos/compute';
 import { invariant } from '@dxos/invariant';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
 import {
@@ -14,8 +15,6 @@ import {
   useGridContext,
 } from '@dxos/react-ui-grid';
 
-import { type ComputeGraph } from '../../compute-graph';
-import { type CellAddress, type CellRange, type CompleteCellRange } from '../../defs';
 import { type SheetModel, useSheetModel } from '../../model';
 import { type SheetType } from '../../types';
 

package/src/components/Toolbar/Toolbar.tsx

@@ -5,7 +5,10 @@
 import { createContext } from '@radix-ui/react-context';
 import React, { type PropsWithChildren, useCallback } from 'react';
 
-import { useIntentDispatcher } from '@dxos/app-framework';
+import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { inRange } from '@dxos/compute';
+import { RefArray } from '@dxos/live-object';
+import { ThreadAction } from '@dxos/plugin-thread/types';
 import {
   Icon,
   type ThemedClassName,
@@ -17,24 +20,22 @@ import {
   useTranslation,
 } from '@dxos/react-ui';
 import { useAttention } from '@dxos/react-ui-attention';
-import { nonNullable } from '@dxos/util';
 
+import { completeCellRangeToThreadCursor } from '../../integrations';
+import { SHEET_PLUGIN } from '../../meta';
 import {
   alignKey,
+  rangeFromIndex,
+  rangeToIndex,
+  styleKey,
   type AlignKey,
   type AlignValue,
   type CommentKey,
   type CommentValue,
-  inRange,
-  rangeFromIndex,
-  rangeToIndex,
-  styleKey,
   type StyleKey,
   type StyleValue,
-} from '../../defs';
-import { completeCellRangeToThreadCursor } from '../../integrations';
-import { SHEET_PLUGIN } from '../../meta';
-import { type SheetType } from '../../types';
+  type SheetType,
+} from '../../types';
 import { useSheetContext } from '../SheetContext';
 
 //
@@ -42,7 +43,7 @@ import { useSheetContext } from '../SheetContext';
 //
 
 const buttonStyles = 'min-bs-0 p-2';
-const tooltipProps = { side: 'bottom' as const, classNames: 'z-10' };
+const tooltipProps = { side: 'bottom' as const };
 
 const ToolbarSeparator = () => <div role='separator' className='grow' />;
 
@@ -111,7 +112,7 @@ type Range = SheetType['ranges'][number];
 const ToolbarRoot = ({ children, role, classNames }: ToolbarProps) => {
   const { id, model, cursorFallbackRange, cursor } = useSheetContext();
   const { hasAttention } = useAttention(id);
-  const dispatch = useIntentDispatcher();
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   // TODO(Zan): Externalize the toolbar action handler. E.g., Toolbar/keys should both fire events.
   const handleAction = useCallback(
@@ -159,16 +160,14 @@ const ToolbarRoot = ({ children, role, classNames }: ToolbarProps) => {
           }
           break;
         case 'comment': {
-          // TODO(Zan): We shouldn't hardcode the action ID.
           if (cursorFallbackRange) {
-            void dispatch({
-              action: 'dxos.org/plugin/thread/action/create',
-              data: {
+            void dispatch(
+              createIntent(ThreadAction.Create, {
                 cursor: completeCellRangeToThreadCursor(cursorFallbackRange),
                 name: action.cellContent,
                 subject: model.sheet,
-              },
-            });
+              }),
+            );
           }
         }
       }
@@ -296,8 +295,7 @@ const Actions = () => {
   const { t } = useTranslation(SHEET_PLUGIN);
 
   // TODO(thure): Can this O(n) call be memoized?
-  const overlapsCommentAnchor = (model.sheet.threads ?? [])
-    .filter(nonNullable)
+  const overlapsCommentAnchor = RefArray.allResolvedTargets(model.sheet.threads ?? [])
     .filter((thread) => thread.status !== 'resolved')
     .some((thread) => {
       if (!cursorFallbackRange) {

package/src/extensions/compute.ts

@@ -15,13 +15,16 @@ import {
 import { Decoration, EditorView, ViewPlugin, WidgetType } from '@codemirror/view';
 
 import { type UnsubscribeCallback, debounce } from '@dxos/async';
+import {
+  createSheetName,
+  type CellAddress,
+  type CellScalarValue,
+  type ComputeGraph,
+  type ComputeNode,
+} from '@dxos/compute';
 import { invariant } from '@dxos/invariant';
 import { documentId, singleValueFacet } from '@dxos/react-ui-editor';
 
-import { type ComputeGraph, type ComputeNode, createSheetName } from '../compute-graph';
-import { type CellAddress } from '../defs';
-import { type CellScalarValue } from '../types';
-
 const LANGUAGE_TAG = 'dx';
 
 // TODO(burdon): Create marker just for our decorator?

package/src/extensions/editor/extension.test.ts

@@ -8,8 +8,9 @@ import { testTree } from '@lezer/generator/test';
 import { spreadsheet } from 'codemirror-lang-spreadsheet';
 import { describe, expect, test } from 'vitest';
 
+import { defaultFunctions } from '@dxos/compute';
+
 import { sheetExtension } from './extension';
-import { defaultFunctions } from '../../compute-graph';
 
 describe('formula parser', () => {
   const {

package/src/extensions/editor/extension.ts

@@ -18,12 +18,11 @@ import { type SyntaxNode } from '@lezer/common';
 import { tags } from '@lezer/highlight';
 import { spreadsheet } from 'codemirror-lang-spreadsheet';
 
+import { type FunctionDefinition } from '@dxos/compute';
+import { RANGE_NOTATION } from '@dxos/compute';
 import { singleValueFacet } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
 
-import { type FunctionDefinition } from '../../compute-graph';
-import { RANGE_NOTATION } from '../../defs';
-
 /**
  * https://codemirror.net/examples/styling
  * https://lezer.codemirror.net/docs/ref/#highlight

package/src/index.ts

@@ -4,9 +4,7 @@
 
 import { SheetPlugin } from './SheetPlugin';
 
+export * from './types';
 export * from './SheetPlugin';
 
-// TODO(burdon): Move to types entrypoint or create a new one.
-export * from './defs';
-
 export default SheetPlugin;

package/src/integrations/thread-ranges.ts

@@ -4,13 +4,20 @@
 
 import { useCallback, useEffect, useMemo } from 'react';
 
-import { type IntentResolver, LayoutAction, useIntentDispatcher, useIntentResolver } from '@dxos/app-framework';
+import {
+  createIntent,
+  createResolver,
+  LayoutAction,
+  useIntentDispatcher,
+  useIntentResolver,
+} from '@dxos/app-framework';
 import { debounce } from '@dxos/async';
+import { type CellAddress, type CompleteCellRange, inRange } from '@dxos/compute';
+import { ThreadAction } from '@dxos/plugin-thread/types';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
 import { type DxGridElement, type DxGridPosition } from '@dxos/react-ui-grid';
 
 import { useSheetContext } from '../components';
-import { type CellAddress, type CompleteCellRange, inRange } from '../defs';
 import { SHEET_PLUGIN } from '../meta';
 
 export const completeCellRangeToThreadCursor = (range: CompleteCellRange): string => {
@@ -32,31 +39,30 @@ export const parseThreadAnchorAsCellRange = (cursor: string): CompleteCellRange
 
 export const useUpdateFocusedCellOnThreadSelection = (grid: DxGridElement | null) => {
   const { model, setActiveRefs } = useSheetContext();
-  const handleScrollIntoView: IntentResolver = useCallback(
-    ({ action, data }) => {
-      switch (action) {
-        case LayoutAction.SCROLL_INTO_VIEW: {
-          if (!data?.id || data?.cursor === undefined || data?.id !== fullyQualifiedId(model.sheet)) {
-            return;
-          }
-          setActiveRefs(data.thread);
+  const scrollIntoViewResolver = useMemo(
+    () =>
+      createResolver(
+        LayoutAction.ScrollIntoView,
+        ({ cursor, ref }) => {
+          setActiveRefs(ref);
           // TODO(Zan): Everywhere we refer to the cursor in a thread context should change to `anchor`.
-          const range = parseThreadAnchorAsCellRange(data.cursor);
+          const range = parseThreadAnchorAsCellRange(cursor!);
           range && grid?.setFocus({ ...range.to, plane: 'grid' }, true);
-
-          return { data: true };
-        }
-      }
-    },
+        },
+        {
+          disposition: 'hoist',
+          filter: (data) => data.id === fullyQualifiedId(model.sheet) && !!data.cursor,
+        },
+      ),
     [model.sheet, setActiveRefs],
   );
 
-  useIntentResolver(SHEET_PLUGIN, handleScrollIntoView);
+  useIntentResolver(SHEET_PLUGIN, scrollIntoViewResolver);
 };
 
 export const useSelectThreadOnCellFocus = () => {
   const { model, cursor } = useSheetContext();
-  const dispatch = useIntentDispatcher();
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const threads = useMemo(
     () => model.sheet.threads?.filter((thread): thread is NonNullable<typeof thread> => !!thread) ?? [],
@@ -72,9 +78,9 @@ export const useSelectThreadOnCellFocus = () => {
         return;
       }
 
-      const closestThread = threads?.find(({ anchor }) => {
-        if (anchor) {
-          const range = parseThreadAnchorAsCellRange(anchor);
+      const closestThread = threads?.find((ref) => {
+        if (ref.target?.anchor) {
+          const range = parseThreadAnchorAsCellRange(ref.target!.anchor);
           return range ? inRange(range, cellAddress) : false;
         } else {
           return false;
@@ -82,9 +88,7 @@ export const useSelectThreadOnCellFocus = () => {
       });
 
       if (closestThread) {
-        void dispatch([
-          { action: 'dxos.org/plugin/thread/action/select', data: { current: fullyQualifiedId(closestThread) } },
-        ]);
+        void dispatch(createIntent(ThreadAction.Select, { current: fullyQualifiedId(closestThread) }));
       }
     },
     [dispatch, threads],

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

@@ -5,20 +5,14 @@
 import { afterEach, beforeEach, describe, expect, onTestFinished, test } from 'vitest';
 
 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 { log } from '@dxos/log';
-import { FunctionType } from '@dxos/plugin-script/types';
 
 import { SheetModel } from './sheet-model';
 import { createTestGrid } from './testing';
-import { TestBuilder, testFunctionPlugins } from '../compute-graph/testing';
-import {
-  addressFromA1Notation,
-  createSheet,
-  isFormula,
-  mapFormulaIndicesToRefs,
-  mapFormulaRefsToIndices,
-} from '../defs';
-import { type CellScalarValue } from '../types';
+import { createSheet, mapFormulaIndicesToRefs, mapFormulaRefsToIndices } from '../types';
 
 describe('SheetModel', () => {
   let testBuilder: TestBuilder;

package/src/model/sheet-model.ts

@@ -2,37 +2,45 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type SimpleCellRange } from 'hyperformula/typings/AbsoluteCellRange';
-import { type SimpleCellAddress } from 'hyperformula/typings/Cell';
-import { type SimpleDate, type SimpleDateTime } from 'hyperformula/typings/DateTimeHelper';
-
 import { Event } from '@dxos/async';
+import {
+  addressFromA1Notation,
+  addressToA1Notation,
+  createSheetName,
+  isFormula,
+  type CellAddress,
+  type CellRange,
+  type CellScalarValue,
+  type ComputeGraph,
+  type ComputeNode,
+  type ComputeNodeEvent,
+  DetailedCellError,
+  ExportedCellChange,
+  type SimpleCellRange,
+  type SimpleCellAddress,
+  type SimpleDate,
+  type SimpleDateTime,
+} from '@dxos/compute';
 import { Resource } from '@dxos/context';
 import { getTypename, FormatEnum, TypeEnum } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 
-import { DetailedCellError, ExportedCellChange } from '#hyperformula';
-import { type ComputeGraph, type ComputeNode, type ComputeNodeEvent, createSheetName } from '../compute-graph';
 import {
-  addressFromA1Notation,
+  ReadonlyException,
   addressFromIndex,
-  addressToA1Notation,
   addressToIndex,
   initialize,
   insertIndices,
-  isFormula,
-  type CellAddress,
-  type CellRange,
-  ReadonlyException,
-  MAX_COLUMNS,
-  MAX_ROWS,
   mapFormulaIndicesToRefs,
   mapFormulaRefsToIndices,
-} from '../defs';
-import { type CellScalarValue, type CellValue, type SheetType, type RestoreAxis } from '../types';
+  MAX_ROWS,
+  MAX_COLS,
+} from '../types';
+import { type SheetAction, type CellValue, type SheetType } from '../types';
 
+// TODO(burdon): Move to compute.
 // Map sheet types to system types.
 // https://hyperformula.handsontable.com/guide/types-of-values.html
 //  - https://github.com/handsontable/hyperformula/blob/master/src/Cell.ts (CellValueType)
@@ -176,12 +184,12 @@ export class SheetModel extends Resource {
   }
 
   insertColumns(i: number, n = 1) {
-    const idx = insertIndices(this._sheet.columns, i, n, MAX_COLUMNS);
+    const idx = insertIndices(this._sheet.columns, i, n, MAX_COLS);
     this.reset();
     return idx;
   }
 
-  dropRow(rowIndex: string): RestoreAxis {
+  dropRow(rowIndex: string): SheetAction.RestoreAxis {
     const range = {
       from: addressFromIndex(this._sheet, `${this._sheet.columns[0]}@${rowIndex}`),
       to: addressFromIndex(this._sheet, `${this._sheet.columns[this._sheet.columns.length - 1]}@${rowIndex}`),
@@ -195,7 +203,7 @@ export class SheetModel extends Resource {
     return { axis: 'row', index, axisIndex: rowIndex, axisMeta: this._sheet.rowMeta[rowIndex], values };
   }
 
-  dropColumn(colIndex: string): RestoreAxis {
+  dropColumn(colIndex: string): SheetAction.RestoreAxis {
     const range = {
       from: addressFromIndex(this._sheet, `${colIndex}@${this._sheet.rows[0]}`),
       to: addressFromIndex(this._sheet, `${colIndex}@${this._sheet.rows[this._sheet.rows.length - 1]}`),
@@ -209,7 +217,7 @@ export class SheetModel extends Resource {
     return { axis: 'col', index, axisIndex: colIndex, axisMeta: this._sheet.rowMeta[colIndex], values };
   }
 
-  restoreRow({ index, axisIndex, axisMeta, values }: RestoreAxis) {
+  restoreRow({ index, axisIndex, axisMeta, values }: SheetAction.RestoreAxis) {
     this._sheet.rows.splice(index, 0, axisIndex);
     values.forEach((value, col) => {
       if (value) {
@@ -222,7 +230,7 @@ export class SheetModel extends Resource {
     this.reset();
   }
 
-  restoreColumn({ index, axisIndex, axisMeta, values }: RestoreAxis) {
+  restoreColumn({ index, axisIndex, axisMeta, values }: SheetAction.RestoreAxis) {
     this._sheet.columns.splice(index, 0, axisIndex);
     values.forEach((value, row) => {
       if (value) {
@@ -373,7 +381,7 @@ export class SheetModel extends Resource {
       refresh = true;
     }
     if (cell.col >= this._sheet.columns.length) {
-      insertIndices(this._sheet.columns, cell.col, 1, MAX_COLUMNS);
+      insertIndices(this._sheet.columns, cell.col, 1, MAX_COLS);
       refresh = true;
     }