@dxos/plugin-sheet 0.8.3 → 0.8.4-main.1c7ec43d41

package/src/testing/testing.tsx

@@ -5,20 +5,21 @@
 import { type Decorator } from '@storybook/react';
 import React, { useState } from 'react';
 
-import { type ComputeGraph, type ComputeGraphOptions, ComputeGraphRegistry } from '@dxos/compute';
+import { type ComputeGraph, type ComputeGraphOptions, ComputeGraphRegistry } from '@dxos/compute-hyperformula';
+import { createMockedComputeRuntimeProvider } from '@dxos/compute-hyperformula/testing';
 import { type Space } from '@dxos/react-client/echo';
 import { useAsyncState } from '@dxos/react-hooks';
 
-import { ComputeGraphContextProvider } from '../components';
-import { createSheet, type CreateSheetOptions } from '../types';
+import { ComputeGraphContextProvider } from '#components';
+import { Sheet } from '#types';
 
-export const useTestSheet = (space?: Space, graph?: ComputeGraph, options?: CreateSheetOptions) => {
+export const useTestSheet = (space?: Space, graph?: ComputeGraph, options?: Sheet.SheetProps) => {
   const [sheet] = useAsyncState(async () => {
     if (!space || !graph) {
       return;
     }
 
-    const sheet = createSheet(options);
+    const sheet = Sheet.make(options);
     space.db.add(sheet);
     return sheet;
   }, [space, graph]);
@@ -26,9 +27,14 @@ export const useTestSheet = (space?: Space, graph?: ComputeGraph, options?: Crea
 };
 
 export const withComputeGraphDecorator =
-  (options?: ComputeGraphOptions): Decorator =>
+  (options?: Partial<ComputeGraphOptions>): Decorator =>
   (Story) => {
-    const [registry] = useState(new ComputeGraphRegistry(options));
+    const [registry] = useState(
+      new ComputeGraphRegistry({
+        ...options,
+        computeRuntime: options?.computeRuntime ?? createMockedComputeRuntimeProvider(),
+      }),
+    );
     return (
       <ComputeGraphContextProvider registry={registry}>
         <Story />

package/src/translations.ts

@@ -2,49 +2,57 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Type } from '@dxos/echo';
+import { type Resource } from '@dxos/react-ui';
 
-import { SHEET_PLUGIN } from './meta';
-import { SheetType } from './types';
+import { meta } from '#meta';
+import { Sheet } from '#types';
 
-export default [
+export const translations = [
   {
     'en-US': {
-      [Type.getTypename(SheetType)]: {
-        'typename label': 'Sheet',
-        'typename label_zero': 'Sheets',
-        'typename label_one': 'Sheet',
-        'typename label_other': 'Sheets',
-        'object name placeholder': 'New sheet',
+      [Sheet.Sheet.typename]: {
+        'typename.label': 'Sheet',
+        'typename.label_zero': 'Sheets',
+        'typename.label_one': 'Sheet',
+        'typename.label_other': 'Sheets',
+        'object-name.placeholder': 'New sheet',
+        'add-object.label': 'Add sheet',
+        'rename-object.label': 'Rename sheet',
+        'delete-object.label': 'Delete sheet',
+        'object-deleted.label': 'Sheet deleted',
       },
-      [SHEET_PLUGIN]: {
-        'plugin name': 'Sheets',
-        'cell placeholder': 'Cell value...',
-        'range key alignment label': 'Align',
-        'range key style label': 'Style',
-        'range value start label': 'Align left',
-        'range value center label': 'Align center',
-        'range value end label': 'Align right',
-        'range value softwrap label': 'Wrap text',
-        'range value highlight label': 'Highlight',
-        'toolbar action label': '{{value}}',
-        'selection overlaps existing comment label': 'Selected cell already has a comment',
-        'comment label': 'Add comment',
-        'comment ranges not supported label': 'Commenting on ranges is not yet supported',
-        'no cursor label': 'Select a cell to comment',
-        'open comment for sheet cell': 'View comments for cell',
-        'add col before label': 'Add column before',
-        'add col after label': 'Add column after',
-        'delete col label': 'Delete column',
-        'add row before label': 'Add row before',
-        'add row after label': 'Add row after',
-        'delete row label': 'Delete row',
-        'range list heading': 'Ranges',
-        'no ranges message': 'No ranges',
-        'range title': '{{position}} — {{value}}',
-        'col dropped label': 'Deleted a column',
-        'row dropped label': 'Deleted a row',
+      [meta.id]: {
+        'plugin.name': 'Sheets',
+        'cell.placeholder': 'Cell value...',
+
+        'range-key.alignment.label': 'Align',
+        'range-key.style.label': 'Style',
+
+        'range-value.start.label': 'Align left',
+        'range-value.center.label': 'Align center',
+        'range-value.end.label': 'Align right',
+        'range-value.softwrap.label': 'Wrap text',
+        'range-value.highlight.label': 'Highlight',
+
+        'toolbar-action.label': '{{value}}',
+        'selection-overlaps-existing-comment.label': 'Selected cell already has a comment',
+        'comment.label': 'Add comment',
+        'comment-ranges-not-supported.label': 'Commenting on ranges is not yet supported',
+        'no-cursor.label': 'Select a cell to comment',
+        'add-col-before.label': 'Add column before',
+        'add-col-after.label': 'Add column after',
+        'delete-col.label': 'Delete column',
+        'add-row-before.label': 'Add row before',
+        'add-row-after.label': 'Add row after',
+        'delete-row.label': 'Delete row',
+        'range-list.heading': 'Ranges',
+        'no-ranges.message': 'No ranges',
+        'range.title': '{{position}} — {{value}}',
+        'col-dropped.label': 'Deleted a column',
+        'row-dropped.label': 'Deleted a row',
+        'align.label': 'Text align',
+        'axis-dropped.label': 'Drop axis', // TODO(burdon): What does this mean?
       },
     },
   },
-] as const;
+] as const satisfies Resource[];

package/src/types/Sheet.ts

@@ -0,0 +1,103 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+// @import-as-namespace
+
+import * as Schema from 'effect/Schema';
+
+import { addressFromA1Notation, isFormula } from '@dxos/compute-hyperformula';
+import { Annotation, Obj, Type } from '@dxos/echo';
+import { FormInputAnnotation } from '@dxos/echo/internal';
+
+import { addressToIndex, initialize, mapFormulaRefsToIndices } from './util';
+
+export type SheetSize = {
+  rows: number;
+  columns: number;
+};
+
+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: Schema.Any,
+});
+
+export type CellValue = Schema.Schema.Type<typeof CellValue>;
+
+// TODO(burdon): IMPORTANT: Reconcile with Field definition.
+export const Range = Schema.Struct({
+  range: Schema.String,
+  key: Schema.String,
+  value: Schema.String,
+});
+
+export type Range = Schema.Schema.Type<typeof Range>;
+
+// TODO(burdon): Visibility, locked, frozen, etc.
+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 const Sheet = Schema.Struct({
+  name: Schema.optional(Schema.String),
+
+  // Sparse map of cells referenced by index.
+  cells: Schema.Record({ key: Schema.String, value: CellValue }).pipe(FormInputAnnotation.set(false)),
+
+  // Ordered row indices.
+  rows: Schema.Array(Schema.String).pipe(FormInputAnnotation.set(false)),
+
+  // Ordered column indices.
+  columns: Schema.Array(Schema.String).pipe(FormInputAnnotation.set(false)),
+
+  // Row metadata referenced by index.
+  rowMeta: Schema.Record({ key: Schema.String, value: RowColumnMeta }).pipe(FormInputAnnotation.set(false)),
+
+  // Column metadata referenced by index.
+  columnMeta: Schema.Record({ key: Schema.String, value: RowColumnMeta }).pipe(FormInputAnnotation.set(false)),
+
+  // Cell formatting referenced by indexed range.
+  ranges: Schema.Array(Range).pipe(FormInputAnnotation.set(false)),
+}).pipe(
+  Type.object({
+    typename: 'org.dxos.type.sheet',
+    version: '0.1.0',
+  }),
+  Annotation.IconAnnotation.set({
+    icon: 'ph--grid-nine--regular',
+    hue: 'indigo',
+  }),
+);
+
+export interface Sheet extends Schema.Schema.Type<typeof Sheet> {}
+
+export type SheetProps = {
+  name?: string;
+  cells?: Record<string, CellValue>;
+} & Partial<SheetSize>;
+
+export const make = ({ name, cells = {}, ...size }: SheetProps = {}) => {
+  const sheet = Obj.make(Sheet, { name, cells: {}, rows: [], columns: [], rowMeta: {}, columnMeta: {}, ranges: [] });
+
+  // Initialize and set cells within Obj.update to satisfy change context requirements.
+  Obj.update(sheet, (sheet) => {
+    initialize(sheet, size);
+
+    if (cells) {
+      Object.entries(cells).forEach(([key, { value }]) => {
+        const idx = addressToIndex(sheet, addressFromA1Notation(key));
+        if (isFormula(value)) {
+          value = mapFormulaRefsToIndices(sheet, value);
+        }
+
+        sheet.cells[idx] = { value };
+      });
+    }
+  });
+
+  return sheet;
+};

package/src/types/capabilities.ts

@@ -0,0 +1,26 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+import { type ComputeGraphRegistry } from '@dxos/compute-hyperformula';
+import { type DxGridElement, type GridContentProps } from '@dxos/react-ui-grid';
+
+import { meta } from '#meta';
+
+export type GridEntry = { grid: DxGridElement; setActiveRefs: (refs: GridContentProps['activeRefs']) => void };
+
+export type GridRegistry = {
+  register: (attendableId: string, grid: DxGridElement, setActiveRefs: GridEntry['setActiveRefs']) => void;
+  unregister: (attendableId: string) => void;
+  get: (attendableId: string) => GridEntry | undefined;
+};
+
+export namespace SheetCapabilities {
+  export const ComputeGraphRegistry = Capability.make<ComputeGraphRegistry>(
+    `${meta.id}.capability.compute-graph-registry`,
+  );
+
+  /** Registry of active grid instances keyed by attendable ID. */
+  export const GridInstances = Capability.make<GridRegistry>(`${meta.id}.capability.grid-instances`);
+}

package/src/types/index.ts

@@ -2,7 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './schema';
+export * from './capabilities';
+export * as Sheet from './Sheet';
 export * from './sheet-range-types';
 export * from './types';
 export * from './util';

package/src/types/sheet-range-types.ts

@@ -4,7 +4,7 @@
 
 import { type ClassNameValue } from '@dxos/react-ui';
 
-import { type SheetType } from '../types';
+import { type Sheet } from '../types';
 
 export const alignKey = 'alignment';
 export type AlignKey = typeof alignKey;
@@ -19,7 +19,7 @@ export type StyleKey = typeof styleKey;
 export type StyleValue = 'highlight' | 'softwrap';
 
 // TODO(burdon): Reconcile with plugin-table.
-export const cellClassNameForRange = ({ key, value }: SheetType['ranges'][number]): ClassNameValue => {
+export const cellClassNameForRange = ({ key, value }: Sheet.Sheet['ranges'][number]): ClassNameValue => {
   switch (key) {
     case alignKey:
       switch (value) {
@@ -34,14 +34,14 @@ export const cellClassNameForRange = ({ key, value }: SheetType['ranges'][number
       }
 
     case commentKey:
-      return 'bg-gridComment';
+      return 'bg-grid-comment';
 
     case styleKey:
       switch (value) {
         case 'highlight':
-          return '!bg-gridHighlight';
+          return 'bg-grid-highlight!';
         case 'softwrap':
-          return '!whitespace-normal';
+          return 'whitespace-normal!';
         default:
           return undefined;
       }

package/src/types/types.ts

@@ -2,66 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { type CellValue, RowColumnMeta, SheetType } from './schema';
-import { SHEET_PLUGIN } from '../meta';
-import { SheetModel } from '../model';
+import * as Sheet from './Sheet';
 
-export type SheetSize = {
-  rows: number;
-  columns: number;
-};
-
-export type CreateSheetOptions = {
-  name?: string;
-  cells?: Record<string, CellValue>;
-} & Partial<SheetSize>;
+// TODO(wittjosiah): Factor out. This is `DxGridAxis` from `@dxos/react-ui-grid`.
+const ActionAxis = Schema.Union(Schema.Literal('row'), Schema.Literal('col'));
 
 export namespace SheetAction {
-  const SHEET_ACTION = `${SHEET_PLUGIN}/action`;
-
-  export class Create extends Schema.TaggedClass<Create>()(`${SHEET_ACTION}/create`, {
-    input: Schema.Struct({
-      name: Schema.optional(Schema.String),
-    }),
-    output: Schema.Struct({
-      object: SheetType,
-    }),
-  }) {}
-
-  // TODO(wittjosiah): Factor out. This is `DxGridAxis` from `@dxos/react-ui-grid`.
-  const Axis = Schema.Union(Schema.Literal('row'), Schema.Literal('col'));
-
-  export class InsertAxis extends Schema.TaggedClass<InsertAxis>()(`${SHEET_ACTION}/axis-insert`, {
-    input: Schema.Struct({
-      // TODO(wittjosiah): Schema.instanceOf(SheetModel) throws when running tests.
-      model: Schema.Any.pipe(Schema.filter((model) => model instanceof SheetModel)) as Schema.Schema<SheetModel>,
-      axis: Axis,
-      index: Schema.Number,
-      count: Schema.optional(Schema.Number),
-    }),
-    output: Schema.Void,
-  }) {}
-
   export const RestoreAxis = Schema.Struct({
-    axis: Axis,
+    axis: ActionAxis,
     axisIndex: Schema.String,
     index: Schema.Number,
-    axisMeta: RowColumnMeta,
+    axisMeta: Sheet.RowColumnMeta,
     values: Schema.Array(Schema.Any),
   });
 
   export type RestoreAxis = Schema.Schema.Type<typeof RestoreAxis>;
-
-  export class DropAxis extends Schema.TaggedClass<DropAxis>()(`${SHEET_ACTION}/axis-drop`, {
-    input: Schema.Struct({
-      // TODO(wittjosiah): Schema.instanceOf(SheetModel) throws when running tests.
-      model: Schema.Any.pipe(Schema.filter((model) => model instanceof SheetModel)) as Schema.Schema<SheetModel>,
-      axis: Axis,
-      axisIndex: Schema.String,
-      deletionData: Schema.optional(RestoreAxis),
-    }),
-    output: Schema.Void,
-  }) {}
 }

package/src/types/util.ts

@@ -3,18 +3,18 @@
 //
 
 import {
-  addressFromA1Notation,
-  addressToA1Notation,
-  isFormula,
   type CellAddress,
   type CellRange,
   type CompleteCellRange,
-} from '@dxos/compute';
+  addressFromA1Notation,
+  addressToA1Notation,
+  isFormula,
+} from '@dxos/compute-hyperformula';
 import { randomBytes } from '@dxos/crypto';
-import { Obj } from '@dxos/echo';
+import { type Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 
-import { type CreateSheetOptions, type SheetSize, SheetType } from '../types';
+import { type Sheet } from '../types';
 
 export const MAX_ROWS = 500;
 export const MAX_COLS = 676; // 26^2;
@@ -56,8 +56,8 @@ export const insertIndices = (indices: string[], i: number, n: number, max: numb
 };
 
 export const initialize = (
-  sheet: SheetType,
-  { rows = DEFAULT_ROWS, columns = DEFAULT_COLS }: Partial<SheetSize> = {},
+  sheet: Obj.Mutable<Sheet.Sheet>,
+  { rows = DEFAULT_ROWS, columns = DEFAULT_COLS }: Partial<Sheet.SheetSize> = {},
 ) => {
   if (!sheet.rows.length) {
     insertIndices(sheet.rows, 0, rows, MAX_ROWS);
@@ -67,44 +67,17 @@ export const initialize = (
   }
 };
 
-export const createSheet = ({ name, cells, ...size }: CreateSheetOptions = {}): SheetType => {
-  const sheet = Obj.make(SheetType, {
-    name,
-    cells: {},
-    rows: [],
-    columns: [],
-    rowMeta: {},
-    columnMeta: {},
-    ranges: [],
-  });
-
-  initialize(sheet, size);
-
-  if (cells) {
-    Object.entries(cells).forEach(([key, { value }]) => {
-      const idx = addressToIndex(sheet, addressFromA1Notation(key));
-      if (isFormula(value)) {
-        value = mapFormulaRefsToIndices(sheet, value);
-      }
-
-      sheet.cells[idx] = { value };
-    });
-  }
-
-  return sheet;
-};
-
 /**
  * E.g., "A1" => "CA2@CB3".
  */
-export const addressToIndex = (sheet: SheetType, cell: CellAddress): string => {
+export const addressToIndex = (sheet: Sheet.Sheet, cell: CellAddress): string => {
   return `${sheet.columns[cell.col]}@${sheet.rows[cell.row]}`;
 };
 
 /**
  * E.g., "CA2@CB3" => "A1".
  */
-export const addressFromIndex = (sheet: SheetType, idx: string): CellAddress => {
+export const addressFromIndex = (sheet: Sheet.Sheet, idx: string): CellAddress => {
   const [column, row] = idx.split('@');
   return {
     col: sheet.columns.indexOf(column),
@@ -115,14 +88,14 @@ export const addressFromIndex = (sheet: SheetType, idx: string): CellAddress =>
 /**
  * E.g., "A1:B2" => "CA2@CB3:CC4@CD5".
  */
-export const rangeToIndex = (sheet: SheetType, range: CellRange): string => {
+export const rangeToIndex = (sheet: Sheet.Sheet, range: CellRange): string => {
   return [range.from, range.to ?? range.from].map((cell) => addressToIndex(sheet, cell)).join(':');
 };
 
 /**
  * E.g., "CA2@CB3:CC4@CD5" => "A1:B2".
  */
-export const rangeFromIndex = (sheet: SheetType, idx: string): CompleteCellRange => {
+export const rangeFromIndex = (sheet: Sheet.Sheet, idx: string): CompleteCellRange => {
   const [from, to] = idx.split(':').map((index) => addressFromIndex(sheet, index));
   return { from, to };
 };
@@ -131,7 +104,7 @@ export const rangeFromIndex = (sheet: SheetType, idx: string): CompleteCellRange
  * Compares the positions of two cell indexes in a sheet.
  * Sorts primarily by row, then by column if rows are equal.
  */
-export const compareIndexPositions = (sheet: SheetType, indexA: string, indexB: string): number => {
+export const compareIndexPositions = (sheet: Sheet.Sheet, indexA: string, indexB: string): number => {
   const { row: rowA, col: columnA } = addressFromIndex(sheet, indexA);
   const { row: rowB, col: columnB } = addressFromIndex(sheet, indexB);
 
@@ -148,7 +121,7 @@ export const compareIndexPositions = (sheet: SheetType, indexA: string, indexB:
 /**
  * Map from A1 notation to indices.
  */
-export const mapFormulaRefsToIndices = (sheet: SheetType, formula: string): string => {
+export const mapFormulaRefsToIndices = (sheet: Sheet.Sheet, formula: string): string => {
   invariant(isFormula(formula));
   return formula.replace(/([a-zA-Z]+)([0-9]+)/g, (match) => {
     return addressToIndex(sheet, addressFromA1Notation(match));
@@ -158,7 +131,7 @@ export const mapFormulaRefsToIndices = (sheet: SheetType, formula: string): stri
 /**
  * Map from indices to A1 notation.
  */
-export const mapFormulaIndicesToRefs = (sheet: SheetType, formula: string): string => {
+export const mapFormulaIndicesToRefs = (sheet: Sheet.Sheet, formula: string): string => {
   invariant(isFormula(formula));
   return formula.replace(/([a-zA-Z0-9]+)@([a-zA-Z0-9]+)/g, (idx) => {
     return addressToA1Notation(addressFromIndex(sheet, idx));