@eventcatalog/core 2.54.1 → 2.54.3

package/README.md

@@ -140,15 +140,6 @@ Thank you to our project  sponsors.
 
 <hr />
 
-<div align="center">
-  <img alt="oso" src="./images/sponsors/oso-logo-green.png" width="30%" />
-  <p style="margin: 0; padding: 0;">Delivering Apache Kafka professional services to your business
-</p>
-  <a href="https://oso.sh/?utm_source=eventcatalog&utm_medium=web&utm_campaign=sponsorship" target="_blank" >Learn more</a>
-</div>
-
-<hr />
-
 _Sponsors help make EventCatalog sustainable, want to help the project? Get in touch! Or [visit our sponsor page](https://www.eventcatalog.dev/support)._
 
 # Enterprise support

package/dist/analytics/analytics.cjs

@@ -37,7 +37,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.54.1";
+var version = "2.54.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-7NKHMS4K.js";
-import "../chunk-EUDMSTHT.js";
+} from "../chunk-YXXP2UQA.js";
+import "../chunk-VH23O4GO.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -106,7 +106,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.54.1";
+var version = "2.54.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-ONQOSPKG.js";
-import "../chunk-7NKHMS4K.js";
-import "../chunk-EUDMSTHT.js";
+} from "../chunk-JQS6ADYS.js";
+import "../chunk-YXXP2UQA.js";
+import "../chunk-VH23O4GO.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-ONQOSPKG.js → chunk-JQS6ADYS.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-7NKHMS4K.js";
+} from "./chunk-YXXP2UQA.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-EUDMSTHT.js → chunk-VH23O4GO.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "2.54.1";
+var version = "2.54.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/{chunk-7NKHMS4K.js → chunk-YXXP2UQA.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-EUDMSTHT.js";
+} from "./chunk-VH23O4GO.js";
 
 // src/analytics/analytics.js
 import axios from "axios";

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-EUDMSTHT.js";
+} from "./chunk-VH23O4GO.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -157,7 +157,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.54.1";
+var version = "2.54.3";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,8 +6,8 @@ import {
 } from "./chunk-XE6PFSH5.js";
 import {
   log_build_default
-} from "./chunk-ONQOSPKG.js";
-import "./chunk-7NKHMS4K.js";
+} from "./chunk-JQS6ADYS.js";
+import "./chunk-YXXP2UQA.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
@@ -15,7 +15,7 @@ import {
 import "./chunk-LDBRNJIL.js";
 import {
   VERSION
-} from "./chunk-EUDMSTHT.js";
+} from "./chunk-VH23O4GO.js";
 import {
   getProjectOutDir,
   isAuthEnabled,

package/eventcatalog/src/components/MDX/EntityMap/EntityMap.astro

@@ -4,28 +4,47 @@ import { getNodesAndEdges } from '@utils/node-graphs/domain-entity-map.ts';
 import Admonition from '@components/MDX/Admonition';
 import NodeGraph from '../NodeGraph/NodeGraph';
 import { getVersionFromCollection } from '@utils/collections/versions';
+import { getServices } from '@utils/collections/services';
 
-const { id, version = 'latest', maxHeight, includeKey = true, entities } = Astro.props;
+const { id, version = 'latest', maxHeight, includeKey = true, entities, collection = 'domains', ...rest } = Astro.props;
+let resource = null;
 
-// Find the flow for the given id and version
-const domains = await getDomains();
-const domainCollection = getVersionFromCollection(domains, id, version) || [];
-const domain = domainCollection[0];
+let resourceId = id;
+
+// If the user did not provide an id, we need to use the id from the rest props (the collection)
+const isAstroGeneratedId = id.match(/-\d+\.\d+\.\d+$/);
+if (isAstroGeneratedId) {
+  resourceId = rest.data.id;
+}
+
+if (collection === 'domains') {
+  const domains = await getDomains();
+  const domainCollection = getVersionFromCollection(domains, resourceId, version) || [];
+  resource = domainCollection[0];
+} else if (collection === 'services') {
+  const services = await getServices();
+  const serviceCollection = getVersionFromCollection(services, resourceId, version) || [];
+  resource = serviceCollection[0];
+} else {
+  throw new Error(`Invalid collection: ${collection}`);
+}
 
 const { nodes, edges } = await getNodesAndEdges({
-  id: id,
-  version: domain?.data?.version,
+  id: resourceId,
+  version: resource?.data?.version,
   ...(entities ? { entities } : {}), // Pass entities if provided
+  type: collection,
 });
 ---
 
 {
-  !domain && (
+  !resource && (
     <Admonition type="warning">
       <div>
         <span class="block font-bold">{`<EntityMap/>`} failed to load</span>
         <span class="block">
-          Tried to load domain id: {id} with version {version}. Make sure you have this domain defined in your project.
+          Tried to load {collection} id: {id} with version {version}. Make sure you have this {collection} defined in your
+          project.
         </span>
       </div>
     </Admonition>
@@ -49,7 +68,7 @@ const { nodes, edges } = await getNodesAndEdges({
     linkTo={'visualiser'}
     mode="simple"
     includeKey={includeKey}
-    footerLabel=`Entity Map - ${domain?.data?.name} - v(${domain?.data?.version})`
+    footerLabel={`Entity Map - ${resource?.data?.name} - v(${resource?.data?.version})`}
     client:only="react"
     portalId={`${id}-entity-map-portal`}
   />

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

@@ -44,7 +44,7 @@ const components = (props: any) => {
     MessageTable: (mdxProp: any) => jsx(MessageTable, { ...props, ...mdxProp }),
     EntityPropertiesTable: (mdxProp: any) => jsx(EntityPropertiesTable, { ...props, ...mdxProp }),
     NodeGraph: (mdxProp: any) => jsx(NodeGraphPortal, { ...props.data, ...mdxProp, props, mdxProp }),
-    EntityMap,
+    EntityMap: (mdxProp: any) => jsx(EntityMap, { ...props, ...mdxProp }),
     OpenAPI,
     ResourceGroupTable: (mdxProp: any) => jsx(ResourceGroupTable, { ...props, ...mdxProp }),
     ResourceLink: (mdxProp: any) => jsx(ResourceLink, { ...props, ...mdxProp }),

package/eventcatalog/src/components/Search/SearchModal.tsx

@@ -35,6 +35,7 @@ const SearchResultItem = React.memo<{
     if (type === 'openapi') return 'OpenAPI';
     if (type === 'language') return 'Language';
     if (type === 'entities') return 'Entity';
+    if (type === 'queries') return 'Query';
     // For plurals, remove 's' at the end, otherwise just capitalize
     if (type.endsWith('s')) {
       return type.charAt(0).toUpperCase() + type.slice(1, -1);
@@ -113,8 +114,6 @@ const SearchModal: React.FC = () => {
   useEffect(() => {
     const handleModalToggle = (event: CustomEvent) => {
       setIsOpen(event.detail.isOpen);
-
-      // Load all results when modal opens - will be handled by another effect
     };
 
     window.addEventListener('searchModalToggle', handleModalToggle as EventListener);
@@ -286,57 +285,6 @@ const SearchModal: React.FC = () => {
     return 'other';
   }, []);
 
-  // Load all results using a wildcard search
-  const loadAllResults = useCallback(async () => {
-    if (!pagefind) return;
-
-    setIsLoading(true);
-    try {
-      // Use a common word or wildcard to get all indexed content
-      const search = await pagefind.search('a');
-      if (!search || !search.results) {
-        return;
-      }
-      const processedResults: SearchResult[] = [];
-
-      for (const result of search.results) {
-        const data = await result.data();
-        const type = getTypeFromUrl(data.url);
-
-        // Clean the title by removing any "Type | " prefix if it exists
-        let cleanTitle = data.meta?.title || 'Untitled';
-
-        // Use regex for more efficient prefix removal
-        cleanTitle = cleanTitle.replace(
-          /^(Domains?|Services?|Events?|Commands?|Queries?|Entities?|Channels?|Teams?|Users?|Language) \| /,
-          ''
-        );
-
-        processedResults.push({
-          id: result.id,
-          name: cleanTitle,
-          type: type,
-          description: data.excerpt || '',
-          url: data.url,
-          tags: data.meta?.tags ? data.meta.tags.split(',').map((tag: string) => tag.trim()) : [],
-        });
-      }
-
-      setAllResults(processedResults);
-    } catch (error) {
-      console.error('Error loading all results:', error);
-    } finally {
-      setIsLoading(false);
-    }
-  }, [pagefind, getTypeFromUrl]);
-
-  // Load results when modal opens and pagefind is available
-  useEffect(() => {
-    if (isOpen && pagefind && !pagefindLoadError) {
-      loadAllResults();
-    }
-  }, [isOpen, pagefind, pagefindLoadError, loadAllResults]);
-
   // Perform search
   const performSearch = useCallback(
     async (searchTerm: string): Promise<SearchResult[]> => {
@@ -407,7 +355,7 @@ const SearchModal: React.FC = () => {
     [exactMatch, currentSearch]
   );
 
-  // Update results
+  // Update results with debouncing
   const updateResults = useCallback(async () => {
     if (currentSearch.trim()) {
       const results = await performSearch(currentSearch);
@@ -417,10 +365,19 @@ const SearchModal: React.FC = () => {
     }
   }, [currentSearch, performSearch]);
 
-  // Search on input change
+  // Search on input change with debouncing
   useEffect(() => {
-    updateResults();
-  }, [updateResults]);
+    if (!currentSearch.trim()) {
+      setAllResults([]);
+      return;
+    }
+
+    const debounceTimer = setTimeout(() => {
+      updateResults();
+    }, 300); // 300ms debounce
+
+    return () => clearTimeout(debounceTimer);
+  }, [currentSearch, updateResults]);
 
   // Handle input change
   const handleSearchChange = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -578,7 +535,7 @@ const SearchModal: React.FC = () => {
                             <div className="flex items-center gap-1.5">
                               <span>All Resources</span>
                             </div>
-                            <span className="text-xs text-gray-400">{counts.all}</span>
+                            <span className="text-xs text-gray-700 font-thin">{counts.all}</span>
                           </div>
                         </button>
                       </div>
@@ -586,7 +543,7 @@ const SearchModal: React.FC = () => {
 
                     {/* Resources Section */}
                     <div className="mb-4">
-                      <h3 className="text-xs font-medium text-gray-600 mb-2">Resources</h3>
+                      <h3 className="text-xs font-bold text-gray-600 mb-2">Resources</h3>
                       <div className="space-y-1">
                         {Object.entries({
                           domains: 'Domains',
@@ -610,9 +567,9 @@ const SearchModal: React.FC = () => {
                               <div className="flex items-center justify-between">
                                 <div className="flex items-center gap-1.5">
                                   {IconComponent && <IconComponent className="h-3 w-3" />}
-                                  <span>{label}</span>
+                                  <span className="font-thin">{label}</span>
                                 </div>
-                                <span className="text-xs text-gray-400">{counts[key as keyof typeof counts]}</span>
+                                <span className="text-xs text-gray-700 font-thin">{counts[key as keyof typeof counts]}</span>
                               </div>
                             </button>
                           );
@@ -622,7 +579,7 @@ const SearchModal: React.FC = () => {
 
                     {/* Messages Section */}
                     <div className="mb-4">
-                      <h3 className="text-xs font-medium text-gray-600 mb-2">Messages</h3>
+                      <h3 className="text-xs font-bold text-gray-600 mb-2">Messages</h3>
                       <div className="space-y-1">
                         {Object.entries({
                           events: 'Events',
@@ -646,9 +603,9 @@ const SearchModal: React.FC = () => {
                               <div className="flex items-center justify-between">
                                 <div className="flex items-center gap-1.5">
                                   {IconComponent && <IconComponent className="h-3 w-3" />}
-                                  <span>{label}</span>
+                                  <span className="font-thin">{label}</span>
                                 </div>
-                                <span className="text-xs text-gray-400">{counts[key as keyof typeof counts]}</span>
+                                <span className="text-xs text-gray-700 font-thin">{counts[key as keyof typeof counts]}</span>
                               </div>
                             </button>
                           );
@@ -658,7 +615,7 @@ const SearchModal: React.FC = () => {
 
                     {/* Organization Section */}
                     <div className="mb-4">
-                      <h3 className="text-xs font-medium text-gray-600 mb-2">Organization</h3>
+                      <h3 className="text-xs font-bold text-gray-600 mb-2">Organization</h3>
                       <div className="space-y-1">
                         {Object.entries({
                           teams: 'Teams',
@@ -680,9 +637,9 @@ const SearchModal: React.FC = () => {
                               <div className="flex items-center justify-between">
                                 <div className="flex items-center gap-1.5">
                                   {IconComponent && <IconComponent className="h-3 w-3" />}
-                                  <span>{label}</span>
+                                  <span className="font-thin">{label}</span>
                                 </div>
-                                <span className="text-xs text-gray-400">{counts[key as keyof typeof counts]}</span>
+                                <span className="text-xs text-gray-700 font-thin">{counts[key as keyof typeof counts]}</span>
                               </div>
                             </button>
                           );
@@ -692,7 +649,7 @@ const SearchModal: React.FC = () => {
 
                     {/* Specifications Section */}
                     <div className="mb-4">
-                      <h3 className="text-xs font-medium text-gray-600 mb-2">Specifications</h3>
+                      <h3 className="text-xs font-bold text-gray-600 mb-2">Specifications</h3>
                       <div className="space-y-1">
                         {Object.entries({
                           openapi: 'OpenAPI Specification',
@@ -714,9 +671,9 @@ const SearchModal: React.FC = () => {
                               <div className="flex items-center justify-between">
                                 <div className="flex items-center gap-1.5">
                                   <IconComponent className="h-3 w-3" />
-                                  <span>{label}</span>
+                                  <span className="font-thin">{label}</span>
                                 </div>
-                                <span className="text-xs text-gray-400">{counts[key as keyof typeof counts]}</span>
+                                <span className="text-xs text-gray-700 font-thin">{counts[key as keyof typeof counts]}</span>
                               </div>
                             </button>
                           );
@@ -726,25 +683,16 @@ const SearchModal: React.FC = () => {
                   </div>
 
                   {/* Right Results */}
-                  <div className="flex-1 p-4 overflow-y-auto">
-                    {/* Show stats and exact match toggle */}
-                    <div className="mb-4 flex items-center justify-between">
-                      <div className="text-sm text-gray-500">
-                        {currentSearch.trim() ? (
-                          <>
-                            <span>{filteredResults.length} results</span> for "{currentSearch}"
-                            {isLoading && <span className="ml-2">Loading...</span>}
-                          </>
-                        ) : (
-                          <>
-                            <span>{filteredResults.length} resources</span> in EventCatalog
-                            {isLoading && <span className="ml-2">Loading...</span>}
-                          </>
-                        )}
-                      </div>
+                  <div className="flex-1 flex flex-col overflow-hidden">
+                    {/* Show stats and exact match toggle - only when there are results or search term */}
+                    {currentSearch.trim() && (filteredResults.length > 0 || isLoading) && (
+                      <div className="p-4 pb-2 flex items-center justify-between border-b border-gray-100">
+                        <div className="text-sm text-gray-500 font-thin">
+                          <span>{filteredResults.length} results</span> for "{currentSearch}"
+                          {isLoading && <span className="ml-2">Loading...</span>}
+                        </div>
 
-                      {/* Exact Match Checkbox - moved here */}
-                      {currentSearch.trim() && (
+                        {/* Exact Match Checkbox */}
                         <div className="flex items-center">
                           <input
                             id="exact-match-results"
@@ -757,49 +705,51 @@ const SearchModal: React.FC = () => {
                             Exact match in title
                           </label>
                         </div>
-                      )}
-                    </div>
-
-                    <div className="search-results grid grid-cols-1 lg:grid-cols-2 gap-3">
-                      {!currentSearch.trim() && filteredResults.length === 0 ? (
-                        // Show when no search term is entered and no results loaded yet
-                        <div className="col-span-full text-center py-20">
-                          <svg className="mx-auto h-16 w-16 text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                            <path
-                              strokeLinecap="round"
-                              strokeLinejoin="round"
-                              strokeWidth="1.5"
-                              d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"
-                            />
-                          </svg>
-                          <h3 className="mt-4 text-lg font-medium text-gray-900">
-                            {isLoading ? 'Loading resources...' : 'Discover your EventCatalog'}
-                          </h3>
-                          <p className="mt-2 text-sm text-gray-300">
-                            {isLoading
-                              ? 'Fetching all available resources from EventCatalog.'
-                              : 'Start typing to search for domains, services, events, and more.'}
-                          </p>
+                      </div>
+                    )}
+
+                    {/* Main content area */}
+                    <div className="flex-1 overflow-y-auto">
+                      {!currentSearch.trim() ? (
+                        // Show when no search term is entered - centered
+                        <div className="h-full flex items-center justify-center">
+                          <div className="text-center">
+                            <MagnifyingGlassIcon className="mx-auto h-8 w-8 text-gray-300" />
+                            <h3 className="mt-4 text-lg font-medium text-gray-900">Discover your EventCatalog</h3>
+                            <p className="mt-2 text-sm text-gray-500 font-thin">
+                              Start typing to search for domains, services, events, and more.
+                            </p>
+                          </div>
+                        </div>
+                      ) : filteredResults.length === 0 && !isLoading ? (
+                        // Show when search term exists but no results and not loading - centered
+                        <div className="h-full flex items-center justify-center">
+                          <div className="text-center">
+                            <MagnifyingGlassIcon className="mx-auto h-8 w-8 text-gray-300" />
+                            <h3 className="mt-2 text-sm font-bold text-gray-900">No results found</h3>
+                            <p className="mt-1 text-sm text-gray-500 font-thin">
+                              No results found for "<span className="font-medium">{currentSearch}</span>".
+                            </p>
+                          </div>
                         </div>
-                      ) : currentSearch.trim() && filteredResults.length === 0 ? (
-                        // Show when search term exists but no results
-                        <div className="col-span-full text-center py-16">
-                          <svg className="mx-auto h-12 w-12 text-gray-300" stroke="currentColor" fill="none" viewBox="0 0 48 48">
-                            <path
-                              d="M21 21l6-6m-6 6l6 6m-6-6h6m-6 0v6"
-                              strokeWidth="2"
-                              strokeLinecap="round"
-                              strokeLinejoin="round"
-                            />
-                          </svg>
-                          <h3 className="mt-2 text-sm font-medium text-gray-900">No results found</h3>
-                          <p className="mt-1 text-sm text-gray-500">
-                            No results found for "<span className="font-medium">{currentSearch}</span>". Try different keywords or
-                            check your spelling.
-                          </p>
+                      ) : isLoading ? (
+                        // Show loading state - centered
+                        <div className="h-full flex items-center justify-center">
+                          <div className="text-center">
+                            <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-purple-600 mx-auto"></div>
+                            <h3 className="mt-4 text-sm font-medium text-gray-900">Searching...</h3>
+                            <p className="mt-2 text-sm text-gray-500 font-thin">
+                              Finding results for "<span className="font-medium">{currentSearch}</span>"
+                            </p>
+                          </div>
                         </div>
                       ) : (
-                        <SearchResults results={filteredResults} typeConfig={typeConfig} currentSearch={currentSearch} />
+                        // Show results in a grid with padding
+                        <div className="p-4">
+                          <div className="search-results grid grid-cols-1 lg:grid-cols-2 gap-3">
+                            <SearchResults results={filteredResults} typeConfig={typeConfig} currentSearch={currentSearch} />
+                          </div>
+                        </div>
                       )}
                     </div>
                   </div>

package/eventcatalog/src/utils/node-graphs/domain-entity-map.ts

@@ -6,6 +6,7 @@ import { getItemsFromCollectionByIdAndSemverOrLatest } from '@utils/collections/
 import { getVersionFromCollection } from '@utils/collections/versions';
 import { getEntities, type Entity } from '@utils/entities';
 import { getDomains, type Domain } from '@utils/collections/domains';
+import { getServices, type Service } from '@utils/collections/services';
 
 const elk = new ELK();
 
@@ -13,36 +14,45 @@ interface Props {
   id: string;
   version: string;
   entities?: string[]; // Optional: array of entity IDs/names to include
+  type?: 'domains' | 'services';
 }
 
-export const getNodesAndEdges = async ({ id, version, entities }: Props) => {
+export const getNodesAndEdges = async ({ id, version, entities, type = 'domains' }: Props) => {
   let nodes = [] as any,
     edges = [] as any;
 
   const allDomains = await getDomains();
   const allEntities = await getEntities();
+  const allServices = await getServices();
 
-  const domain = getVersionFromCollection(allDomains, id, version)[0] as Domain;
-  let domainEntities = (domain?.data?.entities ?? []) as any;
+  let resource = null;
+
+  if (type === 'domains') {
+    resource = getVersionFromCollection(allDomains, id, version)[0] as Domain;
+  } else if (type === 'services') {
+    resource = getVersionFromCollection(allServices, id, version)[0] as Service;
+  }
+
+  let resourceEntities = (resource?.data?.entities ?? []) as any;
 
   // If entities filter is provided, filter domainEntities to only those specified
   if (entities && Array.isArray(entities) && entities.length > 0) {
-    domainEntities = domainEntities.filter(
+    resourceEntities = resourceEntities.filter(
       (entity: Entity) => entities.includes(entity.data.id) || entities.includes(entity.data.name)
     );
   }
 
-  const entitiesWithReferences = domainEntities.filter((entity: Entity) =>
+  const entitiesWithReferences = resourceEntities.filter((entity: Entity) =>
     entity.data.properties?.some((property: any) => property.references)
   );
   // Creates all the entity nodes for the domain
-  for (const entity of domainEntities) {
+  for (const entity of resourceEntities) {
     const nodeId = generateIdForNode(entity);
     nodes.push({
       id: nodeId,
       type: 'entities',
       position: { x: 0, y: 0 },
-      data: { label: entity.data.name, entity, domainName: domain?.data.name, domainId: domain?.data.id },
+      data: { label: entity.data.name, entity, domainName: resource?.data.name, domainId: resource?.data.id },
     });
   }
 
@@ -53,7 +63,7 @@ export const getNodesAndEdges = async ({ id, version, entities }: Props) => {
     .filter((ref: any) => ref !== undefined);
 
   const externalToDomain = Array.from(new Set<string>(listOfReferencedEntities as string[])) // Remove duplicates
-    .filter((entityId: any) => !domainEntities.some((domainEntity: any) => domainEntity.id === entityId));
+    .filter((entityId: any) => !resourceEntities.some((domainEntity: any) => domainEntity.id === entityId));
 
   // Helper function to find which domain an entity belongs to
   const findEntityDomain = (entityId: string) => {
@@ -98,7 +108,7 @@ export const getNodesAndEdges = async ({ id, version, entities }: Props) => {
   entitiesWithReferences.push(...addedExternalEntities);
 
   // Create complete list of entities for edge creation and layout
-  const allEntitiesInGraph = [...domainEntities, ...addedExternalEntities];
+  const allEntitiesInGraph = [...resourceEntities, ...addedExternalEntities];
 
   // Go through any entities that are related to other entities
   for (const entity of entitiesWithReferences) {

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.54.1",
+  "version": "2.54.3",
   "publishConfig": {
     "access": "public"
   },
@@ -26,7 +26,7 @@
     "@ai-sdk/openai": "^1.3.16",
     "@astrojs/markdown-remark": "^6.3.3",
     "@astrojs/mdx": "^4.3.1",
-    "@astrojs/node": "^9.3.0",
+    "@astrojs/node": "^9.3.1",
     "@astrojs/react": "^4.3.0",
     "@astrojs/rss": "^4.0.12",
     "@astrojs/tailwind": "^6.0.2",
@@ -56,7 +56,7 @@
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
     "ai": "^4.3.9",
-    "astro": "^5.12.0",
+    "astro": "^5.12.5",
     "astro-compress": "^2.3.8",
     "astro-expressive-code": "^0.40.1",
     "astro-seo": "^0.8.4",