@eventcatalog/core 4.3.2 → 4.3.3

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

@@ -0,0 +1,25 @@
+---
+import LatestVersionRedirect from '@components/LatestVersionRedirect.astro';
+import { isSSR } from '@utils/feature';
+import { buildUrl } from '@utils/url-builder';
+import { Page as VersionedPage } from '../../../[type]/[id]/[version]/spec/_[filename].data';
+import { getLatestServicePaths, getLatestServiceVersion } from '../../_latest-version-route';
+
+export const prerender = !isSSR();
+export const getStaticPaths = async () => getLatestServicePaths(await VersionedPage.getStaticPaths());
+
+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' });
+}
+
+const redirectUrl = buildUrl(`/docs/services/${id}/${version}/spec/${filename}`);
+
+if (isSSR()) {
+  return Astro.redirect(`${redirectUrl}${Astro.url.search}${Astro.url.hash}`);
+}
+---
+
+<LatestVersionRedirect title="Latest OpenAPI specification" redirectUrl={redirectUrl} />

package/eventcatalog/src/pages/docs/services/_latest-version-route.ts

@@ -0,0 +1,42 @@
+import type { CollectionEntry } from 'astro:content';
+
+type StaticPath = {
+  params: Record<string, string | undefined>;
+  props?: Record<string, unknown>;
+};
+
+type LatestService = CollectionEntry<'services'>;
+
+export const toLatestServicePaths = (paths: StaticPath[], latestServices: LatestService[]): StaticPath[] => {
+  const latestVersions = new Map(latestServices.map((service) => [service.data.id, service.data.version]));
+
+  return paths.flatMap(({ params, props = {} }) => {
+    const { type, version, ...aliasParams } = params;
+
+    if (type !== 'services' || !params.id || latestVersions.get(params.id) !== version) {
+      return [];
+    }
+
+    return [
+      {
+        params: aliasParams,
+        props: {
+          ...props,
+          redirectVersion: version,
+        },
+      },
+    ];
+  });
+};
+
+export const getLatestServicePaths = async (paths: StaticPath[]): Promise<StaticPath[]> => {
+  const { getServices } = await import('@utils/collections/services');
+  const latestServices = await getServices({ getAllVersions: false });
+  return toLatestServicePaths(paths, latestServices);
+};
+
+export const getLatestServiceVersion = async (id: string): Promise<string | undefined> => {
+  const { getServices } = await import('@utils/collections/services');
+  const latestServices = await getServices({ getAllVersions: false });
+  return latestServices.find((service) => service.data.id === id)?.data.version;
+};

package/eventcatalog/src/stores/sidebar-store/builders/service.ts

@@ -58,12 +58,15 @@ export const buildServiceNode = (
   const renderEntities = serviceEntities.length > 0 && shouldRenderSideBarSection(service, 'entities');
   const renderOwners = owners.length > 0 && shouldRenderSideBarSection(service, 'owners');
   const renderRepository = service.data.repository && shouldRenderSideBarSection(service, 'repository');
+  const isLatestVersion = service.data.version === service.data.latestVersion;
+  const docsBasePath = `/docs/services/${service.data.id}${isLatestVersion ? '' : `/${service.data.version}`}`;
   const docsSection = buildResourceDocsSection(
     'services',
     service.data.id,
     service.data.version,
     context.resourceDocs,
-    context.resourceDocCategories
+    context.resourceDocCategories,
+    { includeVersionInUrl: !isLatestVersion }
   );
 
   // Diagrams
@@ -82,11 +85,11 @@ export const buildServiceNode = (
     pages: [
       buildQuickReferenceSection(
         [
-          { title: 'Overview', href: buildUrl(`/docs/services/${service.data.id}/${service.data.version}`) },
+          { title: 'Overview', href: buildUrl(docsBasePath) },
           isChangelogEnabled() &&
             shouldRenderSideBarSection(service, 'changelog') && {
               title: 'Changelog',
-              href: buildUrl(`/docs/services/${service.data.id}/${service.data.version}/changelog`),
+              href: buildUrl(`${docsBasePath}/changelog`),
             },
         ].filter(Boolean) as { title: string; href: string }[]
       ),
@@ -135,25 +138,19 @@ export const buildServiceNode = (
             type: 'item',
             title: `${specification.name}`,
             leftIcon: '/icons/openapi-black.svg',
-            href: buildUrl(
-              `/docs/services/${service.data.id}/${service.data.version}/spec/${specification.filenameWithoutExtension}`
-            ),
+            href: buildUrl(`${docsBasePath}/spec/${specification.filenameWithoutExtension}`),
           })),
           ...asyncAPISpecifications.map((specification) => ({
             type: 'item',
             title: `${specification.name}`,
             leftIcon: '/icons/asyncapi-black.svg',
-            href: buildUrl(
-              `/docs/services/${service.data.id}/${service.data.version}/asyncapi/${specification.filenameWithoutExtension}`
-            ),
+            href: buildUrl(`${docsBasePath}/asyncapi/${specification.filenameWithoutExtension}`),
           })),
           ...graphQLSpecifications.map((specification) => ({
             type: 'item',
             title: `${specification.name}`,
             leftIcon: '/icons/graphql-black.svg',
-            href: buildUrl(
-              `/docs/services/${service.data.id}/${service.data.version}/graphql/${specification.filenameWithoutExtension}`
-            ),
+            href: buildUrl(`${docsBasePath}/graphql/${specification.filenameWithoutExtension}`),
           })),
         ],
       },

package/eventcatalog/src/stores/sidebar-store/builders/shared.ts

@@ -189,8 +189,10 @@ export const buildResourceDocsSection = (
   id: string,
   version: string,
   resourceDocs: ResourceDocEntry[],
-  resourceDocCategories: ResourceDocCategoryEntry[]
+  resourceDocCategories: ResourceDocCategoryEntry[],
+  options: { includeVersionInUrl?: boolean } = {}
 ): NavNode | null => {
+  const { includeVersionInUrl = true } = options;
   const docsForResource = resourceDocs.filter(
     (doc) => doc.data.resourceCollection === collection && doc.data.resourceId === id && doc.data.resourceVersion === version
   );
@@ -249,7 +251,7 @@ export const buildResourceDocsSection = (
         type: 'item',
         title: doc.data.title || doc.data.id,
         href: buildUrl(
-          `/docs/${collection}/${id}/${version}/${encodeURIComponent(doc.data.type)}/${encodeURIComponent(doc.data.id)}`
+          `/docs/${collection}/${id}${includeVersionInUrl ? `/${version}` : ''}/${encodeURIComponent(doc.data.type)}/${encodeURIComponent(doc.data.id)}`
         ),
       })),
     })),

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.3.2",
+  "version": "4.3.3",
   "publishConfig": {
     "access": "public"
   },
@@ -117,8 +117,8 @@
     "uuid": "^10.0.0",
     "zod": "^4.3.6",
     "@eventcatalog/linter": "1.1.8",
-    "@eventcatalog/visualiser": "^4.1.1",
-    "@eventcatalog/sdk": "2.26.3"
+    "@eventcatalog/sdk": "2.26.3",
+    "@eventcatalog/visualiser": "^4.1.1"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.9",

package/dist/docs/cli/import.md

@@ -1,26 +0,0 @@
----
-id: cli-import
-title: Import
-sidebar_label: Import
-sidebar_position: 18
----
-
-# Import CLI Commands
-
-Manage import in your EventCatalog from the command line.
-
-## import
-
-Import EventCatalog DSL (.ec) files into catalog markdown files. Existing resources with the same version are overridden. Importing a newer version automatically moves the old version into the versioned/ folder.
-
-**Arguments:**
-| Name | Type | Required | Description |
-|------|------|----------|-------------|
-| files | string | No | One or more .ec file paths to import |
-| stdin | boolean | No | Read DSL from stdin |
-| dry-run | boolean | No | Preview resources without writing |
-| no-init | boolean | No | Skip catalog initialization prompt |
-
-
-
----