@cap-js/ord 1.3.2 → 1.3.3

package/lib/ord.js

@@ -34,14 +34,15 @@ const initializeAppConfig = (csn) => {
 
     _validateNamespaces(ordNamespace, eventApplicationNamespace);
 
-    const { serviceNames, apiResourceNames, apiEndpoints, eventNames, entityTypeTargets } = _triageCsnDefinitions(csn);
+    const { serviceNames, apiResourceNames, apiEndpoints, eventServiceNames, entityTypeTargets } =
+        _triageCsnDefinitions(csn);
 
     return {
         env: cds.env["ord"],
         lastUpdate,
         appName,
         apiEndpoints: Array.from(apiEndpoints),
-        eventNames,
+        eventServiceNames,
         serviceNames,
         apiResourceNames,
         entityTypeTargets: _.uniqBy(entityTypeTargets, CONTENT_MERGE_KEY),
@@ -77,9 +78,12 @@ function _validateNamespaces(ordNamespace, eventApplicationNamespace) {
 function _triageCsnDefinitions(csn) {
     const pendingApiResourceNames = [];
     const apiEndpoints = new Set();
-    const pendingEventNames = [];
+    const pendingEventServiceNames = new Set();
     const entityTypeTargets = [];
     const pendingServiceNames = [];
+    const serviceNames = Object.keys(csn.definitions).filter(
+        (key) => csn.definitions[key].kind === CDS_ELEMENT_KIND.service,
+    );
 
     for (const definitionKey of Object.keys(csn.definitions)) {
         const definitionObj = csn.definitions[definitionKey];
@@ -103,8 +107,8 @@ function _triageCsnDefinitions(csn) {
                 break;
             }
             case CDS_ELEMENT_KIND.event: {
-                const event = _handleEvent(definitionKey);
-                if (event) pendingEventNames.push(event);
+                const event = _handleEvent(serviceNames, definitionKey);
+                if (event) pendingEventServiceNames.add(event);
                 break;
             }
             case CDS_ELEMENT_KIND.action:
@@ -120,7 +124,7 @@ function _triageCsnDefinitions(csn) {
         serviceNames: pendingServiceNames,
         apiResourceNames: pendingApiResourceNames,
         apiEndpoints: Array.from(apiEndpoints),
-        eventNames: pendingEventNames,
+        eventServiceNames: [...pendingEventServiceNames],
         entityTypeTargets,
     };
 }
@@ -156,8 +160,12 @@ function _handleEntity(key, keyDefinition) {
     return null;
 }
 
-function _handleEvent(key) {
-    return key;
+function _handleEvent(serviceNames, key) {
+    for (const serviceName of serviceNames) {
+        if (key.startsWith(serviceName + ".")) {
+            return serviceName;
+        }
+    }
 }
 
 function _handleActionOrFunction(key) {
@@ -200,7 +208,7 @@ const _getAPIResources = (csn, appConfig, packageIds, accessStrategies) => {
 };
 
 const _getEventResources = (csn, appConfig, packageIds, accessStrategies) => {
-    return appConfig.serviceNames.flatMap((serviceName) =>
+    return appConfig.eventServiceNames.flatMap((serviceName) =>
         createEventResourceTemplate(serviceName, csn.definitions[serviceName], appConfig, packageIds, accessStrategies),
     );
 };
@@ -295,7 +303,7 @@ module.exports = (csn) => {
             ordDocument.apiResources = apiResources;
         }
     }
-    if (appConfig.eventNames.length) {
+    if (appConfig.eventServiceNames.length) {
         const eventResources = _getEventResources(linkedCsn, appConfig, packageIds, accessStrategies);
         if (eventResources.length) {
             ordDocument.eventResources = eventResources;

package/lib/templates.js

@@ -301,8 +301,6 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
                     accessStrategies,
                 ),
             ];
-
-            apiResources.push(obj);
         }
 
         if (obj.visibility !== RESOURCE_VISIBILITY.private) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cap-js/ord",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "description": "CAP Plugin for generating ORD document.",
     "repository": "cap-js/ord",
     "author": "SAP SE (https://www.sap.com)",