@eventcatalog/core 4.5.2 → 4.6.1

package/dist/analytics/analytics.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.5.2";
+var version = "4.6.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-WLKAMUKO.js";
-import "../chunk-ER7ASBD5.js";
+} from "../chunk-U6VOVEVZ.js";
+import "../chunk-X7XI7NEP.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -140,7 +140,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.5.2";
+var version = "4.6.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-TH7CEKTM.js";
+} from "../chunk-Y7JJ2B3L.js";
 import "../chunk-K2XIENVT.js";
-import "../chunk-WLKAMUKO.js";
-import "../chunk-ER7ASBD5.js";
+import "../chunk-U6VOVEVZ.js";
+import "../chunk-X7XI7NEP.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-KUDNNV6Z.js → chunk-MTXVQ4VP.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-ER7ASBD5.js";
+} from "./chunk-X7XI7NEP.js";
 
 // src/utils/cli-logger.ts
 import pc from "picocolors";

package/dist/{chunk-L7KILCHA.js → chunk-N3YKQTGX.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-KUDNNV6Z.js";
+} from "./chunk-MTXVQ4VP.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-WLKAMUKO.js → chunk-U6VOVEVZ.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-ER7ASBD5.js";
+} from "./chunk-X7XI7NEP.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/{chunk-ER7ASBD5.js → chunk-X7XI7NEP.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "4.5.2";
+var version = "4.6.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/{chunk-TH7CEKTM.js → chunk-Y7JJ2B3L.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-K2XIENVT.js";
 import {
   raiseEvent
-} from "./chunk-WLKAMUKO.js";
+} from "./chunk-U6VOVEVZ.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/constants.cjs

@@ -25,7 +25,7 @@ __export(constants_exports, {
 module.exports = __toCommonJS(constants_exports);
 
 // package.json
-var version = "4.5.2";
+var version = "4.6.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-ER7ASBD5.js";
+} from "./chunk-X7XI7NEP.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -144,7 +144,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.5.2";
+var version = "4.6.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,6 +1,6 @@
 import {
   log_build_default
-} from "./chunk-TH7CEKTM.js";
+} from "./chunk-Y7JJ2B3L.js";
 import "./chunk-K2XIENVT.js";
 import {
   runMigrations
@@ -14,10 +14,10 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-L7KILCHA.js";
+} from "./chunk-N3YKQTGX.js";
 import {
   logger
-} from "./chunk-KUDNNV6Z.js";
+} from "./chunk-MTXVQ4VP.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -27,7 +27,7 @@ import {
 import {
   watch
 } from "./chunk-CAJUIMDJ.js";
-import "./chunk-WLKAMUKO.js";
+import "./chunk-U6VOVEVZ.js";
 import {
   createAstroDevLineFilter,
   createAstroLineFilter
@@ -38,7 +38,7 @@ import {
 import "./chunk-W5JQON7Z.js";
 import {
   VERSION
-} from "./chunk-ER7ASBD5.js";
+} from "./chunk-X7XI7NEP.js";
 import {
   linkCoreNodeModules,
   resolveInstalledCoreNodeModules

package/dist/generate.cjs

@@ -108,7 +108,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.5.2";
+var version = "4.6.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-L7KILCHA.js";
-import "./chunk-KUDNNV6Z.js";
-import "./chunk-ER7ASBD5.js";
+} from "./chunk-N3YKQTGX.js";
+import "./chunk-MTXVQ4VP.js";
+import "./chunk-X7XI7NEP.js";
 import "./chunk-6QENHZZP.js";
 export {
   generate

package/dist/utils/cli-logger.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.5.2";
+var version = "4.6.1";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-KUDNNV6Z.js";
-import "../chunk-ER7ASBD5.js";
+} from "../chunk-MTXVQ4VP.js";
+import "../chunk-X7XI7NEP.js";
 export {
   logger
 };

package/eventcatalog/src/components/SideNav/NestedSideBar/index.tsx

@@ -749,7 +749,7 @@ export default function NestedSideBar() {
       }) ?? [];
 
     const groupId = groupKey || group.collapseKey || `${currentLevel.key ?? 'root'}:group:${group.title}`;
-    const canCollapse = canCollapseGroup(visibleChildren.length, isTopLevel);
+    const canCollapse = canCollapseGroup(visibleChildren.length, isTopLevel, group.collapsible);
     const isCollapsed = isGroupCollapsed(canCollapse, groupId, sectionCollapsePreferences);
 
     // When a group's children are subtle subgroups (e.g. Resources > Services/Flows/Data Stores),
@@ -866,12 +866,6 @@ export default function NestedSideBar() {
     // a custom icon (item.leftIcon) is always still shown.
     const IconComponent =
       item.icon && !suppressDefaultIcon ? (LucideIcons as unknown as Record<string, LucideIcons.LucideIcon>)[item.icon] : null;
-    // Some glyphs fill their box more than others, so they read larger at the shared
-    // item size. Render these ~25% smaller (matching the ADR icon) to visually balance:
-    // ClipboardList (ADRs) and the message glyphs (events/commands/queries).
-    const smallerIcons = ['ClipboardList', 'Zap', 'MessageSquare', 'Search', 'Mail'];
-    const iconSizeClass = item.icon && smallerIcons.includes(item.icon) ? 'w-3 h-3' : 'w-4 h-4';
-
     const handleStarClick = (e: React.MouseEvent) => {
       e.preventDefault();
       e.stopPropagation();
@@ -888,7 +882,7 @@ export default function NestedSideBar() {
                 isActive ? 'text-[rgb(var(--ec-accent-text))]' : 'text-[rgb(var(--ec-content-text-muted))]'
               )}
             >
-              <IconComponent className={iconSizeClass} />
+              <IconComponent className="w-4 h-4" />
             </span>
           )}
           {item.leftIcon && <img src={resolveIconUrl(item.leftIcon)} alt="" loading="lazy" className="w-4 h-4 flex-shrink-0" />}

package/eventcatalog/src/components/SideNav/NestedSideBar/utils.spec.ts

@@ -22,6 +22,10 @@ describe('sidebar group presentation', () => {
     expect(canCollapseGroup(5, false)).toBe(false);
     expect(canCollapseGroup(6, false)).toBe(true);
   });
+
+  it('keeps groups marked as non-collapsible expanded regardless of their size', () => {
+    expect(canCollapseGroup(100, false, false)).toBe(false);
+  });
 });
 
 describe('isGroupCollapsed', () => {

package/eventcatalog/src/components/SideNav/NestedSideBar/utils.ts

@@ -7,8 +7,8 @@ export type SectionCollapsePreferences = {
   expanded: Set<string>;
 };
 
-export const canCollapseGroup = (childCount: number, isTopLevel: boolean): boolean =>
-  !isTopLevel && childCount > SIDEBAR_GROUP_COLLAPSE_THRESHOLD;
+export const canCollapseGroup = (childCount: number, isTopLevel: boolean, collapsible = true): boolean =>
+  collapsible && !isTopLevel && childCount > SIDEBAR_GROUP_COLLAPSE_THRESHOLD;
 
 export const getGroupLabel = (title: string, childCount: number): string =>
   GROUP_TITLES_WITHOUT_COUNT.has(title) ? title : `${title} (${childCount})`;

package/eventcatalog/src/components/Tables/SystemResources/SystemResourcesTable.tsx

@@ -12,7 +12,18 @@ import { getColorAndIconForCollection } from '@utils/collections/icons';
 import { getCollectionTextColorClass } from '@utils/collection-colors';
 import { isIconPath, resolveIconUrl } from '@utils/icon';
 
-export type SystemResourceCollection = 'services' | 'flows' | 'entities' | 'containers' | 'events' | 'commands' | 'queries';
+export type SystemResourceCollection =
+  | 'domains'
+  | 'systems'
+  | 'agents'
+  | 'services'
+  | 'flows'
+  | 'entities'
+  | 'data-products'
+  | 'containers'
+  | 'events'
+  | 'commands'
+  | 'queries';
 
 export interface SystemResourceItem {
   collection: SystemResourceCollection;
@@ -29,9 +40,13 @@ interface SystemResourcesTableProps {
 }
 
 const TYPE_LABELS: Record<SystemResourceCollection, string> = {
+  domains: 'Subdomains',
+  systems: 'Systems',
+  agents: 'Agents',
   services: 'Services',
   flows: 'Flows',
   entities: 'Entities',
+  'data-products': 'Data Products',
   containers: 'Data Stores',
   events: 'Events',
   commands: 'Commands',
@@ -39,7 +54,19 @@ const TYPE_LABELS: Record<SystemResourceCollection, string> = {
 };
 
 // Order the type filter pills follow on the page.
-const TYPE_ORDER: SystemResourceCollection[] = ['services', 'flows', 'entities', 'containers', 'events', 'commands', 'queries'];
+const TYPE_ORDER: SystemResourceCollection[] = [
+  'domains',
+  'systems',
+  'agents',
+  'services',
+  'flows',
+  'entities',
+  'data-products',
+  'containers',
+  'events',
+  'commands',
+  'queries',
+];
 
 // Small icon for a collection type (used in filter pills and the type column).
 const CollectionTypeIcon = ({ collection, className }: { collection: SystemResourceCollection; className?: string }) => {

package/eventcatalog/src/content.config.ts

@@ -9,7 +9,7 @@ import path from 'path';
 import { userTeamDirectoryLoader } from './enterprise/directory/user-team-directory';
 import config from '@config';
 import { schemaLoader } from './utils/collections/schema-loader';
-import { globWithSafeWatcher, withIgnoredBuildArtifacts } from './utils/collections/glob-loader';
+import { globWithSafeWatcher, withFederatedContent, withIgnoredBuildArtifacts } from './utils/collections/glob-loader';
 import { withExtensionProperties } from './utils/collections/extension-properties';
 
 // Enterprise Collections
@@ -494,24 +494,26 @@ const dataProducts = defineCollection({
 
 const services = defineCollection({
   loader: globWithSafeWatcher({
-    pattern: withIgnoredBuildArtifacts([
-      'domains/*/services/*/index.(md|mdx)',
-      'domains/*/services/*/versioned/*/index.(md|mdx)',
-
-      // Capture subdomain folders
-      'domains/*/subdomains/*/services/*/index.(md|mdx)',
-      'domains/*/subdomains/*/services/*/versioned/*/index.(md|mdx)',
-
-      // Capture services inside systems
-      'systems/*/services/*/index.(md|mdx)',
-      'systems/*/services/*/versioned/*/index.(md|mdx)',
-      'domains/*/systems/*/services/*/index.(md|mdx)',
-      'domains/*/systems/*/services/*/versioned/*/index.(md|mdx)',
-
-      // Capture services in the root
-      'services/*/index.(md|mdx)', // ✅ Capture only services markdown files
-      'services/*/versioned/*/index.(md|mdx)', // ✅ Capture versioned files inside services
-    ]),
+    pattern: withIgnoredBuildArtifacts(
+      withFederatedContent([
+        'domains/*/services/*/index.(md|mdx)',
+        'domains/*/services/*/versioned/*/index.(md|mdx)',
+
+        // Capture subdomain folders
+        'domains/*/subdomains/*/services/*/index.(md|mdx)',
+        'domains/*/subdomains/*/services/*/versioned/*/index.(md|mdx)',
+
+        // Capture services inside systems
+        'systems/*/services/*/index.(md|mdx)',
+        'systems/*/services/*/versioned/*/index.(md|mdx)',
+        'domains/*/systems/*/services/*/index.(md|mdx)',
+        'domains/*/systems/*/services/*/versioned/*/index.(md|mdx)',
+
+        // Capture services in the root
+        'services/*/index.(md|mdx)', // ✅ Capture only services markdown files
+        'services/*/versioned/*/index.(md|mdx)', // ✅ Capture versioned files inside services
+      ])
+    ),
     base: projectDirBase,
     generateId: ({ data, ...rest }) => {
       return `${data.id}-${data.version}`;
@@ -730,14 +732,16 @@ const resourceDocs = defineCollection({
   loader: globWithSafeWatcher({
     // Resource-level docs are restricted to known resource paths.
     // This avoids scanning external docs such as node_modules/**/docs.
-    pattern: withIgnoredBuildArtifacts([
-      '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/**/*.@(md|mdx)',
-      '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/*.@(md|mdx)',
-      '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/versioned/*/docs/**/*.@(md|mdx)',
-      '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/versioned/*/docs/*.@(md|mdx)',
-      'domains/**/docs/**/*.@(md|mdx)',
-      'domains/**/docs/*.@(md|mdx)',
-    ]),
+    pattern: withIgnoredBuildArtifacts(
+      withFederatedContent([
+        '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/**/*.@(md|mdx)',
+        '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/*.@(md|mdx)',
+        '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/versioned/*/docs/**/*.@(md|mdx)',
+        '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/versioned/*/docs/*.@(md|mdx)',
+        'domains/**/docs/**/*.@(md|mdx)',
+        'domains/**/docs/*.@(md|mdx)',
+      ])
+    ),
     base: projectDirBase,
   }),
   schema: resourceDocsSchema,
@@ -745,16 +749,18 @@ const resourceDocs = defineCollection({
 
 const resourceDocCategories = defineCollection({
   loader: globWithSafeWatcher({
-    pattern: withIgnoredBuildArtifacts([
-      '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/**/category.json',
-      '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/**/_category_.json',
-      '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/versioned/*/docs/**/category.json',
-      '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/versioned/*/docs/**/_category_.json',
-      'domains/**/docs/**/category.json',
-      'domains/**/docs/**/_category_.json',
-      'domains/**/docs/category.json',
-      'domains/**/docs/_category_.json',
-    ]),
+    pattern: withIgnoredBuildArtifacts(
+      withFederatedContent([
+        '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/**/category.json',
+        '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/docs/**/_category_.json',
+        '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/versioned/*/docs/**/category.json',
+        '{agents,events,commands,queries,services,flows,containers,channels,entities,data-products,systems}/**/versioned/*/docs/**/_category_.json',
+        'domains/**/docs/**/category.json',
+        'domains/**/docs/**/_category_.json',
+        'domains/**/docs/category.json',
+        'domains/**/docs/_category_.json',
+      ])
+    ),
     base: projectDirBase,
   }),
   schema: resourceDocCategoriesSchema,
@@ -762,15 +768,17 @@ const resourceDocCategories = defineCollection({
 
 const domains = defineCollection({
   loader: globWithSafeWatcher({
-    pattern: withIgnoredBuildArtifacts([
-      // ✅ Strictly include only index.md at the expected levels
-      'domains/*/index.(md|mdx)',
-      'domains/*/versioned/*/index.(md|mdx)',
-
-      // Capture subdomain folders
-      'domains/*/subdomains/*/index.(md|mdx)',
-      'domains/*/subdomains/*/versioned/*/index.(md|mdx)',
-    ]),
+    pattern: withIgnoredBuildArtifacts(
+      withFederatedContent([
+        // ✅ Strictly include only index.md at the expected levels
+        'domains/*/index.(md|mdx)',
+        'domains/*/versioned/*/index.(md|mdx)',
+
+        // Capture subdomain folders
+        'domains/*/subdomains/*/index.(md|mdx)',
+        'domains/*/subdomains/*/versioned/*/index.(md|mdx)',
+      ])
+    ),
     base: projectDirBase,
     generateId: ({ data, ...rest }) => {
       return `${data.id}-${data.version}`;
@@ -938,10 +946,9 @@ const channels = defineCollection({
 
 const ubiquitousLanguages = defineCollection({
   loader: globWithSafeWatcher({
-    pattern: withIgnoredBuildArtifacts([
-      'domains/*/ubiquitous-language.(md|mdx)',
-      'domains/*/subdomains/*/ubiquitous-language.(md|mdx)',
-    ]),
+    pattern: withIgnoredBuildArtifacts(
+      withFederatedContent(['domains/*/ubiquitous-language.(md|mdx)', 'domains/*/subdomains/*/ubiquitous-language.(md|mdx)'])
+    ),
     base: projectDirBase,
     generateId: ({ data }) => {
       // File has no id, so we need to generate one
@@ -1039,7 +1046,7 @@ const users = defineCollection({
     sources: config.directory?.sources,
     conflictStrategy: config.directory?.conflictStrategy,
     local: {
-      pattern: withIgnoredBuildArtifacts('users/*.(md|mdx)'),
+      pattern: withIgnoredBuildArtifacts(withFederatedContent('users/*.(md|mdx)')),
       base: projectDirBase,
       generateId: ({ data }) => data.id as string,
     },
@@ -1071,7 +1078,7 @@ const teams = defineCollection({
     sources: config.directory?.sources,
     conflictStrategy: config.directory?.conflictStrategy,
     local: {
-      pattern: withIgnoredBuildArtifacts('teams/*.(md|mdx)'),
+      pattern: withIgnoredBuildArtifacts(withFederatedContent('teams/*.(md|mdx)')),
       base: projectDirBase,
       generateId: ({ data }) => data.id as string,
     },

package/eventcatalog/src/enterprise/auth/login.astro

@@ -5,6 +5,7 @@ const { title, logo } = config;
 import { join } from 'node:path';
 import { isAuthEnabled, isSSR } from '@utils/feature';
 import { buildUrl } from '@utils/url-builder';
+import { getSession } from 'auth-astro/server';
 
 const catalogDirectory = process.env.PROJECT_DIR || process.cwd();
 
@@ -32,7 +33,6 @@ if (!isSSR() || !isAuthEnabled()) {
 
 // If we are in SSR mode, check if the user is already logged in
 if (isSSR() && isAuthEnabled()) {
-  const { getSession } = await import(/* @vite-ignore */ 'auth-astro/server');
   const session = await getSession(Astro.request);
   if (session) {
     return Astro.redirect('/');

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/resources/_index.data.spec.ts

@@ -0,0 +1,28 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { loadResourceOwner } from './_index.data';
+
+const collectionMocks = vi.hoisted(() => ({
+  getDomains: vi.fn(() => Promise.resolve([])),
+  getSystems: vi.fn(() => Promise.resolve([])),
+}));
+
+vi.mock('@utils/collections/domains', () => ({ getDomains: collectionMocks.getDomains }));
+vi.mock('@utils/collections/systems', () => ({ getSystems: collectionMocks.getSystems }));
+
+describe('Resources page owner loader', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('loads domains without flattening child-subdomain services and agents', async () => {
+    await loadResourceOwner('domains');
+
+    expect(collectionMocks.getDomains).toHaveBeenCalledWith({ includeServicesInSubdomains: false });
+  });
+
+  it('keeps the system loader unchanged', async () => {
+    await loadResourceOwner('systems');
+
+    expect(collectionMocks.getSystems).toHaveBeenCalledWith();
+  });
+});

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/resources/_index.data.ts

@@ -1,36 +1,21 @@
 import { isSSR } from '@utils/feature';
 import { HybridPage } from '@utils/page-loaders/hybrid-page';
+import { hasResources } from './_resources';
 
-// The Resources page lists the top-level resources (services, flows, entities and
-// data stores) attached to a single system or domain. It is only available for
-// systems and domains — every other resource type 404s.
+// The Resources page lists the resources directly attached to a single system or
+// domain. It is only available for systems and domains — every other resource type 404s.
 const SUPPORTED_TYPES = ['systems', 'domains'] as const;
 type SupportedType = (typeof SUPPORTED_TYPES)[number];
 
 const isSupportedType = (type: string): type is SupportedType => SUPPORTED_TYPES.includes(type as SupportedType);
 
-const loadResourceOwner = async (type: SupportedType) => {
+export const loadResourceOwner = async (type: SupportedType) => {
   if (type === 'systems') {
     const { getSystems } = await import('@utils/collections/systems');
     return getSystems();
   }
   const { getDomains } = await import('@utils/collections/domains');
-  return getDomains();
-};
-
-// A system/domain only gets a Resources page when it actually has resources attached.
-// Mirrors what the page renders: services, flows, entities, data stores and (domains
-// only) the domain's own messages.
-const hasResources = (owner: any): boolean => {
-  const data = owner?.data ?? {};
-  return (
-    (data.services || []).length > 0 ||
-    (data.flows || []).length > 0 ||
-    (data.entities || []).length > 0 ||
-    (data.containers || []).length > 0 ||
-    (data.sends || []).length > 0 ||
-    (data.receives || []).length > 0
-  );
+  return getDomains({ includeServicesInSubdomains: false });
 };
 
 export class Page extends HybridPage {
@@ -47,7 +32,7 @@ export class Page extends HybridPage {
 
     return SUPPORTED_TYPES.flatMap((type, index) =>
       owners[index]
-        .filter((owner) => hasResources(owner))
+        .filter((owner) => hasResources(owner, type))
         .map((owner) => ({
           params: {
             type,
@@ -71,7 +56,7 @@ export class Page extends HybridPage {
     const owners = await loadResourceOwner(type);
     const owner = owners.find((o) => o.data.id === id && o.data.version === version);
 
-    if (!owner || !hasResources(owner)) {
+    if (!owner || !hasResources(owner, type)) {
       return null;
     }
 

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/resources/_resources.spec.ts

@@ -0,0 +1,65 @@
+import { describe, expect, it } from 'vitest';
+import { getResourceGroups, hasResources } from './_resources';
+
+const resource = (id: string, version = '1.0.0') => ({ data: { id, name: id, version } });
+const message = (collection: 'events' | 'commands' | 'queries', id: string, version = '1.0.0') => ({
+  collection,
+  data: { id, name: id, version },
+});
+
+describe('resource page groups', () => {
+  it('includes every resource directly attached to a domain', () => {
+    const sharedEvent = message('events', 'OrderPlaced');
+    const groups = getResourceGroups(
+      {
+        domains: [resource('Fulfilment')],
+        systems: [resource('OrderingSystem')],
+        agents: [resource('OrderAgent')],
+        'data-products': [resource('OrderAnalytics')],
+        services: [resource('OrdersService')],
+        flows: [resource('PlaceOrder')],
+        entities: [resource('Order')],
+        sends: [sharedEvent, message('commands', 'PlaceOrder')],
+        receives: [sharedEvent, message('queries', 'GetOrder')],
+      },
+      'domains'
+    );
+
+    expect(Object.fromEntries(groups.map(({ collection, items }) => [collection, items.map((item) => item.data.id)]))).toEqual({
+      domains: ['Fulfilment'],
+      systems: ['OrderingSystem'],
+      agents: ['OrderAgent'],
+      'data-products': ['OrderAnalytics'],
+      services: ['OrdersService'],
+      flows: ['PlaceOrder'],
+      entities: ['Order'],
+      containers: [],
+      events: ['OrderPlaced'],
+      commands: ['PlaceOrder'],
+      queries: ['GetOrder'],
+    });
+  });
+
+  it('keeps domain-only resources off system resource pages', () => {
+    const collections = getResourceGroups(
+      {
+        domains: [resource('Fulfilment')],
+        systems: [resource('OrderingSystem')],
+        agents: [resource('OrderAgent')],
+        'data-products': [resource('OrderAnalytics')],
+        services: [resource('OrdersService')],
+        containers: [resource('OrdersDatabase')],
+      },
+      'systems'
+    ).map(({ collection }) => collection);
+
+    expect(collections).toEqual(['services', 'flows', 'entities', 'containers', 'events', 'commands', 'queries']);
+  });
+
+  it.each(['domains', 'systems', 'agents', 'data-products'] as const)(
+    'makes a domain with only %s eligible for a Resources page',
+    (collection) => {
+      expect(hasResources({ data: { [collection]: [resource('direct-resource')] } }, 'domains')).toBe(true);
+    }
+  );
+});

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/resources/_resources.ts

@@ -0,0 +1,46 @@
+import type { SystemResourceCollection } from '@components/Tables/SystemResources/SystemResourcesTable';
+
+export type ResourceOwnerCollection = 'systems' | 'domains';
+
+export interface ResourceGroup {
+  collection: SystemResourceCollection;
+  items: any[];
+}
+
+const getDomainMessages = (data: any) => {
+  const seen = new Map<string, any>();
+
+  for (const message of [...(data.sends || []), ...(data.receives || [])]) {
+    if (!message?.data?.id || !message?.collection) continue;
+    seen.set(`${message.collection}:${message.data.id}:${message.data.version}`, message);
+  }
+
+  return Array.from(seen.values());
+};
+
+export const getResourceGroups = (data: any, ownerCollection: ResourceOwnerCollection): ResourceGroup[] => {
+  const domainMessages = ownerCollection === 'domains' ? getDomainMessages(data) : [];
+  const domainOnlyGroups: ResourceGroup[] =
+    ownerCollection === 'domains'
+      ? [
+          { collection: 'domains', items: data.domains || [] },
+          { collection: 'systems', items: data.systems || [] },
+          { collection: 'agents', items: data.agents || [] },
+          { collection: 'data-products', items: data['data-products'] || [] },
+        ]
+      : [];
+
+  return [
+    ...domainOnlyGroups,
+    { collection: 'services', items: data.services || [] },
+    { collection: 'flows', items: data.flows || [] },
+    { collection: 'entities', items: data.entities || [] },
+    { collection: 'containers', items: data.containers || [] },
+    { collection: 'events', items: domainMessages.filter((message) => message.collection === 'events') },
+    { collection: 'commands', items: domainMessages.filter((message) => message.collection === 'commands') },
+    { collection: 'queries', items: domainMessages.filter((message) => message.collection === 'queries') },
+  ];
+};
+
+export const hasResources = (owner: any, ownerCollection: ResourceOwnerCollection): boolean =>
+  getResourceGroups(owner?.data ?? {}, ownerCollection).some(({ items }) => items.length > 0);

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/resources/index.astro

@@ -7,6 +7,7 @@ import {
   type SystemResourceItem,
   type SystemResourceCollection,
 } from '@components/Tables/SystemResources/SystemResourcesTable';
+import { getResourceGroups, type ResourceOwnerCollection } from './_resources';
 
 import { Page } from './_index.data';
 
@@ -15,35 +16,11 @@ export const getStaticPaths = Page.getStaticPaths;
 
 const resourceOwner = await Page.getData(Astro);
 const { data } = resourceOwner;
-const ownerCollection = resourceOwner.collection as 'systems' | 'domains';
+const ownerCollection = resourceOwner.collection as ResourceOwnerCollection;
 
-// Domain-level messages come from the domain's own `sends` (Domain Events) and
-// `receives` (External Events). Each resolved entry already carries its own
-// collection (events / commands / queries). Dedupe across sends + receives.
-const messageEntries = (() => {
-  const seen = new Map<string, any>();
-  for (const message of [...(data.sends || []), ...(data.receives || [])]) {
-    if (!message?.data?.id || !message?.collection) continue;
-    seen.set(`${message.collection}:${message.data.id}:${message.data.version}`, message);
-  }
-  return Array.from(seen.values());
-})();
-
-const messagesByCollection = (collection: SystemResourceCollection) =>
-  messageEntries.filter((message: any) => message.collection === collection);
-
-// Only show resources that are directly attached to the system/domain — not resources
-// nested further downstream. Domains can't hold containers directly, so a domain's
-// Resources page shows services, flows, entities and its own messages.
-const resourceGroups: Array<{ collection: SystemResourceCollection; items: any[] }> = [
-  { collection: 'services', items: data.services || [] },
-  { collection: 'flows', items: data.flows || [] },
-  { collection: 'entities', items: data.entities || [] },
-  { collection: 'containers', items: data.containers || [] },
-  { collection: 'events', items: messagesByCollection('events') },
-  { collection: 'commands', items: messagesByCollection('commands') },
-  { collection: 'queries', items: messagesByCollection('queries') },
-];
+// Only show resources directly attached to this system/domain. Domain child resources
+// are not flattened, so services inside a child system remain on that system's page.
+const resourceGroups = getResourceGroups(data, ownerCollection);
 
 const hrefForResource = (collection: SystemResourceCollection, id: string, version: string) => {
   if (collection === 'entities') {
@@ -72,7 +49,8 @@ const resources: SystemResourceItem[] = resourceGroups.flatMap(({ collection, it
         <div class="border-b border-[rgb(var(--ec-page-border))] pb-4">
           <h2 class="text-2xl md:text-4xl font-bold text-[rgb(var(--ec-page-text))]">{data.name} Resources</h2>
           <h2 class="text-lg pt-2 text-[rgb(var(--ec-page-text-muted))] font-light">
-            A group of resources that are mapped to the {data.name} {ownerCollection === 'domains' ? 'domain' : 'system'}.
+            A group of resources that are mapped to the {data.name}{' '}
+            {ownerCollection === 'domains' ? 'domain' : 'system'}.
           </h2>
         </div>
 

package/eventcatalog/src/stores/sidebar-store/builders/domain.ts

@@ -81,10 +81,14 @@ export const buildDomainNode = (domain: CollectionEntry<'domains'>, owners: any[
   const sortedReceivesMessages = [...receivesMessages].sort(byResourceName);
   const renderMessages = shouldRenderSideBarSection(domain, 'messages');
 
-  // The Resources page/link only makes sense when the domain actually has resources
-  // attached (services, flows, entities or its own messages). Mirrors what the page renders.
+  // The Resources page/link only makes sense when the domain has direct resources.
+  // Keep this aligned with the resource groups rendered by the page.
   const hasResources =
-    servicesInDomain.length > 0 ||
+    subDomains.length > 0 ||
+    systemsInDomain.length > 0 ||
+    agentsInDomain.length > 0 ||
+    dataProductsInDomain.length > 0 ||
+    allServicesInDomain.length > 0 ||
     domainFlows.length > 0 ||
     entitiesInDomain.length > 0 ||
     sendsMessages.length > 0 ||

package/eventcatalog/src/stores/sidebar-store/builders/service.ts

@@ -58,15 +58,13 @@ export const buildServiceNode = (
   const renderEntities = serviceEntities.length > 0 && shouldRenderSideBarSection(service, 'entities');
   const renderOwners = owners.length > 0 && shouldRenderSideBarSection(service, 'owners');
   const renderRepository = service.data.repository && shouldRenderSideBarSection(service, 'repository');
-  const isLatestVersion = service.data.version === service.data.latestVersion;
-  const docsBasePath = `/docs/services/${service.data.id}${isLatestVersion ? '' : `/${service.data.version}`}`;
+  const docsBasePath = `/docs/services/${service.data.id}/${service.data.version}`;
   const docsSection = buildResourceDocsSection(
     'services',
     service.data.id,
     service.data.version,
     context.resourceDocs,
-    context.resourceDocCategories,
-    { includeVersionInUrl: !isLatestVersion }
+    context.resourceDocCategories
   );
 
   // Diagrams

package/eventcatalog/src/stores/sidebar-store/builders/shared.ts

@@ -24,6 +24,7 @@ export type NavNode = {
   type: 'group' | 'item';
   title: string;
   collapseKey?: string; // Stable key used to persist collapse state for inline groups
+  collapsible?: boolean; // Set to false to keep a group expanded regardless of its size
   icon?: string; // Lucide icon name
   subtle?: boolean; // Render lightweight styling for nested subgroup headers
   leftIcon?: string; // Path to SVG icon shown on the left of the label

package/eventcatalog/src/stores/sidebar-store/state.ts

@@ -1104,6 +1104,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     allList = {
       type: 'group',
       title: 'Browse',
+      collapsible: false,
       icon: 'Telescope',
       pages: validAllChildren,
     };

package/eventcatalog/src/utils/collections/glob-loader.spec.ts

@@ -0,0 +1,20 @@
+import picomatch from 'picomatch';
+import { describe, expect, it } from 'vitest';
+import { withFederatedContent } from './glob-loader';
+
+describe('withFederatedContent', () => {
+  it('loads root catalog content from every federated source directory', () => {
+    const patterns = withFederatedContent(['services/*/index.(md|mdx)', 'domains/*/index.(md|mdx)', '!domains/*/services/**']);
+
+    expect(patterns).toEqual([
+      'services/*/index.(md|mdx)',
+      'domains/*/index.(md|mdx)',
+      '!domains/*/services/**',
+      'federated/*/services/*/index.(md|mdx)',
+      'federated/*/domains/*/index.(md|mdx)',
+      '!federated/*/domains/*/services/**',
+    ]);
+    expect(picomatch.isMatch('federated/team-payments--abc123/services/payment-service/index.mdx', patterns)).toBe(true);
+    expect(picomatch.isMatch('federated/team-payments--abc123/domains/payments/index.mdx', patterns)).toBe(true);
+  });
+});

package/eventcatalog/src/utils/collections/glob-loader.ts

@@ -15,6 +15,17 @@ export const withIgnoredBuildArtifacts = (patterns: string | string[]) => {
 
 const toPatterns = (patterns: string | string[]) => (Array.isArray(patterns) ? patterns : [patterns]);
 
+export const withFederatedContent = (patterns: string | string[]) => {
+  const patternList = toPatterns(patterns);
+  const federatedPatterns = patternList.map((pattern) => {
+    const isNegative = pattern.startsWith('!');
+    const catalogPattern = isNegative ? pattern.slice(1) : pattern;
+    return `${isNegative ? '!' : ''}federated/*/${catalogPattern}`;
+  });
+
+  return [...patternList, ...federatedPatterns];
+};
+
 const matchesGlobPattern = (entry: string, patterns: string | string[]) => {
   const patternList = toPatterns(patterns);
   const positivePatterns = patternList.filter((pattern) => !pattern.startsWith('!'));

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.5.2",
+  "version": "4.6.1",
   "publishConfig": {
     "access": "public"
   },
@@ -32,10 +32,10 @@
   ],
   "dependencies": {
     "@ai-sdk/react": "^3.0.17",
-    "@astrojs/markdown-remark": "^7.2.1",
-    "@astrojs/mdx": "^7.0.3",
-    "@astrojs/node": "^11.0.2",
-    "@astrojs/react": "^6.0.1",
+    "@astrojs/markdown-remark": "^7.2.2",
+    "@astrojs/mdx": "^7.0.5",
+    "@astrojs/node": "^11.1.0",
+    "@astrojs/react": "^6.0.2",
     "@astrojs/rss": "^4.0.19",
     "@asyncapi/avro-schema-parser": "3.0.24",
     "@asyncapi/parser": "^3.6.0",
@@ -61,7 +61,7 @@
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
     "ai": "^6.0.17",
-    "astro": "^7.1.1",
+    "astro": "^7.2.0",
     "astro-expressive-code": "^0.44.0",
     "astro-seo": "^0.8.4",
     "auth-astro": "^4.2.0",
@@ -81,7 +81,7 @@
     "gray-matter": "^4.0.3",
     "hono": "4.12.27",
     "html-to-image": "^1.11.11",
-    "js-yaml": "^4.3.0",
+    "js-yaml": "^4.3.1",
     "jsonpath-plus": "^10.4.0",
     "jsonwebtoken": "^9.0.2",
     "lodash.debounce": "^4.0.8",
@@ -119,12 +119,12 @@
     "update-notifier": "^7.3.1",
     "uuid": "^10.0.0",
     "zod": "^4.3.6",
-    "@eventcatalog/linter": "1.1.9",
-    "@eventcatalog/sdk": "2.27.0",
+    "@eventcatalog/linter": "1.1.10",
+    "@eventcatalog/sdk": "2.27.1",
     "@eventcatalog/visualiser": "^4.1.1"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.9.9",
+    "@astrojs/check": "^0.9.10",
     "@types/d3-drag": "^3.0.7",
     "@types/d3-force": "^3.0.10",
     "@types/d3-selection": "^3.0.11",