@dxos/plugin-space 0.7.1 → 0.7.2-main.f1adc9f

package/dist/lib/browser/index.mjs

@@ -22,7 +22,7 @@ import { signal } from "@preact/signals-core";
 import React17 from "react";
 import { LayoutAction as LayoutAction2, NavigationAction as NavigationAction4, Surface, findPlugin, firstIdInPart, openIds, parseGraphPlugin, parseIntentPlugin as parseIntentPlugin2, parseLayoutPlugin, parseMetadataResolverPlugin, parseNavigationPlugin as parseNavigationPlugin2, resolvePlugin } from "@dxos/app-framework";
 import { EventSubscriptions } from "@dxos/async";
-import { isReactiveObject as isReactiveObject2 } from "@dxos/echo-schema";
+import { isDeleted, isReactiveObject as isReactiveObject2 } from "@dxos/echo-schema";
 import { scheduledEffect } from "@dxos/echo-signals/core";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { LocalStorageStore } from "@dxos/local-storage";
@@ -33,7 +33,7 @@ import { parseClientPlugin } from "@dxos/plugin-client";
 import { createExtension, memoize as memoize2, toSignal } from "@dxos/plugin-graph";
 import { ObservabilityAction as ObservabilityAction2 } from "@dxos/plugin-observability/meta";
 import { PublicKey as PublicKey2 } from "@dxos/react-client";
-import { Expando, Filter, SpaceState as SpaceState2, create as create2, fullyQualifiedId as fullyQualifiedId4, getSpace as getSpace4, getTypename as getTypename2, isEchoObject as isEchoObject2, isSpace as isSpace2, loadObjectReferences, parseId, FQ_ID_LENGTH } from "@dxos/react-client/echo";
+import { Expando, Filter as Filter2, SpaceState as SpaceState2, create as create2, fullyQualifiedId as fullyQualifiedId4, getSpace as getSpace4, getTypename as getTypename2, isEchoObject as isEchoObject2, isSpace as isSpace2, loadObjectReferences, parseId, FQ_ID_LENGTH, SPACE_ID_LENGTH, OBJECT_ID_LENGTH, parseFullyQualifiedId } from "@dxos/react-client/echo";
 import { osTranslations } from "@dxos/shell/react";
 import { ComplexMap as ComplexMap2, nonNullable, reduceGroupBy } from "@dxos/util";
 
@@ -280,7 +280,7 @@ import { create, isReactiveObject, getTypename, getSchema, getObjectAnnotation,
 import { invariant } from "@dxos/invariant";
 import { Migrations } from "@dxos/migrations";
 import { ACTION_TYPE, ACTION_GROUP_TYPE, actionGroupSymbol, getGraph, cleanup, memoize } from "@dxos/plugin-graph";
-import { fullyQualifiedId as fullyQualifiedId2, getSpace, isEchoObject, isSpace, SpaceState } from "@dxos/react-client/echo";
+import { fullyQualifiedId as fullyQualifiedId2, getSpace, isEchoObject, isSpace, SpaceState, Filter } from "@dxos/react-client/echo";
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/util.tsx";
 var SPACES = `${SPACE_PLUGIN}-spaces`;
 var SPACE_TYPE = "dxos.org/type/Space";
@@ -288,7 +288,10 @@ var COMPOSER_SPACE_LOCK = "dxos.org/plugin/space/lock";
 var SHARED = "shared-spaces";
 var EMPTY_ARRAY = [];
 var memoizeQuery = (spaceOrEcho, filter, options) => {
-  const key = isSpace(spaceOrEcho) ? spaceOrEcho.id : void 0;
+  const key = JSON.stringify({
+    space: isSpace(spaceOrEcho) ? spaceOrEcho.id : void 0,
+    filter: Filter.from(filter).toProto()
+  });
   const query = memoize(() => isSpace(spaceOrEcho) ? spaceOrEcho.db.query(filter, options) : spaceOrEcho?.query(filter, options), key);
   const unsubscribe = memoize(() => query?.subscribe(), key);
   cleanup(() => unsubscribe?.());
@@ -361,6 +364,11 @@ var constructSpaceNode = ({ space, navigable = false, personal, namesCache, reso
   return {
     id: space.id,
     type: SPACE_TYPE,
+    cacheable: [
+      "label",
+      "icon",
+      "role"
+    ],
     data: space,
     properties: {
       ...partials,
@@ -640,6 +648,11 @@ var createObjectNode = ({ object, space, navigable = false, resolve }) => {
   return {
     id: fullyQualifiedId2(object),
     type,
+    cacheable: [
+      "label",
+      "icon",
+      "role"
+    ],
     data: object,
     properties: {
       ...partials,
@@ -833,7 +846,7 @@ var cloneObject = async (object, resolve, newSpace) => {
   const serializer = metadata.serializer;
   invariant(serializer, `No serializer for type: ${typename}`, {
     F: __dxlog_file,
-    L: 632,
+    L: 639,
     S: void 0,
     A: [
       "serializer",
@@ -1861,7 +1874,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
     if (typeof defaultSpace.properties[COMPOSER_SPACE_LOCK] !== "boolean") {
       defaultSpace.properties[COMPOSER_SPACE_LOCK] = true;
     }
-    const { objects: [spacesOrder] } = await defaultSpace.db.query(Filter.schema(Expando, {
+    const { objects: [spacesOrder] } = await defaultSpace.db.query(Filter2.schema(Expando, {
       key: SHARED
     })).run();
     if (!spacesOrder) {
@@ -1905,17 +1918,25 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
       });
     }).unsubscribe);
     subscriptions.add(scheduledEffect(() => ({
-      ids: openIds(location.active),
-      removed: location.closed ? [
-        location.closed
-      ].flat() : []
-    }), ({ ids, removed }) => {
+      open: openIds(location.active, layout.layoutMode === "solo" ? [
+        "solo"
+      ] : [
+        "main"
+      ]),
+      closed: [
+        ...location.closed
+      ]
+    }), ({ open, closed }) => {
       const send = () => {
         const spaces = client.spaces.get();
         const identity = client.halo.identity.get();
         if (identity && location.active) {
-          const idsBySpace = reduceGroupBy(ids, (id) => {
-            const [spaceId] = id.split(":");
+          const idsBySpace = reduceGroupBy(open, (id) => {
+            const [spaceId] = parseFullyQualifiedId(id);
+            return spaceId;
+          });
+          const removedBySpace = reduceGroupBy(closed, (id) => {
+            const [spaceId] = parseFullyQualifiedId(id);
             return spaceId;
           });
           for (const space of spaces) {
@@ -1923,7 +1944,8 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               idsBySpace.set(space.id, []);
             }
           }
-          for (const [spaceId, ids2] of idsBySpace) {
+          for (const [spaceId, added] of idsBySpace) {
+            const removed = removedBySpace.get(spaceId) ?? [];
             const space = spaces.find((space2) => space2.id === spaceId);
             if (!space) {
               continue;
@@ -1933,15 +1955,14 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               attended: attention.attended ? [
                 ...attention.attended
               ] : [],
-              added: ids2,
-              // TODO(Zan): When we re-open a part, we should remove it from the removed list in the navigation plugin.
-              removed: removed.filter((id) => !ids2.includes(id))
+              added,
+              removed
             }).catch((err) => {
               log3.warn("Failed to broadcast active node for presence.", {
                 err: err.message
               }, {
                 F: __dxlog_file6,
-                L: 292,
+                L: 300,
                 S: void 0,
                 C: (f, a) => f(...a)
               });
@@ -1959,7 +1980,8 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
         spaceSubscriptions.add(space.listen("viewing", (message) => {
           const { added, removed, attended } = message.payload;
           const identityKey = PublicKey2.safeFrom(message.payload.identityKey);
-          if (identityKey && Array.isArray(added) && Array.isArray(removed)) {
+          const currentIdentity = client.halo.identity.get();
+          if (identityKey && !currentIdentity?.identityKey.equals(identityKey) && Array.isArray(added) && Array.isArray(removed)) {
             added.forEach((id) => {
               if (typeof id === "string") {
                 if (!(id in state.values.viewersByObject)) {
@@ -2228,6 +2250,10 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   {
                     id: SPACES,
                     type: SPACES,
+                    cacheable: [
+                      "label",
+                      "role"
+                    ],
                     properties: {
                       label: [
                         "spaces label",
@@ -2241,7 +2267,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                       childrenPersistenceClass: "echo",
                       onRearrangeChildren: async (nextOrder) => {
                         graph._sortEdges(SPACES, "outbound", nextOrder.map(({ id }) => id));
-                        const { objects: [spacesOrder] } = await client.spaces.default.db.query(Filter.schema(Expando, {
+                        const { objects: [spacesOrder] } = await client.spaces.default.db.query(Filter2.schema(Expando, {
                           key: SHARED
                         })).run();
                         if (spacesOrder) {
@@ -2249,7 +2275,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                         } else {
                           log3.warn("spaces order object not found", void 0, {
                             F: __dxlog_file6,
-                            L: 596,
+                            L: 612,
                             S: void 0,
                             C: (f, a) => f(...a)
                           });
@@ -2314,7 +2340,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   return;
                 }
                 try {
-                  const [spacesOrder] = memoizeQuery(client.spaces.default, Filter.schema(Expando, {
+                  const [spacesOrder] = memoizeQuery(client.spaces.default, Filter2.schema(Expando, {
                     key: SHARED
                   }));
                   const order = spacesOrder?.order ?? [];
@@ -2334,37 +2360,31 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   }));
                 } catch {
                 }
-              }
-            }),
-            // Find an object by its fully qualified id.
-            createExtension({
-              id: `${SPACE_PLUGIN}/objects`,
+              },
               resolver: ({ id }) => {
-                const [spaceId, objectId] = id.split(":");
-                const space = client.spaces.get().find((space2) => space2.id === spaceId);
-                if (!space) {
+                if (id.length !== SPACE_ID_LENGTH) {
                   return;
                 }
-                const spaceState = toSignal((onChange) => space.state.subscribe(() => onChange()).unsubscribe, () => space.state.get(), space.id);
-                if (spaceState !== SpaceState2.SPACE_READY) {
+                const spaces = toSignal((onChange) => client.spaces.subscribe(() => onChange()).unsubscribe, () => client.spaces.get());
+                const isReady = toSignal((onChange) => client.spaces.isReady.subscribe(() => onChange()).unsubscribe, () => client.spaces.isReady.get());
+                if (!spaces || !isReady) {
                   return;
                 }
-                const store = memoize2(() => signal(space.db.getObjectById(objectId)), id);
-                memoize2(() => {
-                  if (!store.value) {
-                    void space.db.loadObjectById(objectId).then((o) => store.value = o);
-                  }
-                }, id);
-                const object = store.value;
-                if (!object) {
+                const space = spaces.find((space2) => space2.id === id);
+                if (!space) {
                   return;
                 }
-                return createObjectNode({
-                  object,
-                  space,
-                  resolve,
-                  navigable: state.values.navigableCollections
-                });
+                if (space.state.get() === SpaceState2.SPACE_INACTIVE) {
+                  return false;
+                } else {
+                  return constructSpaceNode({
+                    space,
+                    navigable: state.values.navigableCollections,
+                    personal: space === client.spaces.default,
+                    namesCache: state.values.spaceNames,
+                    resolve
+                  });
+                }
               }
             }),
             // Create space actions and action groups.
@@ -2408,23 +2428,9 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 })).filter(nonNullable);
               }
             }),
-            // Create collection actions and action groups.
-            createExtension({
-              id: `${SPACE_PLUGIN}/object-actions`,
-              filter: (node) => isEchoObject2(node.data),
-              actionGroups: ({ node }) => constructObjectActionGroups({
-                object: node.data,
-                dispatch,
-                navigable: state.values.navigableCollections
-              }),
-              actions: ({ node }) => constructObjectActions({
-                node,
-                dispatch
-              })
-            }),
-            // Create nodes for objects in collections.
+            // Create nodes for objects in a collection or by its fully qualified id.
             createExtension({
-              id: `${SPACE_PLUGIN}/collection-objects`,
+              id: `${SPACE_PLUGIN}/objects`,
               filter: (node) => node.data instanceof CollectionType,
               connector: ({ node }) => {
                 const collection = node.data;
@@ -2438,8 +2444,68 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   resolve,
                   navigable: state.values.navigableCollections
                 })).filter(nonNullable);
+              },
+              resolver: ({ id }) => {
+                if (id.length !== FQ_ID_LENGTH) {
+                  return;
+                }
+                const [spaceId, objectId] = id.split(":");
+                if (spaceId.length !== SPACE_ID_LENGTH && objectId.length !== OBJECT_ID_LENGTH) {
+                  return;
+                }
+                const space = client.spaces.get().find((space2) => space2.id === spaceId);
+                if (!space) {
+                  return;
+                }
+                const spaceState = toSignal((onChange) => space.state.subscribe(() => onChange()).unsubscribe, () => space.state.get(), space.id);
+                if (spaceState !== SpaceState2.SPACE_READY) {
+                  return;
+                }
+                const store = memoize2(() => signal(space.db.getObjectById(objectId)), id);
+                memoize2(() => {
+                  if (!store.value) {
+                    void space.db.query({
+                      id: objectId
+                    }).first().then((o) => store.value = o).catch((err) => log3.catch(err, {
+                      objectId
+                    }, {
+                      F: __dxlog_file6,
+                      L: 835,
+                      S: void 0,
+                      C: (f, a) => f(...a)
+                    }));
+                  }
+                }, id);
+                const object = store.value;
+                if (!object) {
+                  return;
+                }
+                if (isDeleted(object)) {
+                  return false;
+                } else {
+                  return createObjectNode({
+                    object,
+                    space,
+                    resolve,
+                    navigable: state.values.navigableCollections
+                  });
+                }
               }
             }),
+            // Create collection actions and action groups.
+            createExtension({
+              id: `${SPACE_PLUGIN}/object-actions`,
+              filter: (node) => isEchoObject2(node.data),
+              actionGroups: ({ node }) => constructObjectActionGroups({
+                object: node.data,
+                dispatch,
+                navigable: state.values.navigableCollections
+              }),
+              actions: ({ node }) => constructObjectActions({
+                node,
+                dispatch
+              })
+            }),
             // Create nodes for object settings.
             createExtension({
               id: `${SPACE_PLUGIN}/settings-for-subject`,
@@ -2451,7 +2517,8 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 const icon = "ph--gear--regular";
                 const [subjectId] = id.split("~");
                 const { spaceId, objectId } = parseId(subjectId);
-                const space = client.spaces.get().find((space2) => space2.id === spaceId);
+                const spaces = toSignal((onChange) => client.spaces.subscribe(() => onChange()).unsubscribe, () => client.spaces.get());
+                const space = spaces?.find((space2) => space2.id === spaceId && space2.state.get() === SpaceState2.SPACE_READY);
                 if (!objectId) {
                   const label2 = space ? space.properties.name || [
                     "unnamed space label",
@@ -2477,13 +2544,9 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                     }
                   };
                 }
-                const object = toSignal((onChange) => {
-                  const timeout = setTimeout(async () => {
-                    await space?.db.loadObjectById(objectId);
-                    onChange();
-                  });
-                  return () => clearTimeout(timeout);
-                }, () => space?.db.getObjectById(objectId), subjectId);
+                const [object] = memoizeQuery(space, {
+                  id: objectId
+                });
                 if (!object || !subjectId) {
                   return;
                 }
@@ -2946,7 +3009,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               const objects = intent.data?.objects ?? intent.data?.result;
               invariant2(Array.isArray(objects), void 0, {
                 F: __dxlog_file6,
-                L: 1291,
+                L: 1349,
                 S: void 0,
                 A: [
                   "Array.isArray(objects)",