@eventcatalog/core 5.0.0-beta.20 → 5.0.0-beta.22

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

@@ -19,6 +19,7 @@ export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 const { Content, headings } = await render(props);
 
 const title = props.data.title || props.data.id;

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

@@ -63,11 +63,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/docs/[type]/[id]/[version]/asyncapi/[filename].astro

@@ -21,7 +21,9 @@ export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
-const { collection, data, filePath, filename, path: relativeSpecPath, headers = {} } = await Page.getData(Astro);
+const pageData = await Page.getData(Astro);
+if (!pageData) return Astro.rewrite('/404');
+const { collection, data, filePath, filename, path: relativeSpecPath, headers = {} } = pageData;
 
 const fileName = filename || 'asyncapi.yaml';
 const pathToSpec = getAbsoluteFilePathForAstroFile(filePath, fileName);

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/asyncapi/_[filename].data.ts

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

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

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

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

@@ -20,6 +20,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 let collectionItem = props;
 const logs = await getChangeLogs(props);

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

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

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/examples/_[...filename].data.ts

@@ -56,8 +56,4 @@ export class Page extends HybridPage {
 
     return { type, example, ...item };
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, { status: 404, statusText: 'Example not found' });
-  }
 }

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/field-lineage/_index.data.ts

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

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/field-lineage/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 { data, collection } = props;
 const messageId = data.id;

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

@@ -16,7 +16,9 @@ export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
-const { collection, data, filePath, filename, path: relativeSpecPath } = await Page.getData(Astro);
+const pageData = await Page.getData(Astro);
+if (!pageData) return Astro.rewrite('/404');
+const { collection, data, filePath, filename, path: relativeSpecPath } = pageData;
 
 const fileName = filename || 'schema.graphql';
 const pathToSpec = getAbsoluteFilePathForAstroFile(filePath, fileName);

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/graphql/_[filename].data.ts

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

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

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

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/resources/_index.data.spec.ts

@@ -38,9 +38,8 @@ describe('Resources routes', () => {
   });
 
   it('returns not found for types without a Resources page on a server request', async () => {
-    await expect(Page.getData({ params: { type: 'entities', id: 'Order', version: '1.0.0' }, props: {} } as any)).rejects.toMatchObject({
-      status: 404,
-    });
+    // Nothing found: the page answers with the 404 page
+    await expect(Page.getData({ params: { type: 'entities', id: 'Order', version: '1.0.0' }, props: {} } as any)).resolves.toBeUndefined();
     expect(mocks.findOwnerWithResources).not.toHaveBeenCalled();
   });
 });

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

@@ -57,13 +57,6 @@ const createResourcesPage = ({
 
       return findOwnerWithResources(type as ResourceOwnerCollection, id, version);
     }
-
-    protected static createNotFoundResponse(): Response {
-      return new Response(null, {
-        status: 404,
-        statusText: 'Resources not found',
-      });
-    }
   };
 
 export const Page = createResourcesPage({

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

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

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

@@ -16,6 +16,7 @@ export const getStaticPaths = Page.getStaticPaths;
 
 // Get data
 const props = await Page.getData(Astro);
+if (!props) return Astro.rewrite('/404');
 
 // @ts-ignore
 const { collection, data, filePath, filename, path: relativeSpecPath } = props;

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/spec/_[filename].data.ts

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

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

@@ -59,11 +59,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/docs/[type]/[id]/index.astro

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

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);
+};