@dxos/plugin-space 0.8.2 → 0.8.3-main.7f5a14c

package/src/capabilities/react-surface.tsx

@@ -6,20 +6,10 @@ import { type Schema } from 'effect';
 import React, { useCallback } from 'react';
 
 import { Capabilities, contributes, createSurface, Surface, useCapability, useLayout } from '@dxos/app-framework';
-import { isInstanceOf } from '@dxos/echo-schema';
+import { Obj } from '@dxos/echo';
 import { findAnnotation } from '@dxos/effect';
 import { SettingsStore } from '@dxos/local-storage';
-import {
-  getSpace,
-  isEchoObject,
-  isLiveObject,
-  isSpace,
-  parseId,
-  SpaceState,
-  useSpace,
-  type AnyLiveObject,
-  type Space,
-} from '@dxos/react-client/echo';
+import { getSpace, isLiveObject, isSpace, parseId, SpaceState, useSpace, type Space } from '@dxos/react-client/echo';
 import { Input } from '@dxos/react-ui';
 import { type InputProps } from '@dxos/react-ui-form';
 import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
@@ -78,7 +68,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       id: `${SPACE_PLUGIN}/collection-fallback`,
       role: 'article',
       position: 'fallback',
-      filter: (data): data is { subject: CollectionType } => isInstanceOf(CollectionType, data.subject),
+      filter: (data): data is { subject: CollectionType } => Obj.instanceOf(CollectionType, data.subject),
       component: ({ data }) => <CollectionMain collection={data.subject} />,
     }),
     createSurface({
@@ -91,8 +81,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${SPACE_PLUGIN}/companion/object-settings`,
       role: 'article',
-      filter: (data): data is { companionTo: AnyLiveObject<any> } =>
-        isEchoObject(data.companionTo) && data.subject === 'settings',
+      filter: (data): data is { companionTo: Obj.Any } => Obj.isObject(data.companionTo) && data.subject === 'settings',
       component: ({ data, role }) => <ObjectSettingsContainer object={data.companionTo} role={role} />,
     }),
     createSurface({
@@ -206,21 +195,21 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: POPOVER_RENAME_OBJECT,
       role: 'popover',
-      filter: (data): data is { props: AnyLiveObject<any> } =>
+      filter: (data): data is { props: Obj.Any } =>
         data.component === POPOVER_RENAME_OBJECT && isLiveObject(data.props),
       component: ({ data }) => <PopoverRenameObject object={data.props} />,
     }),
     createSurface({
       id: `${SPACE_PLUGIN}/menu-footer`,
       role: 'menu-footer',
-      filter: (data): data is { subject: AnyLiveObject<any> } => isEchoObject(data.subject),
+      filter: (data): data is { subject: Obj.Any } => Obj.isObject(data.subject),
       component: ({ data }) => <MenuFooter object={data.subject} />,
     }),
     createSurface({
       id: `${SPACE_PLUGIN}/navtree-presence`,
       role: 'navtree-item-end',
-      filter: (data): data is { id: string; subject: AnyLiveObject<any>; open?: boolean } =>
-        typeof data.id === 'string' && isEchoObject(data.subject),
+      filter: (data): data is { id: string; subject: Obj.Any; open?: boolean } =>
+        typeof data.id === 'string' && Obj.isObject(data.subject),
       component: ({ data }) => {
         // TODO(wittjosiah): Doesn't need to be mutable but readonly type messes with ComplexMap.
         const state = useCapability(SpaceCapabilities.MutableState);
@@ -246,8 +235,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       id: `${SPACE_PLUGIN}/navbar-presence`,
       role: 'navbar-end',
       position: 'hoist',
-      filter: (data): data is { subject: Space | AnyLiveObject<any> } =>
-        isSpace(data.subject) || isEchoObject(data.subject),
+      filter: (data): data is { subject: Space | Obj.Any } => isSpace(data.subject) || Obj.isObject(data.subject),
       component: ({ data }) => {
         const space = isSpace(data.subject) ? data.subject : getSpace(data.subject);
         const object = isSpace(data.subject)
@@ -262,7 +250,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${SPACE_PLUGIN}/collection-section`,
       role: 'section',
-      filter: (data): data is { subject: CollectionType } => isInstanceOf(CollectionType, data.subject),
+      filter: (data): data is { subject: CollectionType } => Obj.instanceOf(CollectionType, data.subject),
       component: ({ data }) => <CollectionSection collection={data.subject} />,
     }),
     createSurface({

package/src/capabilities/schema-tools.ts

@@ -7,7 +7,8 @@ import { Schema, SchemaAST } from 'effect';
 import { createTool, ToolResult } from '@dxos/ai';
 import { Capabilities, contributes, type PromiseIntentDispatcher } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
-import { FormatEnum, FormatEnums, SelectOptionSchema, GeoPoint, toJsonSchema } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
+import { FormatEnum, FormatEnums, SelectOptionSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { hues } from '@dxos/react-ui-theme';
 import { getSchemaFromPropertyDefinitions } from '@dxos/schema';
@@ -32,7 +33,7 @@ export const TypeNameSchema = Schema.String.pipe(
 );
 
 const formatDescription = `The format of the property. Additional information:
-  ${FormatEnum.GeoPoint}: ${JSON.stringify(toJsonSchema(GeoPoint))}
+  ${FormatEnum.GeoPoint}: ${JSON.stringify(Type.toJsonSchema(Type.Format.GeoPoint))}
   This tuple is GeoJSON. You must specify \`${FormatEnum.GeoPoint}\` as [Longitude, Latitude]`;
 
 // TODO(ZaymonFC): All properties are default optional, but maybe we should allow for required properties.

package/src/capabilities/settings.ts

@@ -5,7 +5,7 @@
 import { Capabilities, contributes } from '@dxos/app-framework';
 import { live } from '@dxos/live-object';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type SpaceSettingsProps, SpaceSettingsSchema } from '../types';
 
 export default () => {
@@ -13,5 +13,9 @@ export default () => {
     showHidden: false,
   });
 
-  return contributes(Capabilities.Settings, { schema: SpaceSettingsSchema, prefix: SPACE_PLUGIN, value: settings });
+  return contributes(Capabilities.Settings, {
+    prefix: meta.id,
+    schema: SpaceSettingsSchema,
+    value: settings,
+  });
 };

package/src/capabilities/spaces-ready.ts

@@ -4,18 +4,17 @@
 
 import { Option } from 'effect';
 
-import { contributes, createIntent, type PluginContext, Capabilities, LayoutAction } from '@dxos/app-framework';
+import { contributes, createIntent, Capabilities, LayoutAction, type PluginContext } from '@dxos/app-framework';
 import { SubscriptionList } from '@dxos/async';
-import { Expando } from '@dxos/echo-schema';
+import { Filter, Obj, Type } from '@dxos/echo';
 import { scheduledEffect } from '@dxos/echo-signals/core';
-import { live } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { DeckCapabilities } from '@dxos/plugin-deck';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { PublicKey } from '@dxos/react-client';
-import { Filter, FQ_ID_LENGTH, parseFullyQualifiedId, SpaceState } from '@dxos/react-client/echo';
+import { FQ_ID_LENGTH, parseFullyQualifiedId, SpaceState } from '@dxos/react-client/echo';
 import { ComplexMap, reduceGroupBy } from '@dxos/util';
 
 import { SpaceCapabilities } from './capabilities';
@@ -51,11 +50,11 @@ export default async (context: PluginContext) => {
 
   const {
     objects: [spacesOrder],
-  } = await defaultSpace.db.query(Filter.type(Expando, { key: SHARED })).run();
+  } = await defaultSpace.db.query(Filter.type(Type.Expando, { key: SHARED })).run();
   if (!spacesOrder) {
     // TODO(wittjosiah): Cannot be a Folder because Spaces are not TypedObjects so can't be saved in the database.
     //  Instead, we store order as an array of space ids.
-    defaultSpace.db.add(live({ key: SHARED, order: [] }));
+    defaultSpace.db.add(Obj.make({ key: SHARED, order: [] }));
   }
 
   // Await missing objects.

package/src/components/CreateDialog/CreateObjectDialog.stories.tsx

@@ -7,7 +7,8 @@ import '@dxos-theme';
 import { type Meta, type StoryObj } from '@storybook/react';
 import React, { useEffect } from 'react';
 
-import { live, Filter, useQuery, useSpace } from '@dxos/react-client/echo';
+import { Filter, Obj } from '@dxos/echo';
+import { useQuery, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Dialog } from '@dxos/react-ui';
 import { osTranslations } from '@dxos/shell/react';
@@ -70,7 +71,7 @@ export const TargetCollection: StoryObj<typeof CreateObjectDialog> = {
 
     useEffect(() => {
       if (space) {
-        space.db.add(live(CollectionType, { name: 'My Collection', objects: [], views: {} }));
+        space.db.add(Obj.make(CollectionType, { name: 'My Collection', objects: [], views: {} }));
       }
     }, [space]);
 

package/src/components/CreateDialog/CreateObjectDialog.tsx

@@ -7,27 +7,28 @@ import React, { useCallback, useRef } from 'react';
 
 import {
   Capabilities,
+  LayoutAction,
   chain,
   createIntent,
-  LayoutAction,
   useCapabilities,
   useIntentDispatcher,
   usePluginManager,
 } from '@dxos/app-framework';
+import { type Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { useClient } from '@dxos/react-client';
-import { getSpace, isLiveObject, isSpace, type Live, useSpaces } from '@dxos/react-client/echo';
+import { getSpace, isLiveObject, isSpace, useSpaces } from '@dxos/react-client/echo';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
 
 import { CreateObjectPanel, type CreateObjectPanelProps } from './CreateObjectPanel';
 import { SpaceCapabilities } from '../../capabilities';
 import { SPACE_PLUGIN } from '../../meta';
-import { type ObjectForm, SpaceAction } from '../../types';
+import { SpaceAction } from '../../types';
 
 export const CREATE_OBJECT_DIALOG = `${SPACE_PLUGIN}/CreateObjectDialog`;
 
 export type CreateObjectDialogProps = Pick<CreateObjectPanelProps, 'target' | 'typename' | 'name'> & {
-  shouldNavigate?: (object: Live<any>) => boolean;
+  shouldNavigate?: (object: Obj.Any) => boolean;
 };
 
 export const CreateObjectDialog = ({
@@ -44,22 +45,14 @@ export const CreateObjectDialog = ({
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const forms = useCapabilities(SpaceCapabilities.ObjectForm);
 
-  const resolve = useCallback(
-    (typename: string) =>
+  const resolve = useCallback<NonNullable<CreateObjectPanelProps['resolve']>>(
+    (typename) =>
       manager.context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {},
     [manager],
   );
 
-  const handleCreateObject = useCallback(
-    async ({
-      form,
-      target,
-      data = {},
-    }: {
-      form: ObjectForm;
-      target: CreateObjectPanelProps['target'];
-      data?: Record<string, any>;
-    }) => {
+  const handleCreateObject = useCallback<NonNullable<CreateObjectPanelProps['onCreateObject']>>(
+    async ({ form, target, data = {} }) => {
       if (!target) {
         // TODO(wittjosiah): UI feedback.
         return;

package/src/components/CreateDialog/CreateObjectPanel.tsx

@@ -4,6 +4,7 @@
 
 import React, { useCallback, useState } from 'react';
 
+import { Type } from '@dxos/echo';
 import { getTypeAnnotation, type TypeAnnotation } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { type SpaceId, type Space } from '@dxos/react-client/echo';
@@ -47,7 +48,7 @@ export const CreateObjectPanel = ({
   const { t } = useTranslation(SPACE_PLUGIN);
   const [typename, setTypename] = useState<string | undefined>(initialTypename);
   const [target, setTarget] = useState<Space | CollectionType | undefined>(initialTarget);
-  const form = forms.find((form) => getTypeAnnotation(form.objectSchema)?.typename === typename);
+  const form = forms.find((form) => Type.getTypename(form.objectSchema) === typename);
   const options: TypeAnnotation[] = forms
     .map((form) => getTypeAnnotation(form.objectSchema))
     .filter(isNonNullable)
@@ -91,7 +92,7 @@ export const CreateObjectPanel = ({
         <SelectSpace spaces={spaces} defaultSpaceId={defaultSpaceId} onChange={setTarget} />
       ) : form.formSchema ? (
         <Form
-          classNames='!p-0'
+          flush
           autoFocus
           values={{ name: initialName }}
           schema={form.formSchema}

package/src/components/CreateDialog/CreateSpaceDialog.tsx

@@ -52,7 +52,7 @@ export const CreateSpaceDialog = () => {
       <div className='p-4'>
         <Form
           testId='create-space-form'
-          classNames='!p-0'
+          flush
           autoFocus
           values={initialValues}
           schema={SpaceForm}

package/src/components/MenuFooter.tsx

@@ -5,14 +5,15 @@
 import { Planet } from '@phosphor-icons/react';
 import React from 'react';
 
-import { type AnyLiveObject, getSpace } from '@dxos/client/echo';
+import { getSpace } from '@dxos/client/echo';
+import { type Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
 import { DropdownMenu, toLocalizedString, useTranslation } from '@dxos/react-ui';
 
 import { SPACE_PLUGIN } from '../meta';
 import { getSpaceDisplayName } from '../util';
 
-export const MenuFooter = ({ object }: { object: AnyLiveObject<any> }) => {
+export const MenuFooter = ({ object }: { object: Obj.Any }) => {
   const { t } = useTranslation(SPACE_PLUGIN);
   const client = useClient();
   const space = getSpace(object);

package/src/components/ObjectSettings/AdvancedObjectSettings.tsx

@@ -4,8 +4,8 @@
 
 import React, { useCallback, useState } from 'react';
 
+import { Obj } from '@dxos/echo';
 import { ForeignKey } from '@dxos/echo-schema';
-import { getMeta, type AnyLiveObject } from '@dxos/react-client/echo';
 import { IconButton, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
@@ -18,13 +18,13 @@ const initialValues = {
 };
 
 export type AdvancedObjectSettingsProps = {
-  object: AnyLiveObject<any>;
+  object: Obj.Any;
 };
 
 export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps) => {
   const { t } = useTranslation(SPACE_PLUGIN);
   const [adding, setAdding] = useState(false);
-  const keys = getMeta(object).keys;
+  const { keys } = Obj.getMeta(object);
 
   const handleNew = useCallback(() => setAdding(true), []);
   const handleCancel = useCallback(() => setAdding(false), []);
@@ -66,7 +66,7 @@ export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps)
         {!adding && <ForeignKeys keys={keys} onDelete={handleDelete} />}
       </div>
 
-      {adding && <Form schema={ForeignKey} values={initialValues} onSave={handleSave} onCancel={handleCancel} />}
+      {adding && <Form flush schema={ForeignKey} values={initialValues} onSave={handleSave} onCancel={handleCancel} />}
     </>
   );
 };

package/src/components/ObjectSettings/BaseObjectSettings.tsx

@@ -4,7 +4,7 @@
 
 import React, { type PropsWithChildren, useRef } from 'react';
 
-import { type AnyLiveObject } from '@dxos/react-client/echo';
+import { type Obj } from '@dxos/echo';
 import { Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
@@ -12,7 +12,7 @@ import { meta } from '../../meta';
 
 export type BaseObjectSettingsProps = ThemedClassName<
   PropsWithChildren<{
-    object: AnyLiveObject<any>;
+    object: Obj.Any;
   }>
 >;
 
@@ -30,9 +30,10 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
         <Input.TextInput
           ref={inputRef}
           placeholder={t('name placeholder')}
-          value={object.name ?? ''}
+          // TODO(burdon): Use annotation to get the name field.
+          value={(object as any).name ?? ''}
           onChange={(event) => {
-            object.name = event.target.value;
+            (object as any).name = event.target.value;
           }}
           onKeyDown={(event) => {
             if (event.key === 'Enter') {

package/src/components/ObjectSettings/ObjectSettingsContainer.tsx

@@ -5,14 +5,14 @@
 import React, { useMemo } from 'react';
 
 import { Surface } from '@dxos/app-framework';
-import { type AnyLiveObject } from '@dxos/react-client/echo';
+import { type Obj } from '@dxos/echo';
 import { Clipboard } from '@dxos/react-ui';
 import { StackItem } from '@dxos/react-ui-stack';
 
 import { BaseObjectSettings } from './BaseObjectSettings';
 
 export type ObjectSettingsContainerProps = {
-  object: AnyLiveObject<any>;
+  object: Obj.Any;
   role: string;
 };
 
@@ -21,7 +21,7 @@ export const ObjectSettingsContainer = ({ object, role }: ObjectSettingsContaine
 
   return (
     <Clipboard.Provider>
-      <StackItem.Content toolbar={false} role={role}>
+      <StackItem.Content role={role}>
         <div className='flex flex-col overflow-y-auto divide-y divide-separator'>
           <BaseObjectSettings object={object}>
             <Surface role='base-object-settings' data={data} />

package/src/components/SchemaContainer.tsx

@@ -4,7 +4,7 @@
 
 import React, { useState, useEffect } from 'react';
 
-import { type EchoSchema } from '@dxos/echo-schema';
+import { type Type } from '@dxos/echo';
 import { type Space } from '@dxos/react-client/echo';
 import { useTranslation } from '@dxos/react-ui';
 import { controlItemClasses, ControlPage, ControlSection } from '@dxos/react-ui-form';
@@ -21,8 +21,8 @@ type SchemaPanelProps = { space: Space };
 /**
  * Subscribe to and retrieve all schemas from a space's schema registry.
  */
-export const useQuerySpaceSchemas = (space: Space): EchoSchema[] => {
-  const [schemas, setSchemas] = useState<EchoSchema[]>([]);
+export const useQuerySpaceSchemas = (space: Space): Type.Schema[] => {
+  const [schemas, setSchemas] = useState<Type.Schema[]>([]);
 
   useEffect(() => {
     const query = space.db.schemaRegistry.query();

package/src/components/SpacePresence.tsx

@@ -7,7 +7,7 @@ import React, { forwardRef, useCallback, useEffect, useState } from 'react';
 
 import { useAppGraph, useCapability } from '@dxos/app-framework';
 import { generateName } from '@dxos/display-name';
-import { type Expando } from '@dxos/echo-schema';
+import { type Type } from '@dxos/echo';
 import { PublicKey, useClient } from '@dxos/react-client';
 import { getSpace, useMembers, type SpaceMember, fullyQualifiedId } from '@dxos/react-client/echo';
 import { type Identity, useIdentity } from '@dxos/react-client/halo';
@@ -42,7 +42,7 @@ const noViewers = new ComplexMap<PublicKey, ObjectViewerProps>(PublicKey.hash);
 // TODO(wittjosiah): Factor out?
 const getName = (identity: Identity) => identity.profile?.displayName ?? generateName(identity.identityKey.toHex());
 
-export const SpacePresence = ({ object, spaceKey }: { object: Expando; spaceKey?: PublicKey }) => {
+export const SpacePresence = ({ object, spaceKey }: { object: Type.Expando; spaceKey?: PublicKey }) => {
   // TODO(wittjosiah): Doesn't need to be mutable but readonly type messes with ComplexMap.
   const spaceState = useCapability(SpaceCapabilities.MutableState);
   const client = useClient();
@@ -149,19 +149,26 @@ export const FullPresence = (props: MemberPresenceProps) => {
           <Popover.Portal>
             <Popover.Content side='bottom'>
               <Popover.Arrow />
-              <List classNames='max-h-56 overflow-y-auto'>
-                {members.map((member) => (
-                  <ListItem.Root
-                    key={member.identity.identityKey.toHex()}
-                    classNames='flex gap-2 items-center cursor-pointer mbe-2'
-                    onClick={() => onMemberClick?.(member)}
-                    data-testid='identity-list-item'
-                  >
-                    {/* TODO(Zan): Match always true now we're showing 'members viewing current object'. */}
-                    <PresenceAvatar identity={member.identity} size={size} showName match={member.currentlyAttended} />
-                  </ListItem.Root>
-                ))}
-              </List>
+              <Popover.Viewport classNames='max-bs-56'>
+                <List>
+                  {members.map((member) => (
+                    <ListItem.Root
+                      key={member.identity.identityKey.toHex()}
+                      classNames='flex gap-2 items-center cursor-pointer mbe-2'
+                      onClick={() => onMemberClick?.(member)}
+                      data-testid='identity-list-item'
+                    >
+                      {/* TODO(Zan): Match always true now we're showing 'members viewing current object'. */}
+                      <PresenceAvatar
+                        identity={member.identity}
+                        size={size}
+                        showName
+                        match={member.currentlyAttended}
+                      />
+                    </ListItem.Root>
+                  ))}
+                </List>
+              </Popover.Viewport>
             </Popover.Content>
           </Popover.Portal>
         </Popover.Root>

package/src/components/SpaceSettings/SpaceSettingsContainer.tsx

@@ -174,7 +174,8 @@ export const SpaceSettingsContainer = ({ space }: SpaceSettingsContainerProps) =
             autoSave
             onSave={handleSave}
             Custom={customElements}
-            classNames='p-0 container-max-width [&_[role="form"]]:grid [&_[role="form"]]:grid-cols-1 md:[&_[role="form"]]:grid-cols-[1fr_min-content] [&_[role="form"]]:gap-4'
+            flush
+            classNames='container-max-width [&_[role="form"]]:grid [&_[role="form"]]:grid-cols-1 md:[&_[role="form"]]:grid-cols-[1fr_min-content] [&_[role="form"]]:gap-4'
           />
         </ControlSection>
       </ControlPage>

package/src/types/collection.ts

@@ -4,15 +4,24 @@
 
 import { Schema } from 'effect';
 
-import { Expando, Ref, TypedObject } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
+import { TypedObject } from '@dxos/echo-schema';
 
-export class CollectionType extends TypedObject({ typename: 'dxos.org/type/Collection', version: '0.1.0' })({
+export class CollectionType extends TypedObject({
+  typename: 'dxos.org/type/Collection',
+  version: '0.1.0',
+})({
   name: Schema.optional(Schema.String),
-  objects: Schema.mutable(Schema.Array(Ref(Expando))),
+  objects: Schema.mutable(Schema.Array(Type.Ref(Type.Expando))),
   // Key is schema typename and value is reference to a view object of the associated schema.
   // Having collection reference the views rather than vice versa ensures that the state converges to a single view per key (i.e. type).
   // This also leaves open a future where this key could be changed to allow for multiple stack views per section.
   // TODO(wittjosiah): Any way to make this more type safe?
   // TODO(wittjosiah): Should the views be separate objects or just be schemas for view data in this record?
-  views: Schema.mutable(Schema.Record({ key: Schema.String, value: Ref(Expando) })),
+  views: Schema.mutable(
+    Schema.Record({
+      key: Schema.String,
+      value: Type.Ref(Type.Expando),
+    }),
+  ),
 }) {}

package/src/types/types.ts

@@ -5,7 +5,8 @@
 import { Schema } from 'effect';
 
 import { type AnyIntentChain } from '@dxos/app-framework';
-import { Expando, type BaseObject, type TypedObject } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
+import { type BaseObject, type TypedObject } from '@dxos/echo-schema';
 import { type PublicKey } from '@dxos/react-client';
 // TODO(wittjosiah): This pulls in full client.
 import { EchoObjectSchema, ReactiveObjectSchema, type Space, SpaceSchema } from '@dxos/react-client/echo';
@@ -80,7 +81,7 @@ export type SpaceSettingsProps = Schema.Schema.Type<typeof SpaceSettingsSchema>;
 
 export type SerializerMap = Record<string, TypedObjectSerializer>;
 
-export interface TypedObjectSerializer<T extends Expando = Expando> {
+export interface TypedObjectSerializer<T extends Type.Expando = Type.Expando> {
   serialize(params: { object: T }): Promise<string>;
 
   /**
@@ -242,8 +243,8 @@ export namespace SpaceAction {
       space: SpaceSchema,
       // TODO(wittjosiah): Relation schema.
       schema: Schema.Any,
-      source: Expando,
-      target: Expando,
+      source: Type.Expando,
+      target: Type.Expando,
       // TODO(wittjosiah): Type based on relation schema.
       fields: Schema.optional(Schema.Record({ key: Schema.String, value: Schema.Any })),
     }),