@cap-js/ord 1.7.0 → 1.8.0

package/lib/defaults.js

@@ -122,17 +122,6 @@ module.exports = {
             CONTENT_MERGE_KEY,
         );
     },
-    consumptionBundles: (appConfig) => [
-        {
-            ordId: `${regexWithRemoval(appConfig.appName)}:consumptionBundle:noAuth:v1`,
-            version: "1.0.0",
-            lastUpdate: appConfig.lastUpdate,
-            title: "Unprotected resources",
-            shortDescription: "If we have another protected API then it will be another object",
-            description:
-                "This Consumption Bundle contains all resources of the reference app which are unprotected and do not require authentication",
-        },
-    ],
     baseTemplate: (authConfig, tenant) => {
         // Get access strategies from the provided authConfig
         // If auth config is not available, fall back to empty array

package/lib/integration-dependency.js

@@ -89,11 +89,12 @@ function createIntegrationDependency(externalServices, appConfig, packageIds) {
 
     // Read IntegrationDependency level config from cdsrc
     const integrationDepConfig = appConfig.env?.integrationDependency || {};
+    const version = integrationDepConfig.version || "1.0.0";
 
     return {
-        ordId: `${appConfig.ordNamespace}:${ORD_RESOURCE_TYPE.integrationDependency}:${INTEGRATION_DEPENDENCY_RESOURCE_NAME}:v1`,
+        ordId: `${appConfig.ordNamespace}:${ORD_RESOURCE_TYPE.integrationDependency}:${INTEGRATION_DEPENDENCY_RESOURCE_NAME}:v${version.split(".")[0]}`,
         title: "External Dependencies",
-        version: "1.0.0",
+        version: version,
         releaseStatus: "active",
         visibility: RESOURCE_VISIBILITY.public,
         mandatory: false,

package/lib/ord.js

@@ -20,26 +20,21 @@ const {
 
 const _getGroups = (csn, appConfig) => {
     return appConfig.serviceNames
-        .flatMap((serviceName) => createGroupsTemplateForService(serviceName, csn.definitions[serviceName], appConfig))
+        .map((name) => csn.definitions[name])
+        .flatMap((srvDefinition) => createGroupsTemplateForService(srvDefinition, appConfig))
         .filter((resource) => !!resource);
 };
 
 const _getAPIResources = (csn, appConfig, packageIds, accessStrategies) => {
-    return appConfig.apiResourceNames.flatMap((apiResourceName) =>
-        createAPIResourceTemplate(
-            apiResourceName,
-            csn.definitions[apiResourceName],
-            appConfig,
-            packageIds,
-            accessStrategies,
-        ),
-    );
+    return appConfig.apiResourceNames
+        .map((name) => csn.definitions[name])
+        .flatMap((srvDefinition) => createAPIResourceTemplate(srvDefinition, appConfig, packageIds, accessStrategies));
 };
 
 const _getEventResources = (csn, appConfig, packageIds, accessStrategies) => {
-    return appConfig.eventServiceNames.flatMap((serviceName) =>
-        createEventResourceTemplate(serviceName, csn.definitions[serviceName], appConfig, packageIds, accessStrategies),
-    );
+    return appConfig.eventServiceNames
+        .map((name) => csn.definitions[name])
+        .flatMap((srvDefinition) => createEventResourceTemplate(srvDefinition, appConfig, packageIds, accessStrategies));
 };
 
 const _getProducts = (appConfig) => {
@@ -75,7 +70,6 @@ const _createDefaultORDDocument = (linkedCsn, appConfig, authConfig) => {
         packages: packages,
         description: appConfig.env?.description || defaults.description,
         openResourceDiscovery: appConfig.env?.openResourceDiscovery || defaults.openResourceDiscovery,
-        consumptionBundles: appConfig.env?.consumptionBundles || defaults.consumptionBundles(appConfig),
 
         // Conditionally added top-level properties
         ...(!entityTypes.length ? {} : { entityTypes: entityTypes }),
@@ -84,6 +78,7 @@ const _createDefaultORDDocument = (linkedCsn, appConfig, authConfig) => {
         ...(appConfig.existingProductORDId ? {} : { products: [products[0]] }),
         ...(!appConfig.serviceNames.length ? {} : { groups: _getGroups(linkedCsn, appConfig) }),
         ...(!integrationDependencies.length ? {} : { integrationDependencies: integrationDependencies }),
+        ...(!appConfig.env?.consumptionBundles?.length ? {} : { consumptionBundles: appConfig.env.consumptionBundles }),
     };
 };
 

package/lib/protocol-resolver.js

@@ -7,18 +7,6 @@ const {
 } = require("./constants");
 const Logger = require("./logger");
 
-/**
- * Gets CAP endpoints for a service using CDS endpoints4().
- *
- * @param {string} serviceName The service name.
- * @param {Object} srvDefinition The service definition object.
- * @returns {Array} Raw endpoints from CDS.
- */
-function _getCapEndpoints(serviceName, srvDefinition) {
-    const srvObj = { name: serviceName, definition: srvDefinition };
-    return cds.service.protocols.endpoints4(srvObj);
-}
-
 /**
  * Reads the explicit @protocol annotation from service definition.
  *
@@ -42,13 +30,12 @@ function _getExplicitProtocol(srvDefinition) {
  * - Rule B: Only fallback to OData when no explicit protocol
  * - Rule C: Never produce [null] in entryPoints
  *
- * @param {string} serviceName The service name.
  * @param {Object} srvDefinition The service definition object.
  * @param {Object} options Configuration options.
  * @param {Function} options.isPrimaryDataProduct Strategy function to check if service is primary data product.
  * @returns {Array} Array with single {apiProtocol, entryPoints, hasResourceDefinitions} object, or empty array.
  */
-function resolveApiResourceProtocol(serviceName, srvDefinition, options = {}) {
+function resolveApiResourceProtocol(srvDefinition, options = {}) {
     const { isPrimaryDataProduct = () => false } = options;
 
     // 1. Primary Data Product - early return
@@ -62,7 +49,7 @@ function resolveApiResourceProtocol(serviceName, srvDefinition, options = {}) {
         ];
     }
 
-    const capEndpoints = _getCapEndpoints(serviceName, srvDefinition);
+    const capEndpoints = cds.service.protocols.endpoints4({ name: srvDefinition.name, definition: srvDefinition });
     const ordProtocols = [];
     for (const endpoint of capEndpoints) {
         if (PLUGIN_UNSUPPORTED_PROTOCOLS.includes(endpoint.kind)) {
@@ -107,7 +94,7 @@ function resolveApiResourceProtocol(serviceName, srvDefinition, options = {}) {
 
         // 4. Handle explicit protocol with no CAP endpoint (Rule A)
         if (!ordProtocols.some((p) => p.apiProtocol === protocol) && !CAP_TO_ORD_PROTOCOL_MAP[protocol]) {
-            Logger.warn(`Unknown protocol '${protocol}' is not supported, and skipped for service '${serviceName}'.`);
+            Logger.warn(`Unknown protocol '${protocol}' is not supported, and skipped for service '${srvDefinition.name}'.`);
         }
     }
 

package/lib/templates.js

@@ -32,11 +32,11 @@ function unflatten(flattedObject) {
     return result;
 }
 
-function readORDExtensions(model) {
+function readORDExtensions(model, prefix = ORD_EXTENSIONS_PREFIX) {
     const ordExtensions = {};
     for (const key in model) {
-        if (key.startsWith(ORD_EXTENSIONS_PREFIX)) {
-            const ordKey = key.replace(ORD_EXTENSIONS_PREFIX, "");
+        if (key.startsWith(prefix)) {
+            const ordKey = key.replace(prefix, "");
             ordExtensions[ordKey] = model[key];
         }
     }
@@ -63,9 +63,9 @@ const createEntityTypeMappingsItemTemplate = (entity) => {
         const ordIdParts = entity[ENTITY_RELATIONSHIP_ANNOTATION].split(":");
         const namespace = ordIdParts[0];
         const entityName = ordIdParts[1];
-        const version = ordIdParts[2] || "v1";
+        const version = entity[`${ORD_EXTENSIONS_PREFIX}version`] || ordIdParts[2]?.substring(1) || "1";
         results.push({
-            ordId: `${namespace}:entityType:${entityName}:${version}`,
+            ordId: `${namespace}:entityType:${entityName}:v${version.split(".")[0]}`,
             entityName,
             ...entity,
         });
@@ -74,8 +74,8 @@ const createEntityTypeMappingsItemTemplate = (entity) => {
     return results;
 };
 
-function _getGroupID(serviceDefinition, groupTypeId = defaults.groupTypeId, appConfig) {
-    return `${groupTypeId}:${appConfig.ordNamespace}:${_getCleanServiceName(serviceDefinition, appConfig)}`;
+function _getGroupID(appConfig, srvDefinition) {
+    return `${defaults.groupTypeId}:${appConfig.ordNamespace}:${_getCleanServiceName(srvDefinition.name, appConfig)}`;
 }
 
 function _startsWithNamespace(name, namespace) {
@@ -84,7 +84,7 @@ function _startsWithNamespace(name, namespace) {
     return rest === "" || rest.startsWith(".");
 }
 
-function _getCleanServiceName({ name }, appConfig) {
+function _getCleanServiceName(name, appConfig) {
     let sortedName = name;
     if (appConfig.internalNamespace && _startsWithNamespace(name, appConfig.internalNamespace)) {
         sortedName = name.substring(appConfig.internalNamespace.length);
@@ -122,7 +122,7 @@ function _getTitleFromServiceName(srv) {
  */
 function _getEntityVersion(entity) {
     const entityVersion = entity.ordId.split(":").pop();
-    const version = entityVersion.replace("v", "") + ".0.0"; // TODO: version can be stated/overwritten by annotation
+    const version = entityVersion.replace("v", "") + ".0.0";
     if (!SEM_VERSION_REGEX.test(version)) {
         Logger.warn("Entity version", version, "is not a valid semantic version.");
     }
@@ -162,31 +162,24 @@ function _getResourceDefinition(resourceType, mediaType, ordId, serviceName, fil
 /**
  * This is a template function to create group object of a service for groups array in ORD doc.
  *
- * @param {string} serviceName The name of the service.
- * @param {object} serviceDefinition The definition of the service
+ * @param {object} srvDefinition The definition of the service
  * @param {object} appConfig - The application configuration.
  * @returns {Object} A group object.
  */
-const createGroupsTemplateForService = (serviceName, serviceDefinition, appConfig) => {
-    const ordExtensions = readORDExtensions(serviceDefinition);
-
-    if (!serviceDefinition) {
-        Logger.warn("Unable to find service definition:", serviceName);
-        return undefined;
-    }
+const createGroupsTemplateForService = (srvDefinition, appConfig) => {
+    const ordExtensions = readORDExtensions(srvDefinition);
+    const visibility = _handleVisibility(ordExtensions, srvDefinition, appConfig.env?.defaultVisibility);
 
-    const visibility = _handleVisibility(ordExtensions, serviceDefinition, appConfig.env?.defaultVisibility);
     if (visibility === RESOURCE_VISIBILITY.private) {
         // If the visibility of the service is private, do not create a group
-        Logger.info("Skipping group creation for private service:", serviceName);
+        Logger.info("Skipping group creation for private service:", srvDefinition.name);
         return undefined;
     }
 
-    const groupId = _getGroupID(serviceDefinition, defaults.groupTypeId, appConfig);
     return {
-        groupId: groupId,
+        groupId: _getGroupID(appConfig, srvDefinition),
         groupTypeId: defaults.groupTypeId,
-        title: ordExtensions.title ?? _getTitleFromServiceName(serviceName),
+        title: ordExtensions.title ?? _getTitleFromServiceName(srvDefinition.name),
     };
 };
 
@@ -221,7 +214,7 @@ const createEntityTypeTemplate = (appConfig, packageIds, entity) => {
     return {
         ordId: entity.ordId,
         localId: entity.entityName,
-        title: entity["@title"] ?? entity["@Common.Label"] ?? entity.entityName,
+        title: entity["@title"] ?? entity["@Common.Label"] ?? entity["@EndUserText.label"] ?? entity.entityName,
         shortDescription: SHORT_DESCRIPTION_PREFIX + entity.entityName,
         description: DESCRIPTION_PREFIX + entity.entityName,
         version: _getEntityVersion(entity),
@@ -280,26 +273,24 @@ function _handleVisibility(ordExtensions, definition, defaultVisibility = RESOUR
  * This is a template function to create API Resource object for API Resource Array.
  * Properties of an API resource can be overwritten by the ORD extensions. Example: visibility.
  * Ensures proper visibility compliance by checking associated EntityTypes.
- * @param {string} serviceName The name of the service.
- * @param {object} serviceDefinition The definition of the service
+ * @param {object} srvDefinition The definition of the service
  * @param {object} appConfig - The application configuration.
  * @param {Array} packageIds - The available package identifiers.
  * @param {Array} accessStrategies The array of accessStrategies objects
  * @returns {Array} An array of objects for the API Resources.
  */
-const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, packageIds, accessStrategies) => {
-    const ordExtensions = readORDExtensions(serviceDefinition);
-    const visibility = _handleVisibility(ordExtensions, serviceDefinition, appConfig.env?.defaultVisibility);
+const createAPIResourceTemplate = (srvDefinition, appConfig, packageIds, accessStrategies) => {
+    const ordExtensions = readORDExtensions(srvDefinition);
+    const visibility = _handleVisibility(ordExtensions, srvDefinition, appConfig.env?.defaultVisibility);
     const packageId = _getPackageID(appConfig.ordNamespace, packageIds, ORD_RESOURCE_TYPE.api, visibility);
-
-    const protocolResults = resolveApiResourceProtocol(serviceName, serviceDefinition, {
+    const protocolResults = resolveApiResourceProtocol(srvDefinition, {
         isPrimaryDataProduct: isPrimaryDataProductService,
     });
     const apiResources = [];
 
     // If no protocols were generated, skip this service
     if (protocolResults.length === 0) {
-        Logger.info(`No supported protocols for service '${serviceName}', skipping API resource generation.`);
+        Logger.info(`No supported protocols for service '${srvDefinition.name}', skipping API resource generation.`);
         return apiResources;
     }
 
@@ -308,31 +299,26 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
         version,
         semanticVersion,
         extracted = null;
-    if (isPrimaryDataProductService(serviceDefinition)) {
-        extracted = _extractVersionFromServiceName(serviceDefinition.name);
-        if (extracted) {
-            // Create a temporary service definition with the clean name for namespace processing
-            const versionExtractedServiceDefinition = { ...serviceDefinition, name: extracted.cleanName };
-            cleanServiceName = _getCleanServiceName(versionExtractedServiceDefinition, appConfig);
-            version = extracted.version;
-            semanticVersion = extracted.semanticVersion;
-        } else {
-            // Invalid pattern - use current behavior
-            cleanServiceName = _getCleanServiceName(serviceDefinition, appConfig);
-            version = "v1";
-            semanticVersion = "1.0.0";
-        }
+    if (isPrimaryDataProductService(srvDefinition)) {
+        extracted = _extractVersionFromServiceName(srvDefinition.name);
+
+        cleanServiceName = _getCleanServiceName(extracted?.cleanName || srvDefinition.name, appConfig);
+        semanticVersion = ordExtensions.version || extracted?.semanticVersion || "1.0.0";
+        version = `v${semanticVersion.split(".")[0]}`;
     } else {
         // Non-data product - use current behavior
-        cleanServiceName = _getCleanServiceName(serviceDefinition, appConfig);
-        version = "v1";
-        semanticVersion = "1.0.0";
+        cleanServiceName = _getCleanServiceName(srvDefinition.name, appConfig);
+        semanticVersion = ordExtensions.version || "1.0.0";
+        version = `v${semanticVersion.split(".")[0]}`;
     }
 
-    const ordId = `${appConfig.ordNamespace}:apiResource:${cleanServiceName}:${version}`;
-
-    protocolResults.forEach((protocolResult) => {
+    protocolResults.forEach((protocolResult, index) => {
         const { apiProtocol, entryPoints, hasResourceDefinitions } = protocolResult;
+        const protocolExtensions = readORDExtensions(srvDefinition, `@protocol('${apiProtocol}').ORD.Extensions.`);
+        const ordId =
+            protocolExtensions.ordId ||
+            ordExtensions.ordId ||
+            `${appConfig.ordNamespace}:apiResource:${cleanServiceName}${index === 0 ? "" : `-${apiProtocol}`}:${version}`;
 
         // Build resource definitions based on protocol
         let resourceDefinitions = [];
@@ -344,7 +330,7 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
                         "sap-csn-interop-effective-v1",
                         "json",
                         ordId,
-                        serviceName,
+                        srvDefinition.name,
                         "csn.json",
                         accessStrategies,
                     ),
@@ -352,7 +338,14 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
             } else if (apiProtocol === ORD_API_PROTOCOL.REST) {
                 // REST only has OpenAPI, no EDMX
                 resourceDefinitions = [
-                    _getResourceDefinition("openapi-v3", "json", ordId, serviceName, "oas3.json", accessStrategies),
+                    _getResourceDefinition(
+                        "openapi-v3",
+                        "json",
+                        ordId,
+                        srvDefinition.name,
+                        "oas3.json",
+                        accessStrategies,
+                    ),
                 ];
             } else if (apiProtocol === ORD_API_PROTOCOL.MCP) {
                 resourceDefinitions = [
@@ -360,7 +353,7 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
                         MCP_RESOURCE_DEFINITION_TYPE,
                         "json",
                         ordId,
-                        serviceName,
+                        srvDefinition.name,
                         "mcp.json",
                         accessStrategies,
                     ),
@@ -371,38 +364,49 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
                     {
                         type: "graphql-sdl",
                         mediaType: "text/plain",
-                        url: `/ord/v1/${ordId}/${serviceName}.graphql`,
+                        url: `/ord/v1/${ordId}/${srvDefinition.name}.graphql`,
                         accessStrategies: ensureAccessStrategies(accessStrategies, {
-                            resourceName: `${serviceName} (graphql-sdl)`,
+                            resourceName: `${srvDefinition.name} (graphql-sdl)`,
                         }),
                     },
                 ];
             } else if (apiProtocol === ORD_API_PROTOCOL.ODATA_V2) {
                 // openapi-v3 is not supported for OData V2, only EDMX
                 resourceDefinitions = [
-                    _getResourceDefinition("edmx", "xml", ordId, serviceName, "edmx", accessStrategies),
+                    _getResourceDefinition("edmx", "xml", ordId, srvDefinition.name, "edmx", accessStrategies),
                 ];
             } else {
                 // odata-v4 and others have both OpenAPI and EDMX
                 resourceDefinitions = [
-                    _getResourceDefinition("openapi-v3", "json", ordId, serviceName, "oas3.json", accessStrategies),
-                    _getResourceDefinition("edmx", "xml", ordId, serviceName, "edmx", accessStrategies),
+                    _getResourceDefinition(
+                        "openapi-v3",
+                        "json",
+                        ordId,
+                        srvDefinition.name,
+                        "oas3.json",
+                        accessStrategies,
+                    ),
+                    _getResourceDefinition("edmx", "xml", ordId, srvDefinition.name, "edmx", accessStrategies),
                 ];
             }
         }
 
-        const exposedEntityTypes = _getExposedEntityTypes(serviceDefinition);
+        const exposedEntityTypes = _getExposedEntityTypes(srvDefinition);
 
         let obj = {
             ordId,
-            title: serviceDefinition["@title"] ?? serviceDefinition["@Common.Label"] ?? serviceName,
-            shortDescription: SHORT_DESCRIPTION_PREFIX + serviceName,
-            description: serviceDefinition["@Core.Description"] ?? DESCRIPTION_PREFIX + serviceName,
+            title:
+                srvDefinition["@title"] ??
+                srvDefinition["@Common.Label"] ??
+                srvDefinition["@EndUserText.label"] ??
+                srvDefinition.name,
+            shortDescription: SHORT_DESCRIPTION_PREFIX + srvDefinition.name,
+            description: srvDefinition["@Core.Description"] ?? DESCRIPTION_PREFIX + srvDefinition.name,
             version: semanticVersion,
             lastUpdate: appConfig.lastUpdate,
             visibility,
             partOfPackage: packageId,
-            partOfGroups: [_getGroupID(serviceDefinition, defaults.groupTypeId, appConfig)],
+            partOfGroups: [_getGroupID(appConfig, srvDefinition)],
             releaseStatus: "active",
             apiProtocol,
             resourceDefinitions,
@@ -412,10 +416,11 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
             },
             ...(exposedEntityTypes ? { exposedEntityTypes } : []),
             ...ordExtensions,
+            ...protocolExtensions,
         };
 
         // Special handling for data product services
-        if (isPrimaryDataProductService(serviceDefinition)) {
+        if (isPrimaryDataProductService(srvDefinition)) {
             obj.direction = "outbound";
             if (extracted) {
                 // Overwrite partOfGroups
@@ -437,39 +442,47 @@ const createAPIResourceTemplate = (serviceName, serviceDefinition, appConfig, pa
  * Properties of an event resource can be overwritten by the ORD extensions. Example: visibility.
  * Ensures proper visibility compliance by checking associated EntityTypes.
  *
- * @param {string} serviceName The name of the service.
- * @param {object} serviceDefinition The definition of the service
+ * @param {object} srvDefinition The definition of the service
  * @param {object} appConfig - The application configuration.
  * @param {Array} packageIds - The available package identifiers.
  * @param {Array} accessStrategies The array of accessStrategies objects
  * @returns {Array} An single-item array of objects for the Event Resources.
  */
-const createEventResourceTemplate = (serviceName, serviceDefinition, appConfig, packageIds, accessStrategies) => {
-    const ordExtensions = readORDExtensions(serviceDefinition);
-    const visibility = _handleVisibility(ordExtensions, serviceDefinition, appConfig.env?.defaultVisibility);
+const createEventResourceTemplate = (srvDefinition, appConfig, packageIds, accessStrategies) => {
+    const ordExtensions = readORDExtensions(srvDefinition);
+    const visibility = _handleVisibility(ordExtensions, srvDefinition, appConfig.env?.defaultVisibility);
+    const version = ordExtensions.version || "1.0.0";
     const packageId = _getPackageID(appConfig.ordNamespace, packageIds, ORD_RESOURCE_TYPE.event, visibility);
-    const ordId = `${appConfig.ordNamespace}:eventResource:${_getCleanServiceName(serviceDefinition, appConfig)}:v1`;
-    const exposedEntityTypes = _getExposedEntityTypes(serviceDefinition);
+    const ordId = `${appConfig.ordNamespace}:eventResource:${_getCleanServiceName(srvDefinition.name, appConfig)}:v${version.split(".")[0]}`;
+    const exposedEntityTypes = _getExposedEntityTypes(srvDefinition);
 
     let obj = {
         ordId,
         title:
-            serviceDefinition["@title"] ??
-            serviceDefinition["@Common.Label"] ??
+            srvDefinition["@title"] ??
+            srvDefinition["@Common.Label"] ??
+            srvDefinition["@EndUserText.label"] ??
             `ODM ${appConfig.appName.replace(/[^a-zA-Z0-9]/g, "")} Events`,
-        shortDescription: `${serviceName} event resource`,
+        shortDescription: `${srvDefinition.name} event resource`,
         description:
-            serviceDefinition["@description"] ??
-            serviceDefinition["@Core.Description"] ??
+            srvDefinition["@description"] ??
+            srvDefinition["@Core.Description"] ??
             "CAP Event resource describing events / messages.",
-        version: "1.0.0",
+        version: version,
         lastUpdate: appConfig.lastUpdate,
         releaseStatus: "active",
         partOfPackage: packageId,
-        partOfGroups: [_getGroupID(serviceDefinition, defaults.groupTypeId, appConfig)],
+        partOfGroups: [_getGroupID(appConfig, srvDefinition)],
         visibility,
         resourceDefinitions: [
-            _getResourceDefinition("asyncapi-v2", "json", ordId, serviceName, "asyncapi2.json", accessStrategies),
+            _getResourceDefinition(
+                "asyncapi-v2",
+                "json",
+                ordId,
+                srvDefinition.name,
+                "asyncapi2.json",
+                accessStrategies,
+            ),
         ],
         extensible: { supported: "no" },
         ...(exposedEntityTypes ? { exposedEntityTypes } : []),
@@ -497,9 +510,9 @@ function _getExposedEntityTypes(definitionObj) {
         return _.uniqBy(entityData, CONTENT_MERGE_KEY);
     });
     const exposedEntityTypes = _.uniqBy(entities, CONTENT_MERGE_KEY)
-        .filter((entity) => entity !== undefined)
-        .map(({ ordId }) => ({
-            ordId,
+        .filter((entity) => !!entity)
+        .map((entity) => ({
+            ordId: entity.isODMMapping ? entity.ordId : entity[`${ORD_EXTENSIONS_PREFIX}ordId`] || entity.ordId,
         }));
 
     if (exposedEntityTypes.length > 0) {
@@ -556,7 +569,6 @@ function _extractVersionFromServiceName(serviceName) {
 
     return {
         cleanName: serviceName.replace(versionPattern, ""),
-        version: `v${versionNumber}`,
         semanticVersion: `${versionNumber}.0.0`,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cap-js/ord",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "description": "CAP Plugin for generating ORD document.",
     "repository": "cap-js/ord",
     "author": "SAP SE (https://www.sap.com)",
@@ -33,7 +33,7 @@
         "@cap-js/sqlite": "^2",
         "@sap/cds-dk": ">=8.9.5",
         "eslint": "^10.0.0",
-        "express": "^4",
+        "express": "^5.0.0",
         "jest": "^30.0.0",
         "prettier": "3.8.3",
         "supertest": "^7.0.0"