@dxos/plugin-space 0.8.4-main.422d1c7879 → 0.8.4-main.43cb759274

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

@@ -12,19 +12,19 @@ import { type SpacePluginOptions } from '#types';
 import {
   createCollectionExtensions,
   createCompanionExtensions,
+  createDatabaseExtensions,
   createSettingsExtensions,
   createSpaceExtensions,
-  createTypeExtensions,
 } from './extensions';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* ({ shareableLinkOrigin = window.location.origin }: SpacePluginOptions = {}) {
     const extensions = yield* Effect.all([
       createSpaceExtensions(),
-      createTypeExtensions(),
+      createSettingsExtensions(),
+      createDatabaseExtensions(),
       createCollectionExtensions({ shareableLinkOrigin }),
       createCompanionExtensions(),
-      createSettingsExtensions(),
     ]);
 
     return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions.flat());

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

@@ -6,12 +6,20 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities, LayoutOperation, Segments, getObjectPathFromObject, toUrlPath } from '@dxos/app-toolkit';
-import { SpaceState, getSpace, isSpace } from '@dxos/client/echo';
-import { Collection, Obj, Type } from '@dxos/echo';
+import {
+  AppCapabilities,
+  AppNodeMatcher,
+  LayoutOperation,
+  RootCollectionAnnotation,
+  Segments,
+  getObjectPathFromObject,
+  toUrlPath,
+} from '@dxos/app-toolkit';
+import { SpaceState, isSpace } from '@dxos/client/echo';
+import { Operation } from '@dxos/compute';
+import { Annotation, Collection, Obj, Type } from '@dxos/echo';
 import { AtomObj } from '@dxos/echo-atom';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 import { CreateAtom, Graph, GraphBuilder, Node } from '@dxos/plugin-graph';
 import { isNonNullable } from '@dxos/util';
 
@@ -24,12 +32,10 @@ import {
   COPY_LINK_LABEL,
   CREATE_OBJECT_IN_COLLECTION_LABEL,
   EXPOSE_OBJECT_LABEL,
-  type MetadataResolver,
   REMOVE_FROM_COLLECTION_LABEL,
   createObjectNode,
   getCollectionGraphNodePartials,
   getDynamicLabel,
-  whenSpace,
 } from './shared';
 
 //
@@ -44,28 +50,25 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
 }) {
   const capabilities = yield* Capability.Service;
 
-  const resolve = (get: any) => (typename: string) =>
-    capabilities.getAll(AppCapabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
-
   return yield* Effect.all([
     // Collections section virtual node under each space.
     GraphBuilder.createExtension({
-      id: 'collections-section',
-      match: whenSpace,
+      id: 'collectionsSection',
+      match: AppNodeMatcher.whenSpace,
       connector: (space, get) => {
         const spaceState = get(CreateAtom.fromObservable(space.state));
         if (spaceState !== SpaceState.SPACE_READY) {
           return Effect.succeed([]);
         }
 
-        const propertiesSnapshot = get(AtomObj.make(space.properties));
-        const collectionRef = propertiesSnapshot[Collection.Collection.typename] as any;
+        get(AtomObj.make(space.properties));
+        const collectionRef = Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined);
         if (collectionRef) {
           get(AtomObj.make(collectionRef));
         }
         const rootCollection = collectionRef?.target;
         const collectionPartials = rootCollection
-          ? getCollectionGraphNodePartials({ collection: rootCollection, db: space.db, resolve: resolve(get) })
+          ? getCollectionGraphNodePartials({ db: space.db, collection: rootCollection })
           : undefined;
 
         return Effect.succeed([
@@ -76,9 +79,9 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
             properties: {
               label: ['collections-section.label', { ns: meta.id }],
               icon: 'ph--folder--regular',
-              iconHue: 'neutral',
+              iconHue: 'amber',
               role: 'branch',
-              position: 'hoist',
+              position: 'first',
               testId: 'spacePlugin.collectionsSection',
               draggable: false,
               droppable: false,
@@ -101,8 +104,8 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
         const ephemeralState = get(ephemeralAtom);
 
-        const propertiesSnapshot = get(AtomObj.make(space.properties));
-        const collectionRef = propertiesSnapshot[Collection.Collection.typename] as any;
+        get(AtomObj.make(space.properties));
+        const collectionRef = Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined);
         const collection = collectionRef ? get(AtomObj.make(collectionRef)) : undefined;
         if (!collection) {
           return Effect.succeed([]);
@@ -123,7 +126,6 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
               createObjectNode({
                 db: space.db,
                 object,
-                resolve: resolve(get),
                 navigable: ephemeralState.navigableCollections,
                 parentCollection: collectionRef?.target,
               }),
@@ -140,7 +142,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
       connector: (collection, get) => {
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
         const ephemeralState = get(ephemeralAtom);
-        const space = getSpace(collection);
+        const db = Obj.getDatabase(collection);
 
         const collectionSnapshot = get(AtomObj.make(collection));
         const refs = collectionSnapshot.objects ?? [];
@@ -156,11 +158,10 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
           objects
             .map(
               (object: Obj.Unknown) =>
-                space &&
+                db &&
                 createObjectNode({
                   object,
-                  db: space.db,
-                  resolve: resolve(get),
+                  db,
                   navigable: ephemeralState.navigableCollections,
                   parentCollection: collection,
                 }),
@@ -174,15 +175,17 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
 
     // Object actions.
     GraphBuilder.createExtension({
-      id: 'object-actions',
+      id: 'objectActions',
       match: (node) => {
-        const space = getSpace(node.data);
-        return space && Obj.isObject(node.data) && Obj.getTypename(node.data) === node.type
-          ? Option.some({ space, object: node.data, nodeId: node.id })
+        return node.data != null &&
+          Obj.getDatabase(node.data) &&
+          Obj.isObject(node.data) &&
+          Obj.getTypename(node.data) === node.type
+          ? Option.some({ object: node.data, nodeId: node.id })
           : Option.none();
       },
-      actions: ({ space, object, nodeId }, get) => {
-        const deletable = !Obj.instanceOf(Type.PersistentType, object);
+      actions: ({ object, nodeId }, get) => {
+        const deletable = !Type.isType(object);
 
         const [appGraph] = get(capabilities.atom(AppCapabilities.AppGraph));
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
@@ -201,7 +204,6 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
           constructObjectActions({
             object,
             nodeId,
-            resolve: resolve(get),
             deletable,
             navigable: ephemeralState.navigableCollections,
             shareableLinkOrigin,
@@ -221,7 +223,6 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
 const constructObjectActions = ({
   object,
   nodeId,
-  resolve,
   deletable = true,
   navigable = false,
   shareableLinkOrigin,
@@ -229,7 +230,6 @@ const constructObjectActions = ({
 }: {
   object: Obj.Unknown;
   nodeId: string;
-  resolve: MetadataResolver;
   shareableLinkOrigin: string;
   deletable?: boolean;
   navigable?: boolean;
@@ -260,7 +260,7 @@ const constructObjectActions = ({
       data: (params?: Node.InvokeProps) =>
         Operation.invoke(SpaceOperation.RenameObject, { object, caller: `${params?.caller}:${params?.parent?.id}` }),
       properties: {
-        label: getDynamicLabel('rename object label', typename, { defaultValue: 'Rename' }),
+        label: getDynamicLabel('rename-object.label', typename, { defaultValue: 'Rename' }),
         icon: 'ph--pencil-simple-line--regular',
         disposition: 'list-item',
         testId: 'spacePlugin.renameObject',
@@ -269,7 +269,7 @@ const constructObjectActions = ({
     ...(parentCollection && !Obj.instanceOf(Collection.Collection, object)
       ? [
           Node.makeAction({
-            id: 'remove-from-collection',
+            id: 'removeFromCollection',
             data: () =>
               Effect.gen(function* () {
                 const index = parentCollection.objects.findIndex((ref: any) => ref.target === object);
@@ -277,7 +277,7 @@ const constructObjectActions = ({
                   const layout = yield* Capabilities.getAtomValue(AppCapabilities.Layout);
                   const isActive = layout.active.includes(nodeId);
 
-                  Obj.change(parentCollection, (parentCollection) => {
+                  Obj.update(parentCollection, (parentCollection) => {
                     parentCollection.objects.splice(index, 1);
                   });
 
@@ -315,7 +315,7 @@ const constructObjectActions = ({
     ...(navigable || !Obj.instanceOf(Collection.Collection, object)
       ? [
           Node.makeAction({
-            id: 'copy-link',
+            id: 'copyLink',
             data: () =>
               Effect.promise(async () => {
                 const url = new URL(toUrlPath(nodeId), shareableLinkOrigin);

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

@@ -6,12 +6,13 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { AppNode } from '@dxos/app-toolkit';
-import { Obj } from '@dxos/echo';
+import { Obj, Type } from '@dxos/echo';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 // TODO(wittjosiah): This is currently necessary for type portability.
 // eslint-disable-next-line unused-imports/no-unused-imports
 import type { Node } from '@dxos/plugin-graph';
 import { linkedSegment } from '@dxos/react-ui-attention';
+import type { EchoViewRefPath } from '@dxos/schema';
 import { ViewAnnotation } from '@dxos/schema';
 
 import { meta } from '#meta';
@@ -34,7 +35,7 @@ export const createCompanionExtensions = Effect.fnUntraced(function* () {
             label: ['object-properties.label', { ns: meta.id }],
             icon: 'ph--sliders--regular',
             data: 'settings', // TODO(burdon): Change to 'object-properties'.
-            position: 'fallback',
+            position: 'last',
           }),
         ]),
     }),
@@ -50,25 +51,26 @@ export const createCompanionExtensions = Effect.fnUntraced(function* () {
             label: ['companion-related.label', { ns: meta.id }],
             icon: 'ph--graph--regular',
             data: 'related',
-            position: 'fallback',
+            position: 'last',
           }),
         ]),
     }),
 
     // View selected objects companion.
     GraphBuilder.createExtension({
-      id: 'selected-objects',
+      id: 'selectedObjects',
       match: (node) => {
         if (!Obj.isObject(node.data)) {
           return Option.none();
         }
 
-        const schema = Obj.getSchema(node.data);
-        const isView = Option.fromNullable(schema).pipe(
-          Option.flatMap((candidate) => ViewAnnotation.get(candidate)),
-          Option.getOrElse(() => false),
-        );
-        if (!isView) {
+        const type = Obj.getType(node.data);
+        const path = type
+          ? ViewAnnotation.get(Type.getSchema(type)).pipe(Option.getOrElse(() => [] as EchoViewRefPath))
+          : [];
+        const isEchoViewBacked = type && path.length > 0 ? ViewAnnotation.hasRefAlongPath(node.data, path) : false;
+
+        if (!isEchoViewBacked) {
           return Option.none();
         }