@eventcatalog/core 5.0.0-beta.2 → 5.0.0-beta.4

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

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-XARPIXWF.js";
-import "../chunk-62EV4IJA.js";
+} from "../chunk-VA77ENFQ.js";
+import "../chunk-Q7FBYUCZ.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

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

package/dist/analytics/log-build.js

@@ -1,10 +1,10 @@
 import {
   log_build_default
-} from "../chunk-KIDISU6X.js";
+} from "../chunk-PL3T5TWF.js";
 import "../chunk-TQLRG35T.js";
 import "../chunk-ZAZHAVKB.js";
-import "../chunk-XARPIXWF.js";
-import "../chunk-62EV4IJA.js";
+import "../chunk-VA77ENFQ.js";
+import "../chunk-Q7FBYUCZ.js";
 import "../chunk-RFIXKATC.js";
 export {
   log_build_default as default

package/dist/{chunk-HGRFXTFC.js → chunk-M7OVJHPV.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-4J2ZM2HX.js";
+} from "./chunk-TOMV5YJH.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-KIDISU6X.js → chunk-PL3T5TWF.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-ZAZHAVKB.js";
 import {
   raiseEvent
-} from "./chunk-XARPIXWF.js";
+} from "./chunk-VA77ENFQ.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-62EV4IJA.js → chunk-Q7FBYUCZ.js}

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

package/dist/{chunk-4J2ZM2HX.js → chunk-TOMV5YJH.js}

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

package/dist/{chunk-XARPIXWF.js → chunk-VA77ENFQ.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-62EV4IJA.js";
+} from "./chunk-Q7FBYUCZ.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-62EV4IJA.js";
+} from "./chunk-Q7FBYUCZ.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

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

package/dist/eventcatalog.js

@@ -4,7 +4,7 @@ import {
 import "./chunk-CA4U2JP7.js";
 import {
   log_build_default
-} from "./chunk-KIDISU6X.js";
+} from "./chunk-PL3T5TWF.js";
 import {
   getLicenseStatus,
   printLicenseStatus
@@ -33,10 +33,10 @@ import {
 } from "./chunk-MDWB5HLO.js";
 import {
   generate
-} from "./chunk-HGRFXTFC.js";
+} from "./chunk-M7OVJHPV.js";
 import {
   logger
-} from "./chunk-4J2ZM2HX.js";
+} from "./chunk-TOMV5YJH.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-36RYTYT5.js";
@@ -50,7 +50,7 @@ import {
 import {
   watch
 } from "./chunk-U63GDPPY.js";
-import "./chunk-XARPIXWF.js";
+import "./chunk-VA77ENFQ.js";
 import {
   getAstroConfigPath
 } from "./chunk-VIJJ7JKH.js";
@@ -66,7 +66,7 @@ import {
 } from "./chunk-LFQJXLHG.js";
 import {
   VERSION
-} from "./chunk-62EV4IJA.js";
+} from "./chunk-Q7FBYUCZ.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/generate.cjs

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

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-HGRFXTFC.js";
-import "./chunk-4J2ZM2HX.js";
-import "./chunk-62EV4IJA.js";
+} from "./chunk-M7OVJHPV.js";
+import "./chunk-TOMV5YJH.js";
+import "./chunk-Q7FBYUCZ.js";
 import "./chunk-RFIXKATC.js";
 export {
   generate

package/dist/runtime-dependencies/manifest.json

@@ -132,7 +132,6 @@
   "rimraf": "rimraf.mjs",
   "semver": "semver.mjs",
   "set-cookie-parser": "set-cookie-parser.mjs",
-  "shelljs": "shelljs.mjs",
   "sonner": "sonner.mjs",
   "sql.js": "sql.js.mjs",
   "tailwindcss": "tailwindcss.mjs",

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

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-4J2ZM2HX.js";
-import "../chunk-62EV4IJA.js";
+} from "../chunk-TOMV5YJH.js";
+import "../chunk-Q7FBYUCZ.js";
 export {
   logger
 };

package/eventcatalog/src/components/Grids/utils.tsx

@@ -24,26 +24,3 @@ export const getCollectionStyles = (collection: CollectionMessageTypes | Collect
       return { color: 'gray', Icon: EnvelopeIcon };
   }
 };
-
-export interface PaginationProps {
-  currentPage: number;
-  totalPages: number;
-  totalItems: number;
-  itemsPerPage: number;
-  onPageChange: (page: number) => void;
-}
-
-export interface SearchBarProps {
-  searchQuery: string;
-  onSearchChange: (query: string) => void;
-  placeholder?: string;
-  totalResults?: number;
-  totalItems?: number;
-}
-
-export interface TypeFilterProps {
-  selectedTypes: CollectionMessageTypes[];
-  onTypeChange: (types: CollectionMessageTypes[]) => void;
-  filteredCount?: number;
-  totalCount?: number;
-}

package/eventcatalog/src/components/MDX/CodeGroup/CodeGroup.tsx

@@ -167,7 +167,12 @@ export default function CodeGroup({
             hidden={index !== active}
             tabIndex={0}
           >
-            {item.html !== undefined ? <div dangerouslySetInnerHTML={{ __html: item.html }} /> : item.content}
+            {/* Astro's router marks scripts in this HTML with data-astro-exec before hydration, so it never matches exactly. */}
+            {item.html !== undefined ? (
+              <div suppressHydrationWarning dangerouslySetInnerHTML={{ __html: item.html }} />
+            ) : (
+              item.content
+            )}
           </div>
         ))}
       </div>

package/eventcatalog/src/components/SchemaExplorer/SchemaDetailsPanel.tsx

@@ -384,6 +384,9 @@ export default function SchemaDetailsPanel({
     [diffToVersion, uniqueAvailableVersions]
   );
   const comparing = (activeTab === 'versions' && hasMultipleVersions) || isDiffModalOpen;
+  const contentReady = !content.loading && !content.error;
+  // Server-rendered examples stay mounted and are only shown on the Examples tab (see the tab content below).
+  const showRenderedExamples = !!renderedExamples && activeTab === 'examples' && contentReady;
 
   const compareWithCurrent = (version: string) => {
     setDiffFromVersion(version);
@@ -705,11 +708,16 @@ export default function SchemaDetailsPanel({
 
         {/* Tab content */}
         <div className="flex-1 min-h-0 overflow-hidden p-6">
-          {content.loading || content.error ? (
+          {/* Always render the examples slot and hide it on other tabs. Astro moves a slot missing from the
+              server HTML into a <template>, where its island scripts never run and no island on the page hydrates. */}
+          {renderedExamples && (
+            <div className="h-full overflow-auto pr-1" hidden={!showRenderedExamples}>
+              {renderedExamples}
+            </div>
+          )}
+          {!contentReady ? (
             <SchemaLoadingState loading={content.loading} error={content.error} retry={content.retry} />
-          ) : activeTab === 'examples' && renderedExamples ? (
-            <div className="h-full overflow-auto pr-1">{renderedExamples}</div>
-          ) : activeTab === 'examples' && examples.length > 0 ? (
+          ) : showRenderedExamples ? null : activeTab === 'examples' && examples.length > 0 ? (
             <ExamplesViewer examples={examples} />
           ) : activeTab === 'metadata' ? (
             <SchemaMetadata message={message} owners={showOwners ? owners : []} />

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

@@ -25,6 +25,7 @@ import {
   findNodeKeyByUrl,
   getBadgeClasses,
   getDefaultCollapsedState,
+  hidesDefaultItemIcon,
   isGroupCollapsed,
   toggleGroupCollapsed,
 } from './utils';
@@ -663,6 +664,11 @@ export default function NestedSideBar() {
 
   const isTopLevel = navigationStack.length === 1;
 
+  // The list drilled into (e.g. Channels): its items, even those in groups under it (e.g. ADRs
+  // grouped by status), drop a default icon that repeats the list's own
+  const levelNode = currentLevel.key ? resolveRef(currentLevel.key) : null;
+  const repeatsLevelIcon = (item: NavNode) => !!levelNode && hidesDefaultItemIcon(levelNode, item, false);
+
   /**
    * Render a list of child refs (resolving keys as needed)
    */
@@ -674,7 +680,7 @@ export default function NestedSideBar() {
       if (currentItemGroup.length > 0) {
         result.push(
           <div key={`items-${result.length}`} className="flex flex-col gap-0.5 mb-1.5">
-            {currentItemGroup.map((item, idx) => renderItem(item.node, item.key, idx))}
+            {currentItemGroup.map((item, idx) => renderItem(item.node, item.key, idx, repeatsLevelIcon(item.node)))}
           </div>
         );
         currentItemGroup = [];
@@ -795,9 +801,12 @@ export default function NestedSideBar() {
                 return renderGroup(child, childKey, childIndex, depth + 1);
               }
 
-              // Under a nested group the header already conveys the resource type, so the
-              // default per-collection glyph is dropped; custom icons still show.
-              return renderItem(child, childKey, childIndex, isNested);
+              return renderItem(
+                child,
+                childKey,
+                childIndex,
+                hidesDefaultItemIcon(group, child, isNested) || repeatsLevelIcon(child)
+              );
             })}
           </div>
         )}
@@ -814,9 +823,9 @@ export default function NestedSideBar() {
     const isFav = isFavorited(itemKey);
     const canFavorite = itemKey !== null; // Only items with keys can be favorited
 
-    // Get icon component from lucide-react. When suppressDefaultIcon is set (e.g. items
-    // listed under a typed subtle subgroup) the default per-collection glyph is hidden;
-    // a custom icon (item.leftIcon) is always still shown.
+    // Get icon component from lucide-react. When suppressDefaultIcon is set (the group heading
+    // already shows the item's type, see hidesDefaultItemIcon) the default per-collection glyph
+    // is hidden; a custom icon (item.leftIcon) is always still shown.
     const IconComponent =
       item.icon && !suppressDefaultIcon ? (LucideIcons as unknown as Record<string, LucideIcons.LucideIcon>)[item.icon] : null;
     const handleStarClick = (e: React.MouseEvent) => {

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

@@ -1,5 +1,7 @@
 // Shared utilities for NestedSideBar components
 
+import type { NavNode } from '@stores/sidebar-store/state';
+
 export const SIDEBAR_GROUP_COLLAPSE_THRESHOLD = 5;
 
 /**
@@ -67,6 +69,14 @@ export const toggleGroupCollapsed = (
  * Finds the sidebar node represented by a resource URL.
  * The URL must have its configured base path removed before it is passed in.
  */
+/**
+ * Whether an item in a group drops its default per-collection icon because the group heading
+ * already conveys its type: every item under a nested group, and items whose icon is the
+ * group's own (e.g. events listed under Events). Custom icons (`leftIcon`) always show.
+ */
+export const hidesDefaultItemIcon = (group: NavNode, item: NavNode, isNested: boolean): boolean =>
+  isNested || (!!group.icon && group.icon === item.icon);
+
 export const findNodeKeyByUrl = (
   url: string,
   nodes: Record<string, unknown>,

package/eventcatalog/src/components/Tables/Discover/DiscoverTable.tsx

@@ -11,7 +11,7 @@ import {
   type ColumnFiltersState,
   type SortingState,
 } from '@tanstack/react-table';
-import { ArrowDown, ArrowUp, ArrowUpDown, ChevronLeft, ChevronRight, SearchX, X, Search, Users } from 'lucide-react';
+import { ArrowDown, ArrowUp, ArrowUpDown, SearchX, X, Search, Users } from 'lucide-react';
 import { UserIcon } from '@heroicons/react/24/outline';
 import { useEffect, useMemo, useState } from 'react';
 import type { TableConfiguration } from '@types';
@@ -19,6 +19,7 @@ import { isSameVersion } from '@utils/collections/version-compare';
 import { resolveIconUrl } from '@utils/icon';
 import { FilterDropdown, CheckboxItem } from './FilterComponents';
 import { getDiscoverColumns } from './columns';
+import { TablePagination, useStoredPageSize } from '../TablePagination';
 import { formatAdrStatus, type AdrStatus } from '@utils/collections/adr-constants';
 import { buildDiscoverFilterSearch, filterKnownValues, parseDiscoverFilterSearch } from './url-filters';
 
@@ -243,18 +244,7 @@ export function DiscoverTable<T extends DiscoverTableData>({
   const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
   const [sorting, setSorting] = useState<SortingState>([]);
   const [tableFilter, setTableFilter] = useState(initialUrlFilters.q);
-  const PAGE_SIZE_OPTIONS = [10, 25, 50, 100];
-  const PAGE_SIZE_STORAGE_KEY = 'eventcatalog-discover-page-size';
-  const [pageSize, setPageSize] = useState<number>(() => {
-    if (typeof window === 'undefined') return 10;
-    const stored = Number(window.localStorage.getItem(PAGE_SIZE_STORAGE_KEY));
-    return PAGE_SIZE_OPTIONS.includes(stored) ? stored : 10;
-  });
-  useEffect(() => {
-    if (typeof window !== 'undefined') {
-      window.localStorage.setItem(PAGE_SIZE_STORAGE_KEY, String(pageSize));
-    }
-  }, [pageSize]);
+  const [pageSize, setPageSize] = useStoredPageSize('eventcatalog-discover-page-size');
   const [showOnlyLatest, setShowOnlyLatest] = useState(initialUrlFilters.showOnlyLatest);
   const [onlyShowDrafts, setOnlyShowDrafts] = useState(initialUrlFilters.onlyShowDrafts);
   const [selectedDomains, setSelectedDomains] = useState<string[]>(() =>
@@ -1287,55 +1277,7 @@ export function DiscoverTable<T extends DiscoverTableData>({
           </div>
         </div>
 
-        {/* Pagination */}
-        <div className="flex-shrink-0 flex items-center justify-between px-6 py-3 border-t border-[rgb(var(--ec-page-border))]">
-          <div className="flex items-center gap-3 text-xs text-[rgb(var(--ec-page-text-muted))]">
-            {totalResults > 0 && (
-              <span>
-                <span className="font-medium text-[rgb(var(--ec-page-text))]">{table.getRowModel().rows.length}</span> of{' '}
-                <span className="font-medium text-[rgb(var(--ec-page-text))]">{totalResults}</span> results
-              </span>
-            )}
-            {totalResults > 0 && <span aria-hidden className="h-3 w-px bg-[rgb(var(--ec-page-border))]" />}
-            <label className="flex items-center gap-1.5">
-              <span>Per page</span>
-              <select
-                value={pageSize}
-                onChange={(e) => setPageSize(Number(e.target.value))}
-                className="cursor-pointer rounded bg-transparent px-1 py-0.5 font-medium text-[rgb(var(--ec-page-text))] hover:bg-[rgb(var(--ec-content-hover))] focus:bg-[rgb(var(--ec-content-hover))] focus:outline-none"
-              >
-                {PAGE_SIZE_OPTIONS.map((size) => (
-                  <option key={size} value={size}>
-                    {size}
-                  </option>
-                ))}
-              </select>
-            </label>
-          </div>
-          <div className="flex items-center gap-1.5">
-            <button
-              className="p-1.5 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] disabled:opacity-30 disabled:cursor-not-allowed transition-colors"
-              onClick={() => table.previousPage()}
-              disabled={!table.getCanPreviousPage()}
-              title="Previous page"
-            >
-              <ChevronLeft className="w-4 h-4" />
-            </button>
-            <span className="text-xs tabular-nums text-[rgb(var(--ec-page-text-muted))] min-w-[60px] text-center">
-              <span className="font-medium text-[rgb(var(--ec-page-text))]">{table.getState().pagination.pageIndex + 1}</span>
-              {' / '}
-              <span>{table.getPageCount() || 1}</span>
-            </span>
-            <button
-              className="p-1.5 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] disabled:opacity-30 disabled:cursor-not-allowed transition-colors"
-              onClick={() => table.nextPage()}
-              disabled={!table.getCanNextPage()}
-              title="Next page"
-            >
-              <ChevronRight className="w-4 h-4" />
-            </button>
-          </div>
-        </div>
+        <TablePagination table={table} pageSize={pageSize} onPageSizeChange={setPageSize} />
       </div>
     </div>
   );