@sap/cds-dk 7.9.1 → 7.9.2

package/lib/bind/bindingResolver.js

@@ -26,7 +26,10 @@ class BindingResolver {
 
         const resolvedBindings = {}
 
-        await Promise.all(Object.keys(bindings).map(async name => {
+        // Serialized because of parallelization issues in the cf CLI,
+        // see https://github.com/cloudfoundry/cli/issues/2232
+        // await Promise.all(Object.keys(bindings).map(async name => {
+        for (const name of Object.keys(bindings)) {
             const binding = bindings[name]
             const cacheKey = JSON.stringify(binding)
             let resolvedBinding
@@ -37,7 +40,7 @@ class BindingResolver {
                 resolvedBinding = cache[cacheKey]
             }
             resolvedBindings[name] = resolvedBinding
-        }))
+        }
         return Object.keys(resolvedBindings).length > 0 ? resolvedBindings : undefined
     }
 

package/lib/bind/index.js

@@ -31,10 +31,13 @@ async function bind(options) {
 
     const onText = { 'cf': 'Cloud Foundry', 'k8s': 'Kubernetes' }[on];
     if (!options['to-app-services']) logger.log(`Retrieving data from ${bold(onText)}...`);
-    let resolvedServices
 
     const targets = options.to.split(/,/g);
-    resolvedServices = await Promise.all(targets.map(async target => {
+    // Serialized because of parallelization issues in the cf CLI,
+    // see https://github.com/cloudfoundry/cli/issues/2232
+    // resolvedServices = await Promise.all(targets.map(async target => {
+    const resolvedServices = [];
+    for (const target of targets) {
         let binding;
         if (on === 'k8s') {
             binding = { type: on, name: target };
@@ -48,8 +51,8 @@ async function bind(options) {
         resolvedService._target = target;
         delete resolvedService.credentials;
         resolvedService.binding.resolved = false;
-        return resolvedService;
-    }));
+        resolvedServices.push(resolvedService);
+    }
 
     if (options.kind) {
         resolvedServices.forEach(service => service.kind = options.kind);

package/lib/init/template/data/as-json.js

@@ -289,32 +289,44 @@ function randomFromReferenceData (entity, csn, referenceData) {
     .map(([file]) => file)
   if (files.length === 0)  return
 
-  if (files[0].endsWith('.csv')) {
-    const content = cds.utils.fs.readFileSync(files[0]).toString()
+  const toCSV = (content) => {
     const records = cds.parse.csv(content)
     if (records?.length > 1) {
       const header = records[0] // 0 is header line
       const randomRecord = records.length === 2 ? records[1] : records[randomIntInRange({from: 1, to: records.length-1} )]
       let result = {}
       for (let i = 0; i < records[0].length; i++) {
-        result[header[i]] = randomRecord[i]
+        // For csv, which is all strings, convert to correct JSON type.
+        // For simplicity, try to convert the value instead of dispatching on the type.
+        const val = toNum(randomRecord[i]) ?? randomRecord[i]  // boolean is already covered by CSV parser
+        result[header[i]] = val
       }
       return result
     }
   }
+  const toJSON = (records) => {
+    if (records.length === 1)
+      return records[0]
+    else if (records.length > 1)
+      return records[randomIntInRange({from: 0, to: records.length-1} )]
+  }
+
+  if (files[0].endsWith('.csv')) {
+    const content = cds.utils.fs.readFileSync(files[0]).toString()
+    return toCSV(content)
+  }
+  else if (files[0].endsWith('.json')) {
+    const content = cds.utils.fs.readFileSync(files[0]).toString()
+    const records = JSON.parse(content)
+    return toJSON(records)
+  }
   else {
-    let content
-    if (files[0].endsWith('.json')) {
-      content = cds.utils.fs.readFileSync(files[0]).toString()
-    } else {
-      content = files[0] // for tests, assuming the content is given inline
-    }
-    if (content) {
+    const content = files[0] // for tests, assuming the content is given inline
+    try {
       const records = JSON.parse(content)
-      if (records.length === 1)
-        return records[0]
-      else if (records.length > 1)
-        return records[randomIntInRange({from: 0, to: records.length-1} )]
+      return toJSON(records)
+    } catch {
+      return toCSV(content)
     }
   }
 }
@@ -524,3 +536,10 @@ function randomNumber() {
   counter = (counter * counter) % M
   return counter;
 }
+
+function toNum(str){
+  if (typeof(str) === 'number')
+    return str
+  if (typeof(str) === 'string')
+    return +str
+}

package/lib/init/template/mta/files/mta.yaml.hbs

@@ -27,13 +27,13 @@ modules:
 {{/isNodejs}}
 {{#isJava}}
     parameters:
-      buildpack: sap_java_buildpack
+      buildpack: sap_java_buildpack_jakarta
       readiness-health-check-type: http
       readiness-health-check-http-endpoint: /
     properties:
       SPRING_PROFILES_ACTIVE: cloud,sandbox
       JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
-      JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: {{jdkVersion}}.+ }'
+      JBP_CONFIG_SAP_MACHINE_JRE: '{ version: {{jdkVersion}}.+ }'
     build-parameters:
       builder: custom
       commands:

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.9.1",
+      "version": "7.9.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -208,7 +208,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.9.0",
+      "version": "7.9.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/cds-types": "<1",
@@ -225,7 +225,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.9.0",
+      "version": "4.9.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -273,7 +273,7 @@
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "3.0.2",
+      "version": "3.0.3",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/cds": ">=5.6.0",
@@ -2688,11 +2688,8 @@
       "license": "ISC"
     },
     "node_modules/semver": {
-      "version": "7.6.0",
+      "version": "7.6.2",
       "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2700,20 +2697,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/semver/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver/node_modules/yallist": {
-      "version": "4.0.0",
-      "license": "ISC"
-    },
     "node_modules/send": {
       "version": "0.18.0",
       "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [