@dxos/plugin-sheet 0.8.1 → 0.8.2-main.2f9c567

package/dist/types/src/types/types.d.ts

@@ -1,4 +1,4 @@
-import { S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
 import { type CellValue, SheetType } from './schema';
 import { SheetModel } from '../model';
 export type SheetSize = {
@@ -10,59 +10,59 @@ export type CreateSheetOptions = {
     cells?: Record<string, CellValue>;
 } & Partial<SheetSize>;
 export declare namespace SheetAction {
-    const Create_base: S.TaggedClass<Create, "dxos.org/plugin/sheet/action/create", {
-        readonly _tag: S.tag<"dxos.org/plugin/sheet/action/create">;
+    const Create_base: Schema.TaggedClass<Create, "dxos.org/plugin/sheet/action/create", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/sheet/action/create">;
     } & {
-        input: S.Struct<{
-            name: S.optional<typeof S.String>;
+        input: Schema.Struct<{
+            name: Schema.optional<typeof Schema.String>;
         }>;
-        output: S.Struct<{
+        output: Schema.Struct<{
             object: typeof SheetType;
         }>;
     }>;
     export class Create extends Create_base {
     }
-    const InsertAxis_base: S.TaggedClass<InsertAxis, "dxos.org/plugin/sheet/action/axis-insert", {
-        readonly _tag: S.tag<"dxos.org/plugin/sheet/action/axis-insert">;
+    const InsertAxis_base: Schema.TaggedClass<InsertAxis, "dxos.org/plugin/sheet/action/axis-insert", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/sheet/action/axis-insert">;
     } & {
-        input: S.Struct<{
-            model: S.Schema<SheetModel>;
-            axis: S.Union<[S.Literal<["row"]>, S.Literal<["col"]>]>;
-            index: typeof S.Number;
-            count: S.optional<typeof S.Number>;
+        input: Schema.Struct<{
+            model: Schema.Schema<SheetModel>;
+            axis: Schema.Union<[Schema.Literal<["row"]>, Schema.Literal<["col"]>]>;
+            index: typeof Schema.Number;
+            count: Schema.optional<typeof Schema.Number>;
         }>;
-        output: typeof S.Void;
+        output: typeof Schema.Void;
     }>;
     export class InsertAxis extends InsertAxis_base {
     }
-    export const RestoreAxis: S.Struct<{
-        axis: S.Union<[S.Literal<["row"]>, S.Literal<["col"]>]>;
-        axisIndex: typeof S.String;
-        index: typeof S.Number;
-        axisMeta: S.Struct<{
-            size: S.optional<typeof S.Number>;
+    export const RestoreAxis: Schema.Struct<{
+        axis: Schema.Union<[Schema.Literal<["row"]>, Schema.Literal<["col"]>]>;
+        axisIndex: typeof Schema.String;
+        index: typeof Schema.Number;
+        axisMeta: Schema.Struct<{
+            size: Schema.optional<typeof Schema.Number>;
         }>;
-        values: S.Array$<typeof S.Any>;
+        values: Schema.Array$<typeof Schema.Any>;
     }>;
-    export type RestoreAxis = S.Schema.Type<typeof RestoreAxis>;
-    const DropAxis_base: S.TaggedClass<DropAxis, "dxos.org/plugin/sheet/action/axis-drop", {
-        readonly _tag: S.tag<"dxos.org/plugin/sheet/action/axis-drop">;
+    export type RestoreAxis = Schema.Schema.Type<typeof RestoreAxis>;
+    const DropAxis_base: Schema.TaggedClass<DropAxis, "dxos.org/plugin/sheet/action/axis-drop", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/sheet/action/axis-drop">;
     } & {
-        input: S.Struct<{
-            model: S.Schema<SheetModel>;
-            axis: S.Union<[S.Literal<["row"]>, S.Literal<["col"]>]>;
-            axisIndex: typeof S.String;
-            deletionData: S.optional<S.Struct<{
-                axis: S.Union<[S.Literal<["row"]>, S.Literal<["col"]>]>;
-                axisIndex: typeof S.String;
-                index: typeof S.Number;
-                axisMeta: S.Struct<{
-                    size: S.optional<typeof S.Number>;
+        input: Schema.Struct<{
+            model: Schema.Schema<SheetModel>;
+            axis: Schema.Union<[Schema.Literal<["row"]>, Schema.Literal<["col"]>]>;
+            axisIndex: typeof Schema.String;
+            deletionData: Schema.optional<Schema.Struct<{
+                axis: Schema.Union<[Schema.Literal<["row"]>, Schema.Literal<["col"]>]>;
+                axisIndex: typeof Schema.String;
+                index: typeof Schema.Number;
+                axisMeta: Schema.Struct<{
+                    size: Schema.optional<typeof Schema.Number>;
                 }>;
-                values: S.Array$<typeof S.Any>;
+                values: Schema.Array$<typeof Schema.Any>;
             }>>;
         }>;
-        output: typeof S.Void;
+        output: typeof Schema.Void;
     }>;
     export class DropAxis extends DropAxis_base {
     }

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEtC,OAAO,EAAE,KAAK,SAAS,EAAiB,SAAS,EAAE,MAAM,UAAU,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACnC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEvB,yBAAiB,WAAW,CAAC;;;;;;;;;;;IAG3B,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;;;;mBAQsE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;;;;;;;IAH/F,MAAM,OAAO,UAAW,SAAQ,eAS9B;KAAG;IAEL,MAAM,CAAC,MAAM,WAAW;;;;;;;;MAMtB,CAAC;IAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC,CAAC;;;;;mBAKe,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;IAH/F,MAAM,OAAO,QAAS,SAAQ,aAS5B;KAAG;;CACN"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,SAAS,EAAiB,SAAS,EAAE,MAAM,UAAU,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACnC,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEvB,yBAAiB,WAAW,CAAC;;;;;;;;;;;IAG3B,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;;;;mBAQgF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;;;;;;;IAH9G,MAAM,OAAO,UAAW,SAAQ,eAS9B;KAAG;IAEL,MAAM,CAAC,MAAM,WAAW;;;;;;;;MAMtB,CAAC;IAEH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC,CAAC;;;;;mBAKoB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;IAH9G,MAAM,OAAO,QAAS,SAAQ,aAS5B;KAAG;;CACN"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-sheet",
-  "version": "0.8.1",
+  "version": "0.8.2-main.2f9c567",
   "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.1",
-    "@dxos/async": "0.8.1",
-    "@dxos/client": "0.8.1",
-    "@dxos/compute": "0.8.1",
-    "@dxos/crypto": "0.8.1",
-    "@dxos/echo-schema": "0.8.1",
-    "@dxos/debug": "0.8.1",
-    "@dxos/context": "0.8.1",
-    "@dxos/functions": "0.8.1",
-    "@dxos/invariant": "0.8.1",
-    "@dxos/keys": "0.8.1",
-    "@dxos/plugin-attention": "0.8.1",
-    "@dxos/plugin-deck": "0.8.1",
-    "@dxos/live-object": "0.8.1",
-    "@dxos/log": "0.8.1",
-    "@dxos/plugin-client": "0.8.1",
-    "@dxos/plugin-graph": "0.8.1",
-    "@dxos/plugin-script": "0.8.1",
-    "@dxos/plugin-markdown": "0.8.1",
-    "@dxos/plugin-space": "0.8.1",
-    "@dxos/plugin-stack": "0.8.1",
-    "@dxos/plugin-thread": "0.8.1",
-    "@dxos/react-client": "0.8.1",
-    "@dxos/react-ui-attention": "0.8.1",
-    "@dxos/react-ui-editor": "0.8.1",
-    "@dxos/react-hooks": "0.8.1",
-    "@dxos/react-ui-form": "0.8.1",
-    "@dxos/react-ui-grid": "0.8.1",
-    "@dxos/react-ui-list": "0.8.1",
-    "@dxos/react-ui-stack": "0.8.1",
-    "@dxos/schema": "0.8.1",
-    "@dxos/util": "0.8.1",
-    "@dxos/react-ui-menu": "0.8.1"
+    "@dxos/async": "0.8.2-main.2f9c567",
+    "@dxos/compute": "0.8.2-main.2f9c567",
+    "@dxos/client": "0.8.2-main.2f9c567",
+    "@dxos/context": "0.8.2-main.2f9c567",
+    "@dxos/echo-schema": "0.8.2-main.2f9c567",
+    "@dxos/crypto": "0.8.2-main.2f9c567",
+    "@dxos/debug": "0.8.2-main.2f9c567",
+    "@dxos/invariant": "0.8.2-main.2f9c567",
+    "@dxos/functions": "0.8.2-main.2f9c567",
+    "@dxos/app-framework": "0.8.2-main.2f9c567",
+    "@dxos/live-object": "0.8.2-main.2f9c567",
+    "@dxos/keys": "0.8.2-main.2f9c567",
+    "@dxos/log": "0.8.2-main.2f9c567",
+    "@dxos/plugin-client": "0.8.2-main.2f9c567",
+    "@dxos/plugin-attention": "0.8.2-main.2f9c567",
+    "@dxos/plugin-deck": "0.8.2-main.2f9c567",
+    "@dxos/plugin-graph": "0.8.2-main.2f9c567",
+    "@dxos/plugin-script": "0.8.2-main.2f9c567",
+    "@dxos/plugin-space": "0.8.2-main.2f9c567",
+    "@dxos/plugin-markdown": "0.8.2-main.2f9c567",
+    "@dxos/plugin-stack": "0.8.2-main.2f9c567",
+    "@dxos/plugin-thread": "0.8.2-main.2f9c567",
+    "@dxos/react-hooks": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-attention": "0.8.2-main.2f9c567",
+    "@dxos/react-client": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-editor": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-form": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-grid": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-menu": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-stack": "0.8.2-main.2f9c567",
+    "@dxos/util": "0.8.2-main.2f9c567",
+    "@dxos/schema": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-list": "0.8.2-main.2f9c567"
   },
   "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.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-generator": "0.8.1",
-    "@dxos/random": "0.8.1",
-    "@dxos/lit-grid": "0.8.1",
-    "@dxos/react-ui-syntax-highlighter": "0.8.1",
-    "@dxos/react-ui": "0.8.1",
-    "@dxos/react-ui-types": "0.8.1",
-    "@dxos/react-ui-theme": "0.8.1",
-    "@dxos/storybook-utils": "0.8.1",
-    "@dxos/test-utils": "0.8.1"
+    "@dxos/echo-generator": "0.8.2-main.2f9c567",
+    "@dxos/lit-grid": "0.8.2-main.2f9c567",
+    "@dxos/random": "0.8.2-main.2f9c567",
+    "@dxos/react-ui": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-theme": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-types": "0.8.2-main.2f9c567",
+    "@dxos/test-utils": "0.8.2-main.2f9c567",
+    "@dxos/storybook-utils": "0.8.2-main.2f9c567"
   },
   "peerDependencies": {
-    "effect": "3.13.3",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.1",
-    "@dxos/react-ui-theme": "0.8.1"
+    "@dxos/react-ui-theme": "0.8.2-main.2f9c567",
+    "@dxos/react-ui": "0.8.2-main.2f9c567"
   },
   "publishConfig": {
     "access": "public"

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

@@ -8,8 +8,8 @@ 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 { create, useSpace, Filter } from '@dxos/react-client/echo';
+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';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
@@ -44,7 +44,7 @@ const Story = () => {
         setResult({ functions: { standard: f1.length, echo: f2.length } });
       });
 
-      space.db.add(create(FunctionType, { name: 'test', version: '0.0.1', binding: FUNCTION_NAME }));
+      space.db.add(live(FunctionType, { name: 'test', version: '0.0.1', binding: FUNCTION_NAME }));
     }
   }, [space, graph]);
 

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/SheetToolbar/useToolbarState.ts

@@ -4,7 +4,7 @@
 
 import { useMemo } from 'react';
 
-import { create } from '@dxos/live-object';
+import { live } from '@dxos/live-object';
 
 import { type AlignState } from './align';
 import { type CommentState } from './comment';
@@ -13,5 +13,5 @@ import { type StyleState } from './style';
 export type ToolbarState = Partial<StyleState & AlignState & CommentState>;
 
 export const useToolbarState = (initialState: ToolbarState = {}) => {
-  return useMemo(() => create<ToolbarState>(initialState), []);
+  return useMemo(() => live<ToolbarState>(initialState), []);
 };

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

@@ -11,8 +11,8 @@ import { describe, test, expect } from 'vitest';
 //    - throws "process.nextTick is not a function" (if browser)
 
 import { Client } from '@dxos/client';
-import { create } from '@dxos/client/echo';
-import { FunctionType } from '@dxos/functions/types';
+import { live } from '@dxos/client/echo';
+import { FunctionType } from '@dxos/functions';
 
 // TODO(burdon): Fix test infrastructure:
 //  - Need docs? esp. needed for config. need pristine example package?
@@ -34,7 +34,7 @@ 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(create(FunctionType, { name: 'test', version: '0.0.1', binding: 'HELLO' }));
+    const fn = space.db.add(live(FunctionType, { name: 'test', version: '0.0.1', binding: 'HELLO' }));
     expect(fn).to.exist;
   });
 });

package/src/serializer.ts

@@ -3,7 +3,7 @@
 //
 
 import { type TypedObjectSerializer } from '@dxos/plugin-space/types';
-import { create, getObjectCore } from '@dxos/react-client/echo';
+import { live, getObjectCore } from '@dxos/react-client/echo';
 
 import { SheetType } from './types';
 
@@ -15,7 +15,7 @@ export const serializer: TypedObjectSerializer<SheetType> = {
 
   deserialize: async ({ content, newId }) => {
     const { id, ...parsed } = JSON.parse(content);
-    const sheet = create(SheetType, parsed);
+    const sheet = live(SheetType, parsed);
 
     if (!newId) {
       const core = getObjectCore(sheet);

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)))),
 }) {}

package/src/types/types.ts

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

package/src/types/util.ts

@@ -12,7 +12,7 @@ import {
 } from '@dxos/compute';
 import { randomBytes } from '@dxos/crypto';
 import { invariant } from '@dxos/invariant';
-import { create } from '@dxos/live-object';
+import { live } from '@dxos/live-object';
 
 import { type CreateSheetOptions, type SheetSize, SheetType } from '../types';
 
@@ -68,7 +68,7 @@ export const initialize = (
 };
 
 export const createSheet = ({ name, cells, ...size }: CreateSheetOptions = {}): SheetType => {
-  const sheet = create(SheetType, {
+  const sheet = live(SheetType, {
     name,
     cells: {},
     rows: [],