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

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

package/dist/analytics/analytics.js

@@ -1,8 +1,8 @@
 import {
   raiseEvent
-} from "../chunk-WHYRRLHE.js";
+} from "../chunk-I7QC5DRU.js";
 import "../chunk-CPW6G62V.js";
-import "../chunk-RIRRWE7D.js";
+import "../chunk-3R4YXM3W.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.21";
+var version = "5.0.0-beta.22";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,11 +1,11 @@
 import {
   log_build_default
-} from "../chunk-I7F7CPDC.js";
+} from "../chunk-KYQBCP3A.js";
 import "../chunk-AWOO63ME.js";
 import "../chunk-ZAZHAVKB.js";
-import "../chunk-WHYRRLHE.js";
+import "../chunk-I7QC5DRU.js";
 import "../chunk-CPW6G62V.js";
-import "../chunk-RIRRWE7D.js";
+import "../chunk-3R4YXM3W.js";
 import "../chunk-RFIXKATC.js";
 export {
   log_build_default as default

package/dist/{chunk-RIRRWE7D.js → chunk-3R4YXM3W.js}

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

package/dist/{chunk-WHYRRLHE.js → chunk-I7QC5DRU.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-CPW6G62V.js";
 import {
   VERSION
-} from "./chunk-RIRRWE7D.js";
+} from "./chunk-3R4YXM3W.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/{chunk-I7F7CPDC.js → chunk-KYQBCP3A.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-ZAZHAVKB.js";
 import {
   raiseEvent
-} from "./chunk-WHYRRLHE.js";
+} from "./chunk-I7QC5DRU.js";
 import {
   TELEMETRY_REQUEST_TIMEOUT_MS,
   isTelemetryDisabled

package/dist/{chunk-W6KDW6ZC.js → chunk-UKD35J77.js}

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

package/dist/{chunk-OVWDUANF.js → chunk-US5TWRHO.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-W6KDW6ZC.js";
+} from "./chunk-UKD35J77.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-RIRRWE7D.js";
+} from "./chunk-3R4YXM3W.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.21";
+var version = "5.0.0-beta.22";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,18 +1,18 @@
-import {
-  runMigrations
-} from "./chunk-XUAF2H54.js";
-import "./chunk-CA4U2JP7.js";
 import {
   stopChildWithParent
 } from "./chunk-S5GWAUG5.js";
 import {
   log_build_default
-} from "./chunk-I7F7CPDC.js";
+} from "./chunk-KYQBCP3A.js";
 import {
   getLicenseStatus,
   printLicenseStatus
 } from "./chunk-AWOO63ME.js";
 import "./chunk-ZAZHAVKB.js";
+import {
+  runMigrations
+} from "./chunk-XUAF2H54.js";
+import "./chunk-CA4U2JP7.js";
 import {
   FederationConflictError,
   FederationDiagnosticError,
@@ -21,13 +21,13 @@ import {
 import "./chunk-WRNH5C3U.js";
 import "./chunk-5EPNFDT5.js";
 import "./chunk-A2RZR3U4.js";
+import "./chunk-SDZQJTJW.js";
+import "./chunk-352FGP6W.js";
 import "./chunk-R7Z5ALYI.js";
 import {
   getFederationDiagnosticCounts,
   getVisibleFederationDiagnostics
 } from "./chunk-JJPB6EOZ.js";
-import "./chunk-SDZQJTJW.js";
-import "./chunk-352FGP6W.js";
 import {
   getProjectOutDir,
   isAuthEnabled,
@@ -36,10 +36,10 @@ import {
 } from "./chunk-MDWB5HLO.js";
 import {
   generate
-} from "./chunk-OVWDUANF.js";
+} from "./chunk-US5TWRHO.js";
 import {
   logger
-} from "./chunk-W6KDW6ZC.js";
+} from "./chunk-UKD35J77.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-36RYTYT5.js";
@@ -53,7 +53,7 @@ import {
 import {
   watch
 } from "./chunk-U63GDPPY.js";
-import "./chunk-WHYRRLHE.js";
+import "./chunk-I7QC5DRU.js";
 import "./chunk-CPW6G62V.js";
 import {
   getAstroConfigPath
@@ -70,7 +70,7 @@ import {
 } from "./chunk-LFQJXLHG.js";
 import {
   VERSION
-} from "./chunk-RIRRWE7D.js";
+} from "./chunk-3R4YXM3W.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/federation/federate.js

@@ -6,10 +6,10 @@ import {
 import "../chunk-WRNH5C3U.js";
 import "../chunk-5EPNFDT5.js";
 import "../chunk-A2RZR3U4.js";
-import "../chunk-R7Z5ALYI.js";
-import "../chunk-JJPB6EOZ.js";
 import "../chunk-SDZQJTJW.js";
 import "../chunk-352FGP6W.js";
+import "../chunk-R7Z5ALYI.js";
+import "../chunk-JJPB6EOZ.js";
 import "../chunk-RFIXKATC.js";
 export {
   FederationConflictError,

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

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-OVWDUANF.js";
-import "./chunk-W6KDW6ZC.js";
-import "./chunk-RIRRWE7D.js";
+} from "./chunk-US5TWRHO.js";
+import "./chunk-UKD35J77.js";
+import "./chunk-3R4YXM3W.js";
 import "./chunk-RFIXKATC.js";
 export {
   generate

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

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-W6KDW6ZC.js";
-import "../chunk-RIRRWE7D.js";
+} from "../chunk-UKD35J77.js";
+import "../chunk-3R4YXM3W.js";
 export {
   logger
 };

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

@@ -68,10 +68,9 @@ describe('architecture page redirects', () => {
   it('returns not found for resources without an architecture page', async () => {
     mocks.isSSR.mockReturnValue(true);
 
+    // Nothing found: the page answers with the 404 page
     await expect(
       Page.getData({ params: { type: 'events', id: 'order-created', version: '1.0.0' }, props: {} } as any)
-    ).rejects.toMatchObject({
-      status: 404,
-    });
+    ).resolves.toBeUndefined();
   });
 });

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

@@ -61,11 +61,4 @@ export class Page extends HybridPage {
 
     return { type, data: { id, name: match.item.data.name, version }, redirectPath: match.redirectPath };
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Documentation not found',
-    });
-  }
 }

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

@@ -9,7 +9,9 @@ import { Page } from './_index.data';
 export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
-const { data, redirectPath } = await Page.getData(Astro);
+const pageData = await Page.getData(Astro);
+if (!pageData) return Astro.rewrite('/404');
+const { data, redirectPath } = pageData;
 const redirectUrl = buildUrl(redirectPath);
 
 if (isSSR()) {

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

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

package/eventcatalog/src/pages/diagrams/[id]/[version]/embed.astro

@@ -10,6 +10,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 } = await render(props);
 
 const currentVersion = props.data.version;

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

@@ -15,6 +15,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 pageTitle = `Diagram | ${props.data.name}`;

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

@@ -45,6 +45,11 @@ export class Page extends HybridPage {
       teams: getTeams,
     };
 
+    // An unknown type (e.g. a mistyped URL) has no directory page
+    if (!Object.hasOwn(loaders, type)) {
+      return null;
+    }
+
     // Get all items of the specified type
     const items = await loaders[type as keyof typeof loaders]();
 
@@ -53,11 +58,4 @@ export class Page extends HybridPage {
       data: items,
     };
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Directory type not found',
-    });
-  }
 }

package/eventcatalog/src/pages/directory/[type]/index.astro

@@ -7,7 +7,9 @@ import { Page } from './_index.data';
 export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
-const { type, data } = await Page.getData(Astro);
+const pageData = await Page.getData(Astro);
+if (!pageData) return Astro.rewrite('/404');
+const { type, data } = pageData;
 
 function mapToItem(i: any) {
   return {

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

@@ -81,6 +81,11 @@ export class Page extends HybridPage {
       'data-products': getDataProducts,
     };
 
+    // An unknown type (e.g. a mistyped URL) has no discover page
+    if (!Object.hasOwn(loaders, type)) {
+      return null;
+    }
+
     // @ts-ignore
     const items = await loaders[type]();
 
@@ -89,11 +94,4 @@ export class Page extends HybridPage {
       data: items,
     };
   }
-
-  protected static createNotFoundResponse(): Response {
-    return new Response(null, {
-      status: 404,
-      statusText: 'Collection type not found',
-    });
-  }
 }

package/eventcatalog/src/pages/discover/[type]/index.astro

@@ -27,7 +27,9 @@ import { Page } from './_index.data';
 export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
-const { type, data } = await Page.getData(Astro);
+const pageData = await Page.getData(Astro);
+if (!pageData) return Astro.rewrite('/404');
+const { type, data } = pageData;
 
 const events = await getEvents();
 const queries = await getQueries();

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

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

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/[docType]/[docId]/[docVersion]/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]/[docType]/[docId]/_index.data.ts

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

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',
-    });
-  }
 }