@eventcatalog/core 2.28.2 → 2.29.0

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.28.2";
+var version = "2.29.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-KZAS3BWD.js";
-import "../chunk-Y5MIG5AN.js";
+} from "../chunk-7IL66XAM.js";
+import "../chunk-GFX4RRFK.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.28.2";
+var version = "2.29.0";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-XKW6AAZE.js";
-import "../chunk-KZAS3BWD.js";
-import "../chunk-Y5MIG5AN.js";
+} from "../chunk-3PFCKHXB.js";
+import "../chunk-7IL66XAM.js";
+import "../chunk-GFX4RRFK.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-XKW6AAZE.js → chunk-3PFCKHXB.js}

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

package/dist/{chunk-KZAS3BWD.js → chunk-7IL66XAM.js}

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

package/dist/{chunk-Y5MIG5AN.js → chunk-GFX4RRFK.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

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

package/dist/eventcatalog.cjs

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

package/dist/eventcatalog.js

@@ -6,14 +6,14 @@ import {
 } from "./chunk-WUCY3QHK.js";
 import {
   log_build_default
-} from "./chunk-XKW6AAZE.js";
-import "./chunk-KZAS3BWD.js";
+} from "./chunk-3PFCKHXB.js";
+import "./chunk-7IL66XAM.js";
 import {
   catalogToAstro
 } from "./chunk-R2NILSWL.js";
 import {
   VERSION
-} from "./chunk-Y5MIG5AN.js";
+} from "./chunk-GFX4RRFK.js";
 import {
   isBackstagePluginEnabled
 } from "./chunk-XMDPVKIJ.js";

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

@@ -81,9 +81,38 @@ const ServiceItem = React.memo(
             window.location.href.includes(`serviceId=${item.id}`) ? 'bg-purple-100' : 'hover:bg-purple-100'
           }`}
         >
-          <span className="truncate">Architecture</span>
+          <span className="truncate flex items-center gap-1">Architecture</span>
         </a>
-
+        {item.specifications && item.specifications.asyncapiPath && (
+          <a
+            href={buildUrl(`/docs/services/${item.id}/${item.version}/asyncapi`)}
+            className={`flex items-center px-2 py-1.5 text-xs text-gray-600 hover:bg-purple-100 rounded-md flex justify-between ${
+              window.location.href.includes(`docs/services/${item.id}/${item.version}/asyncapi`)
+                ? 'bg-purple-100'
+                : 'hover:bg-purple-100'
+            }`}
+          >
+            <span className="truncate flex items-center gap-1">AsyncAPI specification</span>
+            <span className="text-purple-600 ml-2 text-[10px] uppercase font-medium bg-gray-50 px-4 py-0.5 rounded">
+              <img src="/icons/asyncapi.svg" className="w-4 h-4" />
+            </span>
+          </a>
+        )}
+        {item.specifications && item.specifications.openapiPath && (
+          <a
+            href={buildUrl(`/docs/services/${item.id}/${item.version}/spec`)}
+            className={`items-center px-2 py-1.5 text-xs text-gray-600 hover:bg-purple-100 rounded-md flex justify-between ${
+              window.location.href.includes(`docs/services/${item.id}/${item.version}/spec`)
+                ? 'bg-purple-100'
+                : 'hover:bg-purple-100'
+            }`}
+          >
+            <span className="truncate flex items-center gap-1">OpenAPI specification</span>
+            <span className="text-green-600 ml-2 text-[10px] uppercase font-medium bg-gray-50 px-4 py-0.5 rounded">
+              <img src="/icons/openapi.svg" className="w-4 h-4" />
+            </span>
+          </a>
+        )}
         <CollapsibleGroup
           isCollapsed={collapsedGroups[`${item.href}-receives`]}
           onToggle={() => toggleGroupCollapse(`${item.href}-receives`)}

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

@@ -15,8 +15,13 @@ export interface ServiceItem {
   label: string;
   name: string;
   id: string;
+  version: string;
   sends: MessageItem[];
   receives: MessageItem[];
+  specifications?: {
+    asyncapiPath: string;
+    openapiPath: string;
+  };
 }
 
 interface DomainItem {

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

@@ -67,6 +67,7 @@ export async function getResourcesForNavigation({ currentPath }: { currentPath:
       services: item.collection === 'domains' ? item.data.services : null,
       sends: sendsWithHref,
       receives: receivesWithHref,
+      specifications: item.collection === 'services' ? item.data.specifications : null,
     };
 
     group.push(navigationItem);

package/eventcatalog/src/layouts/VerticalSideBarLayout.astro

@@ -9,7 +9,9 @@ import { BookOpenText, Workflow, TableProperties, House, BookUser, MessageSquare
 import Header from '../components/Header.astro';
 import SEO from '../components/Seo.astro';
 import SideNav from '../components/SideNav/SideNav.astro';
-// import '@fontsource/inter';
+import '@fontsource/inter';
+import '@fontsource/inter/400.css'; // Specify weight
+import '@fontsource/inter/700.css'; // Specify weight
 
 import { getCommands } from '@utils/commands';
 import { getDomains } from '@utils/collections/domains';
@@ -251,7 +253,7 @@ const canPageBeEmbedded = process.env.ENABLE_EMBED === 'true';
     const currentPath = window.location.href;
 
     // Hide the sidebar if the current navigation item is not a sidebar item
-    if (!currentNavigationItem.sidebar || currentPath.includes('asyncapi') || currentPath.includes('/spec')) {
+    if (!currentNavigationItem.sidebar) {
       sidebar.style.display = 'none';
       content.style.width = '100%';
       content.classList.add('ml-16');

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/spec/OpenAPI.tsx

@@ -0,0 +1,33 @@
+import { useState } from 'react';
+import { ApiReferenceReact } from '@scalar/api-reference-react';
+import '@scalar/api-reference-react/style.css';
+import './_styles.css';
+const OpenAPISpec = ({ spec }: { spec: string }) => {
+  const [loaded, setLoaded] = useState(false);
+  return (
+    <div>
+      {!loaded && <div>Loading...</div>}
+      <ApiReferenceReact
+        configuration={{
+          spec: {
+            url: spec,
+          },
+          theme: 'fastify',
+          hideClientButton: true,
+          onLoaded: () => {
+            setLoaded(true);
+          },
+          forceDarkModeState: 'light',
+          darkMode: false,
+          defaultOpenAllTags: true,
+          hideDarkModeToggle: true,
+          searchHotKey: 'p',
+          showSidebar: true,
+          customCss: 'bg-red-500',
+        }}
+      />
+    </div>
+  );
+};
+
+export default OpenAPISpec;

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/spec/_styles.css

@@ -1,3 +1,7 @@
-#nav-bar-search{
+#nav-bar-search {
     margin: 0 10px;
-}
+}
+
+.scalar-card-header[data-v-838dc259] {
+    display: none !important;
+}

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

@@ -2,6 +2,7 @@
 import type { CollectionEntry } from 'astro:content';
 import * as path from 'path';
 import fs from 'node:fs';
+import OpenAPISpec from './OpenAPI.tsx';
 
 import type { CollectionTypes, PageTypes } from '@types';
 import { DocumentMinusIcon } from '@heroicons/react/24/outline';
@@ -52,86 +53,9 @@ const fileExists = fs.existsSync(pathOnDisk);
         </p>
       </div>
     ) : (
-      <rapi-doc
-        spec-url={buildUrl(pathToSpec, true)}
-        render-style="read"
-        show-header="false"
-        allow-authentication="true"
-        allow-try="true"
-        default-schema-tab="schema"
-        use-path-in-nav-bar="true"
-        show-method-in-nav-bar="as-colored-block"
-        theme="light"
-        schema-style="table"
-        class="relative top-0"
-        style={{ height: '100%', width: '100%', zIndex: 100 }}
-        regular-font="ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji"
-        bg-color="#ffffff"
-        primary-color="#6b21a8"
-        nav-bg-color="#fff"
-        nav-text-color=""
-        nav-hover-bg-color="#fff"
-        nav-hover-text-color="#6b21a8"
-        nav-accent-color=""
-      />
+      <div>
+        <OpenAPISpec client:only="react" spec={buildUrl(pathToSpec, true)} />
+      </div>
     )
   }
 </VerticalSideBarLayout>
-
-<script>
-  // @ts-ignore
-  await import('rapidoc');
-</script>
-
-<style>
-  rapi-doc::part(section-servers) {
-    /* <<< targets the server div */
-    /* background: #6b5b95; */
-    border: 2px solid #f1edff;
-    color: black;
-    margin: 0 24px 0 24px;
-    border-radius: 5px;
-  }
-  rapi-doc::part(label-selected-server) {
-    /* <<< targets selected server label */
-    color: black;
-  }
-
-  rapi-doc::part(section-navbar-search) {
-    margin: 0 10px;
-    padding: 0;
-    margin-bottom: 1em;
-  }
-  rapi-doc::part(section-navbar) {
-    margin: 0;
-    padding: 10px important;
-    margin-bottom: 1em;
-    background-image: linear-gradient(to bottom, rgb(255, 255, 255), rgb(243, 244, 246));
-    border-right-width: 1px;
-    border-right-color: rgb(229, 231, 235);
-  }
-  rapi-doc::part(section-overview) {
-    margin: 0 2em 0 2em;
-    padding: 1em 0 1em;
-  }
-  rapi-doc::part(section-auth) {
-    margin: 2em 2em;
-    padding: 0;
-  }
-  rapi-doc::part(section-tag) {
-    margin: 2em 2em;
-    padding: 0;
-  }
-  rapi-doc::part(section-tag-title) {
-    margin: 0.5em 0 0;
-    padding: 0;
-  }
-  rapi-doc::part(section-operations-in-tag) {
-    margin: 1em 2em;
-    padding: 0;
-  }
-  rapi-doc::part(section-navbar) {
-    border-right: 1px solid #f1edff;
-    padding: 1em 1em 0 0;
-  }
-</style>

package/eventcatalog/src/utils/url-builder.ts

@@ -40,5 +40,5 @@ export const buildUrlWithParams = (baseUrl: string, params: Record<string, strin
     .map(([key, value]) => `${key}=${value}`)
     .join('&');
 
-  return buildUrl(`${baseUrl}?${queryString}`);
+  return `${buildUrl(baseUrl)}?${queryString}`;
 };

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.28.2",
+  "version": "2.29.0",
   "publishConfig": {
     "access": "public"
   },
@@ -40,6 +40,7 @@
     "@parcel/watcher": "^2.4.1",
     "@radix-ui/react-context-menu": "^2.2.6",
     "@radix-ui/react-dialog": "^1.1.6",
+    "@scalar/api-reference-react": "^0.4.37",
     "@stoplight/json-schema-viewer": "^4.16.4",
     "@tailwindcss/typography": "^0.5.13",
     "@tanstack/react-table": "^8.17.3",
@@ -68,7 +69,6 @@
     "marked": "^15.0.6",
     "mermaid": "^11.4.1",
     "prismjs": "^1.29.0",
-    "rapidoc": "^9.3.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "rehype-slug": "^6.0.0",