@dxos/plugin-space 0.7.1 → 0.7.2-staging.6d26b2a

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, 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 } from "@dxos/react-client/echo";
 import { osTranslations } from "@dxos/shell/react";
 import { ComplexMap as ComplexMap2, nonNullable, reduceGroupBy } from "@dxos/util";
 
@@ -361,6 +361,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 +645,11 @@ var createObjectNode = ({ object, space, navigable = false, resolve }) => {
   return {
     id: fullyQualifiedId2(object),
     type,
+    cacheable: [
+      "label",
+      "icon",
+      "role"
+    ],
     data: object,
     properties: {
       ...partials,
@@ -833,7 +843,7 @@ var cloneObject = async (object, resolve, newSpace) => {
   const serializer = metadata.serializer;
   invariant(serializer, `No serializer for type: ${typename}`, {
     F: __dxlog_file,
-    L: 632,
+    L: 634,
     S: void 0,
     A: [
       "serializer",
@@ -1941,7 +1951,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 err: err.message
               }, {
                 F: __dxlog_file6,
-                L: 292,
+                L: 294,
                 S: void 0,
                 C: (f, a) => f(...a)
               });
@@ -2228,6 +2238,10 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   {
                     id: SPACES,
                     type: SPACES,
+                    cacheable: [
+                      "label",
+                      "role"
+                    ],
                     properties: {
                       label: [
                         "spaces label",
@@ -2249,7 +2263,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                         } else {
                           log3.warn("spaces order object not found", void 0, {
                             F: __dxlog_file6,
-                            L: 596,
+                            L: 599,
                             S: void 0,
                             C: (f, a) => f(...a)
                           });
@@ -2334,37 +2348,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 +2416,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 +2432,61 @@ 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);
+                  }
+                }, 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 +2498,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",
@@ -2479,7 +2527,9 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 }
                 const object = toSignal((onChange) => {
                   const timeout = setTimeout(async () => {
-                    await space?.db.loadObjectById(objectId);
+                    await space?.db.query({
+                      id: objectId
+                    }).first();
                     onChange();
                   });
                   return () => clearTimeout(timeout);
@@ -2946,7 +2996,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: 1346,
                 S: void 0,
                 A: [
                   "Array.isArray(objects)",