@eventcatalog/core 2.39.0 → 2.39.2

package/dist/analytics/analytics.cjs

@@ -37,7 +37,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.39.0";
+var version = "2.39.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-7TGRVLSE.js";
-import "../chunk-PG6VTEEI.js";
+} from "../chunk-UMDTA3ST.js";
+import "../chunk-MYIRODAL.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -106,7 +106,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.39.0";
+var version = "2.39.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-YFIADR2I.js";
-import "../chunk-7TGRVLSE.js";
-import "../chunk-PG6VTEEI.js";
+} from "../chunk-ZCL3ECGU.js";
+import "../chunk-UMDTA3ST.js";
+import "../chunk-MYIRODAL.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-PG6VTEEI.js → chunk-MYIRODAL.js}

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

package/dist/{chunk-7TGRVLSE.js → chunk-UMDTA3ST.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-PG6VTEEI.js";
+} from "./chunk-MYIRODAL.js";
 
 // src/analytics/analytics.js
 import axios from "axios";

package/dist/{chunk-YFIADR2I.js → chunk-ZCL3ECGU.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-7TGRVLSE.js";
+} from "./chunk-UMDTA3ST.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/constants.cjs

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

package/dist/constants.js

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

package/dist/eventcatalog.cjs

@@ -157,7 +157,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.39.0";
+var version = "2.39.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,15 +6,15 @@ import {
 } from "./chunk-DCLTVJDP.js";
 import {
   log_build_default
-} from "./chunk-YFIADR2I.js";
-import "./chunk-7TGRVLSE.js";
+} from "./chunk-ZCL3ECGU.js";
+import "./chunk-UMDTA3ST.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
 } from "./chunk-SLEMYHTU.js";
 import {
   VERSION
-} from "./chunk-PG6VTEEI.js";
+} from "./chunk-MYIRODAL.js";
 import {
   isBackstagePluginEnabled,
   isEventCatalogScaleEnabled,

package/eventcatalog/src/components/MDX/NodeGraph/Nodes/Service.tsx

@@ -29,8 +29,8 @@ export default function ServiceNode({ data, sourcePosition, targetPosition }: an
   const nodeLabel = label || service?.data?.sidebar?.badge || 'Service';
   const fontSize = nodeLabel.length > 10 ? '7px' : '9px';
 
-  let asyncApiFiles = Array.isArray(specifications) ? specifications?.filter((spec) => spec.type === 'asyncapi') : [];
-  let openApiFiles = Array.isArray(specifications) ? specifications?.filter((spec) => spec.type === 'openapi') : [];
+  let asyncApiFiles = Array.isArray(specifications) ? specifications?.filter((spec) => spec.type === 'asyncapi') : ([] as any);
+  let openApiFiles = Array.isArray(specifications) ? specifications?.filter((spec) => spec.type === 'openapi') : ([] as any);
 
   if (!Array.isArray(specifications) && specifications?.asyncapiPath) {
     asyncApiFiles.push({ path: specifications.asyncapiPath, type: 'asyncapi', name: 'AsyncAPI' });
@@ -41,13 +41,13 @@ export default function ServiceNode({ data, sourcePosition, targetPosition }: an
   }
 
   // Add filename on asyncApiFiles and openApiFiles
-  asyncApiFiles = asyncApiFiles.map((file) => {
+  asyncApiFiles = asyncApiFiles.map((file: any) => {
     return {
       ...file,
       filename: file.path.split('/').pop()?.split('.').shift(),
     };
   });
-  openApiFiles = openApiFiles.map((file) => {
+  openApiFiles = openApiFiles.map((file: any) => {
     return {
       ...file,
       filename: file.path.split('/').pop()?.split('.').shift(),
@@ -120,7 +120,7 @@ export default function ServiceNode({ data, sourcePosition, targetPosition }: an
           </ContextMenu.Item>
           <ContextMenu.Separator className="h-[1px] bg-gray-200 m-1" />
           {asyncApiFiles.length > 0 &&
-            asyncApiFiles.map((file) => (
+            asyncApiFiles.map((file: any) => (
               <ContextMenu.Item asChild key={file.path}>
                 <a
                   href={buildUrl(`/docs/services/${id}/${version}/asyncapi/${file.filename}`)}
@@ -133,7 +133,7 @@ export default function ServiceNode({ data, sourcePosition, targetPosition }: an
               </ContextMenu.Item>
             ))}
           {openApiFiles.length > 0 &&
-            openApiFiles.map((file) => (
+            openApiFiles.map((file: any) => (
               <ContextMenu.Item asChild key={file.path}>
                 <a
                   href={buildUrl(`/docs/services/${id}/${version}/spec/${file.filename}`)}

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

@@ -57,6 +57,11 @@ export async function getResourcesForNavigation({ currentPath }: { currentPath:
       href: buildUrl(`/${route}/${entity.collection}/${entity.data.id}/${entity.data.version}`),
     }));
 
+    // don't render items if we are in the visualiser and the item has visualiser set to false
+    if (currentPath.includes('visualiser') && item.data.visualiser === false) {
+      return acc;
+    }
+
     const navigationItem = {
       label: item.data.name,
       version: item.data.version,
@@ -78,6 +83,7 @@ export async function getResourcesForNavigation({ currentPath }: { currentPath:
       entities: entitiesWithHref,
       specifications: isCollectionService ? getSpecificationsForService(item) : null,
       sidebar: item.data?.sidebar,
+      renderInVisualiser: item.data?.visualiser ?? true,
     };
 
     group.push(navigationItem);

package/eventcatalog/src/content.config.ts

@@ -135,6 +135,7 @@ const baseSchema = z.object({
       z.boolean().optional(),
     ])
     .optional(),
+  visualiser: z.boolean().optional(),
   // Used by eventcatalog
   versions: z.array(z.string()).optional(),
   latestVersion: z.string().optional(),

package/eventcatalog/src/layouts/VerticalSideBarLayout.astro

@@ -70,8 +70,13 @@ const getDefaultUrl = (route: string, defaultValue: string) => {
 
   for (const { data, key } of collections) {
     if (data.length > 0 && isCollectionVisibleInCatalog(key)) {
-      const item = data[0];
-      return buildUrl(`/${route}/${key}/${item.data.id}/${item.data.latestVersion}`);
+      // find the first item that has visualiser set to true
+      const item = data.find((item) => item.data.visualiser !== false);
+      if (item) {
+        return buildUrl(`/${route}/${key}/${item.data.id}/${item.data.latestVersion}`);
+      } else {
+        continue;
+      }
     }
   }
 

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

@@ -8,6 +8,8 @@ import NodeGraph from '@components/MDX/NodeGraph/NodeGraph.astro';
 import SchemaViewer from '@components/MDX/SchemaViewer/SchemaViewerRoot.astro';
 import Admonition from '@components/MDX/Admonition';
 
+import { getSpecificationsForService } from '@utils/collections/services';
+
 import { resourceToCollectionMap, collectionToResourceMap } from '@utils/collections/util';
 
 // SideBars
@@ -136,31 +138,40 @@ const getBadge = () => {
 
 const getSpecificationBadges = () => {
   const badges = [];
-  const hasOpenAPISpec = !!props.data.specifications?.openapiPath;
-  const hasAsyncAPISpec = !!props.data.specifications?.asyncapiPath;
-
-  if (hasOpenAPISpec) {
-    badges.push({
-      backgroundColor: 'white',
-      textColor: 'gray',
-      content: 'OpenAPI Spec',
-      iconURL: buildUrl('/icons/openapi.svg', true),
-      class: 'text-black hover:underline',
-      id: 'open-api-badge',
-      url: buildUrl(`/docs/${props.collection}/${props.data.id}/${props.data.version}/spec`),
-    });
+
+  const specifications = getSpecificationsForService(props);
+
+  const asyncapiSpecs = specifications.filter((spec) => spec.type === 'asyncapi');
+  const openapiSpecs = specifications.filter((spec) => spec.type === 'openapi');
+
+  if (openapiSpecs.length > 0) {
+    for (const spec of openapiSpecs) {
+      badges.push({
+        backgroundColor: 'white',
+        textColor: 'gray',
+        content: spec.name || 'OpenAPI Spec',
+        iconURL: buildUrl('/icons/openapi.svg', true),
+        class: 'text-black hover:underline',
+        id: 'open-api-badge',
+        url: buildUrl(`/docs/${props.collection}/${props.data.id}/${props.data.version}/spec/${spec.filenameWithoutExtension}`),
+      });
+    }
   }
 
-  if (hasAsyncAPISpec) {
-    badges.push({
-      backgroundColor: 'white',
-      textColor: 'gray',
-      content: 'AsyncAPI Spec',
-      iconURL: buildUrl('/icons/asyncapi.svg', true),
-      class: 'text-black hover:underline',
-      id: 'asyncapi-badge',
-      url: buildUrl(`/docs/${props.collection}/${props.data.id}/${props.data.version}/asyncapi`),
-    });
+  if (asyncapiSpecs.length > 0) {
+    for (const spec of asyncapiSpecs) {
+      badges.push({
+        backgroundColor: 'white',
+        textColor: 'gray',
+        content: spec.name || 'AsyncAPI Spec',
+        iconURL: buildUrl('/icons/asyncapi.svg', true),
+        class: 'text-black hover:underline',
+        id: 'asyncapi-badge',
+        url: buildUrl(
+          `/docs/${props.collection}/${props.data.id}/${props.data.version}/asyncapi/${spec.filenameWithoutExtension}`
+        ),
+      });
+    }
   }
 
   return badges;

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

@@ -19,17 +19,19 @@ export async function getStaticPaths() {
   const allItems = await Promise.all(itemTypes.map((type) => loaders[type]()));
 
   return allItems.flatMap((items, index) =>
-    items.map((item) => ({
-      params: {
-        type: itemTypes[index],
-        id: item.data.id,
-        version: item.data.version,
-      },
-      props: {
-        type: itemTypes[index],
-        ...item,
-      },
-    }))
+    items
+      .filter((item) => item.data.visualiser !== false)
+      .map((item) => ({
+        params: {
+          type: itemTypes[index],
+          id: item.data.id,
+          version: item.data.version,
+        },
+        props: {
+          type: itemTypes[index],
+          ...item,
+        },
+      }))
   );
 }
 

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

@@ -11,6 +11,9 @@ import type { CollectionTypes } from '@types';
 export async function getStaticPaths() {
   const [events, commands, services, domains] = await Promise.all([getEvents(), getCommands(), getServices(), getDomains()]);
 
+  const resources = [...domains, ...events, ...services, ...commands];
+  const resourcesWithVisualiserEnabled = resources.filter((resource) => resource.data.visualiser !== false);
+
   const buildPages = (collection: CollectionEntry<CollectionTypes>[]) => {
     return collection.map((item) => ({
       params: {
@@ -24,7 +27,7 @@ export async function getStaticPaths() {
     }));
   };
 
-  return [...buildPages(domains), ...buildPages(events), ...buildPages(services), ...buildPages(commands)];
+  return [...buildPages(resourcesWithVisualiserEnabled)];
 }
 
 const props = Astro.props;

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

@@ -35,8 +35,13 @@ export const getSchemasFromResource = (resource: CollectionEntry<PageTypes>): Sc
   }
 
   if (resource.collection === 'services') {
-    const asyncapiPath = resource?.data?.specifications?.asyncapiPath;
-    const openapiPath = resource?.data?.specifications?.openapiPath;
+    const specifications = resource?.data?.specifications;
+    const asyncapiPath = Array.isArray(specifications)
+      ? specifications.find((spec) => spec.type === 'asyncapi')?.path
+      : specifications?.asyncapiPath;
+    const openapiPath = Array.isArray(specifications)
+      ? specifications.find((spec) => spec.type === 'openapi')?.path
+      : specifications?.openapiPath;
     // @ts-ignore
     const publicPath = resource?.catalog?.publicPath;
     const schemas = [];

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.39.0",
+  "version": "2.39.2",
   "publishConfig": {
     "access": "public"
   },