@cap-js/ord 1.3.12 → 1.3.14

package/lib/constants.js

@@ -14,7 +14,7 @@ const BLOCKED_SERVICE_NAME = Object.freeze({
 
 const ORD_ACCESS_STRATEGY = Object.freeze({
     Open: "open",
-    Basic: "sap.businesshub:basic-auth:v1",
+    Basic: "basic-auth",
 });
 
 const AUTH_TYPE_ORD_ACCESS_STRATEGY_MAP = Object.freeze({
@@ -60,7 +60,7 @@ const LEVEL = Object.freeze({
     subEntity: "sub-entity",
 });
 
-const OPEN_RESOURCE_DISCOVERY_VERSION = "1.9";
+const OPEN_RESOURCE_DISCOVERY_VERSION = "1.12";
 
 const ORD_EXTENSIONS_PREFIX = "@ORD.Extensions.";
 

package/lib/interopCsn.js

@@ -4,6 +4,7 @@ const localize = require("@sap/cds/lib/i18n/localize");
 function interopCSN(csn) {
     if (typeof csn != "object" || csn === null) return csn; // handle non-object inputs early
     add_i18n_texts(csn);
+    remove_localized_assoc(csn);
     map_annotations(csn);
     add_meta_info(csn);
     return csn;
@@ -61,6 +62,30 @@ function add_i18n_texts(csn) {
     }
 }
 
+//
+// remove association "localized" for localized texts
+//
+// The "localized" association for localized elements contains a reference to $user.locale
+// and is specific to the CAP. It needs to be removed from the interop CSN.
+//
+function remove_localized_assoc(csn) {
+    // how to detect "localized" association?
+    // - name is "localized"
+    // - type is "cds.Association"
+    // - target name is source name + ".texts"
+    // - there is an ON condition 
+    for (let n1 in csn.definitions) {
+        let def = csn.definitions[n1];
+        if (def.kind === "entity")
+            for (let n2 in def.elements) {
+                let el = def.elements[n2];
+                if (n2 === "localized" && el.type === "cds.Association" && el.target === `${n1}.texts` && el.on) {
+                    delete def.elements[n2];
+                }
+            }
+    }
+}
+
 //
 // annotation mapping/replacement
 //
@@ -103,6 +128,8 @@ function add_meta_info(csn) {
     csn["csnInteropEffective"] = "1.0";
     csn.meta ??= {};
     csn.meta.flavor = "effective";
+    // Remove compiler creator information – not relevant for ORD interop and leaks build details
+    if (csn.meta.creator) delete csn.meta.creator;
 
     let services = Object.entries(csn.definitions).filter(([, def]) => def.kind === "service");
     if (services.length === 1) {

package/lib/ord-service.js

@@ -3,8 +3,7 @@ const { ord, getMetadata, defaults, authentication, Logger } = require("./index.
 
 class OpenResourceDiscoveryService extends cds.ApplicationService {
     init() {
-        const logger = Logger.Logger;
-        cds.app.get(`${this.path}`, cds.middlewares.before, (_, res) => {
+        cds.app.get(`${this.path}`, (_, res) => {
             return res.status(200).send(defaults.baseTemplate);
         });
 
@@ -23,7 +22,7 @@ class OpenResourceDiscoveryService extends cds.ApplicationService {
                 const { contentType, response } = await getMetadata(req.url);
                 return res.status(200).contentType(contentType).send(response);
             } catch (error) {
-                logger.error(error, "Error while processing the resource definition document");
+                Logger.error(error, "Error while processing the resource definition document");
                 return res.status(500).send(error.message);
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cap-js/ord",
-    "version": "1.3.12",
+    "version": "1.3.14",
     "description": "CAP Plugin for generating ORD document.",
     "repository": "cap-js/ord",
     "author": "SAP SE (https://www.sap.com)",
@@ -8,7 +8,8 @@
     "license": "Apache-2.0",
     "workspaces": [
         "xmpl",
-        "xmpl_java"
+        "xmpl_java",
+        "__tests__/integration-test-app"
     ],
     "main": "cds-plugin.js",
     "files": [
@@ -20,13 +21,15 @@
     "scripts": {
         "lint": "npx eslint .",
         "test": "jest --ci --collectCoverage",
+        "test:integration": "jest __tests__/integration.test.js --testTimeout=30000 --testPathIgnorePatterns=/node_modules/ --forceExit",
         "update-snapshot": "jest --ci --updateSnapshot",
         "cds:version": "cds v -i"
     },
     "devDependencies": {
         "eslint": "^9.2.0",
         "jest": "^30.0.0",
-        "prettier": "3.6.2"
+        "prettier": "3.6.2",
+        "supertest": "^7.0.0"
     },
     "peerDependencies": {
         "@sap/cds": ">=8.9.4",
@@ -35,10 +38,13 @@
     "dependencies": {
         "@cap-js/asyncapi": "^1.0.3",
         "@cap-js/openapi": "^1.2.1",
-        "bcryptjs": "3.0.2",
+        "bcryptjs": "3.0.3",
         "cli-progress": "^3.12.0",
         "lodash": "^4.17.21"
     },
+    "engines": {
+        "node": ">=18 <23"
+    },
     "cds": {
         "requires": {
             "SAP ORD Service": {