@dxos/plugin-space 0.8.4-main.5ea62a8 → 0.8.4-main.72ec0f3

package/src/capabilities/app-graph-builder.ts

@@ -2,39 +2,42 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Array, Option, Schema, pipe } from 'effect';
+import { Atom } from '@effect-atom/atom-react';
+import * as Array from 'effect/Array';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import * as Schema from 'effect/Schema';
 
 import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
-import { type QueryResult, type Space, SpaceState, getSpace, isSpace, parseId } from '@dxos/client/echo';
-import { Filter, Obj, Query, Type } from '@dxos/echo';
+import { type QueryResult, type Space, SpaceState, getSpace, isSpace } from '@dxos/client/echo';
+import { DXN, Filter, Obj, Query, Type } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
-import { ROOT_ID, createExtension, rxFromObservable, rxFromSignal } from '@dxos/plugin-graph';
-import { DataType } from '@dxos/schema';
+import { ROOT_ID, atomFromObservable, atomFromSignal, createExtension } from '@dxos/plugin-graph';
+import { Collection, StoredSchema, View, getTypenameFromQuery } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
 import { getActiveSpace } from '../hooks';
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { SPACE_TYPE, SpaceAction, type SpaceSettingsProps } from '../types';
 import {
   SHARED,
   SPACES,
+  atomFromQuery,
   constructObjectActions,
   constructSpaceActions,
   constructSpaceNode,
   createObjectNode,
   createStaticSchemaActions,
   createStaticSchemaNode,
-  rxFromQuery,
 } from '../util';
 
 import { SpaceCapabilities } from './capabilities';
 
 export default (context: PluginContext) => {
-  // TODO(wittjosiah): Make reactive.
-  const resolve = (typename: string) =>
+  // TODO(wittjosiah): Using `get` and being reactive seems to cause a bug with Atom where disposed atoms are accessed.
+  const resolve = (get: Atom.Context) => (typename: string) =>
     context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
 
   const spacesNode = {
@@ -42,7 +45,7 @@ export default (context: PluginContext) => {
     type: SPACES,
     cacheable: ['label', 'role'],
     properties: {
-      label: ['spaces label', { ns: SPACE_PLUGIN }],
+      label: ['spaces label', { ns: meta.id }],
       icon: 'ph--planet--regular',
       testId: 'spacePlugin.spaces',
       role: 'branch',
@@ -77,11 +80,11 @@ export default (context: PluginContext) => {
   return contributes(Capabilities.AppGraphBuilder, [
     // Primary actions.
     createExtension({
-      id: `${SPACE_PLUGIN}/primary-actions`,
+      id: `${meta.id}/primary-actions`,
       position: 'hoist',
       actions: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map(() => [
@@ -92,7 +95,7 @@ export default (context: PluginContext) => {
                   await dispatch(createIntent(SpaceAction.OpenCreateSpace));
                 },
                 properties: {
-                  label: ['create space label', { ns: SPACE_PLUGIN }],
+                  label: ['create space label', { ns: meta.id }],
                   icon: 'ph--plus--regular',
                   testId: 'spacePlugin.createSpace',
                   disposition: 'menu',
@@ -105,7 +108,7 @@ export default (context: PluginContext) => {
                   await dispatch(createIntent(SpaceAction.Join));
                 },
                 properties: {
-                  label: ['join space label', { ns: SPACE_PLUGIN }],
+                  label: ['join space label', { ns: meta.id }],
                   icon: 'ph--sign-in--regular',
                   testId: 'spacePlugin.joinSpace',
                   disposition: 'menu',
@@ -120,7 +123,7 @@ export default (context: PluginContext) => {
                   await dispatch(createIntent(SpaceAction.OpenMembers, { space }));
                 },
                 properties: {
-                  label: ['share space label', { ns: SPACE_PLUGIN }],
+                  label: ['share space label', { ns: meta.id }],
                   icon: 'ph--users--regular',
                   testId: 'spacePlugin.shareSpace',
                   keyBinding: {
@@ -138,7 +141,7 @@ export default (context: PluginContext) => {
                   await dispatch(createIntent(SpaceAction.OpenSettings, { space }));
                 },
                 properties: {
-                  label: ['open current space settings label', { ns: SPACE_PLUGIN }],
+                  label: ['open current space settings label', { ns: meta.id }],
                   icon: 'ph--faders--regular',
                   keyBinding: {
                     macos: 'meta+shift+,',
@@ -154,11 +157,11 @@ export default (context: PluginContext) => {
 
     // Create spaces group node.
     createExtension({
-      id: `${SPACE_PLUGIN}/root`,
+      id: `${meta.id}/root`,
       position: 'hoist',
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map(() => [spacesNode]),
@@ -173,25 +176,25 @@ export default (context: PluginContext) => {
       id: SPACES,
       connector: (node) => {
         let query: QueryResult<Type.Expando> | undefined;
-        return Rx.make((get) =>
-          pipe(
+        return Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === SPACES ? Option.some(node) : Option.none())),
             Option.map(() => {
               const state = context.getCapability(SpaceCapabilities.State);
               const client = context.getCapability(ClientCapabilities.Client);
-              const spacesRx = rxFromObservable(client.spaces);
-              const isReadyRx = rxFromObservable(client.spaces.isReady);
+              const spacesAtom = atomFromObservable(client.spaces);
+              const isReadyAtom = atomFromObservable(client.spaces.isReady);
 
-              const spaces = get(spacesRx);
-              const isReady = get(isReadyRx);
+              const spaces = get(spacesAtom);
+              const isReady = get(isReadyAtom);
 
               if (!spaces || !isReady) {
                 return [];
               }
 
               const settings = get(context.capabilities(Capabilities.SettingsStore))[0]?.getStore<SpaceSettingsProps>(
-                SPACE_PLUGIN,
+                meta.id,
               )?.value;
 
               // TODO(wittjosiah): During client reset, accessing default space throws.
@@ -199,9 +202,9 @@ export default (context: PluginContext) => {
                 if (!query) {
                   query = client.spaces.default.db.query(Filter.type(Type.Expando, { key: SHARED }));
                 }
-                const [spacesOrder] = get(rxFromQuery(query));
+                const [spacesOrder] = get(atomFromQuery(query));
                 return get(
-                  rxFromSignal(() => {
+                  atomFromSignal(() => {
                     const order: string[] = spacesOrder?.order ?? [];
                     const orderMap = new Map(order.map((id, index) => [id, index]));
                     return [
@@ -219,7 +222,7 @@ export default (context: PluginContext) => {
                           navigable: state.navigableCollections,
                           personal: space === client.spaces.default,
                           namesCache: state.spaceNames,
-                          resolve,
+                          resolve: resolve(get),
                         }),
                       );
                   }),
@@ -276,10 +279,10 @@ export default (context: PluginContext) => {
 
     // Create space actions.
     createExtension({
-      id: `${SPACE_PLUGIN}/actions`,
+      id: `${meta.id}/actions`,
       actions: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
               node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none(),
@@ -308,24 +311,24 @@ export default (context: PluginContext) => {
 
     // Create nodes for objects in the root collection of a space.
     createExtension({
-      id: `${SPACE_PLUGIN}/root-collection`,
+      id: `${meta.id}/root-collection`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
               node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none(),
             ),
             Option.map((space) => {
               const state = context.getCapability(SpaceCapabilities.State);
-              const spaceState = get(rxFromObservable(space.state));
+              const spaceState = get(atomFromObservable(space.state));
               if (spaceState !== SpaceState.SPACE_READY) {
                 return [];
               }
 
               const collection = get(
-                rxFromSignal(
-                  () => space.properties[DataType.Collection.typename]?.target as DataType.Collection | undefined,
+                atomFromSignal(
+                  () => space.properties[Collection.Collection.typename]?.target as Collection.Collection | undefined,
                 ),
               );
               if (!collection) {
@@ -333,8 +336,8 @@ export default (context: PluginContext) => {
               }
 
               return get(
-                rxFromSignal(() =>
-                  pipe(
+                atomFromSignal(() =>
+                  Function.pipe(
                     collection.objects,
                     Array.map((object) => object.target),
                     Array.filter(isNonNullable),
@@ -342,7 +345,7 @@ export default (context: PluginContext) => {
                       createObjectNode({
                         space,
                         object,
-                        resolve,
+                        resolve: resolve(get),
                         navigable: state.navigableCollections,
                       }),
                     ),
@@ -358,27 +361,33 @@ export default (context: PluginContext) => {
 
     // Create nodes for objects in a collection or by its fully qualified id.
     createExtension({
-      id: `${SPACE_PLUGIN}/objects`,
+      id: `${meta.id}/objects`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
-              Obj.instanceOf(DataType.Collection, node.data) ? Option.some(node.data) : Option.none(),
+              Obj.instanceOf(Collection.Collection, node.data) ? Option.some(node.data) : Option.none(),
             ),
             Option.map((collection) => {
               const state = context.getCapability(SpaceCapabilities.State);
               const space = getSpace(collection);
 
               return get(
-                rxFromSignal(() =>
-                  pipe(
+                atomFromSignal(() =>
+                  Function.pipe(
                     collection.objects,
                     Array.map((object) => object.target),
                     Array.filter(isNonNullable),
                     Array.map(
                       (object) =>
-                        space && createObjectNode({ object, space, resolve, navigable: state.navigableCollections }),
+                        space &&
+                        createObjectNode({
+                          object,
+                          space,
+                          resolve: resolve(get),
+                          navigable: state.navigableCollections,
+                        }),
                     ),
                     Array.filter(isNonNullable),
                   ),
@@ -429,20 +438,19 @@ export default (context: PluginContext) => {
 
     // Create nodes for objects in a query collection.
     createExtension({
-      id: `${SPACE_PLUGIN}/query-collection-objects`,
+      id: `${meta.id}/query-collection-objects`,
       connector: (node) => {
         let query: QueryResult<Type.Expando> | undefined;
-        return Rx.make((get) =>
-          pipe(
+        return Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
-              Obj.instanceOf(DataType.QueryCollection, node.data) ? Option.some(node.data) : Option.none(),
+              Obj.instanceOf(Collection.QueryCollection, node.data) ? Option.some(node.data) : Option.none(),
             ),
             Option.flatMap((collection) => {
               const space = getSpace(collection);
-              return collection.query.typename && space
-                ? Option.some({ typename: collection.query.typename, space })
-                : Option.none();
+              const typename = getTypenameFromQuery(collection.query);
+              return typename && space ? Option.some({ typename, space }) : Option.none();
             }),
             Option.map(({ typename, space }) => {
               const state = context.getCapability(SpaceCapabilities.State);
@@ -454,22 +462,22 @@ export default (context: PluginContext) => {
                     //   It will return all objects in the collection, not just the ones of the given type.
                     //   However this works fine for now because this query is only used for exclusions.
                     Query.select(Filter.typename(typename))
-                      .referencedBy(DataType.Collection, 'objects')
+                      .referencedBy(Collection.Collection, 'objects')
                       .reference('objects'),
                   ),
                 );
               }
               return (
-                get(rxFromQuery(query))
+                get(atomFromQuery(query))
                   // TODO(wittjosiah): This should be the default sort order.
                   .toSorted((a, b) => a.id.localeCompare(b.id))
                   .map((object) =>
                     get(
-                      rxFromSignal(() =>
+                      atomFromSignal(() =>
                         createObjectNode({
                           object,
                           space,
-                          resolve,
+                          resolve: resolve(get),
                           droppable: false, // Cannot rearrange query collections.
                           navigable: state.navigableCollections,
                         }),
@@ -487,15 +495,15 @@ export default (context: PluginContext) => {
 
     // Static schema records.
     createExtension({
-      id: `${SPACE_PLUGIN}/static-schemas`,
+      id: `${meta.id}/static-schemas`,
       connector: (node) => {
         const client = context.getCapability(ClientCapabilities.Client);
-        return Rx.make((get) =>
-          pipe(
+        return Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
-              Obj.instanceOf(DataType.QueryCollection, node.data) &&
-              node.data.query.typename === DataType.StoredSchema.typename
+              Obj.instanceOf(Collection.QueryCollection, node.data) &&
+              getTypenameFromQuery(node.data.query) === StoredSchema.typename
                 ? Option.some(node.data)
                 : Option.none(),
             ),
@@ -504,7 +512,7 @@ export default (context: PluginContext) => {
               return space?.properties.staticRecords ? Option.some(space) : Option.none();
             }),
             Option.map((space) => {
-              return get(rxFromSignal(() => (space.properties.staticRecords ?? []) as string[]))
+              return get(atomFromSignal(() => (space.properties.staticRecords ?? []) as string[]))
                 .map((typename) =>
                   client.graph.schemaRegistry.schemas.find((schema) => Type.getTypename(schema) === typename),
                 )
@@ -519,11 +527,11 @@ export default (context: PluginContext) => {
 
     // Create static schema actions.
     createExtension({
-      id: `${SPACE_PLUGIN}/static-schema-actions`,
+      id: `${meta.id}/static-schema-actions`,
       actions: (node) => {
-        let query: QueryResult<DataType.View> | undefined;
-        return Rx.make((get) =>
-          pipe(
+        let query: QueryResult<View.View> | undefined;
+        return Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) => {
               const space = isSpace(node.properties.space) ? node.properties.space : undefined;
@@ -532,14 +540,16 @@ export default (context: PluginContext) => {
             Option.map(({ space, schema }) => {
               if (!query) {
                 // TODO(wittjosiah): Support filtering by nested properties (e.g. `query.typename`).
-                query = space.db.query(Filter.type(DataType.View));
+                query = space.db.query(Filter.type(View.View));
               }
 
-              const views = get(rxFromQuery(query));
+              const views = get(atomFromQuery(query));
               const filteredViews = get(
-                rxFromSignal(() =>
+                atomFromSignal(() =>
                   // TODO(wittjosiah): Remove cast.
-                  views.filter((view) => view.query.typename === Type.getTypename(schema as Type.Obj.Any)),
+                  views.filter(
+                    (view) => getTypenameFromQuery(view.query.ast) === Type.getTypename(schema as Type.Obj.Any),
+                  ),
                 ),
               );
               const deletable = filteredViews.length === 0;
@@ -565,41 +575,57 @@ export default (context: PluginContext) => {
 
     // Create nodes for schema views.
     createExtension({
-      id: `${SPACE_PLUGIN}/schema-views`,
+      id: `${meta.id}/schema-views`,
       connector: (node) => {
-        let query: QueryResult<DataType.View> | undefined;
-        return Rx.make((get) =>
-          pipe(
+        let query: QueryResult<View.View> | undefined;
+        return Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) => {
               const space = getSpace(node.data) ?? (isSpace(node.properties.space) ? node.properties.space : undefined);
-              return space && (Obj.instanceOf(DataType.StoredSchema, node.data) || Schema.isSchema(node.data))
+              return space && (Obj.instanceOf(StoredSchema, node.data) || Schema.isSchema(node.data))
                 ? Option.some({ space, schema: node.data })
                 : Option.none();
             }),
             Option.map(({ space, schema }) => {
               if (!query) {
                 // TODO(wittjosiah): Support filtering by nested properties (e.g. `query.typename`).
-                query = space.db.query(Filter.type(DataType.View));
+                query = space.db.query(Filter.type(View.View));
               }
 
               // TODO(wittjosiah): Remove cast.
               const typename = Schema.isSchema(schema) ? Type.getTypename(schema as Type.Obj.Any) : schema.typename;
-              return get(rxFromQuery(query))
-                .filter((view) => view.query.typename === typename)
-                .map((view) =>
-                  get(
-                    rxFromSignal(() =>
-                      createObjectNode({
-                        object: view,
-                        space,
-                        resolve,
-                        droppable: false,
+              return (
+                get(atomFromQuery(query))
+                  .filter((view) => getTypenameFromQuery(view.query.ast) === typename)
+                  // Filter out Collection views from Projects.
+                  .filter((view) =>
+                    get(
+                      atomFromSignal(() => {
+                        const presentation = view.presentation.target;
+                        if (presentation) {
+                          const typename = Obj.getTypename(presentation);
+                          return typename !== Collection.Collection.typename;
+                        } else {
+                          return false;
+                        }
                       }),
                     ),
-                  ),
-                )
-                .filter(isNonNullable);
+                  )
+                  .map((view) =>
+                    get(
+                      atomFromSignal(() =>
+                        createObjectNode({
+                          object: view,
+                          space,
+                          resolve: resolve(get),
+                          droppable: false,
+                        }),
+                      ),
+                    ),
+                  )
+                  .filter(isNonNullable)
+              );
             }),
             Option.getOrElse(() => []),
           ),
@@ -609,65 +635,74 @@ export default (context: PluginContext) => {
 
     // Create record nodes.
     createExtension({
-      id: `${SPACE_PLUGIN}/records`,
+      id: `${meta.id}/records`,
       resolver: (id) => {
         let query: QueryResult<Type.Expando> | undefined;
-        return Rx.make((get) => {
+        return Atom.make((get) => {
           const client = context.getCapability(ClientCapabilities.Client);
-          const { spaceId, objectId } = parseId(id);
-          if (!spaceId || !objectId) {
+          const dxn = DXN.tryParse(id)?.asEchoDXN();
+          if (!dxn || !dxn.spaceId) {
             return null;
           }
 
-          const space = client.spaces.get(spaceId);
+          const space = client.spaces.get(dxn.spaceId);
           if (!space) {
             return null;
           }
 
           if (!query) {
-            query = space.db.query(Filter.ids(objectId));
+            query = space.db.query(Filter.ids(dxn.echoId));
           }
 
-          const object = get(rxFromQuery(query)).at(0);
+          const object = get(atomFromQuery(query)).at(0);
           if (!object) {
             return null;
           }
 
-          return createObjectNode({ object, space, resolve, disposition: 'hidden' });
+          return createObjectNode({
+            object,
+            space,
+            resolve: resolve(get),
+            disposition: 'hidden',
+          });
         });
       },
     }),
 
     // Create collection actions and action groups.
     createExtension({
-      id: `${SPACE_PLUGIN}/object-actions`,
+      id: `${meta.id}/object-actions`,
       actions: (node) => {
-        let query: QueryResult<DataType.View> | undefined;
-        return Rx.make((get) =>
-          pipe(
+        let query: QueryResult<View.View> | undefined;
+        return Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) => {
               const space = getSpace(node.data);
-              return space && Obj.isObject(node.data) ? Option.some({ space, object: node.data }) : Option.none();
+              return space && Obj.isObject(node.data) && Obj.getTypename(node.data) === node.type
+                ? Option.some({ space, object: node.data })
+                : Option.none();
             }),
             Option.flatMap(({ space, object }) => {
-              const isSchema = Obj.instanceOf(DataType.StoredSchema, object);
+              const isSchema = Obj.instanceOf(StoredSchema, object);
               if (!query && isSchema) {
                 // TODO(wittjosiah): Support filtering by nested properties (e.g. `query.typename`).
-                query = space.db.query(Filter.type(DataType.View));
+                query = space.db.query(Filter.type(View.View));
               }
 
               let deletable =
                 !isSchema &&
                 // Don't allow the Records smart collection to be deleted.
                 !(
-                  Obj.instanceOf(DataType.QueryCollection, object) &&
-                  object.query.typename === DataType.StoredSchema.typename
+                  Obj.instanceOf(Collection.QueryCollection, object) &&
+                  getTypenameFromQuery(object.query) === StoredSchema.typename
                 );
               if (isSchema && query) {
-                const views = get(rxFromQuery(query));
+                const views = get(atomFromQuery(query));
                 const filteredViews = get(
-                  rxFromSignal(() => views.filter((view) => view.query.typename === object.typename)),
+                  atomFromSignal(() =>
+                    views.filter((view) => getTypenameFromQuery(view.query.ast) === object.typename),
+                  ),
                 );
                 deletable = filteredViews.length === 0;
               }
@@ -686,7 +721,7 @@ export default (context: PluginContext) => {
                   dispatch: dispatcher.dispatchPromise,
                   objectForms,
                   deletable,
-                  navigable: get(rxFromSignal(() => state.navigableCollections)),
+                  navigable: get(atomFromSignal(() => state.navigableCollections)),
                 });
               }
             }),
@@ -699,19 +734,19 @@ export default (context: PluginContext) => {
 
     // View selected objects.
     createExtension({
-      id: `${SPACE_PLUGIN}/selected-objects`,
+      id: `${meta.id}/selected-objects`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
-            Option.flatMap((node) => (Obj.instanceOf(DataType.View, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(View.View, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'selected-objects'].join(ATTENDABLE_PATH_SEPARATOR),
                 type: PLANK_COMPANION_TYPE,
                 data: 'selected-objects',
                 properties: {
-                  label: ['companion selected objects label', { ns: SPACE_PLUGIN }],
+                  label: ['companion selected objects label', { ns: meta.id }],
                   icon: 'ph--tree-view--regular',
                   disposition: 'hidden',
                 },
@@ -724,10 +759,10 @@ export default (context: PluginContext) => {
 
     // Object settings plank companion.
     createExtension({
-      id: `${SPACE_PLUGIN}/settings`,
+      id: `${meta.id}/settings`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (Obj.isObject(node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
@@ -736,7 +771,7 @@ export default (context: PluginContext) => {
                 type: PLANK_COMPANION_TYPE,
                 data: 'settings',
                 properties: {
-                  label: ['object settings label', { ns: SPACE_PLUGIN }],
+                  label: ['object settings label', { ns: meta.id }],
                   icon: 'ph--sliders--regular',
                   disposition: 'hidden',
                   position: 'fallback',