@dxos/plugin-space 0.8.3-main.672df60 → 0.8.3-staging.0fa589b

package/src/translations.ts

@@ -2,16 +2,28 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Type } from '@dxos/echo';
+import { DataType } from '@dxos/schema';
+
 import { SPACE_PLUGIN } from './meta';
-import { CollectionType } from './types';
 
 export default [
   {
     'en-US': {
-      [CollectionType.typename]: {
+      [Type.getTypename(DataType.Collection)]: {
         'typename label': 'Collection',
+        'typename label_zero': 'Collections',
+        'typename label_one': 'Collection',
+        'typename label_other': 'Collections',
         'object name placeholder': 'New collection',
       },
+      [Type.getTypename(DataType.QueryCollection)]: {
+        'typename label': 'Smart Collection',
+        'typename label_zero': 'Smart Collections',
+        'typename label_one': 'Smart Collection',
+        'typename label_other': 'Smart Collections',
+        'object name placeholder': 'New smart collection',
+      },
       [SPACE_PLUGIN]: {
         'plugin name': 'Spaces',
         'first run message': 'Nothing selected.',
@@ -27,7 +39,7 @@ export default [
         'rename space label': 'Rename space',
         'active space label': 'Active space:',
         'space name label': 'Space name',
-        'object name label': 'Object name',
+        'object name label': 'Item name',
         'close space label': 'Close space',
         'open space label': 'Open space',
         'export data label': 'Export data',
@@ -42,6 +54,9 @@ export default [
         'object placeholder': 'Type a title here…',
         'personal space label': 'Personal Space',
         'spaces label': 'Spaces',
+        'space settings label': 'Spaces',
+        'space settings description':
+          'Each space has its own settings you can configure, where you can adjust its properties, membership, integrations, and other items specific to that space.',
         'show hidden spaces label': 'Show archived spaces',
         'save files to directory label': 'Save files to disk',
         'select path label': 'Select path',
@@ -55,17 +70,18 @@ export default [
         'objects deleted label': 'Items deleted',
         'go to object label': 'Open item',
         'found object label': 'Ready.',
-        'found object description': 'The requested object is now available.',
+        'found object description': 'The requested item is now available.',
         'waiting for object label': 'Loading…',
-        'waiting for object description': 'The requested object is still being synchronized.',
+        'waiting for object description': 'The requested item is still being synchronized.',
         'object not found label': 'Nothing found.',
         'object not found description':
-          'The requested object has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
-        'missing object message': 'Object not available.',
+          'The requested item has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
+        'missing object message': 'Item not available.',
         'missing object description':
-          'The requested object has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
+          'The requested item has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
         'create object in space label': 'Add to space',
         'create object in collection label': 'Add to collection',
+        'create object in smart collection label': 'Add to smart collection',
         'space members label': 'Space members',
         'active space members heading': 'Online ({{count}})',
         'inactive space members heading': 'Offline ({{count}})',
@@ -83,10 +99,10 @@ export default [
         'location label': 'Located in',
         'space limit label': 'Space Limit Reached',
         'space limit description':
-          'This space has reached the maximum number of objects for the beta. This limit includes deleted objects currently, but those can be permanently removed with the cleanup action.',
+          'This space has reached the maximum number of items for the beta. This limit includes deleted items currently, but those can be permanently removed with the cleanup action.',
         'space limit close label': 'Close',
         'remove deleted objects label': 'Cleanup',
-        'remove deleted objects alt': 'Permanently remove deleted objects to free up space.',
+        'remove deleted objects alt': 'Permanently remove deleted items to free up space.',
         'copy link label': 'Copy link',
         'default on space create label': 'On space create',
         'sync status title': 'Sync status',
@@ -103,11 +119,11 @@ export default [
         'remote synced label': 'Synced with peers',
         'syncing label': 'Space syncing',
         'show all label': 'Show all',
-        'no sync status label': 'No space with missing objects.',
+        'no sync status label': 'No space with missing items.',
         'create space dialog title': 'Create Space',
-        'create object dialog title': 'Create Object',
+        'create object dialog title': 'Create {{object}}',
         'space input placeholder': 'Select space',
-        'schema input placeholder': 'Select object type',
+        'schema input placeholder': 'Select item type',
         'creating object type label': 'Type',
         'creating in space label': 'Location',
         'creating in collection label': 'In Collection',
@@ -116,7 +132,7 @@ export default [
         'advanced settings label': 'Advanced',
         'foreign keys': 'Foreign Keys',
         'add key': 'Add Key',
-        'open space settings label': 'Open',
+        'open space settings label': 'Open settings',
 
         'members panel label': 'Members',
         'members verbose label': 'Manage space members',

package/src/types/index.ts

@@ -2,5 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './collection';
 export * from './types';

package/src/types/types.ts

@@ -5,14 +5,15 @@
 import { Schema } from 'effect';
 
 import { type AnyIntentChain } from '@dxos/app-framework';
-import { Expando, type BaseObject, type TypedObject } from '@dxos/echo-schema';
+import { Type, type Obj } 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';
 import { CancellableInvitationObservable, Invitation } from '@dxos/react-client/invitations';
+import { DataType, TypenameAnnotationId } from '@dxos/schema';
 import { type ComplexMap } from '@dxos/util';
 
-import { CollectionType } from './collection';
 import { SPACE_PLUGIN } from '../meta';
 
 export const SPACE_DIRECTORY_HANDLE = 'dxos.org/plugin/space/directory';
@@ -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 Obj.Any = Type.Expando> {
   serialize(params: { object: T }): Promise<string>;
 
   /**
@@ -218,7 +219,8 @@ export namespace SpaceAction {
 
   export class OpenCreateObject extends Schema.TaggedClass<OpenCreateObject>()(`${SPACE_ACTION}/open-create-object`, {
     input: Schema.Struct({
-      target: Schema.Union(SpaceSchema, CollectionType),
+      target: Schema.Union(SpaceSchema, DataType.Collection),
+      typename: Schema.optional(Schema.String),
       navigable: Schema.optional(Schema.Boolean),
     }),
     output: Schema.Void,
@@ -227,7 +229,7 @@ export namespace SpaceAction {
   export class AddObject extends Schema.TaggedClass<AddObject>()(`${SPACE_ACTION}/add-object`, {
     input: Schema.Struct({
       object: ReactiveObjectSchema,
-      target: Schema.Union(SpaceSchema, CollectionType),
+      target: Schema.Union(SpaceSchema, DataType.Collection),
       hidden: Schema.optional(Schema.Boolean),
     }),
     output: Schema.Struct({
@@ -242,8 +244,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 })),
     }),
@@ -254,7 +256,7 @@ export namespace SpaceAction {
 
   export const DeletionData = Schema.Struct({
     objects: Schema.Array(EchoObjectSchema),
-    parentCollection: CollectionType,
+    parentCollection: DataType.Collection,
     indices: Schema.Array(Schema.Number),
     nestedObjectsList: Schema.Array(Schema.Array(EchoObjectSchema)),
     wasActive: Schema.Array(Schema.String),
@@ -265,7 +267,7 @@ export namespace SpaceAction {
   export class RemoveObjects extends Schema.TaggedClass<RemoveObjects>()(`${SPACE_ACTION}/remove-objects`, {
     input: Schema.Struct({
       objects: Schema.Array(EchoObjectSchema),
-      target: Schema.optional(CollectionType),
+      target: Schema.optional(DataType.Collection),
       deletionData: Schema.optional(DeletionData),
     }),
     output: Schema.Void,
@@ -282,7 +284,7 @@ export namespace SpaceAction {
   export class DuplicateObject extends Schema.TaggedClass<DuplicateObject>()(`${SPACE_ACTION}/duplicate-object`, {
     input: Schema.Struct({
       object: EchoObjectSchema,
-      target: Schema.Union(SpaceSchema, CollectionType),
+      target: Schema.Union(SpaceSchema, DataType.Collection),
     }),
     output: Schema.Void,
   }) {}
@@ -301,7 +303,26 @@ export namespace CollectionAction {
       name: Schema.optional(Schema.String),
     }),
     output: Schema.Struct({
-      object: CollectionType,
+      object: DataType.Collection,
     }),
   }) {}
+
+  export const QueryCollectionForm = Schema.Struct({
+    name: Schema.optional(Schema.String),
+    typename: Schema.optional(
+      Schema.String.annotations({
+        [TypenameAnnotationId]: ['object-form'],
+      }),
+    ),
+  });
+
+  export class CreateQueryCollection extends Schema.TaggedClass<CreateQueryCollection>()(
+    'dxos.org/plugin/collection/action/create-query-collection',
+    {
+      input: QueryCollectionForm,
+      output: Schema.Struct({
+        object: DataType.QueryCollection,
+      }),
+    },
+  ) {}
 }

package/src/util.tsx

@@ -3,12 +3,12 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
+import { pipe } from 'effect';
 
-import { createIntent, LayoutAction, type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { type BaseObject, EXPANDO_TYPENAME, getTypeAnnotation, getTypename, type Expando } from '@dxos/echo-schema';
-import { getSchema } from '@dxos/echo-schema';
+import { chain, createIntent, LayoutAction, type PromiseIntentDispatcher } from '@dxos/app-framework';
+import { Obj, Ref, Type } from '@dxos/echo';
+import { EXPANDO_TYPENAME } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
-import { makeRef } from '@dxos/live-object';
 import { Migrations } from '@dxos/migrations';
 import {
   ACTION_GROUP_TYPE,
@@ -18,20 +18,15 @@ import {
   type InvokeParams,
   type Node,
   type NodeArg,
+  isGraphNode,
 } from '@dxos/plugin-graph';
-import {
-  fullyQualifiedId,
-  getSpace,
-  isEchoObject,
-  type QueryResult,
-  SpaceState,
-  type AnyLiveObject,
-  type Space,
-} from '@dxos/react-client/echo';
+import { fullyQualifiedId, getSpace, type QueryResult, SpaceState, type Space, isSpace } from '@dxos/react-client/echo';
 import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
+import { type TreeData } from '@dxos/react-ui-list';
+import { DataType } from '@dxos/schema';
 
 import { SPACE_PLUGIN } from './meta';
-import { CollectionType, SpaceAction, SPACE_TYPE } from './types';
+import { SpaceAction, SPACE_TYPE, type ObjectForm } from './types';
 
 export const SPACES = `${SPACE_PLUGIN}-spaces`;
 export const COMPOSER_SPACE_LOCK = 'dxos.org/plugin/space/lock';
@@ -41,14 +36,13 @@ export const SHARED = 'shared-spaces';
 /**
  * Convert a query result to an Rx value of the objects.
  */
-export const rxFromQuery = <T extends BaseObject>(query: QueryResult<T>): Rx.Rx<T[]> => {
+export const rxFromQuery = <T extends Obj.Any>(query: QueryResult<T>): Rx.Rx<T[]> => {
   return Rx.make((get) => {
     const unsubscribe = query.subscribe((result) => {
       get.setSelf(result.objects);
     });
 
     get.addFinalizer(() => unsubscribe());
-
     return query.objects;
   });
 };
@@ -68,13 +62,11 @@ export const getSpaceDisplayName = (
 };
 
 const getCollectionGraphNodePartials = ({
-  navigable,
   collection,
   space,
   resolve,
 }: {
-  navigable: boolean;
-  collection: CollectionType;
+  collection: DataType.Collection;
   space: Space;
   resolve: (typename: string) => Record<string, any>;
 }) => {
@@ -84,9 +76,9 @@ const getCollectionGraphNodePartials = ({
     role: 'branch',
     onRearrangeChildren: (nextOrder: unknown[]) => {
       // Change on disk.
-      collection.objects = nextOrder.filter(isEchoObject).map(makeRef);
+      collection.objects = nextOrder.filter(Obj.isObject).map(Ref.make);
     },
-    onTransferStart: (child: Node<AnyLiveObject<any>>, index?: number) => {
+    onTransferStart: (child: Node<Obj.Any>, index?: number) => {
       // TODO(wittjosiah): Support transfer between spaces.
       // const childSpace = getSpace(child.data);
       // if (space && childSpace && !childSpace.key.equals(space.key)) {
@@ -107,15 +99,15 @@ const getCollectionGraphNodePartials = ({
       // TODO(dmaretskyi): Compare by id.
       if (!collection.objects.find((object) => object.target === child.data)) {
         if (typeof index !== 'undefined') {
-          collection.objects.splice(index, 0, makeRef(child.data));
+          collection.objects.splice(index, 0, Ref.make(child.data));
         } else {
-          collection.objects.push(makeRef(child.data));
+          collection.objects.push(Ref.make(child.data));
         }
       }
 
       // }
     },
-    onTransferEnd: (child: Node<AnyLiveObject<any>>, destination: Node) => {
+    onTransferEnd: (child: Node<Obj.Any>, destination: Node) => {
       // Remove child from origin collection.
       const index = collection.objects.findIndex((object) => object.target === child.data);
       if (index > -1) {
@@ -131,19 +123,49 @@ const getCollectionGraphNodePartials = ({
       //   childSpace.db.remove(child.data);
       // }
     },
-    onCopy: async (child: Node<AnyLiveObject<any>>, index?: number) => {
+    onCopy: async (child: Node<Obj.Any>, index?: number) => {
       // Create clone of child and add to destination space.
       const newObject = await cloneObject(child.data, resolve, space);
       space.db.add(newObject);
       if (typeof index !== 'undefined') {
-        collection.objects.splice(index, 0, makeRef(newObject));
+        collection.objects.splice(index, 0, Ref.make(newObject));
       } else {
-        collection.objects.push(makeRef(newObject));
+        collection.objects.push(Ref.make(newObject));
       }
     },
   };
 };
 
+const getQueryCollectionNodePartials = ({
+  collection,
+  space,
+  resolve,
+}: {
+  collection: DataType.QueryCollection;
+  space: Space;
+  resolve: (typename: string) => Record<string, any>;
+}) => {
+  return {
+    icon: collection.query.typename && resolve(collection.query.typename)?.icon,
+    acceptPersistenceClass: new Set(['echo']),
+    acceptPersistenceKey: new Set([space.id]),
+    role: 'branch',
+    canDrop: (source: TreeData) => {
+      return (
+        isGraphNode(source.item) &&
+        Obj.isObject(source.item.data) &&
+        Obj.getTypename(source.item.data) === collection.query.typename
+      );
+    },
+    onTransferStart: (child: Node<Obj.Any>, index?: number) => {
+      // No-op. Objects are moved into query collections by being removed from their original collection.
+    },
+    onTransferEnd: (child: Node<Obj.Any>, destination: Node) => {
+      // No-op. Objects are moved out of query collections by being added to another collection.
+    },
+  };
+};
+
 const checkPendingMigration = (space: Space) => {
   return (
     space.state.get() === SpaceState.SPACE_REQUIRES_MIGRATION ||
@@ -167,10 +189,11 @@ export const constructSpaceNode = ({
   resolve: (typename: string) => Record<string, any>;
 }) => {
   const hasPendingMigration = checkPendingMigration(space);
-  const collection = space.state.get() === SpaceState.SPACE_READY && space.properties[CollectionType.typename]?.target;
+  const collection =
+    space.state.get() === SpaceState.SPACE_READY && space.properties[Type.getTypename(DataType.Collection)]?.target;
   const partials =
-    space.state.get() === SpaceState.SPACE_READY && collection instanceof CollectionType
-      ? getCollectionGraphNodePartials({ collection, space, resolve, navigable })
+    space.state.get() === SpaceState.SPACE_READY && Obj.instanceOf(DataType.Collection, collection)
+      ? getCollectionGraphNodePartials({ collection, space, resolve })
       : {};
 
   return {
@@ -189,6 +212,10 @@ export const constructSpaceNode = ({
           : undefined,
       disabled: !navigable || space.state.get() !== SpaceState.SPACE_READY || hasPendingMigration,
       testId: 'spacePlugin.space',
+      canDrop: (source: TreeData) => {
+        // TODO(wittjosiah): Find a way to only allow space as source for rearranging.
+        return Obj.isObject(source.item.data) || isSpace(source.item.data);
+      },
     },
     nodes: [
       {
@@ -305,17 +332,19 @@ export const constructSpaceActions = ({
 };
 
 export const createObjectNode = ({
-  object,
   space,
+  object,
+  droppable = true,
   navigable = false,
   resolve,
 }: {
-  object: AnyLiveObject<any>;
   space: Space;
+  object: Obj.Any;
+  droppable?: boolean;
   navigable?: boolean;
   resolve: (typename: string) => Record<string, any>;
 }) => {
-  const type = getTypename(object);
+  const type = Obj.getTypename(object);
   if (!type) {
     return undefined;
   }
@@ -325,9 +354,10 @@ export const createObjectNode = ({
     return undefined;
   }
 
-  const partials =
-    object instanceof CollectionType
-      ? getCollectionGraphNodePartials({ collection: object, space, resolve, navigable })
+  const partials = Obj.instanceOf(DataType.Collection, object)
+    ? getCollectionGraphNodePartials({ collection: object, space, resolve })
+    : Obj.instanceOf(DataType.QueryCollection, object)
+      ? getQueryCollectionNodePartials({ collection: object, space, resolve })
       : metadata.graphProps;
 
   return {
@@ -336,13 +366,17 @@ export const createObjectNode = ({
     cacheable: ['label', 'icon', 'role'],
     data: object,
     properties: {
-      ...partials,
+      // TODO(burdon): Use annotation to get the name field.
       label: metadata.label?.(object) ||
-        object.name || ['object name placeholder', { ns: type, default: 'New object' }],
+        (object as any).name || ['object name placeholder', { ns: type, default: 'New object' }],
       icon: metadata.icon ?? 'ph--placeholder--regular',
       testId: 'spacePlugin.object',
       persistenceClass: 'echo',
       persistenceKey: space?.id,
+      canDrop: (source: TreeData) => {
+        return droppable && isGraphNode(source.item) && Obj.isObject(source.item.data);
+      },
+      ...partials,
     },
   };
 };
@@ -351,18 +385,26 @@ export const constructObjectActions = ({
   object,
   graph,
   dispatch,
+  objectForms,
   navigable = false,
 }: {
-  object: AnyLiveObject<any>;
+  object: Obj.Any;
   graph: ReadableGraph;
   dispatch: PromiseIntentDispatcher;
+  objectForms: ObjectForm<any>[];
   navigable?: boolean;
 }) => {
   const space = getSpace(object);
   invariant(space, 'Space not found');
   const getId = (id: string) => `${id}/${fullyQualifiedId(object)}`;
+
+  const queryCollection = Obj.instanceOf(DataType.QueryCollection, object) ? object : undefined;
+  const matchingObjectForm = queryCollection
+    ? objectForms.find((form) => Type.getTypename(form.objectSchema) === queryCollection.query.typename)
+    : undefined;
+
   const actions: NodeArg<ActionData>[] = [
-    ...(object instanceof CollectionType
+    ...(Obj.instanceOf(DataType.Collection, object)
       ? [
           {
             id: getId(SpaceAction.OpenCreateObject._tag),
@@ -379,6 +421,38 @@ export const constructObjectActions = ({
           },
         ]
       : []),
+    ...(matchingObjectForm
+      ? [
+          {
+            id: getId(SpaceAction.OpenCreateObject._tag),
+            type: ACTION_TYPE,
+            data: async () => {
+              if (matchingObjectForm.formSchema) {
+                await dispatch(
+                  createIntent(SpaceAction.OpenCreateObject, {
+                    target: space,
+                    typename: queryCollection?.query.typename,
+                  }),
+                );
+              } else {
+                await dispatch(
+                  pipe(
+                    matchingObjectForm.getIntent({}, { space }),
+                    chain(SpaceAction.AddObject, { target: space, hidden: true }),
+                    chain(LayoutAction.Open, { part: 'main' }),
+                  ),
+                );
+              }
+            },
+            properties: {
+              label: ['create object in smart collection label', { ns: SPACE_PLUGIN }],
+              icon: 'ph--plus--regular',
+              disposition: 'list-item-primary',
+              testId: 'spacePlugin.createObject',
+            },
+          },
+        ]
+      : []),
     {
       id: getId(SpaceAction.RenameObject._tag),
       type: ACTION_TYPE,
@@ -387,14 +461,15 @@ export const constructObjectActions = ({
       },
       properties: {
         label: [
-          object instanceof CollectionType ? 'rename collection label' : 'rename object label',
+          Obj.instanceOf(DataType.Collection, object) ? 'rename collection label' : 'rename object label',
           { ns: SPACE_PLUGIN },
         ],
         icon: 'ph--pencil-simple-line--regular',
-        // TODO(wittjosiah): Need's focus.
-        keyBinding: {
-          macos: 'shift+F6',
-        },
+        disposition: 'list-item',
+        // TODO(wittjosiah): Not working.
+        // keyBinding: {
+        //   macos: 'shift+F6',
+        // },
         testId: 'spacePlugin.renameObject',
       },
     },
@@ -404,20 +479,22 @@ export const constructObjectActions = ({
       data: async () => {
         const collection = graph
           .getConnections(fullyQualifiedId(object), 'inbound')
-          .find(({ data }) => data instanceof CollectionType)?.data;
+          .find(({ data }) => Obj.instanceOf(DataType.Collection, data))?.data;
         await dispatch(createIntent(SpaceAction.RemoveObjects, { objects: [object], target: collection }));
       },
       properties: {
         label: [
-          object instanceof CollectionType ? 'delete collection label' : 'delete object label',
+          Obj.instanceOf(DataType.Collection, object) ? 'delete collection label' : 'delete object label',
           { ns: SPACE_PLUGIN },
         ],
         icon: 'ph--trash--regular',
-        keyBinding: object instanceof CollectionType ? undefined : 'shift+meta+Backspace',
+        disposition: 'list-item',
+        // TODO(wittjosiah): This is a browser shortcut.
+        // keyBinding: object instanceof CollectionType ? undefined : 'shift+meta+Backspace',
         testId: 'spacePlugin.deleteObject',
       },
     },
-    ...(navigable || !(object instanceof CollectionType)
+    ...(navigable || (!Obj.instanceOf(DataType.Collection, object) && !Obj.instanceOf(DataType.QueryCollection, object))
       ? [
           {
             id: getId('copy-link'),
@@ -429,6 +506,7 @@ export const constructObjectActions = ({
             properties: {
               label: ['copy link label', { ns: SPACE_PLUGIN }],
               icon: 'ph--link--regular',
+              disposition: 'list-item',
               testId: 'spacePlugin.copyLink',
             },
           },
@@ -444,6 +522,7 @@ export const constructObjectActions = ({
       properties: {
         label: ['expose object label', { ns: SPACE_PLUGIN }],
         icon: 'ph--eye--regular',
+        disposition: 'heading-list-item',
         testId: 'spacePlugin.exposeObject',
       },
     },
@@ -456,10 +535,10 @@ export const constructObjectActions = ({
  * @deprecated This is a temporary solution.
  */
 export const getNestedObjects = async (
-  object: AnyLiveObject<any>,
+  object: Obj.Any,
   resolve: (typename: string) => Record<string, any>,
-): Promise<AnyLiveObject<any>[]> => {
-  const type = getTypename(object);
+): Promise<Obj.Any[]> => {
+  const type = Obj.getTypename(object);
   if (!type) {
     return [];
   }
@@ -470,7 +549,7 @@ export const getNestedObjects = async (
     return [];
   }
 
-  const objects: AnyLiveObject<any>[] = await loadReferences(object);
+  const objects: Obj.Any[] = await loadReferences(object);
   const nested = await Promise.all(objects.map((object) => getNestedObjects(object, resolve)));
   return [...objects, ...nested.flat()];
 };
@@ -480,12 +559,12 @@ export const getNestedObjects = async (
  */
 // TODO(burdon): Remove.
 export const cloneObject = async (
-  object: Expando,
+  object: Type.Expando,
   resolve: (typename: string) => Record<string, any>,
   newSpace: Space,
-): Promise<Expando> => {
-  const schema = getSchema(object);
-  const typename = schema ? getTypeAnnotation(schema)?.typename ?? EXPANDO_TYPENAME : EXPANDO_TYPENAME;
+): Promise<Type.Expando> => {
+  const schema = Obj.getSchema(object);
+  const typename = schema ? Type.getTypename(schema) ?? EXPANDO_TYPENAME : EXPANDO_TYPENAME;
   const metadata = resolve(typename);
   const serializer = metadata.serializer;
   invariant(serializer, `No serializer for type: ${typename}`);