@dxos/plugin-space 0.8.4-main.c85a9c8dae → 0.8.4-main.d05673bc65

package/src/containers/CreateObjectDialog/CreateObjectDialog.tsx

@@ -8,9 +8,8 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 
 import { Capability } from '@dxos/app-framework';
 import { useOperationInvoker, usePluginManager } from '@dxos/app-framework/ui';
-import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
-import { Database, Obj, Type } from '@dxos/echo';
-import { type Collection } from '@dxos/echo';
+import { AppCapabilities, LayoutOperation, getObjectPath } from '@dxos/app-toolkit';
+import { Collection, Database, Obj, Type } from '@dxos/echo';
 import { runAndForwardErrors } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
 import { Operation } from '@dxos/operation';
@@ -28,12 +27,13 @@ import {
 import { meta } from '../../meta';
 import { SpaceOperation } from '../../types';
 
-export const CREATE_OBJECT_DIALOG = `${meta.id}/CreateObjectDialog`;
+export const CREATE_OBJECT_DIALOG = `${meta.id}.CreateObjectDialog`;
 
 export type CreateObjectDialogProps = Pick<CreateObjectPanelProps, 'target' | 'typename' | 'initialFormValues'> & {
   views?: boolean;
   onCreateObject?: (object: Obj.Unknown) => void;
   shouldNavigate?: (object: Obj.Unknown) => boolean;
+  targetNodeId?: string;
 };
 
 export const CreateObjectDialog = ({
@@ -43,6 +43,7 @@ export const CreateObjectDialog = ({
   initialFormValues,
   onCreateObject,
   shouldNavigate: _shouldNavigate,
+  targetNodeId,
 }: CreateObjectDialogProps) => {
   const manager = usePluginManager();
   const { t } = useTranslation(meta.id);
@@ -82,7 +83,7 @@ export const CreateObjectDialog = ({
       manager.capabilities
         .getAll(AppCapabilities.Metadata)
         .filter((entry) => entry.metadata?.createObject)
-        .filter((entry) => (views === true ? viewTypenames.has(entry.id) : !viewTypenames.has(entry.id)))
+        .filter((entry) => (views === true ? viewTypenames.has(entry.id) : true))
         .map((entry) => ({
           id: entry.id,
           label: t('typename label', { ns: entry.id, defaultValue: entry.id }),
@@ -106,17 +107,16 @@ export const CreateObjectDialog = ({
         invariant(db, 'Missing database');
         const object = yield* metadata.createObject(data, { db });
         if (Obj.isObject(object) && !Obj.instanceOf(Type.PersistentType, object)) {
-          // TODO(wittjosiah): Selection in navtree isn't working as expected when hidden typenames evals to true.
-          const hidden = !metadata.addToCollectionOnCreate;
-          yield* operationInvoker.invoke(SpaceOperation.AddObject, {
+          const { subject } = yield* operationInvoker.invoke(SpaceOperation.AddObject, {
             target,
             object,
-            hidden,
+            hidden: !Obj.instanceOf(Collection.Collection, object),
+            targetNodeId,
           });
           const shouldNavigate = _shouldNavigate ?? (() => true);
           if (shouldNavigate(object)) {
             yield* operationInvoker.invoke(LayoutOperation.Open, {
-              subject: [Obj.getDXN(object).toString()],
+              subject,
             });
           }
 

package/src/containers/CreateObjectDialog/index.ts

@@ -2,6 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
-import { CreateObjectDialog } from './CreateObjectDialog';
-
-export default CreateObjectDialog;
+export { CreateObjectDialog, type CreateObjectDialogProps } from './CreateObjectDialog';
+export { CreateObjectDialog as default } from './CreateObjectDialog';

package/src/containers/CreateSpaceDialog/CreateSpaceDialog.tsx

@@ -7,7 +7,7 @@ import type * as Schema from 'effect/Schema';
 import React, { useCallback, useRef } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { LayoutOperation } from '@dxos/app-toolkit';
+import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
 import { runAndForwardErrors } from '@dxos/effect';
 import { Dialog, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
@@ -16,7 +16,7 @@ import { useInputSurfaceLookup } from '../../hooks';
 import { meta } from '../../meta';
 import { SpaceForm, SpaceOperation } from '../../types';
 
-export const CREATE_SPACE_DIALOG = `${meta.id}/CreateSpaceDialog`;
+export const CREATE_SPACE_DIALOG = `${meta.id}.CreateSpaceDialog`;
 
 type FormValues = Schema.Schema.Type<typeof SpaceForm>;
 const initialValues: FormValues = { edgeReplication: true };
@@ -33,7 +33,9 @@ export const CreateSpaceDialog = () => {
       const program = Effect.gen(function* () {
         const { data: result } = yield* Effect.promise(() => invokePromise(SpaceOperation.Create, data));
         if (result?.space) {
-          yield* Effect.promise(() => invokePromise(LayoutOperation.SwitchWorkspace, { subject: result.space.id }));
+          yield* Effect.promise(() =>
+            invokePromise(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(result.space.id) }),
+          );
           yield* Effect.promise(() => invokePromise(LayoutOperation.UpdateDialog, { state: false }));
         }
       });

package/src/containers/InlineSyncStatus/InlineSyncStatus.tsx

@@ -2,18 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
-import * as Option from 'effect/Option';
 import React, { useEffect, useState } from 'react';
 
-import { useAppGraph } from '@dxos/app-toolkit/ui';
+import { getSpacePath } from '@dxos/app-toolkit';
 import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { useClient } from '@dxos/react-client';
 import { type Space, useSpaceSyncState } from '@dxos/react-client/echo';
 import { Tooltip, useTranslation } from '@dxos/react-ui';
-import { AttentionGlyph, useAttended, useAttention } from '@dxos/react-ui-attention';
+import { AttentionGlyph, useAttention } from '@dxos/react-ui-attention';
 
-import { usePath } from '../../hooks';
 import { meta } from '../../meta';
 
 const useEdgeStatus = (): EdgeStatus.ConnectionState => {
@@ -30,19 +28,10 @@ const useEdgeStatus = (): EdgeStatus.ConnectionState => {
 
 export const InlineSyncStatus = ({ space, open }: { space: Space; open?: boolean }) => {
   const { t } = useTranslation(meta.id);
-  const id = space.id;
-  const { hasAttention, isAncestor, isRelated } = useAttention(id);
-  const isAttended = hasAttention || isAncestor || isRelated;
-
-  // TODO(wittjosiah): If the attended node is deep in the graph and the graph is not fully loaded
-  //   this will result in an empty path until the graph is connected.
-  // TODO(wittjosiah): Consider using this indicator for all open nodes instead of just attended.
-  const { graph } = useAppGraph();
-  const attended = useAttended();
-  const startOfAttention = attended.at(-1);
-  const path = usePath(graph, startOfAttention);
-  const containsAttended = !open && !isAttended && id && Option.isSome(path) ? path.value.includes(id) : false;
-
+  const qualifiedId = getSpacePath(space.id);
+  const { hasAttention, isAncestor, isRelated } = useAttention(qualifiedId);
+  const attended = hasAttention || isRelated;
+  const containsAttended = isAncestor && !open;
   const connectedToEdge = useEdgeStatus() === EdgeStatus.ConnectionState.CONNECTED;
   // TODO(wittjosiah): This is not reactive.
   const edgeSyncEnabled = space.internal.data.edgeReplication === EdgeReplicationSetting.ENABLED;
@@ -53,7 +42,7 @@ export const InlineSyncStatus = ({ space, open }: { space: Space; open?: boolean
     <Tooltip.Trigger asChild content={t('syncing label')} side='bottom'>
       <AttentionGlyph
         syncing={syncing}
-        attended={isAttended}
+        attended={attended}
         containsAttended={containsAttended}
         classNames='self-center mx-1'
       />

package/src/containers/JoinDialog/JoinDialog.tsx

@@ -5,7 +5,7 @@
 import React, { useCallback } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { LayoutOperation } from '@dxos/app-toolkit';
+import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
 import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { Trigger } from '@dxos/async';
 import { Graph } from '@dxos/plugin-graph';
@@ -19,7 +19,7 @@ import { osTranslations } from '@dxos/ui-theme';
 
 import { meta } from '../../meta';
 
-export const JOIN_DIALOG = `${meta.id}/JoinDialog`;
+export const JOIN_DIALOG = `${meta.id}.JoinDialog`;
 
 export type JoinDialogProps = JoinPanelProps & {
   navigableCollections?: boolean;
@@ -40,7 +40,7 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
 
       await Promise.all([
         invokePromise(LayoutOperation.AddToast, {
-          id: `${meta.id}/join-success`,
+          id: `${meta.id}.join-success`,
           duration: 5_000,
           title: ['join success label', { ns: meta.id }],
           closeLabel: ['dismiss label', { ns: meta.id }],
@@ -61,7 +61,7 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         space = await trigger.wait();
       }
 
-      await invokePromise(LayoutOperation.SwitchWorkspace, { subject: space.id });
+      await invokePromise(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(space.id) });
 
       // TODO(wittjosiah): If navigableCollections is false and there's no target,
       //   should try to navigate to the first object of the space replicates.

package/src/containers/JoinDialog/index.ts

@@ -2,6 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
-import { JoinDialog } from './JoinDialog';
-
-export default JoinDialog;
+export { JoinDialog, type JoinDialogProps } from './JoinDialog';
+export { JoinDialog as default } from './JoinDialog';

package/src/containers/ObjectRenamePopover/ObjectRenamePopover.tsx

@@ -13,7 +13,7 @@ import { osTranslations } from '@dxos/ui-theme';
 
 import { meta } from '../../meta';
 
-export const OBJECT_RENAME_POPOVER = `${meta.id}/ObjectRenamePopover`;
+export const OBJECT_RENAME_POPOVER = `${meta.id}.ObjectRenamePopover`;
 
 export const ObjectRenamePopover = ({ object }: { object: Obj.Unknown }) => {
   const { t } = useTranslation(meta.id);

package/src/containers/SmallPresenceLive/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export { SmallPresenceLive as default } from '../SpacePresence/SpacePresence';
+export { SmallPresenceLive as default } from '../SpacePresence';

package/src/containers/SpacePresence/SpacePresence.tsx

@@ -2,11 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Option from 'effect/Option';
 import React, { forwardRef, useCallback, useEffect, useState } from 'react';
 
 import { useAtomCapability } from '@dxos/app-framework/ui';
-import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { generateName } from '@dxos/display-name';
 import { type Key, Obj } from '@dxos/echo';
 import { PublicKey } from '@dxos/react-client';
@@ -25,10 +23,9 @@ import {
   useDefaultValue,
   useTranslation,
 } from '@dxos/react-ui';
-import { AttentionGlyph, type AttentionGlyphProps, useAttended, useAttention } from '@dxos/react-ui-attention';
+import { AttentionGlyph, type AttentionGlyphProps, useAttention } from '@dxos/react-ui-attention';
 import { ComplexMap, keyToFallback } from '@dxos/util';
 
-import { usePath } from '../../hooks';
 import { meta } from '../../meta';
 import { type ObjectViewerProps, SpaceCapabilities } from '../../types';
 
@@ -220,17 +217,8 @@ export type SmallPresenceLiveProps = {
 
 export const SmallPresenceLive = ({ id, open, viewers }: SmallPresenceLiveProps) => {
   const { hasAttention, isAncestor, isRelated } = useAttention(id);
-  const isAttended = hasAttention || isAncestor || isRelated;
-
-  // TODO(wittjosiah): If the attended node is deep in the graph and the graph is not fully loaded
-  //   this will result in an empty path until the graph is connected.
-  // TODO(wittjosiah): Consider using this indicator for all open nodes instead of just attended.
-  const { graph } = useAppGraph();
-  const attended = useAttended();
-  const startOfAttention = attended.at(-1);
-  const path = usePath(graph, startOfAttention);
-  const containsAttended = !open && !isAttended && id && Option.isSome(path) ? path.value.includes(id) : false;
-
+  const attended = hasAttention || isRelated;
+  const containsAttended = isAncestor && !open;
   const getActiveViewers = (viewers: ComplexMap<PublicKey, ObjectViewerProps>): ObjectViewerProps[] => {
     const moment = Date.now();
     return Array.from<ObjectViewerProps>(viewers.values()).filter(
@@ -250,7 +238,7 @@ export const SmallPresenceLive = ({ id, open, viewers }: SmallPresenceLiveProps)
     }
   }, [viewers]);
 
-  return <SmallPresence count={activeViewers.length} attended={isAttended} containsAttended={containsAttended} />;
+  return <SmallPresence count={activeViewers.length} attended={attended} containsAttended={containsAttended} />;
 };
 
 export type SmallPresenceProps = {

package/src/containers/SpacePresence/index.ts

@@ -2,6 +2,5 @@
 // Copyright 2023 DXOS.org
 //
 
-import { SpacePresence } from './SpacePresence';
-
-export default SpacePresence;
+export { SpacePresence, SmallPresenceLive } from './SpacePresence';
+export { SpacePresence as default } from './SpacePresence';

package/src/containers/SpaceRenamePopover/SpaceRenamePopover.tsx

@@ -13,7 +13,7 @@ import { osTranslations } from '@dxos/ui-theme';
 
 import { meta } from '../../meta';
 
-export const SPACE_RENAME_POPOVER = `${meta.id}/SpaceRenamePopover`;
+export const SPACE_RENAME_POPOVER = `${meta.id}.SpaceRenamePopover`;
 
 export const SpaceRenamePopover = ({ space }: { space: Space }) => {
   const { t } = useTranslation(meta.id);

package/src/containers/SpaceSettingsContainer/SpaceSettingsContainer.tsx

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 import React, { type ChangeEvent, useCallback, useMemo, useState } from 'react';
 
 import { useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
-import { LayoutOperation } from '@dxos/app-toolkit';
+import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
 import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
@@ -78,7 +78,7 @@ export const SpaceSettingsContainer = ({ space }: SpaceSettingsContainerProps) =
         if (newValues.archived && !archived) {
           void invokePromise(SpaceOperation.Close, { space });
           void invokePromise(LayoutOperation.SwitchWorkspace, {
-            subject: client.spaces.default.id,
+            subject: getSpacePath(client.spaces.default.id),
           });
         } else if (!newValues.archived && archived) {
           void invokePromise(SpaceOperation.Open, { space });

package/src/containers/ViewEditor/ViewEditor.tsx

@@ -32,7 +32,6 @@ export const ViewEditor = ({ view }: ViewEditorProps) => {
     annotation: {
       location: ['database', 'runtime'],
       kind: ['user'],
-      registered: ['registered'],
     },
   });
 

package/src/containers/index.ts

@@ -4,7 +4,7 @@
 
 import { type ComponentType, lazy } from 'react';
 
-export type { CreateObjectDialogProps } from './CreateObjectDialog/CreateObjectDialog';
+export type { CreateObjectDialogProps } from './CreateObjectDialog';
 
 export const CollectionArticle: ComponentType<any> = lazy(() => import('./CollectionArticle'));
 export const CollectionSection: ComponentType<any> = lazy(() => import('./CollectionSection'));

package/src/helpers/query.test.ts

@@ -15,7 +15,7 @@ describe('evalQuery', () => {
           "id": undefined,
           "props": {},
           "type": "object",
-          "typename": "dxn:type:dxos.org/type/Person:0.1.0",
+          "typename": "dxn:type:org.dxos.type.person:0.1.0",
         },
         "type": "select",
       }

package/src/hooks/useActiveSpace.ts

@@ -3,22 +3,22 @@
 //
 
 import { Capabilities, type CapabilityManager } from '@dxos/app-framework';
-import { AppCapabilities } from '@dxos/app-toolkit';
+import { AppCapabilities, getSpaceIdFromPath } from '@dxos/app-toolkit';
 import { useLayout } from '@dxos/app-toolkit/ui';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { parseId, useSpace } from '@dxos/react-client/echo';
+import { useSpace } from '@dxos/react-client/echo';
 
 export const getActiveSpace = (capabilities: CapabilityManager.CapabilityManager) => {
   const client = capabilities.get(ClientCapabilities.Client);
   const registry = capabilities.get(Capabilities.AtomRegistry);
   const layoutAtom = capabilities.get(AppCapabilities.Layout);
   const layout = registry.get(layoutAtom);
-  const { spaceId } = parseId(layout.workspace);
+  const spaceId = getSpaceIdFromPath(layout.workspace);
   return spaceId ? client.spaces.get(spaceId) : undefined;
 };
 
 export const useActiveSpace = () => {
   const layout = useLayout();
-  const { spaceId } = parseId(layout.workspace);
+  const spaceId = getSpaceIdFromPath(layout.workspace);
   return useSpace(spaceId);
 };

package/src/meta.ts

@@ -6,7 +6,7 @@ import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/space',
+  id: 'org.dxos.plugin.space',
   name: 'Spaces',
   description: trim`
     Core workspace container system for organizing and sharing collaborative environments.

package/src/translations.ts

@@ -19,6 +19,7 @@ export const translations = [
         'typename label_one': 'Collection',
         'typename label_other': 'Collections',
         'object name placeholder': 'New collection',
+        'add object label': 'Add collection',
         'rename object label': 'Rename collection',
         'delete object label': 'Delete collection',
         'object deleted label': 'Collection deleted',
@@ -29,6 +30,7 @@ export const translations = [
         'typename label_one': 'Type',
         'typename label_other': 'Types',
         'object name placeholder': 'New type',
+        'add object label': 'Add type',
         'rename object label': 'Rename type',
         'delete object label': 'Delete type',
         'object deleted label': 'Type deleted',
@@ -39,6 +41,9 @@ export const translations = [
         'typename label_one': 'Event',
         'typename label_other': 'Events',
         'object name placeholder': 'New event',
+        'add object label': 'Add event',
+        'rename object label': 'Rename event',
+        'delete object label': 'Delete event',
       },
       [Message.Message.typename]: {
         'typename label': 'Message',
@@ -46,6 +51,9 @@ export const translations = [
         'typename label_one': 'Message',
         'typename label_other': 'Messages',
         'object name placeholder': 'New message',
+        'add object label': 'Add message',
+        'rename object label': 'Rename message',
+        'delete object label': 'Delete message',
       },
       [Organization.Organization.typename]: {
         'typename label': 'Organization',
@@ -53,6 +61,9 @@ export const translations = [
         'typename label_one': 'Organization',
         'typename label_other': 'Organizations',
         'object name placeholder': 'New organization',
+        'add object label': 'Add organization',
+        'rename object label': 'Rename organization',
+        'delete object label': 'Delete organization',
       },
       [Person.Person.typename]: {
         'typename label': 'Person',
@@ -60,6 +71,9 @@ export const translations = [
         'typename label_one': 'Person',
         'typename label_other': 'People',
         'object name placeholder': 'New person',
+        'add object label': 'Add person',
+        'rename object label': 'Rename person',
+        'delete object label': 'Delete person',
       },
       [Pipeline.Pipeline.typename]: {
         'typename label': 'Project',
@@ -67,6 +81,9 @@ export const translations = [
         'typename label_one': 'Project',
         'typename label_other': 'Projects',
         'object name placeholder': 'New project',
+        'add object label': 'Add project',
+        'rename object label': 'Rename project',
+        'delete object label': 'Delete project',
       },
       [Task.Task.typename]: {
         'typename label': 'Task',
@@ -74,6 +91,9 @@ export const translations = [
         'typename label_one': 'Task',
         'typename label_other': 'Tasks',
         'object name placeholder': 'New task',
+        'add object label': 'Add task',
+        'rename object label': 'Rename task',
+        'delete object label': 'Delete task',
       },
       [meta.id]: {
         'plugin name': 'Spaces',
@@ -131,8 +151,10 @@ export const translations = [
           'The requested object has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
         'create object in space label': 'Add to space',
         'create object in collection label': 'Add to collection',
+        'remove from collection label': 'Remove from collection',
         'create object in system collection label': 'Add to system collection',
-        'add view to schema label': 'Add view to type',
+        'new type label': 'New type',
+        'add view to schema label': 'Add view for type',
         'space members label': 'Space members',
         'active space members heading': 'Online ({{count}})',
         'inactive space members heading': 'Offline ({{count}})',
@@ -239,6 +261,10 @@ export const translations = [
         'sync upload label': 'Upload',
         'sync download label': 'Download',
 
+        'types section label': 'Types',
+        'collections section label': 'Collections',
+        'type collection all label': 'All',
+
         'search placeholder': 'Search…',
       },
     },

package/src/types/capabilities.ts

@@ -20,7 +20,7 @@ import { meta } from '../meta';
 import { type ObjectViewerProps, type SpaceSettingsProps } from './types';
 
 export namespace SpaceCapabilities {
-  export const Settings = Capability.make<Atom.Writable<SpaceSettingsProps>>(`${meta.id}/capability/settings`);
+  export const Settings = Capability.make<Atom.Writable<SpaceSettingsProps>>(`${meta.id}.capability.settings`);
 
   /** Schema for persisted space plugin state. */
   export const StateSchema = Schema.mutable(
@@ -33,7 +33,7 @@ export namespace SpaceCapabilities {
   export type SpaceState = Schema.Schema.Type<typeof StateSchema>;
 
   /** Persisted state (stored in KVS/localStorage). */
-  export const State = Capability.make<Atom.Writable<SpaceState>>(`${meta.id}/capability/state`);
+  export const State = Capability.make<Atom.Writable<SpaceState>>(`${meta.id}.capability.state`);
 
   /** Ephemeral space plugin state (not persisted). */
   export type SpaceEphemeralState = {
@@ -46,18 +46,18 @@ export namespace SpaceCapabilities {
 
   /** Transient/ephemeral state (not persisted). */
   export const EphemeralState = Capability.make<Atom.Writable<SpaceEphemeralState>>(
-    `${meta.id}/capability/ephemeral-state`,
+    `${meta.id}.capability.ephemeral-state`,
   );
 
   export type SettingsSection = { id: string; label: Label; position?: Position };
-  export const SettingsSection = Capability.make<SettingsSection>(`${meta.id}/capability/settings-section`);
+  export const SettingsSection = Capability.make<SettingsSection>(`${meta.id}.capability.settings-section`);
 
   export type OnCreateSpace = (params: {
     space: Space;
     isDefault: boolean;
     rootCollection: Collection.Collection;
   }) => Effect.Effect<void, Error, Operation.Service>;
-  export const OnCreateSpace = Capability.make<OnCreateSpace>(`${meta.id}/capability/on-space-created`);
+  export const OnCreateSpace = Capability.make<OnCreateSpace>(`${meta.id}.capability.on-space-created`);
 
   export type OnSchemaAdded = (params: {
     db: Database.Database;
@@ -65,9 +65,9 @@ export namespace SpaceCapabilities {
     // TODO(wittjosiah): This is leaky.
     show?: boolean;
   }) => Effect.Effect<void, Error, Operation.Service>;
-  export const OnSchemaAdded = Capability.make<OnSchemaAdded>(`${meta.id}/capability/on-schema-added`);
+  export const OnSchemaAdded = Capability.make<OnSchemaAdded>(`${meta.id}.capability.on-schema-added`);
 
   // TODO(wittjosiah): Replace with migrations, this is not a sustainable solution.
   export type HandleRepair = (params: { space: Space; isDefault: boolean }) => Promise<void>;
-  export const Repair = Capability.make<HandleRepair>(`${meta.id}/capability/repair`);
+  export const Repair = Capability.make<HandleRepair>(`${meta.id}.capability.repair`);
 }

package/src/types/events.ts

@@ -8,9 +8,9 @@ import { AppActivationEvents } from '@dxos/app-toolkit';
 import { meta } from '../meta';
 
 export namespace SpaceEvents {
-  export const StateReady = AppActivationEvents.createStateEvent(`${meta.id}/event/state-ready`);
-  export const SetupSettingsPanel = ActivationEvent.make(`${meta.id}/event/setup-settings-panel`);
-  export const DefaultSpaceReady = ActivationEvent.make(`${meta.id}/event/default-space-ready`);
-  export const SpaceCreated = ActivationEvent.make(`${meta.id}/event/space-created`);
-  export const SchemaAdded = ActivationEvent.make(`${meta.id}/event/schema-added`);
+  export const StateReady = AppActivationEvents.createStateEvent(`${meta.id}.event.state-ready`);
+  export const SetupSettingsPanel = ActivationEvent.make(`${meta.id}.event.setup-settings-panel`);
+  export const DefaultSpaceReady = ActivationEvent.make(`${meta.id}.event.default-space-ready`);
+  export const SpaceCreated = ActivationEvent.make(`${meta.id}.event.space-created`);
+  export const SchemaAdded = ActivationEvent.make(`${meta.id}.event.schema-added`);
 }

package/src/types/form.ts

@@ -12,7 +12,6 @@ import { EntityKind, SystemTypeAnnotation, createAnnotationHelper, getTypeAnnota
 export const TypeInputOptions = Schema.Struct({
   location: Schema.Array(Schema.Literal('database', 'runtime')),
   kind: Schema.Array(Schema.Literal('system', 'user')),
-  registered: Schema.Array(Schema.Literal('registered', 'unregistered')),
 });
 
 export type TypeInputOptions = Schema.Schema.Type<typeof TypeInputOptions>;
@@ -29,8 +28,6 @@ export const getTypenames = ({ annotation, space }: { annotation: TypeInputOptio
   const includeDatabase = annotation.location.includes('database');
   const includeSystemType = annotation.kind.includes('system');
   const includeUserType = annotation.kind.includes('user');
-  const includeRegistered = annotation.registered.includes('registered');
-  const includeUnregistered = annotation.registered.includes('unregistered');
 
   const runtimeTypenames =
     includeRuntime && space
@@ -50,15 +47,11 @@ export const getTypenames = ({ annotation, space }: { annotation: TypeInputOptio
 
             return includeUserType;
           })
-          .filter((schema) => {
-            const registered = space?.properties.staticRecords?.includes(Type.getTypename(schema));
-            return registered ? includeRegistered : includeUnregistered;
-          })
           .map((schema) => Type.getTypename(schema))
       : [];
 
   const databaseTypenames =
-    includeDatabase && includeRegistered && space
+    includeDatabase && space
       ? space.db.schemaRegistry
           .query({ location: ['database'] })
           .runSync()