@dxos/plugin-sheet 0.8.2-main.5885341 → 0.8.2-main.600d381

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.8.2-main.5885341",
+  "version": "0.8.2-main.600d381",
   "description": "Braneframe sketch plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -49,43 +49,44 @@
     "@radix-ui/react-context": "1.1.1",
     "codemirror-lang-spreadsheet": "^1.3.0",
     "date-fns": "^3.3.1",
+    "effect": "^3.13.3",
     "lodash.defaultsdeep": "^4.6.1",
     "re-resizable": "^6.9.17",
     "react-markdown": "^8.0.5",
     "react-resize-detector": "^11.0.1",
-    "@dxos/app-framework": "0.8.2-main.5885341",
-    "@dxos/client": "0.8.2-main.5885341",
-    "@dxos/compute": "0.8.2-main.5885341",
-    "@dxos/crypto": "0.8.2-main.5885341",
-    "@dxos/debug": "0.8.2-main.5885341",
-    "@dxos/context": "0.8.2-main.5885341",
-    "@dxos/echo-schema": "0.8.2-main.5885341",
-    "@dxos/invariant": "0.8.2-main.5885341",
-    "@dxos/async": "0.8.2-main.5885341",
-    "@dxos/functions": "0.8.2-main.5885341",
-    "@dxos/keys": "0.8.2-main.5885341",
-    "@dxos/live-object": "0.8.2-main.5885341",
-    "@dxos/plugin-attention": "0.8.2-main.5885341",
-    "@dxos/log": "0.8.2-main.5885341",
-    "@dxos/plugin-client": "0.8.2-main.5885341",
-    "@dxos/plugin-deck": "0.8.2-main.5885341",
-    "@dxos/plugin-script": "0.8.2-main.5885341",
-    "@dxos/plugin-space": "0.8.2-main.5885341",
-    "@dxos/plugin-stack": "0.8.2-main.5885341",
-    "@dxos/plugin-graph": "0.8.2-main.5885341",
-    "@dxos/plugin-thread": "0.8.2-main.5885341",
-    "@dxos/react-client": "0.8.2-main.5885341",
-    "@dxos/plugin-markdown": "0.8.2-main.5885341",
-    "@dxos/react-ui-attention": "0.8.2-main.5885341",
-    "@dxos/react-hooks": "0.8.2-main.5885341",
-    "@dxos/react-ui-editor": "0.8.2-main.5885341",
-    "@dxos/react-ui-form": "0.8.2-main.5885341",
-    "@dxos/react-ui-grid": "0.8.2-main.5885341",
-    "@dxos/react-ui-menu": "0.8.2-main.5885341",
-    "@dxos/react-ui-stack": "0.8.2-main.5885341",
-    "@dxos/schema": "0.8.2-main.5885341",
-    "@dxos/react-ui-list": "0.8.2-main.5885341",
-    "@dxos/util": "0.8.2-main.5885341"
+    "@dxos/app-framework": "0.8.2-main.600d381",
+    "@dxos/client": "0.8.2-main.600d381",
+    "@dxos/context": "0.8.2-main.600d381",
+    "@dxos/debug": "0.8.2-main.600d381",
+    "@dxos/async": "0.8.2-main.600d381",
+    "@dxos/crypto": "0.8.2-main.600d381",
+    "@dxos/echo-schema": "0.8.2-main.600d381",
+    "@dxos/compute": "0.8.2-main.600d381",
+    "@dxos/functions": "0.8.2-main.600d381",
+    "@dxos/invariant": "0.8.2-main.600d381",
+    "@dxos/live-object": "0.8.2-main.600d381",
+    "@dxos/keys": "0.8.2-main.600d381",
+    "@dxos/log": "0.8.2-main.600d381",
+    "@dxos/plugin-client": "0.8.2-main.600d381",
+    "@dxos/plugin-attention": "0.8.2-main.600d381",
+    "@dxos/plugin-deck": "0.8.2-main.600d381",
+    "@dxos/plugin-markdown": "0.8.2-main.600d381",
+    "@dxos/plugin-script": "0.8.2-main.600d381",
+    "@dxos/plugin-space": "0.8.2-main.600d381",
+    "@dxos/plugin-graph": "0.8.2-main.600d381",
+    "@dxos/plugin-thread": "0.8.2-main.600d381",
+    "@dxos/plugin-stack": "0.8.2-main.600d381",
+    "@dxos/react-ui-editor": "0.8.2-main.600d381",
+    "@dxos/react-client": "0.8.2-main.600d381",
+    "@dxos/react-ui-attention": "0.8.2-main.600d381",
+    "@dxos/react-hooks": "0.8.2-main.600d381",
+    "@dxos/react-ui-grid": "0.8.2-main.600d381",
+    "@dxos/react-ui-form": "0.8.2-main.600d381",
+    "@dxos/react-ui-list": "0.8.2-main.600d381",
+    "@dxos/react-ui-menu": "0.8.2-main.600d381",
+    "@dxos/react-ui-stack": "0.8.2-main.600d381",
+    "@dxos/util": "0.8.2-main.600d381",
+    "@dxos/schema": "0.8.2-main.600d381"
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.1",
@@ -94,26 +95,25 @@
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "@types/react-window": "^1.8.8",
-    "effect": "3.14.21",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-generator": "0.8.2-main.5885341",
-    "@dxos/lit-grid": "0.8.2-main.5885341",
-    "@dxos/react-ui": "0.8.2-main.5885341",
-    "@dxos/random": "0.8.2-main.5885341",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.5885341",
-    "@dxos/react-ui-theme": "0.8.2-main.5885341",
-    "@dxos/storybook-utils": "0.8.2-main.5885341",
-    "@dxos/react-ui-types": "0.8.2-main.5885341",
-    "@dxos/test-utils": "0.8.2-main.5885341"
+    "@dxos/lit-grid": "0.8.2-main.600d381",
+    "@dxos/random": "0.8.2-main.600d381",
+    "@dxos/echo-generator": "0.8.2-main.600d381",
+    "@dxos/react-ui-theme": "0.8.2-main.600d381",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.600d381",
+    "@dxos/react-ui": "0.8.2-main.600d381",
+    "@dxos/react-ui-types": "0.8.2-main.600d381",
+    "@dxos/storybook-utils": "0.8.2-main.600d381",
+    "@dxos/test-utils": "0.8.2-main.600d381"
   },
   "peerDependencies": {
-    "effect": "3.13.3",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.5885341",
-    "@dxos/react-ui-theme": "0.8.2-main.5885341"
+    "@dxos/react-ui": "0.8.2-main.600d381",
+    "@dxos/react-ui-theme": "0.8.2-main.600d381"
   },
   "publishConfig": {
     "access": "public"

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

@@ -8,7 +8,7 @@ import { type Meta } from '@storybook/react';
 import React, { useEffect, useRef, useState } from 'react';
 
 import { testFunctionPlugins } from '@dxos/compute/testing';
-import { FunctionType } from '@dxos/functions/types';
+import { FunctionType } from '@dxos/functions';
 import { live, useSpace, Filter } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Toolbar, Button, Input } from '@dxos/react-ui';

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

@@ -41,7 +41,7 @@ const meta: Meta = {
     withClientProvider({ types: [SheetType], createSpace: true }),
     withComputeGraphDecorator(),
     withTheme,
-    withLayout({ fullscreen: true, tooltips: true, classNames: 'grid' }),
+    withLayout({ fullscreen: true, classNames: 'grid' }),
     withPluginManager(),
   ],
   parameters: { translations },

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

@@ -8,7 +8,7 @@ import { type Meta } from '@storybook/react';
 import React, { useEffect, useMemo, useState } from 'react';
 
 import { Client } from '@dxos/client';
-import { createDocAccessor, type ReactiveEchoObject } from '@dxos/client/echo';
+import { createDocAccessor, type AnyLiveObject } from '@dxos/client/echo';
 import { defaultFunctions } from '@dxos/compute';
 import { getRegisteredFunctionNames } from '@dxos/compute/testing';
 import { automerge } from '@dxos/react-ui-editor';
@@ -32,7 +32,7 @@ const Story = ({ value, ...props }: StoryProps) => {
 
 const AutomergeStory = ({ value, ...props }: StoryProps) => {
   const cell = 'A1';
-  const [object, setObject] = useState<ReactiveEchoObject<SheetType>>();
+  const [object, setObject] = useState<AnyLiveObject<SheetType>>();
   useEffect(() => {
     setTimeout(async () => {
       const client = new Client({ types: [SheetType] });

package/src/components/RangeList/RangeList.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 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';
@@ -32,7 +32,7 @@ export const RangeList = ({ sheet }: RangeListProps) => {
   return (
     <>
       <h2 className='p-2 text-sm font-semibold'>{t('range list heading')}</h2>
-      <List.Root<Range> items={sheet.ranges} isItem={S.is(Range)}>
+      <List.Root<Range> items={sheet.ranges} isItem={Schema.is(Range)}>
         {({ items: ranges }) =>
           ranges.map((range, i) => (
             <List.Item key={i} item={range} classNames={['p-2', ghostHover]}>

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

@@ -64,11 +64,7 @@ const meta: Meta = {
     withClientProvider({ types: [SheetType], createSpace: true }),
     withComputeGraphDecorator(),
     withTheme,
-    withLayout({
-      fullscreen: true,
-      tooltips: true,
-      classNames: 'grid',
-    }),
+    withLayout({ fullscreen: true, classNames: 'grid' }),
     withAttention,
     // TODO(wittjosiah): Consider whether we should refactor component so story doesn't need to depend on intents.
     withPluginManager({

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

@@ -23,7 +23,7 @@ const meta: Meta = {
   title: 'plugins/plugin-sheet/Toolbar',
   component: SheetToolbar,
   render: DefaultStory,
-  decorators: [withTheme, withLayout({ tooltips: true })],
+  decorators: [withTheme, withLayout()],
   parameters: { translations, layout: 'fullscreen' },
 };
 

package/src/components/SheetToolbar/SheetToolbar.tsx

@@ -4,14 +4,18 @@
 
 import React, { type PropsWithChildren, useCallback } from 'react';
 
+import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { type CompleteCellRange } from '@dxos/compute';
+import { ThreadAction } from '@dxos/plugin-thread/types';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { createGapSeparator, MenuProvider, ToolbarMenu, useMenuActions } from '@dxos/react-ui-menu';
 
 import { createAlign, useAlignState } from './align';
 import { createComment, useCommentState } from './comment';
 import { createStyle, useStyleState } from './style';
-import { useToolbarAction } from './useToolbarAction';
 import { type ToolbarState, useToolbarState } from './useToolbarState';
+import { type SheetModel } from '../../model';
+import { useSheetContext } from '../SheetContext';
 
 //
 // Root
@@ -19,11 +23,16 @@ import { type ToolbarState, useToolbarState } from './useToolbarState';
 
 export type SheetToolbarProps = ThemedClassName<PropsWithChildren<{ attendableId?: string }>>;
 
-const createToolbarActions = (state: ToolbarState) => {
-  const align = createAlign(state);
-  const style = createStyle(state);
+const createToolbarActions = (
+  model: SheetModel,
+  state: ToolbarState,
+  onComment: (cellContent: string, cursor: string) => void,
+  cursorFallbackRange?: CompleteCellRange,
+) => {
+  const align = createAlign(model, state, cursorFallbackRange);
+  const style = createStyle(model, state, cursorFallbackRange);
   const gap = createGapSeparator();
-  const comment = createComment(state);
+  const comment = createComment(model, state, onComment, cursorFallbackRange);
   return {
     nodes: [...align.nodes, ...style.nodes, ...gap.nodes, ...comment.nodes],
     edges: [...align.edges, ...style.edges, ...gap.edges, ...comment.edges],
@@ -31,17 +40,33 @@ const createToolbarActions = (state: ToolbarState) => {
 };
 
 export const SheetToolbar = ({ attendableId, classNames }: SheetToolbarProps) => {
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const { model, cursorFallbackRange } = useSheetContext();
   const state = useToolbarState({});
   useAlignState(state);
   useStyleState(state);
   useCommentState(state);
 
-  const actionsCreator = useCallback(() => createToolbarActions(state), [state]);
+  const handleComment = useCallback(
+    (name: string, cursor: string) =>
+      dispatch(
+        createIntent(ThreadAction.Create, {
+          cursor,
+          name,
+          subject: model.sheet,
+        }),
+      ),
+    [model.sheet, dispatch],
+  );
+
+  const actionsCreator = useCallback(
+    () => createToolbarActions(model, state, handleComment, cursorFallbackRange),
+    [model, state, handleComment, cursorFallbackRange],
+  );
   const menu = useMenuActions(actionsCreator);
-  const handleAction = useToolbarAction(state);
 
   return (
-    <MenuProvider {...menu} attendableId={attendableId} onAction={handleAction}>
+    <MenuProvider {...menu} attendableId={attendableId}>
       <ToolbarMenu classNames={classNames} />
     </MenuProvider>
   );

package/src/components/SheetToolbar/align.ts

@@ -4,11 +4,13 @@
 
 import { useEffect } from 'react';
 
-import { inRange } from '@dxos/compute';
+import { type CompleteCellRange, inRange } from '@dxos/compute';
 import { createMenuAction, createMenuItemGroup, type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
 
+import { type ToolbarState } from './useToolbarState';
 import { SHEET_PLUGIN } from '../../meta';
-import { type AlignKey, alignKey, type AlignValue, rangeFromIndex } from '../../types';
+import { type SheetModel } from '../../model';
+import { type AlignKey, alignKey, type AlignValue, rangeFromIndex, rangeToIndex } from '../../types';
 import { useSheetContext } from '../SheetContext';
 
 export type AlignAction = { key: AlignKey; value: AlignValue };
@@ -43,21 +45,49 @@ const createAlignGroupAction = (value?: AlignValue) =>
     value: `${alignKey}--${value}`,
   } as ToolbarMenuActionGroupProperties);
 
-const createAlignActions = (value?: AlignValue) =>
+const createAlignActions = (model: SheetModel, state: ToolbarState, cursorFallbackRange?: CompleteCellRange) =>
   Object.entries(aligns).map(([alignValue, icon]) => {
-    return createMenuAction<AlignAction>(`${alignKey}--${alignValue}`, {
-      key: alignKey,
-      value: alignValue as AlignValue,
-      checked: value === alignValue,
-      label: [`range value ${alignValue} label`, { ns: SHEET_PLUGIN }],
-      icon,
-      testId: `grid.toolbar.${alignKey}.${alignValue}`,
-    });
+    return createMenuAction<AlignAction>(
+      `${alignKey}--${alignValue}`,
+      () => {
+        if (!cursorFallbackRange) {
+          return;
+        }
+        const index =
+          model.sheet.ranges?.findIndex(
+            (range) =>
+              range.key === alignKey && inRange(rangeFromIndex(model.sheet, range.range), cursorFallbackRange.from),
+          ) ?? -1;
+        const nextRangeEntity = {
+          range: rangeToIndex(model.sheet, cursorFallbackRange),
+          key: alignKey,
+          value: alignValue as AlignValue,
+        };
+        if (index < 0) {
+          model.sheet.ranges?.push(nextRangeEntity);
+          state[alignKey] = nextRangeEntity.value;
+        } else if (model.sheet.ranges![index].value === nextRangeEntity.value) {
+          model.sheet.ranges?.splice(index, 1);
+          state[alignKey] = undefined;
+        } else {
+          model.sheet.ranges?.splice(index, 1, nextRangeEntity);
+          state[alignKey] = nextRangeEntity.value;
+        }
+      },
+      {
+        key: alignKey,
+        value: alignValue as AlignValue,
+        checked: state[alignKey] === alignValue,
+        label: [`range value ${alignValue} label`, { ns: SHEET_PLUGIN }],
+        icon,
+        testId: `grid.toolbar.${alignKey}.${alignValue}`,
+      },
+    );
   });
 
-export const createAlign = ({ [alignKey]: alignValue }: Partial<AlignState>) => {
-  const alignGroup = createAlignGroupAction(alignValue);
-  const alignActions = createAlignActions(alignValue);
+export const createAlign = (model: SheetModel, state: ToolbarState, cursorFallbackRange?: CompleteCellRange) => {
+  const alignGroup = createAlignGroupAction(state[alignKey]);
+  const alignActions = createAlignActions(model, state, cursorFallbackRange);
   return {
     nodes: [alignGroup, ...alignActions],
     edges: [

package/src/components/SheetToolbar/comment.ts

@@ -4,10 +4,13 @@
 
 import { useEffect, useMemo } from 'react';
 
+import { type CompleteCellRange } from '@dxos/compute';
 import { RefArray } from '@dxos/live-object';
 import { createMenuAction } from '@dxos/react-ui-menu';
 
+import { completeCellRangeToThreadCursor } from '../../integrations/thread-ranges';
 import { SHEET_PLUGIN } from '../../meta';
+import { type SheetModel } from '../../model';
 import { commentKey, type CommentKey, type CommentValue, rangeToIndex } from '../../types';
 import { useSheetContext } from '../SheetContext';
 
@@ -41,16 +44,41 @@ export const useCommentState = (state: Partial<CommentState>) => {
   }, [overlapsCommentAnchor, cursorFallbackRange]);
 };
 
-const createCommentAction = (state: Partial<CommentState>) =>
-  createMenuAction<Pick<CommentAction, 'key'>>('comment', {
-    key: commentKey,
-    testId: 'editor.toolbar.comment',
-    icon: 'ph--chat-text--regular',
-    label: [`${state.commentEnabled} label`, { ns: SHEET_PLUGIN }],
-    disabled: state.commentEnabled !== 'comment',
-  });
-
-export const createComment = (state: Partial<CommentState>) => ({
-  nodes: [createCommentAction(state)],
+const createCommentAction = (
+  model: SheetModel,
+  state: Partial<CommentState>,
+  onComment: (cellContent: string, cursor: string) => void,
+  cursorFallbackRange?: CompleteCellRange,
+) =>
+  createMenuAction<Pick<CommentAction, 'key'>>(
+    'comment',
+    () => {
+      if (!cursorFallbackRange) {
+        return;
+      }
+
+      const cellContent = model.getCellText(cursorFallbackRange.from);
+      if (!cellContent) {
+        return;
+      }
+
+      onComment(cellContent, completeCellRangeToThreadCursor(cursorFallbackRange));
+    },
+    {
+      key: commentKey,
+      testId: 'editor.toolbar.comment',
+      icon: 'ph--chat-text--regular',
+      label: [`${state.commentEnabled} label`, { ns: SHEET_PLUGIN }],
+      disabled: state.commentEnabled !== 'comment',
+    },
+  );
+
+export const createComment = (
+  model: SheetModel,
+  state: Partial<CommentState>,
+  onComment: (cellContent: string, cursor: string) => void,
+  cursorFallbackRange?: CompleteCellRange,
+) => ({
+  nodes: [createCommentAction(model, state, onComment, cursorFallbackRange)],
   edges: [{ source: 'root', target: 'comment' }],
 });

package/src/components/SheetToolbar/style.ts

@@ -4,11 +4,12 @@
 
 import { useEffect } from 'react';
 
-import { inRange } from '@dxos/compute';
+import { type CompleteCellRange, inRange } from '@dxos/compute';
 import { createMenuAction, createMenuItemGroup, type ToolbarMenuActionGroupProperties } from '@dxos/react-ui-menu';
 
 import { SHEET_PLUGIN } from '../../meta';
-import { rangeFromIndex, type StyleKey, type StyleValue } from '../../types';
+import { type SheetModel } from '../../model';
+import { rangeFromIndex, rangeToIndex, type StyleKey, type StyleValue } from '../../types';
 import { useSheetContext } from '../SheetContext';
 
 export type StyleState = Partial<Record<StyleValue, boolean>>;
@@ -48,20 +49,55 @@ const createStyleGroup = (state: StyleState) => {
   } as ToolbarMenuActionGroupProperties);
 };
 
-const createStyleActions = (state: StyleState) =>
+const createStyleActions = (model: SheetModel, state: StyleState, cursorFallbackRange?: CompleteCellRange) =>
   Object.entries(styles).map(([styleValue, icon]) => {
-    return createMenuAction<StyleAction>(`style--${styleValue}`, {
-      key: 'style',
-      value: styleValue as StyleValue,
-      icon,
-      label: [`range value ${styleValue} label`, { ns: SHEET_PLUGIN }],
-      checked: !!state[styleValue as StyleValue],
-    });
+    return createMenuAction<StyleAction>(
+      `style--${styleValue}`,
+      () => {
+        if (!cursorFallbackRange) {
+          return;
+        }
+        const index =
+          model.sheet.ranges?.findIndex(
+            (range) =>
+              range.key === 'style' && inRange(rangeFromIndex(model.sheet, range.range), cursorFallbackRange.from),
+          ) ?? -1;
+        const nextRangeEntity = {
+          range: rangeToIndex(model.sheet, cursorFallbackRange),
+          key: 'style',
+          value: styleValue as StyleValue,
+        };
+        if (
+          model.sheet.ranges
+            .filter(
+              ({ range, key: rangeKey }) =>
+                rangeKey === 'style' && inRange(rangeFromIndex(model.sheet, range), cursorFallbackRange.from),
+            )
+            .some(({ value: rangeValue }) => rangeValue === styleValue)
+        ) {
+          // this value should be unset
+          if (index >= 0) {
+            model.sheet.ranges?.splice(index, 1);
+          }
+          state[nextRangeEntity.value] = false;
+        } else {
+          model.sheet.ranges?.push(nextRangeEntity);
+          state[nextRangeEntity.value] = true;
+        }
+      },
+      {
+        key: 'style',
+        value: styleValue as StyleValue,
+        icon,
+        label: [`range value ${styleValue} label`, { ns: SHEET_PLUGIN }],
+        checked: !!state[styleValue as StyleValue],
+      },
+    );
   });
 
-export const createStyle = (state: StyleState) => {
+export const createStyle = (model: SheetModel, state: StyleState, cursorFallbackRange?: CompleteCellRange) => {
   const styleGroupAction = createStyleGroup(state);
-  const styleActions = createStyleActions(state);
+  const styleActions = createStyleActions(model, state, cursorFallbackRange);
   return {
     nodes: [styleGroupAction, ...styleActions],
     edges: [

package/src/integrations/thread-ranges.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { pipe } from 'effect';
+import { Schema, pipe } from 'effect';
 import { useCallback, useEffect, useMemo } from 'react';
 
 import {
@@ -15,7 +15,6 @@ import {
 } from '@dxos/app-framework';
 import { debounce } from '@dxos/async';
 import { type CellAddress, type CompleteCellRange, inRange } from '@dxos/compute';
-import { S } from '@dxos/echo-schema';
 import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
 import { ThreadAction } from '@dxos/plugin-thread/types';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
@@ -55,7 +54,7 @@ export const useUpdateFocusedCellOnThreadSelection = (grid: DxGridElement | null
           subject: string;
           options: { cursor: string; ref: GridContentProps['activeRefs'] };
         } => {
-          if (!S.is(LayoutAction.ScrollIntoView.fields.input)(data)) {
+          if (!Schema.is(LayoutAction.ScrollIntoView.fields.input)(data)) {
             return false;
           }
 

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

@@ -7,7 +7,7 @@ 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/types';
+import { FunctionType } from '@dxos/functions';
 import { log } from '@dxos/log';
 
 import { SheetModel } from './sheet-model';

package/src/sanity.test.ts

@@ -12,7 +12,7 @@ import { describe, test, expect } from 'vitest';
 
 import { Client } from '@dxos/client';
 import { live } from '@dxos/client/echo';
-import { FunctionType } from '@dxos/functions/types';
+import { FunctionType } from '@dxos/functions';
 
 // TODO(burdon): Fix test infrastructure:
 //  - Need docs? esp. needed for config. need pristine example package?

package/src/types/schema.ts

@@ -2,55 +2,57 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Ref, S, TypedObject } from '@dxos/echo-schema';
+import { Schema } from 'effect';
+
+import { Ref, TypedObject } from '@dxos/echo-schema';
 import { ThreadType } from '@dxos/plugin-space/types';
 
-export const CellValue = S.Struct({
+export const CellValue = Schema.Struct({
   // TODO(burdon): How to store dates (datetime, date, time), percentages, etc.
   //  Consider import/export; natural access for other plugins. Special handling for currency (precision).
   // TODO(burdon): Automerge (long string) or short string or number.
-  value: S.Any,
+  value: Schema.Any,
 });
 
-export type CellValue = S.Schema.Type<typeof CellValue>;
+export type CellValue = Schema.Schema.Type<typeof CellValue>;
 
 // TODO(burdon): IMPORTANT: Reconcile with Field definition.
-export const Range = S.Struct({
-  range: S.String,
-  key: S.String,
-  value: S.String,
+export const Range = Schema.Struct({
+  range: Schema.String,
+  key: Schema.String,
+  value: Schema.String,
 });
 
-export type Range = S.Schema.Type<typeof Range>;
+export type Range = Schema.Schema.Type<typeof Range>;
 
 // TODO(burdon): Visibility, locked, frozen, etc.
-export const RowColumnMeta = S.Struct({
-  size: S.optional(S.Number),
+export const RowColumnMeta = Schema.Struct({
+  size: Schema.optional(Schema.Number),
 });
 
 // TODO(burdon): Reconcile col/column (across packages).
 // TODO(burdon): Index to all updates when rows/columns are inserted/deleted.
 export class SheetType extends TypedObject({ typename: 'dxos.org/type/Sheet', version: '0.1.0' })({
-  name: S.optional(S.String),
+  name: Schema.optional(Schema.String),
 
   // Sparse map of cells referenced by index.
-  cells: S.mutable(S.Record({ key: S.String, value: S.mutable(CellValue) })),
+  cells: Schema.mutable(Schema.Record({ key: Schema.String, value: Schema.mutable(CellValue) })),
 
   // Ordered row indices.
-  rows: S.mutable(S.Array(S.String)),
+  rows: Schema.mutable(Schema.Array(Schema.String)),
 
   // Ordered column indices.
-  columns: S.mutable(S.Array(S.String)),
+  columns: Schema.mutable(Schema.Array(Schema.String)),
 
   // Row metadata referenced by index.
-  rowMeta: S.mutable(S.Record({ key: S.String, value: S.mutable(RowColumnMeta) })),
+  rowMeta: Schema.mutable(Schema.Record({ key: Schema.String, value: Schema.mutable(RowColumnMeta) })),
 
   // Column metadata referenced by index.
-  columnMeta: S.mutable(S.Record({ key: S.String, value: S.mutable(RowColumnMeta) })),
+  columnMeta: Schema.mutable(Schema.Record({ key: Schema.String, value: Schema.mutable(RowColumnMeta) })),
 
   // Cell formatting referenced by indexed range.
-  ranges: S.mutable(S.Array(Range)),
+  ranges: Schema.mutable(Schema.Array(Range)),
 
   // Threads associated with the sheet
-  threads: S.optional(S.mutable(S.Array(Ref(ThreadType)))),
+  threads: Schema.optional(Schema.mutable(Schema.Array(Ref(ThreadType)))),
 }) {}