@dxos/plugin-sheet 0.8.4-main.c85a9c8dae → 0.8.4-main.d9fc60f731

package/src/integrations/thread-ranges.ts

@@ -2,23 +2,19 @@
 // Copyright 2024 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
 import { useCallback, useEffect, useMemo } from 'react';
 
-import { useOperationInvoker, useOperationResolver } from '@dxos/app-framework/ui';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { LayoutOperation } from '@dxos/app-toolkit';
 import { debounce } from '@dxos/async';
-import { type CellAddress, type CompleteCellRange, inRange } from '@dxos/compute';
-import { Obj, Relation } from '@dxos/echo';
-import { OperationResolver } from '@dxos/operation';
-import { ATTENDABLE_PATH_SEPARATOR, DeckOperation } from '@dxos/plugin-deck/types';
-import { ThreadOperation } from '@dxos/plugin-thread/types';
-import { Filter, Query, useQuery } from '@dxos/react-client/echo';
-import { type DxGridElement, type GridContentProps } from '@dxos/react-ui-grid';
+import { type CellAddress, type CompleteCellRange, inRange } from '@dxos/compute-hyperformula';
+import { Filter, Obj, Query, Relation } from '@dxos/echo';
+import { ThreadOperation } from '@dxos/plugin-thread';
+import { useQuery } from '@dxos/react-client/echo';
+import { linkedSegment } from '@dxos/react-ui-attention';
 import { AnchoredTo, Thread } from '@dxos/types';
 
-import { useSheetContext } from '../components';
-import { meta } from '../meta';
+import { useSheetContext } from '#components';
 
 export const completeCellRangeToThreadCursor = (range: CompleteCellRange): string => {
   return `${range.from.col},${range.from.row},${range.to.col},${range.to.row}`;
@@ -37,33 +33,6 @@ export const parseThreadAnchorAsCellRange = (cursor: string): CompleteCellRange
   }
 };
 
-export const useUpdateFocusedCellOnThreadSelection = (grid: DxGridElement | null) => {
-  const { model, setActiveRefs } = useSheetContext();
-  const sheetId = Obj.getDXN(model.sheet).toString();
-
-  const scrollIntoViewHandler = useMemo(
-    () =>
-      OperationResolver.make({
-        operation: LayoutOperation.ScrollIntoView,
-        position: 'hoist',
-        filter: (input) => input.subject === sheetId && !!input.cursor,
-        handler: (input) =>
-          Effect.sync(() => {
-            const { cursor, ref } = input;
-            if (cursor) {
-              setActiveRefs(ref as GridContentProps['activeRefs']);
-              // TODO(Zan): Everywhere we refer to the cursor in a thread context should change to `anchor`.
-              const range = parseThreadAnchorAsCellRange(cursor);
-              range && grid?.setFocus({ ...range.to, plane: 'grid' }, true);
-            }
-          }),
-      }),
-    [sheetId, setActiveRefs, grid],
-  );
-
-  useOperationResolver(meta.id, scrollIntoViewHandler);
-};
-
 export const useSelectThreadOnCellFocus = () => {
   const { model, cursor } = useSheetContext();
   const { invokePromise } = useOperationInvoker();
@@ -88,11 +57,10 @@ export const useSelectThreadOnCellFocus = () => {
       });
 
       if (closestThread) {
-        const primary = Obj.getDXN(model.sheet).toString();
         void (async () => {
-          await invokePromise(ThreadOperation.Select, { current: Relation.getDXN(closestThread).toString() });
-          await invokePromise(DeckOperation.ChangeCompanion, {
-            companion: `${primary}${ATTENDABLE_PATH_SEPARATOR}comments`,
+          await invokePromise(ThreadOperation.Select, { current: Relation.getURI(closestThread) });
+          await invokePromise(LayoutOperation.UpdateCompanion, {
+            subject: linkedSegment('comments'),
           });
         })();
       }

package/src/meta.ts

@@ -2,18 +2,30 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { DXN } from '@dxos/keys';
 import { trim } from '@dxos/util';
 
-export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/sheet',
+export const meta = Plugin.makeMeta({
+  key: DXN.make('org.dxos.plugin.sheet'),
   name: 'Sheet',
+  author: 'DXOS',
   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.
+    Full-featured spreadsheet for DXOS Composer backed by ECHO for local-first, real-time collaborative editing.
+    Cells, row/column metadata, and range-based formatting are all stored as ECHO objects and replicated to peers instantly.
+
+    Formula evaluation is powered by HyperFormula, providing over 400 built-in functions covering arithmetic, statistics,
+    text manipulation, date/time, financial, and logical operations. Formulas are stored with internal cell indices and
+    translated to A1-notation on display, keeping references stable across row and column insertions.
+
+    The plugin integrates with plugin-markdown to expose formula results inside document fenced code blocks, and
+    contributes anchor-navigation support so other plugins can scroll and highlight specific cell ranges by DXN reference.
+    AI agents can invoke sheet operations — insert/drop axes, scroll to anchor, and read or write cell values — through
+    the standard operations framework.
   `,
   icon: 'ph--grid-nine--regular',
   iconHue: 'indigo',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-sheet',
+  spec: 'PLUGIN.mdl',
   screenshots: ['https://dxos.network/plugin-details-sheet-dark.png'],
-};
+});

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

@@ -5,12 +5,12 @@
 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 { Function } from '@dxos/functions';
+import { Operation } from '@dxos/compute';
+import { type CellScalarValue, addressFromA1Notation, isFormula } from '@dxos/compute-hyperformula';
+import { TestBuilder, testFunctionPlugins } from '@dxos/compute-hyperformula/testing';
 import { log } from '@dxos/log';
 
-import { Sheet, mapFormulaIndicesToRefs, mapFormulaRefsToIndices } from '../types';
+import { Sheet, mapFormulaIndicesToRefs, mapFormulaRefsToIndices } from '#types';
 
 import { SheetModel } from './sheet-model';
 import { createTestGrid } from './testing';
@@ -18,7 +18,7 @@ import { createTestGrid } from './testing';
 describe('SheetModel', () => {
   let testBuilder: TestBuilder;
   beforeEach(async () => {
-    testBuilder = new TestBuilder({ types: [Function.Function], plugins: testFunctionPlugins });
+    testBuilder = new TestBuilder({ types: [Operation.PersistentOperation], plugins: testFunctionPlugins });
     await testBuilder.open();
   });
   afterEach(async () => {

package/src/model/sheet-model.ts

@@ -20,11 +20,11 @@ import {
   addressToA1Notation,
   createSheetName,
   isFormula,
-} from '@dxos/compute';
+} from '@dxos/compute-hyperformula';
 import { Resource } from '@dxos/context';
 import { Obj } from '@dxos/echo';
 import { Format, TypeEnum } from '@dxos/echo/internal';
-import { invariant } from '@dxos/invariant';
+import { assertArgument, invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 
@@ -38,8 +38,8 @@ import {
   insertIndices,
   mapFormulaIndicesToRefs,
   mapFormulaRefsToIndices,
-} from '../types';
-import { type Sheet, type SheetAction } from '../types';
+} from '#types';
+import { type Sheet, type SheetAction } from '#types';
 
 // TODO(burdon): Move to compute.
 // Map sheet types to system types.
@@ -122,7 +122,7 @@ export class SheetModel extends Resource {
    */
   protected override async _open(): Promise<void> {
     log('initialize', { id: this.id });
-    Obj.change(this._sheet, (obj) => {
+    Obj.update(this._sheet, (obj) => {
       initialize(obj);
     });
 
@@ -184,7 +184,7 @@ export class SheetModel extends Resource {
 
   insertRows(i: number, n = 1): string[] {
     let idx: string[] = [];
-    Obj.change(this._sheet, (obj) => {
+    Obj.update(this._sheet, (obj) => {
       idx = insertIndices(obj.rows, i, n, MAX_ROWS);
     });
     this.reset();
@@ -193,7 +193,7 @@ export class SheetModel extends Resource {
 
   insertColumns(i: number, n = 1): string[] {
     let idx: string[] = [];
-    Obj.change(this._sheet, (obj) => {
+    Obj.update(this._sheet, (obj) => {
       idx = insertIndices(obj.columns, i, n, MAX_COLS);
     });
     this.reset();
@@ -208,7 +208,7 @@ export class SheetModel extends Resource {
     const values = this.getCellValues(range).flat();
     const index = this._sheet.rows.indexOf(rowIndex);
     this.clear(range);
-    Obj.change(this._sheet, (obj) => {
+    Obj.update(this._sheet, (obj) => {
       obj.rows.splice(index, 1);
       delete obj.rowMeta[rowIndex];
     });
@@ -224,7 +224,7 @@ export class SheetModel extends Resource {
     const values = this.getCellValues(range).flat();
     const index = this._sheet.columns.indexOf(colIndex);
     this.clear(range);
-    Obj.change(this._sheet, (obj) => {
+    Obj.update(this._sheet, (obj) => {
       obj.columns.splice(index, 1);
       delete obj.columnMeta[colIndex];
     });
@@ -233,7 +233,7 @@ export class SheetModel extends Resource {
   }
 
   restoreRow({ index, axisIndex, axisMeta, values }: SheetAction.RestoreAxis): void {
-    Obj.change(this._sheet, (obj) => {
+    Obj.update(this._sheet, (obj) => {
       obj.rows.splice(index, 0, axisIndex);
       values.forEach((value, col) => {
         if (value) {
@@ -249,7 +249,7 @@ export class SheetModel extends Resource {
   }
 
   restoreColumn({ index, axisIndex, axisMeta, values }: SheetAction.RestoreAxis): void {
-    Obj.change(this._sheet, (obj) => {
+    Obj.update(this._sheet, (obj) => {
       obj.columns.splice(index, 0, axisIndex);
       values.forEach((value, row) => {
         if (value) {
@@ -277,7 +277,7 @@ export class SheetModel extends Resource {
     const topLeft = getTopLeft(range);
     const values = this._iterRange(range, () => null);
     this._node.graph.hf.setCellContents(toSimpleCellAddress(this._node.sheetId, topLeft), values);
-    Obj.change(this._sheet, (obj) => {
+    Obj.update(this._sheet, (obj) => {
       this._iterRange(range, (cell) => {
         const idx = addressToIndex(this._sheet, cell);
         delete obj.cells[idx];
@@ -288,7 +288,7 @@ export class SheetModel extends Resource {
   cut(range: CellRange): void {
     invariant(this._node);
     this._node.graph.hf.cut(toModelRange(this._node.sheetId, range));
-    Obj.change(this._sheet, (obj) => {
+    Obj.update(this._sheet, (obj) => {
       this._iterRange(range, (cell) => {
         const idx = addressToIndex(this._sheet, cell);
         delete obj.cells[idx];
@@ -305,7 +305,7 @@ export class SheetModel extends Resource {
     invariant(this._node);
     if (!this._node.graph.hf.isClipboardEmpty()) {
       const changes = this._node.graph.hf.paste(toSimpleCellAddress(this._node.sheetId, cell));
-      Obj.change(this._sheet, (obj) => {
+      Obj.update(this._sheet, (obj) => {
         for (const change of changes) {
           if (change instanceof ExportedCellChange) {
             const { address, newValue } = change;
@@ -404,13 +404,13 @@ export class SheetModel extends Resource {
     // Reallocate if > current bounds.
     let refresh = false;
     if (cell.row >= this._sheet.rows.length) {
-      Obj.change(this._sheet, (obj) => {
+      Obj.update(this._sheet, (obj) => {
         insertIndices(obj.rows, cell.row, 1, MAX_ROWS);
       });
       refresh = true;
     }
     if (cell.col >= this._sheet.columns.length) {
-      Obj.change(this._sheet, (obj) => {
+      Obj.update(this._sheet, (obj) => {
         insertIndices(obj.columns, cell.col, 1, MAX_COLS);
       });
       refresh = true;
@@ -429,7 +429,7 @@ export class SheetModel extends Resource {
     // Insert into sheet.
     const idx = addressToIndex(this._sheet, cell);
     if (value === undefined || value === null) {
-      Obj.change(this._sheet, (obj) => {
+      Obj.update(this._sheet, (obj) => {
         delete obj.cells[idx];
       });
     } else {
@@ -437,7 +437,7 @@ export class SheetModel extends Resource {
         value = this._graph.mapFunctionBindingToId(mapFormulaRefsToIndices(this._sheet, value));
       }
 
-      Obj.change(this._sheet, (obj) => {
+      Obj.update(this._sheet, (obj) => {
         obj.cells[idx] = { value };
       });
     }
@@ -489,7 +489,7 @@ export class SheetModel extends Resource {
    * Map from indices to A1 notation.
    */
   mapFormulaIndicesToRefs(formula: string): string {
-    invariant(isFormula(formula));
+    assertArgument(isFormula(formula), 'formula');
     return formula.replace(/([a-zA-Z0-9]+)@([a-zA-Z0-9]+)/g, (idx) => {
       return addressToA1Notation(addressFromIndex(this._sheet, idx));
     });

package/src/model/testing.ts

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { addressToA1Notation } from '@dxos/compute';
+import { addressToA1Notation } from '@dxos/compute-hyperformula';
 
-import { Sheet } from '../types';
+import { Sheet } from '#types';
 
 // TODO(burdon): Create testing endpoint.
 // TODO(burdon): Move to react-ui-sheet.

package/src/model/useSheetModel.ts

@@ -4,10 +4,11 @@
 
 import { useEffect, useState } from 'react';
 
-import { type ComputeGraph } from '@dxos/compute';
+import { type ComputeGraph } from '@dxos/compute-hyperformula';
+
+import { type Sheet } from '#types';
 
 import { SheetModel } from '../model';
-import { type Sheet } from '../types';
 
 export type UseSheetModelOptions = {
   readonly?: boolean;

package/src/operations/drop-axis.ts

@@ -0,0 +1,26 @@
+//
+
+import * as Effect from 'effect/Effect';
+// Copyright 2025 DXOS.org
+//
+
+import { Operation } from '@dxos/compute';
+
+import { SheetOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof SheetOperation.DropAxis> = SheetOperation.DropAxis.pipe(
+  Operation.withHandler(({ model, axis, axisIndex }) =>
+    Effect.sync(() => {
+      const undoData = model[axis === 'col' ? 'dropColumn' : 'dropRow'](axisIndex);
+      return {
+        axis: undoData.axis,
+        axisIndex: undoData.axisIndex,
+        index: undoData.index,
+        axisMeta: undoData.axisMeta,
+        values: undoData.values,
+      };
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/index.ts

@@ -0,0 +1,12 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { OperationHandlerSet } from '@dxos/compute';
+
+export const SheetOperationHandlerSet = OperationHandlerSet.lazy(
+  () => import('./drop-axis'),
+  () => import('./insert-axis'),
+  () => import('./restore-axis'),
+  () => import('./scroll-to-anchor'),
+);

package/src/operations/insert-axis.ts

@@ -0,0 +1,19 @@
+//
+
+import * as Effect from 'effect/Effect';
+// Copyright 2025 DXOS.org
+//
+
+import { Operation } from '@dxos/compute';
+
+import { SheetOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof SheetOperation.InsertAxis> = SheetOperation.InsertAxis.pipe(
+  Operation.withHandler(({ model, axis, index, count }) =>
+    Effect.sync(() => {
+      model[axis === 'col' ? 'insertColumns' : 'insertRows'](index, count);
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/restore-axis.ts

@@ -0,0 +1,19 @@
+//
+
+import * as Effect from 'effect/Effect';
+// Copyright 2025 DXOS.org
+//
+
+import { Operation } from '@dxos/compute';
+
+import { SheetOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof SheetOperation.RestoreAxis> = SheetOperation.RestoreAxis.pipe(
+  Operation.withHandler(({ model, axis, ...restoreData }) =>
+    Effect.sync(() => {
+      model[axis === 'col' ? 'restoreColumn' : 'restoreRow'](restoreData);
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/scroll-to-anchor.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+
+import { parseThreadAnchorAsCellRange } from '../integrations/thread-ranges';
+import { SheetCapabilities, SheetOperation } from '../types';
+
+const handler: Operation.WithHandler<typeof SheetOperation.ScrollToAnchor> = SheetOperation.ScrollToAnchor.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ subject, cursor, ref }) {
+      const gridInstances = yield* Capability.get(SheetCapabilities.GridInstances);
+      const entry = gridInstances.get(subject);
+      if (!entry) {
+        return;
+      }
+      entry.setActiveRefs(ref);
+      const range = parseThreadAnchorAsCellRange(cursor);
+      if (range) {
+        entry.grid.setFocus({ ...range.to, plane: 'grid' }, true);
+      }
+    }),
+  ),
+);
+
+export default handler;

package/src/playwright/sheet.spec.ts

@@ -4,7 +4,7 @@
 
 import { type Page, expect, test } from '@playwright/test';
 
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { setupPage, storybookUrl } from '@dxos/test-utils/playwright';
 
 import { SheetManager } from './sheet-manager';
@@ -15,7 +15,7 @@ test.describe('plugin-sheet', () => {
 
   test.beforeEach(async ({ browser }) => {
     const setup = await setupPage(browser, {
-      url: storybookUrl('plugins-plugin-sheet-containers-sheetcontainer--spec', 9005),
+      url: storybookUrl('plugins-plugin-sheet-containers-sheetarticle--spec', 9005),
       viewportSize: { width: 1280, height: 720 },
     });
     page = setup.page;
@@ -39,7 +39,7 @@ test.describe('plugin-sheet', () => {
     // Confirm editor displays
     await expect(sheet.cellEditor()).toBeVisible();
     // Type in a value and press enter
-    const testString = faker.string.uuid();
+    const testString = random.string.uuid();
     await sheet.setFocusedCellValue(testString, 'Enter');
     // Expect that value to now show in the grid
     await expect(sheet.cellByText(testString)).toBeVisible();

package/src/plugin.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const SheetPlugin = Plugin.lazy(meta, () => import('#plugin'));
+
+export { SheetOperationHandlerSet } from './operations';

package/src/sanity.test.ts

@@ -5,7 +5,8 @@
 import { describe, expect, test } from 'vitest';
 
 import { Client } from '@dxos/client';
-import { Function } from '@dxos/functions';
+import { Operation } from '@dxos/compute';
+import { Obj } from '@dxos/echo';
 
 // Part 2.
 // TODO(burdon): Cannot test outside of browser.
@@ -22,7 +23,7 @@ import { Function } from '@dxos/functions';
 describe('test', () => {
   test('test', async () => {
     const client = new Client();
-    await client.addTypes([Function.Function]);
+    await client.addTypes([Operation.PersistentOperation]);
     await client.initialize();
     await client.halo.createIdentity();
 
@@ -33,7 +34,13 @@ describe('test', () => {
     //  - ERROR "process.nextTick is not a function"
     //  - ERROR "Identifier 'Buffer' has already been declared" if { nodeExternal: true }
     const space = await client.spaces.create();
-    const fn = space.db.add(Function.make({ name: 'test', version: '0.0.1', binding: 'HELLO' }));
+    const fn = space.db.add(
+      Obj.make(Operation.PersistentOperation, {
+        [Obj.Meta]: { key: 'com.example.function.test', version: '0.0.1' },
+        name: 'test',
+        binding: 'HELLO',
+      }),
+    );
     expect(fn).to.exist;
   });
 });

package/src/serializer.ts

@@ -4,9 +4,9 @@
 
 import { Obj } from '@dxos/echo';
 import { getObjectCore } from '@dxos/echo-db';
-import { type TypedObjectSerializer } from '@dxos/plugin-space/types';
+import { type TypedObjectSerializer } from '@dxos/plugin-space';
 
-import { Sheet } from './types';
+import { Sheet } from '#types';
 
 export const serializer: TypedObjectSerializer<Sheet.Sheet> = {
   serialize: async ({ object }): Promise<string> => {

package/src/testing/data.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import type { Sheet } from '../types';
+import type { Sheet } from '#types';
 
 export const createTestCells = (testSheetName = 'test'): Record<string, Sheet.CellValue> => ({
   B1: { value: 'Qty2' },

package/src/testing/testing.tsx

@@ -5,13 +5,13 @@
 import { type Decorator } from '@storybook/react';
 import React, { useState } from 'react';
 
-import { type ComputeGraph, type ComputeGraphOptions, ComputeGraphRegistry } from '@dxos/compute';
-import { createMockedComputeRuntimeProvider } from '@dxos/compute/testing';
+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 { Sheet } from '../types';
+import { ComputeGraphContextProvider } from '#components';
+import { Sheet } from '#types';
 
 export const useTestSheet = (space?: Space, graph?: ComputeGraph, options?: Sheet.SheetProps) => {
   const [sheet] = useAsyncState(async () => {

package/src/translations.ts

@@ -2,51 +2,57 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Type } from '@dxos/echo';
 import { type Resource } from '@dxos/react-ui';
 
-import { meta } from './meta';
-import { Sheet } from './types';
+import { meta } from '#meta';
+import { Sheet } from '#types';
 
 export const translations = [
   {
     'en-US': {
-      [Sheet.Sheet.typename]: {
-        'typename label': 'Sheet',
-        'typename label_zero': 'Sheets',
-        'typename label_one': 'Sheet',
-        'typename label_other': 'Sheets',
-        'object name placeholder': 'New sheet',
-        'rename object label': 'Rename sheet',
-        'delete object label': 'Delete sheet',
-        'object deleted label': 'Sheet deleted',
+      [Type.getTypename(Sheet.Sheet)]: {
+        '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',
       },
       [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',
-        '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',
+        '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?
       },
     },
   },