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

package/dist/lib/browser/index.mjs

@@ -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 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 { 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";
 
@@ -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, Filter } from "@dxos/react-client/echo";
+import { fullyQualifiedId as fullyQualifiedId2, getSpace, isEchoObject, isSpace, SpaceState } 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,10 +288,7 @@ var COMPOSER_SPACE_LOCK = "dxos.org/plugin/space/lock";
 var SHARED = "shared-spaces";
 var EMPTY_ARRAY = [];
 var memoizeQuery = (spaceOrEcho, filter, options) => {
-  const key = JSON.stringify({
-    space: isSpace(spaceOrEcho) ? spaceOrEcho.id : void 0,
-    filter: Filter.from(filter).toProto()
-  });
+  const key = isSpace(spaceOrEcho) ? spaceOrEcho.id : void 0;
   const query = memoize(() => isSpace(spaceOrEcho) ? spaceOrEcho.db.query(filter, options) : spaceOrEcho?.query(filter, options), key);
   const unsubscribe = memoize(() => query?.subscribe(), key);
   cleanup(() => unsubscribe?.());
@@ -846,7 +843,7 @@ var cloneObject = async (object, resolve, newSpace) => {
   const serializer = metadata.serializer;
   invariant(serializer, `No serializer for type: ${typename}`, {
     F: __dxlog_file,
-    L: 639,
+    L: 634,
     S: void 0,
     A: [
       "serializer",
@@ -1874,7 +1871,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(Filter2.schema(Expando, {
+    const { objects: [spacesOrder] } = await defaultSpace.db.query(Filter.schema(Expando, {
       key: SHARED
     })).run();
     if (!spacesOrder) {
@@ -1918,25 +1915,17 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
       });
     }).unsubscribe);
     subscriptions.add(scheduledEffect(() => ({
-      open: openIds(location.active, layout.layoutMode === "solo" ? [
-        "solo"
-      ] : [
-        "main"
-      ]),
-      closed: [
-        ...location.closed
-      ]
-    }), ({ open, closed }) => {
+      ids: openIds(location.active),
+      removed: location.closed ? [
+        location.closed
+      ].flat() : []
+    }), ({ ids, removed }) => {
       const send = () => {
         const spaces = client.spaces.get();
         const identity = client.halo.identity.get();
         if (identity && location.active) {
-          const idsBySpace = reduceGroupBy(open, (id) => {
-            const [spaceId] = parseFullyQualifiedId(id);
-            return spaceId;
-          });
-          const removedBySpace = reduceGroupBy(closed, (id) => {
-            const [spaceId] = parseFullyQualifiedId(id);
+          const idsBySpace = reduceGroupBy(ids, (id) => {
+            const [spaceId] = id.split(":");
             return spaceId;
           });
           for (const space of spaces) {
@@ -1944,8 +1933,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               idsBySpace.set(space.id, []);
             }
           }
-          for (const [spaceId, added] of idsBySpace) {
-            const removed = removedBySpace.get(spaceId) ?? [];
+          for (const [spaceId, ids2] of idsBySpace) {
             const space = spaces.find((space2) => space2.id === spaceId);
             if (!space) {
               continue;
@@ -1955,14 +1943,15 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               attended: attention.attended ? [
                 ...attention.attended
               ] : [],
-              added,
-              removed
+              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))
             }).catch((err) => {
               log3.warn("Failed to broadcast active node for presence.", {
                 err: err.message
               }, {
                 F: __dxlog_file6,
-                L: 300,
+                L: 294,
                 S: void 0,
                 C: (f, a) => f(...a)
               });
@@ -1980,8 +1969,7 @@ 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);
-          const currentIdentity = client.halo.identity.get();
-          if (identityKey && !currentIdentity?.identityKey.equals(identityKey) && Array.isArray(added) && Array.isArray(removed)) {
+          if (identityKey && Array.isArray(added) && Array.isArray(removed)) {
             added.forEach((id) => {
               if (typeof id === "string") {
                 if (!(id in state.values.viewersByObject)) {
@@ -2267,7 +2255,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(Filter2.schema(Expando, {
+                        const { objects: [spacesOrder] } = await client.spaces.default.db.query(Filter.schema(Expando, {
                           key: SHARED
                         })).run();
                         if (spacesOrder) {
@@ -2275,7 +2263,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                         } else {
                           log3.warn("spaces order object not found", void 0, {
                             F: __dxlog_file6,
-                            L: 612,
+                            L: 599,
                             S: void 0,
                             C: (f, a) => f(...a)
                           });
@@ -2340,7 +2328,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   return;
                 }
                 try {
-                  const [spacesOrder] = memoizeQuery(client.spaces.default, Filter2.schema(Expando, {
+                  const [spacesOrder] = memoizeQuery(client.spaces.default, Filter.schema(Expando, {
                     key: SHARED
                   }));
                   const order = spacesOrder?.order ?? [];
@@ -2466,14 +2454,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   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)
-                    }));
+                    }).first().then((o) => store.value = o);
                   }
                 }, id);
                 const object = store.value;
@@ -2544,9 +2525,15 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                     }
                   };
                 }
-                const [object] = memoizeQuery(space, {
-                  id: objectId
-                });
+                const object = toSignal((onChange) => {
+                  const timeout = setTimeout(async () => {
+                    await space?.db.query({
+                      id: objectId
+                    }).first();
+                    onChange();
+                  });
+                  return () => clearTimeout(timeout);
+                }, () => space?.db.getObjectById(objectId), subjectId);
                 if (!object || !subjectId) {
                   return;
                 }
@@ -3009,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: 1349,
+                L: 1346,
                 S: void 0,
                 A: [
                   "Array.isArray(objects)",