@eventcatalog/core 2.42.2 → 2.42.4

package/README.md

@@ -278,4 +278,4 @@ This project follows the [all-contributors](https://github.com/all-contributors/
 
 # License
 
-MIT.
+MIT

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-7UGAOGXQ.js";
-import "../chunk-JSNXGDYW.js";
+} from "../chunk-QKYZ35CN.js";
+import "../chunk-VBWDUTD4.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.42.2";
+var version = "2.42.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-CJI2BJQN.js";
-import "../chunk-7UGAOGXQ.js";
-import "../chunk-JSNXGDYW.js";
+} from "../chunk-CD54ILWK.js";
+import "../chunk-QKYZ35CN.js";
+import "../chunk-VBWDUTD4.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-CJI2BJQN.js → chunk-CD54ILWK.js}

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

package/dist/{chunk-7UGAOGXQ.js → chunk-QKYZ35CN.js}

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

package/dist/{chunk-JSNXGDYW.js → chunk-VBWDUTD4.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "2.42.2";
+var version = "2.42.4";
 
 // 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.42.2";
+var version = "2.42.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-JSNXGDYW.js";
+} from "./chunk-VBWDUTD4.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.42.2";
+var version = "2.42.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.config.d.cts

@@ -37,6 +37,7 @@ interface Config {
     organizationName: string;
     homepageLink: string;
     editUrl: string;
+    repositoryUrl?: string;
     landingPage?: string;
     base?: string;
     port?: string;

package/dist/eventcatalog.config.d.ts

@@ -37,6 +37,7 @@ interface Config {
     organizationName: string;
     homepageLink: string;
     editUrl: string;
+    repositoryUrl?: string;
     landingPage?: string;
     base?: string;
     port?: string;

package/dist/eventcatalog.js

@@ -6,15 +6,15 @@ import {
 } from "./chunk-DCLTVJDP.js";
 import {
   log_build_default
-} from "./chunk-CJI2BJQN.js";
-import "./chunk-7UGAOGXQ.js";
+} from "./chunk-CD54ILWK.js";
+import "./chunk-QKYZ35CN.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
 } from "./chunk-SLEMYHTU.js";
 import {
   VERSION
-} from "./chunk-JSNXGDYW.js";
+} from "./chunk-VBWDUTD4.js";
 import {
   isBackstagePluginEnabled,
   isEventCatalogScaleEnabled,

package/eventcatalog/src/components/Header.astro

@@ -2,12 +2,15 @@
 import catalog from '@utils/eventcatalog-config/catalog';
 import Search from '@components/Search.astro';
 import { buildUrl } from '@utils/url-builder';
+import { showEventCatalogBranding, showCustomBranding } from '@utils/feature';
 
 const logo = {
   src: ('/' + (catalog?.logo?.src || 'logo.png')).replace(/^\/+/, '/'),
   alt: catalog?.logo?.alt || 'Event Catalog',
   text: catalog?.logo?.text || 'EventCatalog',
 };
+
+const repositoryUrl = catalog?.repositoryUrl || 'https://github.com/event-catalog/eventcatalog';
 ---
 
 <nav
@@ -28,18 +31,33 @@ const logo = {
       </div>
 
       <div class="hidden md:block w-3/12">
-        <ul class="flex space-x-8 justify-end pr-2">
-          <li>
-            <a href="https://discord.com/invite/3rjaZMmrAm">
-              <img src={buildUrl('/icons/discord.svg', true)} class="h-7 w-7" />
-            </a>
-          </li>
-          <li>
-            <a href="https://github.com/event-catalog/eventcatalog">
-              <img src={buildUrl('/icons/github.svg', true)} class="h-7 w-7" />
-            </a>
-          </li>
-        </ul>
+        {
+          showEventCatalogBranding() && (
+            <ul class="flex space-x-8 justify-end pr-2">
+              <li>
+                <a href="https://discord.com/invite/3rjaZMmrAm">
+                  <img src={buildUrl('/icons/discord.svg', true)} class="h-7 w-7" />
+                </a>
+              </li>
+              <li>
+                <a href="https://github.com/event-catalog/eventcatalog">
+                  <img src={buildUrl('/icons/github.svg', true)} class="h-7 w-7" />
+                </a>
+              </li>
+            </ul>
+          )
+        }
+        {
+          showCustomBranding() && !showEventCatalogBranding() && (
+            <ul class="flex space-x-8 justify-end pr-2">
+              <li>
+                <a href={repositoryUrl} class="text-gray-500 hover:text-gray-600 focus:outline-none focus:text-gray-600">
+                  <img src={buildUrl('/icons/github.svg', true)} class="h-7 w-7" />
+                </a>
+              </li>
+            </ul>
+          )
+        }
       </div>
 
       <div class="md:hidden">

package/eventcatalog/src/components/MDX/SchemaViewer/SchemaViewer.astro

@@ -48,6 +48,22 @@ function mergeAllOfSchemas(schema: any) {
 }
 
 function processSchema(schema: any) {
+  // Handle $ref
+  if (schema.$ref) {
+    // Only support local refs like "#/definitions/xyz"
+    const refPath = schema.$ref;
+    if (refPath.startsWith('#/definitions/')) {
+      const defName = refPath.replace('#/definitions/', '');
+      const definitions = schema.definitions;
+      if (definitions && definitions[defName]) {
+        // Recursively process the referenced schema
+        return processSchema(definitions[defName]);
+      }
+    }
+    // If not found, return as is
+    return schema;
+  }
+
   if (schema.allOf) {
     return mergeAllOfSchemas(schema);
   }

package/eventcatalog/src/content.config.ts

@@ -130,7 +130,7 @@ const baseSchema = z.object({
     .union([
       z.object({
         message: z.string().optional(),
-        date: z.date().optional(),
+        date: z.union([z.string(), z.date()]).optional(),
       }),
       z.boolean().optional(),
     ])

package/eventcatalog/src/layouts/Footer.astro

@@ -1,34 +1,43 @@
 ---
 import { buildUrl } from '@utils/url-builder';
+import { showEventCatalogBranding } from '@utils/feature';
 const { className } = Astro.props;
 ---
 
 <footer class={`relative py-4 space-y-8 border-t border-gray-300 ${className}`}>
-  <div class="flex justify-between items-center py-8 text-gray-500 text-sm font-light">
-    <div class="flex space-x-5">
-      <a href="https://github.com/event-catalog/eventcatalog" target="_blank"
-        ><svg
-          class="w-5 h-5 bg-gray-400 hover:bg-primary dark:hover:bg-gray-400"
-          style={`mask-image: url("${buildUrl('/icons/github.svg', true)}"); mask-repeat: no-repeat; mask-position: center center;`}
-        ></svg></a
-      >
-      <a href="https://x.com/event_catalog" target="_blank"
-        ><span class="sr-only">x</span><svg
-          class="w-5 h-5 bg-gray-400 hover:bg-primary dark:hover:bg-gray-400"
-          style={`mask-image: url("${buildUrl('/icons/x-twitter.svg', true)}"); mask-repeat: no-repeat; mask-position: center center;`}
-        ></svg></a
-      >
-      <a href="https://www.youtube.com/@event-catalog" target="_blank"
-        ><span class="sr-only">x</span><svg
-          class="w-5 h-5 bg-gray-400 hover:bg-primary dark:hover:bg-gray-400"
-          style={`mask-image: url("${buildUrl('/icons/youtube.svg', true)}"); mask-repeat: no-repeat; mask-position: center center;`}
-        ></svg></a
-      >
-    </div>
-    <a
-      target="_blank"
-      class="hover:text-primary hover:underline text-gray-400 font-light not-prose"
-      href="https://eventcatalog.dev">Powered by EventCatalog</a
-    >
-  </div>
+  {
+    showEventCatalogBranding() && (
+      <div class="flex justify-between items-center py-8 text-gray-500 text-sm font-light">
+        <div class="flex space-x-5">
+          <a href="https://github.com/event-catalog/eventcatalog" target="_blank">
+            <svg
+              class="w-5 h-5 bg-gray-400 hover:bg-primary dark:hover:bg-gray-400"
+              style={`mask-image: url("${buildUrl('/icons/github.svg', true)}"); mask-repeat: no-repeat; mask-position: center center;`}
+            />
+          </a>
+          <a href="https://x.com/event_catalog" target="_blank">
+            <span class="sr-only">x</span>
+            <svg
+              class="w-5 h-5 bg-gray-400 hover:bg-primary dark:hover:bg-gray-400"
+              style={`mask-image: url("${buildUrl('/icons/x-twitter.svg', true)}"); mask-repeat: no-repeat; mask-position: center center;`}
+            />
+          </a>
+          <a href="https://www.youtube.com/@event-catalog" target="_blank">
+            <span class="sr-only">x</span>
+            <svg
+              class="w-5 h-5 bg-gray-400 hover:bg-primary dark:hover:bg-gray-400"
+              style={`mask-image: url("${buildUrl('/icons/youtube.svg', true)}"); mask-repeat: no-repeat; mask-position: center center;`}
+            />
+          </a>
+        </div>
+        <a
+          target="_blank"
+          class="hover:text-primary hover:underline text-gray-400 font-light not-prose"
+          href="https://eventcatalog.dev"
+        >
+          Powered by EventCatalog
+        </a>
+      </div>
+    )
+  }
 </footer>

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

@@ -109,5 +109,9 @@ const pagefindAttributes =
         z-index: 1 !important;
       }
     }
+
+    .aui-root .z-10 {
+      z-index: 8;
+    }
   }
 </style>

package/eventcatalog/src/utils/feature.ts

@@ -17,6 +17,19 @@ import config from '@config';
 export const isEventCatalogStarterEnabled = () => process.env.EVENTCATALOG_STARTER === 'true';
 export const isEventCatalogScaleEnabled = () => process.env.EVENTCATALOG_SCALE === 'true';
 
+export const showEventCatalogBranding = () => {
+  const override = process.env.EVENTCATALOG_SHOW_BRANDING;
+  // if any value we return true
+  if (override) {
+    return true;
+  }
+  return !isEventCatalogStarterEnabled() && !isEventCatalogScaleEnabled();
+};
+
+export const showCustomBranding = () => {
+  return isEventCatalogStarterEnabled() || isEventCatalogScaleEnabled();
+};
+
 export const isCustomDocsEnabled = () => isEventCatalogStarterEnabled() || isEventCatalogScaleEnabled();
 export const isEventCatalogChatEnabled = () => {
   const isFeatureEnabledFromPlan = isEventCatalogStarterEnabled() || isEventCatalogScaleEnabled();

package/package.json

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