@dxos/plugin-space 0.8.4-main.f9ba587 → 0.8.4-main.fffef41

package/src/util.tsx

@@ -2,42 +2,42 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { pipe } from 'effect';
+import { Atom } from '@effect-atom/atom-react';
+import * as Function from 'effect/Function';
 
-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 { LayoutAction, type PromiseIntentDispatcher, chain, createIntent } from '@dxos/app-framework';
+import { Filter, Obj, Query, Ref, Type } from '@dxos/echo';
+import { type AnyEchoObject, EXPANDO_TYPENAME } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
 import { Migrations } from '@dxos/migrations';
 import {
   ACTION_GROUP_TYPE,
   ACTION_TYPE,
-  type ReadableGraph,
   type ActionData,
   type InvokeParams,
   type Node,
   type NodeArg,
+  type ReadableGraph,
   isGraphNode,
 } from '@dxos/plugin-graph';
-import { fullyQualifiedId, getSpace, type QueryResult, SpaceState, type Space, isSpace } from '@dxos/react-client/echo';
+import { type QueryResult, type Space, SpaceState, getSpace, 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 { Collection, StoredSchema, View, getTypenameFromQuery } from '@dxos/schema';
 
-import { SPACE_PLUGIN } from './meta';
-import { SpaceAction, SPACE_TYPE, type ObjectForm } from './types';
+import { meta } from './meta';
+import { type ObjectForm, SPACE_TYPE, SpaceAction } from './types';
 
-export const SPACES = `${SPACE_PLUGIN}-spaces`;
-export const COMPOSER_SPACE_LOCK = 'dxos.org/plugin/space/lock';
+export const SPACES = `${meta.id}-spaces`;
+export const COMPOSER_SPACE_LOCK = `${meta.id}/lock`;
 // TODO(wittjosiah): Remove.
 export const SHARED = 'shared-spaces';
 
 /**
- * Convert a query result to an Rx value of the objects.
+ * Convert a query result to an Atom value of the objects.
  */
-export const rxFromQuery = <T extends Obj.Any>(query: QueryResult<T>): Rx.Rx<T[]> => {
-  return Rx.make((get) => {
+export const atomFromQuery = <T extends AnyEchoObject>(query: QueryResult<T>): Atom.Atom<T[]> => {
+  return Atom.make((get) => {
     const unsubscribe = query.subscribe((result) => {
       get.setSelf(result.objects);
     });
@@ -57,8 +57,8 @@ export const getSpaceDisplayName = (
     : namesCache[space.id]
       ? namesCache[space.id]
       : personal
-        ? ['personal space label', { ns: SPACE_PLUGIN }]
-        : ['unnamed space label', { ns: SPACE_PLUGIN }];
+        ? ['personal space label', { ns: meta.id }]
+        : ['unnamed space label', { ns: meta.id }];
 };
 
 const getCollectionGraphNodePartials = ({
@@ -66,7 +66,7 @@ const getCollectionGraphNodePartials = ({
   space,
   resolve,
 }: {
-  collection: DataType.Collection;
+  collection: Collection.Collection;
   space: Space;
   resolve: (typename: string) => Record<string, any>;
 }) => {
@@ -141,20 +141,21 @@ const getQueryCollectionNodePartials = ({
   space,
   resolve,
 }: {
-  collection: DataType.QueryCollection;
+  collection: Collection.QueryCollection;
   space: Space;
   resolve: (typename: string) => Record<string, any>;
 }) => {
+  const typename = getTypenameFromQuery(collection.query);
+  const metadata = typename ? resolve(typename) : {};
   return {
-    icon: collection.query.typename && resolve(collection.query.typename)?.icon,
+    icon: metadata.icon,
+    iconHue: metadata.iconHue,
     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
+        isGraphNode(source.item) && Obj.isObject(source.item.data) && Obj.getTypename(source.item.data) === typename
       );
     },
     onTransferStart: (child: Node<Obj.Any>, index?: number) => {
@@ -166,6 +167,32 @@ const getQueryCollectionNodePartials = ({
   };
 };
 
+const getSchemaGraphNodePartials = () => {
+  return {
+    role: 'branch',
+    canDrop: () => false,
+  };
+};
+
+const getViewGraphNodePartials = ({
+  view,
+  resolve,
+}: {
+  view: View.View;
+  resolve: (typename: string) => Record<string, any>;
+}) => {
+  const presentation = view.presentation.target;
+  const typename = presentation ? Obj.getTypename(presentation) : undefined;
+  const metadata = typename ? resolve(typename) : {};
+
+  return {
+    label: view.name || ['object name placeholder', { ns: typename, default: 'New view' }],
+    icon: metadata.icon,
+    iconHue: metadata.iconHue,
+    canDrop: () => false,
+  };
+};
+
 const checkPendingMigration = (space: Space) => {
   return (
     space.state.get() === SpaceState.SPACE_REQUIRES_MIGRATION ||
@@ -190,9 +217,9 @@ export const constructSpaceNode = ({
 }) => {
   const hasPendingMigration = checkPendingMigration(space);
   const collection =
-    space.state.get() === SpaceState.SPACE_READY && space.properties[DataType.Collection.typename]?.target;
+    space.state.get() === SpaceState.SPACE_READY && space.properties[Collection.Collection.typename]?.target;
   const partials =
-    space.state.get() === SpaceState.SPACE_READY && Obj.instanceOf(DataType.Collection, collection)
+    space.state.get() === SpaceState.SPACE_READY && Obj.instanceOf(Collection.Collection, collection)
       ? getCollectionGraphNodePartials({ collection, space, resolve })
       : {};
 
@@ -210,6 +237,7 @@ export const constructSpaceNode = ({
         space.state.get() === SpaceState.SPACE_READY && space.properties.icon
           ? `ph--${space.properties.icon}--regular`
           : undefined,
+      iconHue: space.state.get() === SpaceState.SPACE_READY && space.properties.iconHue,
       disabled: !navigable || space.state.get() !== SpaceState.SPACE_READY || hasPendingMigration,
       testId: 'spacePlugin.space',
       canDrop: (source: TreeData) => {
@@ -220,40 +248,40 @@ export const constructSpaceNode = ({
     nodes: [
       {
         id: `settings${ATTENDABLE_PATH_SEPARATOR}${space.id}`,
-        type: `${SPACE_PLUGIN}/settings`,
+        type: `${meta.id}/settings`,
         data: null,
         properties: {
-          label: ['settings panel label', { ns: SPACE_PLUGIN }],
+          label: ['settings panel label', { ns: meta.id }],
           icon: 'ph--faders--regular',
           disposition: 'alternate-tree',
         },
         nodes: [
           {
             id: `properties-settings${ATTENDABLE_PATH_SEPARATOR}${space.id}`,
-            type: `${SPACE_PLUGIN}/properties`,
-            data: `${SPACE_PLUGIN}/properties`,
+            type: `${meta.id}/properties`,
+            data: `${meta.id}/properties`,
             properties: {
-              label: ['space settings properties label', { ns: SPACE_PLUGIN }],
+              label: ['space settings properties label', { ns: meta.id }],
               icon: 'ph--sliders--regular',
               position: 'hoist',
             },
           },
           {
             id: `members-settings${ATTENDABLE_PATH_SEPARATOR}${space.id}`,
-            type: `${SPACE_PLUGIN}/members`,
-            data: `${SPACE_PLUGIN}/members`,
+            type: `${meta.id}/members`,
+            data: `${meta.id}/members`,
             properties: {
-              label: ['members panel label', { ns: SPACE_PLUGIN }],
+              label: ['members panel label', { ns: meta.id }],
               icon: 'ph--users--regular',
               position: 'hoist',
             },
           },
           {
             id: `schema-settings${ATTENDABLE_PATH_SEPARATOR}${space.id}`,
-            type: `${SPACE_PLUGIN}/schema`,
-            data: `${SPACE_PLUGIN}/schema`,
+            type: `${meta.id}/schema`,
+            data: `${meta.id}/schema`,
             properties: {
-              label: ['space settings schema label', { ns: SPACE_PLUGIN }],
+              label: ['space settings schema label', { ns: meta.id }],
               icon: 'ph--shapes--regular',
             },
           },
@@ -287,7 +315,7 @@ export const constructSpaceActions = ({
         await dispatch(createIntent(SpaceAction.Migrate, { space }));
       },
       properties: {
-        label: ['migrate space label', { ns: SPACE_PLUGIN }],
+        label: ['migrate space label', { ns: meta.id }],
         icon: 'ph--database--regular',
         disposition: 'list-item-primary',
         disabled: migrating || Migrations.running(space),
@@ -304,7 +332,7 @@ export const constructSpaceActions = ({
           await dispatch(createIntent(SpaceAction.OpenCreateObject, { target: space }));
         },
         properties: {
-          label: ['create object in space label', { ns: SPACE_PLUGIN }],
+          label: ['create object in space label', { ns: meta.id }],
           icon: 'ph--plus--regular',
           disposition: 'item',
           testId: 'spacePlugin.createObject',
@@ -317,7 +345,7 @@ export const constructSpaceActions = ({
           await dispatch(createIntent(SpaceAction.Rename, { space, caller: params?.caller }));
         },
         properties: {
-          label: ['rename space label', { ns: SPACE_PLUGIN }],
+          label: ['rename space label', { ns: meta.id }],
           icon: 'ph--pencil-simple-line--regular',
           keyBinding: {
             macos: 'shift+F6',
@@ -331,48 +359,176 @@ export const constructSpaceActions = ({
   return actions;
 };
 
+export const createStaticSchemaNode = ({ schema, space }: { schema: Type.Obj.Any; space: Space }) => {
+  return {
+    id: `${space.id}/${Type.getTypename(schema)}`,
+    type: `${meta.id}/static-schema`,
+    data: schema,
+    properties: {
+      label: ['typename label', { ns: Type.getTypename(schema), default: Type.getTypename(schema) }],
+      icon: 'ph--database--regular',
+      iconHue: 'green',
+      role: 'branch',
+      selectable: false,
+      canDrop: () => false,
+      space,
+    },
+  };
+};
+
+export const createStaticSchemaActions = ({
+  schema,
+  space,
+  dispatch,
+  deletable,
+}: {
+  schema: Type.Obj.Any;
+  space: Space;
+  dispatch: PromiseIntentDispatcher;
+  deletable: boolean;
+}) => {
+  const getId = (id: string) => `${space.id}/${Type.getTypename(schema)}/${id}`;
+
+  const actions: NodeArg<ActionData>[] = [
+    {
+      id: getId(SpaceAction.AddObject._tag),
+      type: ACTION_TYPE,
+      data: async () => {
+        await dispatch(
+          createIntent(SpaceAction.OpenCreateObject, {
+            target: space,
+            views: true,
+            initialFormValues: { typename: Type.getTypename(schema) },
+          }),
+        );
+      },
+      properties: {
+        label: ['add view to schema label', { ns: Type.getTypename(StoredSchema) }],
+        icon: 'ph--plus--regular',
+        disposition: 'list-item-primary',
+        testId: 'spacePlugin.addViewToSchema',
+      },
+    },
+    {
+      id: getId(SpaceAction.RenameObject._tag),
+      type: ACTION_TYPE,
+      data: async (params?: InvokeParams) => {
+        throw new Error('Not implemented');
+      },
+      properties: {
+        label: ['rename object label', { ns: Type.getTypename(StoredSchema) }],
+        icon: 'ph--pencil-simple-line--regular',
+        disabled: true,
+        disposition: 'list-item',
+        testId: 'spacePlugin.renameObject',
+      },
+    },
+    {
+      id: getId(SpaceAction.RemoveObjects._tag),
+      type: ACTION_TYPE,
+      data: async () => {
+        const index = space.properties.staticRecords.findIndex(
+          (typename: string) => typename === Type.getTypename(schema),
+        );
+        if (index > -1) {
+          space.properties.staticRecords.splice(index, 1);
+        }
+      },
+      properties: {
+        label: ['delete object label', { ns: Type.getTypename(StoredSchema) }],
+        icon: 'ph--trash--regular',
+        disposition: 'list-item',
+        disabled: !deletable,
+        testId: 'spacePlugin.deleteObject',
+      },
+    },
+    {
+      id: getId(SpaceAction.Snapshot._tag),
+      type: ACTION_TYPE,
+      data: async () => {
+        const result = await dispatch(
+          createIntent(SpaceAction.Snapshot, {
+            space,
+            query: Query.select(Filter.type(schema)).ast,
+          }),
+        );
+        if (result.data?.snapshot) {
+          await downloadBlob(
+            result.data.snapshot,
+            // TODO(wittjosiah): Factor out file name construction.
+            `${new Date().toISOString()}-${space.id}-${Type.getTypename(schema)}.json`,
+          );
+        }
+      },
+      properties: {
+        label: ['snapshot by schema label', { ns: meta.id }],
+        icon: 'ph--camera--regular',
+        disposition: 'list-item',
+      },
+    },
+  ];
+
+  return actions;
+};
+
 export const createObjectNode = ({
   space,
   object,
+  disposition,
   droppable = true,
   navigable = false,
   resolve,
 }: {
   space: Space;
   object: Obj.Any;
+  disposition?: string;
   droppable?: boolean;
   navigable?: boolean;
   resolve: (typename: string) => Record<string, any>;
 }) => {
   const type = Obj.getTypename(object);
   if (!type) {
-    return undefined;
+    return null;
   }
 
   const metadata = resolve(type);
-  if (Object.keys(metadata).length === 0) {
-    return undefined;
-  }
-
-  const partials = Obj.instanceOf(DataType.Collection, object)
+  const partials = Obj.instanceOf(Collection.Collection, object)
     ? getCollectionGraphNodePartials({ collection: object, space, resolve })
-    : Obj.instanceOf(DataType.QueryCollection, object)
+    : Obj.instanceOf(Collection.QueryCollection, object)
       ? getQueryCollectionNodePartials({ collection: object, space, resolve })
-      : metadata.graphProps;
+      : Obj.instanceOf(StoredSchema, object)
+        ? getSchemaGraphNodePartials()
+        : Obj.instanceOf(View.View, object)
+          ? getViewGraphNodePartials({ view: object, resolve })
+          : metadata.graphProps;
+
+  // TODO(wittjosiah): Obj.getLabel isn't triggering reactivity in some cases.
+  //   e.g., create new collection with no name and rename it.
+  const label = (object as any).name ||
+    Obj.getLabel(object) ||
+    // TODO(wittjosiah): Remove metadata labels.
+    metadata.label?.(object) || ['object name placeholder', { ns: type, default: 'New item' }];
+
+  const selectable =
+    (!Obj.instanceOf(StoredSchema, object) &&
+      !Obj.instanceOf(Collection.QueryCollection, object) &&
+      !Obj.instanceOf(Collection.Collection, object)) ||
+    (navigable && Obj.instanceOf(Collection.Collection, object));
 
   return {
-    id: fullyQualifiedId(object),
+    id: Obj.getDXN(object).toString(),
     type,
     cacheable: ['label', 'icon', 'role'],
     data: object,
     properties: {
-      // TODO(burdon): Use annotation to get the name field.
-      label: metadata.label?.(object) ||
-        (object as any).name || ['object name placeholder', { ns: type, default: 'New object' }],
+      label,
       icon: metadata.icon ?? 'ph--placeholder--regular',
+      iconHue: metadata.iconHue,
+      disposition,
       testId: 'spacePlugin.object',
       persistenceClass: 'echo',
       persistenceKey: space?.id,
+      selectable,
       canDrop: (source: TreeData) => {
         return droppable && isGraphNode(source.item) && Obj.isObject(source.item.data);
       },
@@ -386,25 +542,30 @@ export const constructObjectActions = ({
   graph,
   dispatch,
   objectForms,
+  deletable = true,
   navigable = false,
 }: {
   object: Obj.Any;
   graph: ReadableGraph;
   dispatch: PromiseIntentDispatcher;
   objectForms: ObjectForm<any>[];
+  deletable?: boolean;
   navigable?: boolean;
 }) => {
   const space = getSpace(object);
   invariant(space, 'Space not found');
-  const getId = (id: string) => `${id}/${fullyQualifiedId(object)}`;
+  const typename = Obj.getTypename(object);
+  invariant(typename, 'Object has no typename');
+
+  const getId = (id: string) => `${id}/${Obj.getDXN(object).toString()}`;
 
-  const queryCollection = Obj.instanceOf(DataType.QueryCollection, object) ? object : undefined;
+  const queryCollection = Obj.instanceOf(Collection.QueryCollection, object) ? object : undefined;
   const matchingObjectForm = queryCollection
-    ? objectForms.find((form) => Type.getTypename(form.objectSchema) === queryCollection.query.typename)
+    ? objectForms.find((form) => Type.getTypename(form.objectSchema) === getTypenameFromQuery(queryCollection.query))
     : undefined;
 
   const actions: NodeArg<ActionData>[] = [
-    ...(Obj.instanceOf(DataType.Collection, object)
+    ...(Obj.instanceOf(Collection.Collection, object)
       ? [
           {
             id: getId(SpaceAction.OpenCreateObject._tag),
@@ -413,7 +574,7 @@ export const constructObjectActions = ({
               await dispatch(createIntent(SpaceAction.OpenCreateObject, { target: object }));
             },
             properties: {
-              label: ['create object in collection label', { ns: SPACE_PLUGIN }],
+              label: ['create object in collection label', { ns: meta.id }],
               icon: 'ph--plus--regular',
               disposition: 'list-item-primary',
               testId: 'spacePlugin.createObject',
@@ -421,6 +582,53 @@ export const constructObjectActions = ({
           },
         ]
       : []),
+    ...(Obj.instanceOf(StoredSchema, object)
+      ? [
+          {
+            id: getId(SpaceAction.AddObject._tag),
+            type: ACTION_TYPE,
+            data: async () => {
+              await dispatch(
+                createIntent(SpaceAction.OpenCreateObject, {
+                  target: space,
+                  views: true,
+                  initialFormValues: { typename: object.typename },
+                }),
+              );
+            },
+            properties: {
+              label: ['add view to schema label', { ns: Type.getTypename(StoredSchema) }],
+              icon: 'ph--plus--regular',
+              disposition: 'list-item-primary',
+              testId: 'spacePlugin.addViewToSchema',
+            },
+          },
+          {
+            id: getId(SpaceAction.Snapshot._tag),
+            type: ACTION_TYPE,
+            data: async () => {
+              const result = await dispatch(
+                createIntent(SpaceAction.Snapshot, {
+                  space,
+                  query: Query.select(Filter.type(Type.toEffectSchema(object.jsonSchema))).ast,
+                }),
+              );
+              if (result.data?.snapshot) {
+                await downloadBlob(
+                  result.data.snapshot,
+                  // TODO(wittjosiah): Factor out file name construction.
+                  `${new Date().toISOString()}-${space.id}-${object.typename}.json`,
+                );
+              }
+            },
+            properties: {
+              label: ['snapshot by schema label', { ns: meta.id }],
+              icon: 'ph--camera--regular',
+              disposition: 'list-item',
+            },
+          },
+        ]
+      : []),
     ...(matchingObjectForm
       ? [
           {
@@ -431,12 +639,12 @@ export const constructObjectActions = ({
                 await dispatch(
                   createIntent(SpaceAction.OpenCreateObject, {
                     target: space,
-                    typename: queryCollection?.query.typename,
+                    typename: queryCollection ? getTypenameFromQuery(queryCollection.query) : undefined,
                   }),
                 );
               } else {
                 await dispatch(
-                  pipe(
+                  Function.pipe(
                     matchingObjectForm.getIntent({}, { space }),
                     chain(SpaceAction.AddObject, { target: space, hidden: true }),
                     chain(LayoutAction.Open, { part: 'main' }),
@@ -445,7 +653,7 @@ export const constructObjectActions = ({
               }
             },
             properties: {
-              label: ['create object in smart collection label', { ns: SPACE_PLUGIN }],
+              label: ['create object in smart collection label', { ns: meta.id }],
               icon: 'ph--plus--regular',
               disposition: 'list-item-primary',
               testId: 'spacePlugin.createObject',
@@ -460,10 +668,7 @@ export const constructObjectActions = ({
         await dispatch(createIntent(SpaceAction.RenameObject, { object, caller: params?.caller }));
       },
       properties: {
-        label: [
-          Obj.instanceOf(DataType.Collection, object) ? 'rename collection label' : 'rename object label',
-          { ns: SPACE_PLUGIN },
-        ],
+        label: ['rename object label', { ns: typename }],
         icon: 'ph--pencil-simple-line--regular',
         disposition: 'list-item',
         // TODO(wittjosiah): Not working.
@@ -478,33 +683,34 @@ export const constructObjectActions = ({
       type: ACTION_TYPE,
       data: async () => {
         const collection = graph
-          .getConnections(fullyQualifiedId(object), 'inbound')
-          .find(({ data }) => Obj.instanceOf(DataType.Collection, data))?.data;
+          .getConnections(Obj.getDXN(object).toString(), 'inbound')
+          .find(({ data }) => Obj.instanceOf(Collection.Collection, data))?.data;
         await dispatch(createIntent(SpaceAction.RemoveObjects, { objects: [object], target: collection }));
       },
       properties: {
-        label: [
-          Obj.instanceOf(DataType.Collection, object) ? 'delete collection label' : 'delete object label',
-          { ns: SPACE_PLUGIN },
-        ],
+        label: ['delete object label', { ns: typename }],
         icon: 'ph--trash--regular',
         disposition: 'list-item',
+        disabled: !deletable,
         // TODO(wittjosiah): This is a browser shortcut.
         // keyBinding: object instanceof CollectionType ? undefined : 'shift+meta+Backspace',
         testId: 'spacePlugin.deleteObject',
       },
     },
-    ...(navigable || (!Obj.instanceOf(DataType.Collection, object) && !Obj.instanceOf(DataType.QueryCollection, object))
+    ...(navigable ||
+    (!Obj.instanceOf(Collection.Collection, object) &&
+      !Obj.instanceOf(Collection.QueryCollection, object) &&
+      !Obj.instanceOf(StoredSchema, object))
       ? [
           {
             id: getId('copy-link'),
             type: ACTION_TYPE,
             data: async () => {
-              const url = `${window.location.origin}/${space.id}/${fullyQualifiedId(object)}`;
+              const url = `${window.location.origin}/${space.id}/${Obj.getDXN(object).toString()}`;
               await navigator.clipboard.writeText(url);
             },
             properties: {
-              label: ['copy link label', { ns: SPACE_PLUGIN }],
+              label: ['copy link label', { ns: meta.id }],
               icon: 'ph--link--regular',
               disposition: 'list-item',
               testId: 'spacePlugin.copyLink',
@@ -517,10 +723,12 @@ export const constructObjectActions = ({
       id: getId(LayoutAction.Expose._tag),
       type: ACTION_TYPE,
       data: async () => {
-        await dispatch(createIntent(LayoutAction.Expose, { part: 'navigation', subject: fullyQualifiedId(object) }));
+        await dispatch(
+          createIntent(LayoutAction.Expose, { part: 'navigation', subject: Obj.getDXN(object).toString() }),
+        );
       },
       properties: {
-        label: ['expose object label', { ns: SPACE_PLUGIN }],
+        label: ['expose object label', { ns: meta.id }],
         icon: 'ph--eye--regular',
         disposition: 'heading-list-item',
         testId: 'spacePlugin.exposeObject',
@@ -531,6 +739,20 @@ export const constructObjectActions = ({
   return actions;
 };
 
+// TODO(wittjosiah): Factor out.
+const downloadBlob = async (blob: Blob, filename: string) => {
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement('a');
+  a.href = url;
+  a.download = filename;
+
+  document.body.appendChild(a);
+  a.click();
+
+  document.body.removeChild(a);
+  URL.revokeObjectURL(url);
+};
+
 /**
  * @deprecated This is a temporary solution.
  */
@@ -564,7 +786,7 @@ export const cloneObject = async (
   newSpace: Space,
 ): Promise<Type.Expando> => {
   const schema = Obj.getSchema(object);
-  const typename = schema ? Type.getTypename(schema) ?? EXPANDO_TYPENAME : EXPANDO_TYPENAME;
+  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}`);