@eventcatalog/core 5.0.0-beta.21 → 5.0.0-beta.23

package/eventcatalog/src/pages/docs/[type]/[id]/language/[dictionaryId]/_index.data.ts

@@ -99,11 +99,4 @@ export class Page extends HybridPage {
 
     return buildUbiquitousLanguageTermPage({ domain, collection, term }).props;
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Domain not found',
-    });
-  }
 }

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

@@ -16,6 +16,7 @@ export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const { ubiquitousLanguage } = props;
 const pageTitle = `${props.type} | ${ubiquitousLanguage.name}`.replace(/^\w/, (c) => c.toUpperCase());

package/eventcatalog/src/pages/docs/[type]/[id]/language/_index.data.ts

@@ -42,11 +42,4 @@ export class Page extends HybridPage {
 
     return domain;
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Domain not found',
-    });
-  }
 }

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

@@ -14,6 +14,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const pageTitle = `${props.collection} | ${props.data.name}`.replace(/^\w/, (c) => c.toUpperCase());
 const ubiquitousLanguageData = await getUbiquitousLanguageWithSubdomains(props);

package/eventcatalog/src/pages/docs/custom/[...path]/_index.data.ts

@@ -39,11 +39,4 @@ export class Page extends HybridPage {
 
     return doc || null;
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Custom documentation page not found',
-    });
-  }
 }

package/eventcatalog/src/pages/docs/custom/[...path]/index.astro

@@ -7,6 +7,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 ---
 
 <CustomDocumentationPage {...props} />

package/eventcatalog/src/pages/docs/services/[id]/[docType]/[docId]/index.astro

@@ -12,7 +12,7 @@ const { id, docType, docId } = Astro.params;
 const version = Astro.props.redirectVersion ?? (id ? await getLatestServiceVersion(id) : undefined);
 
 if (!id || !docType || !docId || !version) {
-  throw new Response(null, { status: 404, statusText: 'Resource documentation not found' });
+  return Astro.rewrite('/404');
 }
 
 const redirectUrl = buildUrl(`/docs/services/${id}/${version}/${docType}/${docId}`);

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

@@ -8,6 +8,7 @@ export const prerender = ServicePage.prerender;
 export const getStaticPaths = ServicePage.getStaticPaths;
 
 const resourceOwner = await ServicePage.getData(Astro);
+if (!resourceOwner) return Astro.rewrite('/404');
 ---
 
 <ResourcesPage resourceOwner={resourceOwner} />

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

@@ -12,7 +12,7 @@ const { id, filename } = Astro.params;
 const version = Astro.props.redirectVersion ?? (id ? await getLatestServiceVersion(id) : undefined);
 
 if (!id || !filename || !version) {
-  throw new Response(null, { status: 404, statusText: 'AsyncAPI specification not found' });
+  return Astro.rewrite('/404');
 }
 
 const redirectUrl = buildUrl(`/docs/services/${id}/${version}/asyncapi/${filename}`);

package/eventcatalog/src/pages/docs/services/[id]/changelog/index.astro

@@ -12,7 +12,7 @@ const { id } = Astro.params;
 const version = Astro.props.redirectVersion ?? (id ? await getLatestServiceVersion(id) : undefined);
 
 if (!isChangelogEnabled() || !id || !version) {
-  throw new Response(null, { status: 404, statusText: 'Changelog not found' });
+  return Astro.rewrite('/404');
 }
 
 const redirectUrl = buildUrl(`/docs/services/${id}/${version}/changelog`);

package/eventcatalog/src/pages/docs/services/[id]/graphql/[filename].astro

@@ -12,7 +12,7 @@ const { id, filename } = Astro.params;
 const version = Astro.props.redirectVersion ?? (id ? await getLatestServiceVersion(id) : undefined);
 
 if (!id || !filename || !version) {
-  throw new Response(null, { status: 404, statusText: 'GraphQL specification not found' });
+  return Astro.rewrite('/404');
 }
 
 const redirectUrl = buildUrl(`/docs/services/${id}/${version}/graphql/${filename}`);

package/eventcatalog/src/pages/docs/services/[id]/spec/[filename].astro

@@ -12,7 +12,7 @@ const { id, filename } = Astro.params;
 const version = Astro.props.redirectVersion ?? (id ? await getLatestServiceVersion(id) : undefined);
 
 if (!id || !filename || !version) {
-  throw new Response(null, { status: 404, statusText: 'OpenAPI specification not found' });
+  return Astro.rewrite('/404');
 }
 
 const redirectUrl = buildUrl(`/docs/services/${id}/${version}/spec/${filename}`);

package/eventcatalog/src/pages/docs/teams/[id]/_index.data.ts

@@ -36,11 +36,4 @@ export class Page extends HybridPage {
 
     return team || null;
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Team not found',
-    });
-  }
 }

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

@@ -18,6 +18,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const { Content } = await render(props);
 

package/eventcatalog/src/pages/docs/users/[id]/_index.data.ts

@@ -36,11 +36,4 @@ export class Page extends HybridPage {
 
     return user || null;
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'User not found',
-    });
-  }
 }

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

@@ -18,6 +18,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const { Content } = await render(props);
 

package/eventcatalog/src/pages/schemas/[type]/[id]/[version]/_index.data.ts

@@ -110,11 +110,4 @@ export class Page extends HybridPage {
       ...item,
     };
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Documentation not found',
-    });
-  }
 }

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

@@ -34,6 +34,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 const { type, data } = props as { type: PageTypes; data: any };
 
 // Check if this is a data product with a contract

package/eventcatalog/src/pages/schemas/explorer/_index.data.ts

@@ -34,11 +34,4 @@ export class Page extends HybridPage {
   protected static hasValidProps(props: any): boolean {
     return props && props.schemas !== undefined;
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Schema explorer not found',
-    });
-  }
 }

package/eventcatalog/src/pages/schemas/explorer/index.astro

@@ -8,7 +8,9 @@ import '@eventcatalog/visualiser/styles-core.css';
 export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
-const { schemas } = await Page.getData(Astro);
+const pageData = await Page.getData(Astro);
+if (!pageData) return Astro.rewrite('/404');
+const { schemas } = pageData;
 ---
 
 <VerticalSideBarLayout title="Schema Explorer" showNestedSideBar={false}>

package/eventcatalog/src/pages/triggers/[type]/[id]/[version]/_index.data.ts

@@ -56,11 +56,4 @@ export class Page extends HybridPage {
     const hasTriggerPaths = getMessagesWithTriggerPaths(receivers, allMessages).includes(item);
     return hasTriggerPaths ? { type, ...item } : null;
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Message trigger paths not found',
-    });
-  }
 }

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

@@ -18,6 +18,7 @@ export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 const { data } = props as CollectionEntry<CollectionMessageTypes>;
 const currentMessage = props as CollectionEntry<CollectionMessageTypes>;
 

package/eventcatalog/src/pages/visualiser/[type]/[id]/[version]/_index.data.ts

@@ -81,13 +81,6 @@ export class Page extends HybridPage {
     };
   }
 
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Visualiser page not found',
-    });
-  }
-
   static get clientAuthScript(): string {
     if (!isAuthEnabled() || !isVisualiserEnabled()) {
       return '';

package/eventcatalog/src/pages/visualiser/[type]/[id]/[version]/data/_index.data.ts

@@ -50,13 +50,6 @@ export class Page extends HybridPage {
     return item;
   }
 
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Service data page not found',
-    });
-  }
-
   static get clientAuthScript(): string {
     if (!isAuthEnabled() || !isVisualiserEnabled()) {
       return '';

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

@@ -8,6 +8,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 // The service's data stores are shown at level 2 of its visualiser page
 return Astro.redirect(buildUrl(`/visualiser/services/${props.data.id}/${props.data.version}?level=2`));

package/eventcatalog/src/pages/visualiser/[type]/[id]/[version]/entity-map/_index.data.ts

@@ -47,13 +47,6 @@ export class Page extends HybridPage {
     return item;
   }
 
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Service entity map page not found',
-    });
-  }
-
   static get clientAuthScript(): string {
     if (!isAuthEnabled() || !isVisualiserEnabled()) {
       return '';

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

@@ -10,6 +10,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const {
   data: { id },

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

@@ -12,6 +12,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const {
   data: { id },

package/eventcatalog/src/pages/visualiser/[type]/[id]/_index.data.ts

@@ -0,0 +1,38 @@
+import type { PageTypes } from '@types';
+import { isVisualiserEnabled } from '@utils/feature';
+import { pageDataLoader } from '@utils/page-loaders/page-data-loader';
+
+/** Resources with a visualiser page (domains and systems have their own, under the same URLs) */
+const VISUALISER_TYPES: PageTypes[] = [
+  'domains',
+  'systems',
+  'agents',
+  'services',
+  'events',
+  'commands',
+  'queries',
+  'flows',
+  'containers',
+  'channels',
+  'data-products',
+];
+
+const isVisualiserType = (type: string | undefined): type is PageTypes => VISUALISER_TYPES.includes(type as PageTypes);
+
+const getLatestWithVisualiser = async (type: PageTypes) =>
+  (await pageDataLoader[type]({ getAllVersions: false })).filter((item) => (item.data as any).visualiser !== false);
+
+/** The latest version of every resource with a visualiser page: the pages a static build redirects from */
+export const getVisualiserResources = async () => {
+  if (!isVisualiserEnabled()) return [];
+  const resources = await Promise.all(
+    VISUALISER_TYPES.map(async (type) => (await getLatestWithVisualiser(type)).map((item) => ({ type, item })))
+  );
+  return resources.flat();
+};
+
+/** The latest version of a resource with a visualiser page, looked up from its URL (a server renders pages on request) */
+export const findVisualiserResource = async (type: string | undefined, id: string | undefined) => {
+  if (!isVisualiserEnabled() || !isVisualiserType(type) || !id) return undefined;
+  return (await getLatestWithVisualiser(type)).find((item) => item.data.id === id);
+};

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

@@ -1,53 +1,30 @@
 ---
 import Seo from '@components/Seo.astro';
 import { buildUrl } from '@utils/url-builder';
-import { getEvents } from '@utils/collections/events';
-import { getCommands } from '@utils/collections/commands';
-import { getServices } from '@utils/collections/services';
-import { getDomains } from '@utils/collections/domains';
-import { getContainers } from '@utils/collections/containers';
-import type { CollectionEntry } from 'astro:content';
-import type { CollectionTypes } from '@types';
-import { isVisualiserEnabled } from '@utils/feature';
+import { isSSR } from '@utils/feature';
+import { findVisualiserResource, getVisualiserResources } from './_index.data';
 
-export async function getStaticPaths() {
-  if (!isVisualiserEnabled()) {
-    return [];
-  }
-
-  const [events, commands, services, domains, containers] = await Promise.all([
-    getEvents(),
-    getCommands(),
-    getServices(),
-    getDomains(),
-    getContainers(),
-  ]);
+export const prerender = !isSSR();
 
-  const resources = [...domains, ...events, ...services, ...commands, ...containers];
-  const resourcesWithVisualiserEnabled = resources.filter((resource) => resource.data.visualiser !== false);
+export async function getStaticPaths() {
+  const resources = await getVisualiserResources();
+  return resources.map(({ type, item }) => ({ params: { type, id: item.data.id }, props: item }));
+}
 
-  const buildPages = (collection: CollectionEntry<CollectionTypes>[]) => {
-    return collection.map((item) => ({
-      params: {
-        type: item.collection,
-        id: item.data.id,
-      },
-      props: {
-        type: item.collection,
-        ...item,
-      },
-    }));
-  };
+// A static build gets the resource from getStaticPaths; a server, which has no static paths, looks it up
+const resource = isSSR() ? await findVisualiserResource(Astro.params.type, Astro.params.id) : Astro.props;
 
-  return [...buildPages(resourcesWithVisualiserEnabled)];
+if (!resource?.data) {
+  return new Response(null, { status: 404, statusText: 'Not found' });
 }
 
-const props = Astro.props;
-const pageTitle = `${props.collection} | ${props.data.name}`.replace(/^\w/, (c) => c.toUpperCase());
-
-const { pathname } = Astro.url;
+const pageTitle = `${resource.collection} | ${resource.data.name}`.replace(/^\w/, (c) => c.toUpperCase());
+const redirectUrl = buildUrl(`${Astro.url.pathname.replace(/\/$/, '')}/${resource.data.latestVersion}`, false, true);
 
-const redirectUrl = buildUrl(pathname + '/' + props.data.latestVersion, false, true);
+// A server redirects straight away (with any query string); a static page redirects in the browser
+if (isSSR()) {
+  return Astro.redirect(`${redirectUrl}${Astro.url.search}`);
+}
 ---
 
 <!doctype html>

package/eventcatalog/src/pages/visualiser/designs/[id]/_index.data.ts

@@ -45,13 +45,6 @@ export class Page extends HybridPage {
     };
   }
 
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Design not found',
-    });
-  }
-
   static get clientAuthScript(): string {
     if (!isAuthEnabled() || !isVisualiserEnabled()) {
       return '';

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

@@ -13,7 +13,8 @@ const isChatEnabled = isEventCatalogChatVisible();
 export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
-const props = Astro.props;
+const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const { data } = props;
 ---

package/eventcatalog/src/pages/visualiser/domains/[id]/[version]/entity-map/_index.data.ts

@@ -47,13 +47,6 @@ export class Page extends HybridPage {
     return item;
   }
 
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Domain entity map page not found',
-    });
-  }
-
   static get clientAuthScript(): string {
     if (!isAuthEnabled() || !isVisualiserEnabled()) {
       return '';

package/eventcatalog/src/pages/visualiser/domains/[id]/[version]/entity-map/index.astro

@@ -10,6 +10,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const {
   data: { id },

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

@@ -11,6 +11,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const {
   data: { id },

package/eventcatalog/src/pages/visualiser/domains/[id]/[version]/systems-context/_index.data.ts

@@ -58,13 +58,6 @@ export class Page extends HybridPage {
     return item;
   }
 
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Domain System Diagram page not found',
-    });
-  }
-
   static get clientAuthScript(): string {
     if (!isAuthEnabled() || !isVisualiserEnabled()) {
       return '';

package/eventcatalog/src/pages/visualiser/domains/[id]/[version]/systems-context/index.astro

@@ -8,6 +8,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 // The System Diagram is now level 1 of the domain's visualiser page
 return Astro.redirect(buildUrl(`/visualiser/domains/${props.data.id}/${props.data.version}?level=1`));

package/eventcatalog/src/pages/visualiser/systems/[id]/[version]/context/_index.data.ts

@@ -61,13 +61,6 @@ export class Page extends HybridPage {
     return item;
   }
 
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'System Diagram page not found',
-    });
-  }
-
   static get clientAuthScript(): string {
     if (!isAuthEnabled() || !isVisualiserEnabled()) {
       return '';

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

@@ -8,6 +8,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 // The System Context diagram is now level 1 of the system's visualiser page
 return Astro.redirect(buildUrl(`/visualiser/systems/${props.data.id}/${props.data.version}?level=1`));

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

@@ -11,6 +11,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 const {
   data: { id },

package/eventcatalog/src/utils/page-loaders/hybrid-page.ts

@@ -24,7 +24,9 @@ export class HybridPage<T = any> {
   }
 
   /**
-   * Static method for getting data
+   * The page's data: its props in a static build, or looked up from its URL on a server. Undefined
+   * when nothing matches (an unknown resource or version): the page then returns
+   * `Astro.rewrite('/404')`. Throwing a Response instead made Astro answer with an empty 500.
    */
   static async getData(astro: AstroGlobal): Promise<any> {
     // Try props first (static mode)
@@ -32,13 +34,7 @@ export class HybridPage<T = any> {
       return this.transformProps(astro.props);
     }
 
-    const data = await this.fetchData(astro.params);
-
-    if (!data) {
-      throw this.createNotFoundResponse();
-    }
-
-    return data;
+    return (await this.fetchData(astro.params)) ?? undefined;
   }
 
   /**
@@ -58,11 +54,4 @@ export class HybridPage<T = any> {
   protected static transformProps(props: any): any {
     return props;
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Not found',
-    });
-  }
 }

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "BUSL-1.1",
   "type": "module",
-  "version": "5.0.0-beta.21",
+  "version": "5.0.0-beta.23",
   "publishConfig": {
     "access": "public"
   },
@@ -143,7 +143,7 @@
     "zod": "^4.3.6",
     "@eventcatalog/sdk": "2.30.0-beta.1",
     "@eventcatalog/visualiser": "^5.0.0-beta.6",
-    "@eventcatalog/linter": "1.2.0-beta.3"
+    "@eventcatalog/linter": "1.2.0-beta.4"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",