@eventcatalog/core 5.0.0-beta.31 → 5.0.0-beta.33

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 = "5.0.0-beta.31";
+var version = "5.0.0-beta.33";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,8 +1,8 @@
 import {
   raiseEvent
-} from "../chunk-BNSLGNQI.js";
+} from "../chunk-Y5YVOT3I.js";
 import "../chunk-CPW6G62V.js";
-import "../chunk-WADZVNCA.js";
+import "../chunk-7RCPGRLA.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -169,7 +169,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "5.0.0-beta.31";
+var version = "5.0.0-beta.33";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,12 +1,12 @@
 import {
   log_build_default
-} from "../chunk-XRFL642Z.js";
+} from "../chunk-YFFESNO5.js";
 import "../chunk-AD7CL772.js";
 import "../chunk-ZAZHAVKB.js";
 import "../chunk-CA6WCQ2T.js";
-import "../chunk-BNSLGNQI.js";
+import "../chunk-Y5YVOT3I.js";
 import "../chunk-CPW6G62V.js";
-import "../chunk-WADZVNCA.js";
+import "../chunk-7RCPGRLA.js";
 import "../chunk-4G7FSRPN.js";
 export {
   log_build_default as default

package/dist/{chunk-OUEGYMBA.js → chunk-46MTR3KO.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-2UCCTEIH.js";
+} from "./chunk-NBFJVJE7.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-WADZVNCA.js → chunk-7RCPGRLA.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "5.0.0-beta.31";
+var version = "5.0.0-beta.33";
 
 // src/constants.ts
 var VERSION = version;

package/dist/{chunk-2UCCTEIH.js → chunk-NBFJVJE7.js}

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

package/dist/{chunk-OX6TSVHY.js → chunk-QJ7KKN2D.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-5EPNFDT5.js";
 import {
   createFederationSourceProvider
-} from "./chunk-6K7XZAYI.js";
+} from "./chunk-A2RZR3U4.js";
 import {
   createFederationContentCache
 } from "./chunk-R7Z5ALYI.js";

package/dist/{chunk-BNSLGNQI.js → chunk-Y5YVOT3I.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-CPW6G62V.js";
 import {
   VERSION
-} from "./chunk-WADZVNCA.js";
+} from "./chunk-7RCPGRLA.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/{chunk-XRFL642Z.js → chunk-YFFESNO5.js}

@@ -13,7 +13,7 @@ import {
 } from "./chunk-CA6WCQ2T.js";
 import {
   raiseEvent
-} from "./chunk-BNSLGNQI.js";
+} from "./chunk-Y5YVOT3I.js";
 import {
   TELEMETRY_REQUEST_TIMEOUT_MS,
   isTelemetryDisabled

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-WADZVNCA.js";
+} from "./chunk-7RCPGRLA.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -174,7 +174,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "5.0.0-beta.31";
+var version = "5.0.0-beta.33";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,13 +1,19 @@
 import {
-  runMigrations
-} from "./chunk-XUAF2H54.js";
-import "./chunk-CA4U2JP7.js";
+  FederationConflictError,
+  FederationDiagnosticError,
+  federateCatalog
+} from "./chunk-QJ7KKN2D.js";
+import "./chunk-WRNH5C3U.js";
+import "./chunk-5EPNFDT5.js";
+import "./chunk-A2RZR3U4.js";
+import "./chunk-SDZQJTJW.js";
+import "./chunk-352FGP6W.js";
 import {
   stopChildWithParent
 } from "./chunk-S5GWAUG5.js";
 import {
   log_build_default
-} from "./chunk-XRFL642Z.js";
+} from "./chunk-YFFESNO5.js";
 import {
   getLicenseStatus,
   printLicenseStatus
@@ -15,20 +21,14 @@ import {
 import "./chunk-ZAZHAVKB.js";
 import "./chunk-CA6WCQ2T.js";
 import {
-  FederationConflictError,
-  FederationDiagnosticError,
-  federateCatalog
-} from "./chunk-OX6TSVHY.js";
-import "./chunk-WRNH5C3U.js";
-import "./chunk-5EPNFDT5.js";
-import "./chunk-6K7XZAYI.js";
-import "./chunk-352FGP6W.js";
+  runMigrations
+} from "./chunk-XUAF2H54.js";
+import "./chunk-CA4U2JP7.js";
 import "./chunk-R7Z5ALYI.js";
 import {
   getFederationDiagnosticCounts,
   getVisibleFederationDiagnostics
 } from "./chunk-JJPB6EOZ.js";
-import "./chunk-SDZQJTJW.js";
 import {
   getProjectOutDir,
   isAuthEnabled,
@@ -37,10 +37,10 @@ import {
 } from "./chunk-NKNOXQ62.js";
 import {
   generate
-} from "./chunk-OUEGYMBA.js";
+} from "./chunk-46MTR3KO.js";
 import {
   logger
-} from "./chunk-2UCCTEIH.js";
+} from "./chunk-NBFJVJE7.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-PD7KTSYN.js";
@@ -54,7 +54,7 @@ import {
 import {
   watch
 } from "./chunk-U63GDPPY.js";
-import "./chunk-BNSLGNQI.js";
+import "./chunk-Y5YVOT3I.js";
 import "./chunk-CPW6G62V.js";
 import {
   getAstroConfigPath
@@ -71,7 +71,7 @@ import {
 } from "./chunk-LFQJXLHG.js";
 import {
   VERSION
-} from "./chunk-WADZVNCA.js";
+} from "./chunk-7RCPGRLA.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/federation/federate.js

@@ -2,14 +2,14 @@ import {
   FederationConflictError,
   FederationDiagnosticError,
   federateCatalog
-} from "../chunk-OX6TSVHY.js";
+} from "../chunk-QJ7KKN2D.js";
 import "../chunk-WRNH5C3U.js";
 import "../chunk-5EPNFDT5.js";
-import "../chunk-6K7XZAYI.js";
+import "../chunk-A2RZR3U4.js";
+import "../chunk-SDZQJTJW.js";
 import "../chunk-352FGP6W.js";
 import "../chunk-R7Z5ALYI.js";
 import "../chunk-JJPB6EOZ.js";
-import "../chunk-SDZQJTJW.js";
 import "../chunk-4G7FSRPN.js";
 export {
   FederationConflictError,

package/dist/federation/source-provider.js

@@ -1,8 +1,8 @@
 import {
   createFederationSourceProvider
-} from "../chunk-6K7XZAYI.js";
-import "../chunk-352FGP6W.js";
+} from "../chunk-A2RZR3U4.js";
 import "../chunk-SDZQJTJW.js";
+import "../chunk-352FGP6W.js";
 export {
   createFederationSourceProvider
 };

package/dist/generate.cjs

@@ -105,7 +105,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "5.0.0-beta.31";
+var version = "5.0.0-beta.33";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-OUEGYMBA.js";
-import "./chunk-2UCCTEIH.js";
-import "./chunk-WADZVNCA.js";
+} from "./chunk-46MTR3KO.js";
+import "./chunk-NBFJVJE7.js";
+import "./chunk-7RCPGRLA.js";
 import "./chunk-4G7FSRPN.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 = "5.0.0-beta.31";
+var version = "5.0.0-beta.33";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-2UCCTEIH.js";
-import "../chunk-WADZVNCA.js";
+} from "../chunk-NBFJVJE7.js";
+import "../chunk-7RCPGRLA.js";
 export {
   logger
 };

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

@@ -190,6 +190,13 @@ if (isDataProduct && contractPath) {
 // Render the requested tab on the server so the page does not flash the default tab before hydration.
 // Static builds cannot see the query string, so the panel also restores the tab on the client.
 const initialTab = Astro.url.searchParams.get('tab') ?? undefined;
+
+// The versions to switch between and compare. The one being viewed is also `message`, with its usage and flow graphs;
+// switching and comparing only need the schemas, so the list leaves the graphs out (each page carried them twice)
+const versionChoices = sortedVersions.map(({ graph: _graph, ...version }) => {
+  const { flows: _flows, ...data } = version.data;
+  return { ...version, data };
+});
 ---
 
 <VerticalSideBarLayout title={pageTitle}>
@@ -214,7 +221,7 @@ const initialTab = Astro.url.searchParams.get('tab') ?? undefined;
         <SchemaPageViewer
           client:load
           message={currentMessage}
-          availableVersions={sortedVersions}
+          availableVersions={versionChoices}
           showOwners={true}
           showProducersConsumers={true}
           initialTab={initialTab}

package/eventcatalog/src/utils/collections/flows.ts

@@ -166,30 +166,43 @@ export const getFlowsWithServiceStep = (
   );
 };
 
-/** A catalog entry a flow step points at (a service, message, agent, data store, data product or flow). */
+/** A catalog entry a flow step points at (a service, system, channel, message, agent, data store, data product or flow). */
 type FlowStepResource = { collection: string; data: { id: string; version: string; [key: string]: any } };
 
 /**
  * The catalog resources a flow's steps point at, each listed once in step order: messages,
- * services, agents, data stores, data products and sub-flows (the same steps the flow's
- * sidebar lists). Expects steps as getFlows returns them, where messages, agents, data stores
- * and data products are already resolved; services and sub-flows are resolved here, with a
- * pointer without a version meaning the latest.
+ * services, systems, channels, agents, data stores, data products and sub-flows (the same steps
+ * the flow's sidebar lists). Expects steps as getFlows returns them, where messages, agents, data
+ * stores and data products are already resolved; services, systems, channels and sub-flows are
+ * resolved here, with a pointer without a version meaning the latest.
  */
 export const getFlowStepResources = (
   flow: Flow,
-  catalog: { services: CollectionEntry<'services'>[]; flows: Flow[] }
+  catalog: {
+    services: CollectionEntry<'services'>[];
+    flows: Flow[];
+    systems?: CollectionEntry<'systems'>[];
+    channels?: CollectionEntry<'channels'>[];
+  }
 ): FlowStepResource[] => {
   const serviceMap = getVersionedMap(catalog.services);
   const flowMap = getVersionedMap(catalog.flows);
+  const systemMap = getVersionedMap(catalog.systems ?? []);
+  const channelMap = getVersionedMap(catalog.channels ?? []);
   const resources: FlowStepResource[] = [];
 
   for (const step of (flow.data.steps || []) as any[]) {
+    // `systems` is another name for a step's `system`
+    const system = step.system ?? step.systems;
     const resource = step.service
       ? findInMap(serviceMap, step.service.id, step.service.version)
       : step.flow
         ? findInMap(flowMap, step.flow.id, step.flow.version)
-        : [step.message, step.agent, step.container, step.dataProduct].find(Array.isArray)?.[0];
+        : system
+          ? findInMap(systemMap, system.id, system.version)
+          : step.channel
+            ? findInMap(channelMap, step.channel.id, step.channel.version)
+            : [step.message, step.agent, step.container, step.dataProduct].find(Array.isArray)?.[0];
     if (resource?.data) resources.push(resource);
   }
 

package/eventcatalog/src/utils/collections/resource-owners.ts

@@ -70,6 +70,7 @@ export const createResourcesCatalog = () => {
     allFlows: once(() => getFlows()),
     currentFlows: once(() => getFlows({ getAllVersions: false })),
     rawChannels: once(() => getCollection('channels')),
+    rawSystems: once(() => getCollection('systems')),
     rawMessages: once(async () => [
       ...(await getCollection('events')),
       ...(await getCollection('commands')),
@@ -108,10 +109,15 @@ const relatedResourcesFor = async (type: ResourceOwnerCollection, catalog: Resou
       });
     }
     case 'flows': {
-      const [services, flows] = await Promise.all([catalog.services(), catalog.allFlows()]);
+      const [services, flows, systems, channels] = await Promise.all([
+        catalog.services(),
+        catalog.allFlows(),
+        catalog.rawSystems(),
+        catalog.rawChannels(),
+      ]);
       return (owner) => ({
         adrs: adrsFor(owner),
-        stepResources: getFlowStepResources(asEntry<'flows'>(owner), { services, flows }),
+        stepResources: getFlowStepResources(asEntry<'flows'>(owner), { services, flows, systems, channels }),
       });
     }
     case 'channels': {

package/eventcatalog/src/utils/collections/resources.ts

@@ -94,6 +94,7 @@ const messageGroups = (messages: any[]): ResourceGroup[] => [
 
 // The collections a flow step can point at, in the order the page groups them.
 const FLOW_STEP_COLLECTIONS: ResourceCollection[] = [
+  'systems',
   'services',
   'agents',
   'flows',
@@ -102,6 +103,7 @@ const FLOW_STEP_COLLECTIONS: ResourceCollection[] = [
   'events',
   'commands',
   'queries',
+  'channels',
 ];
 
 export const getResourceGroups = (

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "BUSL-1.1",
   "type": "module",
-  "version": "5.0.0-beta.31",
+  "version": "5.0.0-beta.33",
   "publishConfig": {
     "access": "public"
   },
@@ -142,8 +142,8 @@
     "yjs": "^13.6.33",
     "zod": "^4.3.6",
     "@eventcatalog/linter": "1.2.0-beta.4",
-    "@eventcatalog/visualiser": "^5.0.0-beta.7",
-    "@eventcatalog/sdk": "2.30.0-beta.1"
+    "@eventcatalog/sdk": "2.30.0-beta.1",
+    "@eventcatalog/visualiser": "^5.0.0-beta.7"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",

package/dist/{chunk-6K7XZAYI.js → chunk-A2RZR3U4.js}

@@ -1,9 +1,9 @@
-import {
-  createGitHubSourceProvider
-} from "./chunk-352FGP6W.js";
 import {
   createFileSystemSourceProvider
 } from "./chunk-SDZQJTJW.js";
+import {
+  createGitHubSourceProvider
+} from "./chunk-352FGP6W.js";
 
 // src/federation/source-provider.ts
 var createFederationSourceProvider = (projectDirectory, providers = {}) => {