@eventcatalog/core 2.33.10 → 2.33.11

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-N7V2JS3E.js";
-import "../chunk-KWYNYLOK.js";
+} from "../chunk-WHJEWUMZ.js";
+import "../chunk-2NTEYUNI.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.33.10";
+var version = "2.33.11";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-L2RGENDX.js";
-import "../chunk-N7V2JS3E.js";
-import "../chunk-KWYNYLOK.js";
+} from "../chunk-FKC4UAA6.js";
+import "../chunk-WHJEWUMZ.js";
+import "../chunk-2NTEYUNI.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-KWYNYLOK.js → chunk-2NTEYUNI.js}

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

package/dist/{chunk-L2RGENDX.js → chunk-FKC4UAA6.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-N7V2JS3E.js";
+} from "./chunk-WHJEWUMZ.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-N7V2JS3E.js → chunk-WHJEWUMZ.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-KWYNYLOK.js";
+} from "./chunk-2NTEYUNI.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.33.10";
+var version = "2.33.11";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,15 +6,15 @@ import {
 } from "./chunk-UKJ7F5WR.js";
 import {
   log_build_default
-} from "./chunk-L2RGENDX.js";
-import "./chunk-N7V2JS3E.js";
+} from "./chunk-FKC4UAA6.js";
+import "./chunk-WHJEWUMZ.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
 } from "./chunk-7SI5EVOX.js";
 import {
   VERSION
-} from "./chunk-KWYNYLOK.js";
+} from "./chunk-2NTEYUNI.js";
 import {
   isBackstagePluginEnabled,
   isEventCatalogScaleEnabled,

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

@@ -12,7 +12,65 @@ interface Props {
 }
 
 const { id, file, title, maxHeight, schema } = Astro.props;
-const { description, properties, required = [] } = schema;
+
+// Function to merge allOf schemas
+function mergeAllOfSchemas(schema: any) {
+  if (!schema.allOf) return schema;
+
+  const mergedSchema: {
+    type: string;
+    properties: Record<string, any>;
+    required: string[];
+    description?: string;
+  } = {
+    type: 'object',
+    properties: {},
+    required: [],
+    description: schema.description,
+  };
+
+  schema.allOf.forEach((subSchema: any) => {
+    if (subSchema.properties) {
+      mergedSchema.properties = {
+        ...mergedSchema.properties,
+        ...subSchema.properties,
+      };
+    }
+    if (subSchema.required) {
+      mergedSchema.required = [...mergedSchema.required, ...subSchema.required];
+    }
+    if (subSchema.description && !mergedSchema.description) {
+      mergedSchema.description = subSchema.description;
+    }
+  });
+
+  return mergedSchema;
+}
+
+function processSchema(schema: any) {
+  if (schema.allOf) {
+    return mergeAllOfSchemas(schema);
+  }
+
+  if (schema.oneOf) {
+    // For oneOf, we'll keep the base properties and handle variants in the UI
+    return {
+      ...schema,
+      variants: schema.oneOf.map((variant: any) => ({
+        title: variant.title || 'Unnamed Variant',
+        required: variant.required || [],
+      })),
+    };
+  }
+
+  return schema;
+}
+
+const processedSchema = processSchema(schema);
+const { description, properties, required = [], variants } = processedSchema;
+
+// Generate a unique ID for this instance
+const instanceId = `${id}-${file}-${Math.random().toString(36).substring(2, 9)}`;
 ---
 
 <div id={`${id}-${file}-SchemaViewer-client`} class="not-prose my-4">
@@ -24,19 +82,74 @@ const { description, properties, required = [] } = schema;
     }}
   >
     {description && <p class="text-gray-600 text-xs mb-5">{description}</p>}
-    {/* Reduced size, adjusted margin */}
 
     {
-      properties &&
-        Object.entries(properties).map(([name, details]) => (
-          <SchemaProperty name={name} details={details} isRequired={required.includes(name)} level={0} />
-        ))
+      variants && (
+        <div class="mb-4">
+          <div class="flex items-center space-x-2">
+            <span class="text-sm text-gray-600">(one of)</span>
+            <select
+              id={`${instanceId}-variant-selector`}
+              class="form-select text-sm border-gray-300 rounded-md shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
+            >
+              {variants.map((variant: any, index: number) => (
+                <option value={index}>{variant.title}</option>
+              ))}
+            </select>
+          </div>
+        </div>
+      )
+    }
+
+    {
+      properties && (
+        <div id={`${instanceId}-properties`}>
+          {Object.entries(properties).map(([name, details]) => (
+            <SchemaProperty name={name} details={details} isRequired={variants ? false : required.includes(name)} level={0} />
+          ))}
+        </div>
+      )
     }
 
     {!properties && <p class="text-gray-500 text-sm">Schema does not contain any properties.</p>}
   </div>
 </div>
 
+<script define:vars={{ instanceId, variants }}>
+  if (variants) {
+    const selector = document.getElementById(`${instanceId}-variant-selector`);
+    const propertiesContainer = document.getElementById(`${instanceId}-properties`);
+
+    function updateRequiredFields() {
+      const selectedVariant = variants[selector.value];
+      const properties = propertiesContainer.querySelectorAll('.property-container');
+
+      properties.forEach((prop) => {
+        const nameEl = prop.querySelector('.font-semibold');
+        if (!nameEl) return;
+
+        const name = nameEl.textContent;
+        const requiredBadge = prop.querySelector('.text-red-600');
+
+        if (selectedVariant.required.includes(name)) {
+          if (!requiredBadge) {
+            const badge = document.createElement('span');
+            badge.className = 'text-red-600 text-xs ml-3 flex-shrink-0';
+            badge.textContent = 'required';
+            nameEl.parentElement.appendChild(badge);
+          }
+        } else {
+          requiredBadge?.remove();
+        }
+      });
+    }
+
+    selector.addEventListener('change', updateRequiredFields);
+    // Initialize with first variant
+    updateRequiredFields();
+  }
+</script>
+
 <style>
   .schema-viewer code {
     font-family: 'Courier New', Courier, monospace;

package/package.json

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