@sap/cds-dk 8.3.0 → 8.4.1

package/lib/import/openapi/utilities.js

@@ -2,8 +2,13 @@ module.exports = { cdsName, nameFromPath, pathAndMethod, serviceName };
 
 function cdsName(oasName) {
   if (oasName === "") return "_";
+  if (typeof oasName === "number") return `_${JSON.stringify(oasName)}`;
   let name = oasName;
-  if (name.match(/^(\p{Nd}|\p{Mn}|\p{Mc}|\p{Pc}|\p{Cf})/u)) name = "_" + name;
+  if (
+    !name.startsWith("_") &&
+    name.match(/^(\p{Nd}|\p{Mn}|\p{Mc}|\p{Pc}|\p{Cf})/u)
+  )
+    name = "_" + name;
   return name.replace(/[^_\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]/gu, "_");
   //TODO: shorten if longer than 128 characters
 }
@@ -15,7 +20,7 @@ function nameFromPath(path, method) {
     .replace(/{[^}]+}/g, ".")
     .replace(/\/\./g, "_")
     .replace(/[^_\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]/gu, "_");
-  if (cleanPath === "") cleanPath = "_";
+  if (cleanPath === "") cleanPath = "_root";
   //TODO: shorten if longer than 128 characters
   return method === "get" ? cleanPath : `${cleanPath}_${method}`;
 }

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '3.2.0',
+    MAVEN_ARCHETYPE_VERSION: '3.4.0',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -24,6 +24,7 @@ module.exports = {
         MULTITENANCY: 'multitenancy',
         TOGGLES: 'toggles',
         EXTENSIBILITY: 'extensibility',
+        SIDE_BY_SIDE_EXTENSIBILITY: 'side-by-side-extensibility',
         MTX: 'mtx',
         XSUAA: 'xsuaa',
         HANA: 'hana',

package/lib/init/index.js

@@ -265,6 +265,10 @@ module.exports = class CDSGenerator {
         // set is ordered ... always
         options.add = new Set(trimmedTokens);
 
+        if (options?.java) { // --java -> --add java
+            options.add.add('java')
+        }
+
         if (cds.cli.command === COMMAND_INIT && !options.add.has(JAVA)) {
             options.add.add(NODEJS);
         }

package/lib/init/projectReader.js

@@ -89,7 +89,7 @@ module.exports = new class ProjectReader {
      * @property {boolean} hasApprouter Indicates if the project uses the SAP Application Router.
      * @property {boolean} hasHtml5Repo Indicates if the project uses the SAP BTP HTML5 Application Repository.
      * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal service.
-     * @property {boolean} hasWorkzone Indicates if the project uses the SAP Build Work Zone service.
+     * @property {boolean} hasWorkzoneStandard Indicates if the project uses the SAP Build Work Zone, Standard Edition service.
      * @property {boolean} hasDestination Indicates if the project uses the SAP BTP Destination service.
      * @property {boolean} hasMTXRoute Indicates if the approuter should have a multitenant route.
      * @property {boolean} hasMTXRouteJava Indicates if the approuter should have a multitenant subscription route (java).
@@ -118,7 +118,6 @@ module.exports = new class ProjectReader {
         const isApp = name => name !== 'appconfig' && !name.startsWith('_') && name !== 'router' && name !== 'portal'
         const reserved = {
             has: x => _inProd(x),
-            shortcut: () => true,
             profile: () => cds.cli.options?.for,
             language: () => exists('pom.xml') ? 'java' : 'nodejs',
             isJava: () => _isJava(),

package/lib/init/registries/mta.js

@@ -5,7 +5,8 @@ const srvNode4 = path => ({ in: 'modules', where: { type: 'nodejs', path } })
 const srvJava4 = path => ({ in: 'modules', where: { type: 'java', path } })
 
 // REVISIT: Clean up
-const isJava = process.argv[process.argv.indexOf('--add') + 1].split(',').includes('java') || cds.env['project-nature'] === 'java' || cds.cli.options?.add?.has('java')
+const isJava = process.argv[process.argv.indexOf('--add') + 1].split(/[,\s+]/).includes('java') || cds.env['project-nature'] === 'java' || cds.cli.options?.add?.has('java') || process.argv.includes('--java')
+
 const srv4 = isJava ? srvJava4 : srvNode4
 
 const approuter = { in: 'modules', where: { type: 'approuter.nodejs' } }
@@ -25,6 +26,11 @@ const destinations = {
     where: { type: 'com.sap.application.content', 'build-parameters.no-source': true }
 }
 
+const destinationSideBySideExtensibility = {
+    in: [destinations, 'parameters.content.subaccount.destinations' ],
+    where: { URL: '~{srv-api/srv-url}', Authentication: 'OAuth2ClientCredentials' }
+}
+
 const connectivity = {
     in: 'resources',
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'connectivity' }
@@ -186,6 +192,7 @@ module.exports = {
     xsuaa,
     destination,
     destinations,
+    destinationSideBySideExtensibility,
     connectivity,
     enterpriseMessaging,
     kafkaMessaging,

package/lib/init/template/application-logging/files/package.json.hbs

@@ -1,7 +1,11 @@
 {
+  {{#isNodejs}}
   "cds": {
+  {{/isNodejs}}
     "requires": {
-      "application-logging": true
-    }
+        "application-logging": true
+      }
+  {{#isNodejs}}
   }
+  {{/isNodejs}}
 }

package/lib/init/template/application-logging/index.js

@@ -1,6 +1,7 @@
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, mtxSidecar4, applicationLogging, approuter } = require('../../registries/mta')
+const mvn = require('../../mvn')
 
 module.exports = class ApplicationLoggingTemplate extends require('../../plugin') {
 
@@ -20,10 +21,9 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
 
     async run() {
         const project = readProject()
-        const { isNodejs } = project
-        if (isNodejs) {
-            await merge(__dirname, 'files/package.json.hbs').into('package.json')
-        }
+        const { isJava, configFile } = project
+        await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
+        if (isJava) await mvn.add('APPLICATION_LOGGING')
     }
 
     async combine() {

package/lib/init/template/approuter/files/package.json

@@ -1,10 +1,10 @@
 {
   "name": "approuter",
   "dependencies": {
-    "@sap/approuter": "^16.0.0"
+    "@sap/approuter": "^17.0.0"
   },
   "engines": {
-    "node": "^20.0.0"
+    "node": "^22.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/approuter/approuter.js"

package/lib/init/template/cf-manifest/files/manifest.yml.hbs

@@ -20,7 +20,9 @@ applications:
   disk_quota: 512M
   env:
     SPRING_PROFILES_ACTIVE: cloud
-  buildpack: java_buildpack
+    JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jdk.SAPMachineJDK']"
+    JBP_CONFIG_SAP_MACHINE_JDK: '{ version: 21.+ }'
+  buildpack: sap_java_buildpack_jakarta
 {{/isJava}}
   services:
 {{#hasHana}}

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

@@ -47,7 +47,7 @@ module.exports = async (data={}, csn, { headerOnly=false, separator=',' }={}) =>
           }
           else {
             if (i === 0)  header.push(name)
-            if (Array.isArray(value)) { // `array of` / `many`
+            if (Array.isArray(value) || typeof value === 'object') { // `array of`/`many` and `cds.Map`
               value = JSON.stringify(value)
             }
             value = escape(value)

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

@@ -10,35 +10,37 @@ const MAX_ASSOC_DEPTH = 5
  *
  * @param {Record<string, object[]>|undefined} data the data with entities and their records to be created
  * @param {object} csn the model
- * @param {Number} numRecords the number of records to be created for each entity
+ * @param {Number} numRecords the number of records to be created for each artifact
  * @param {{referenceData? : Record<string, string}} options misc. options
  * @returns {Record<string, object[]>} the filled data
  */
 const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
-  let { referenceData, contentType } = options
+  let { referenceData, contentType, artifact='entity' } = options
 
-  // if no entity restrictions are given, use all entities
-  if (!data)  data = csn.all('entity').reduce((all, e) => { all[e.name] = []; return all }, {})
+  // if no data is given, use all data
+  if (!data) {
+    data = csn.all(artifact).reduce((all, e) => { all[e.name] = []; return all }, {})
+  }
 
   // if no reference data is given, scan for it using cds.deploy.resources
   if (!referenceData)  referenceData = await cds.deploy.resources(csn)
 
   // sort all entities first that are referenced by others, so that dependant entities can be created after them
   const { definitions: defs } = csn
-  const entityNames = Object.keys(data).sort((n1, n2) => {
-    const n1HasComp = Object.values(defs[n1].elements).some(el => el.type === 'cds.Composition')
-    const n2HasComp = Object.values(defs[n2].elements).some(el => el.type === 'cds.Composition')
+  const names = Object.keys(data).sort((n1, n2) => {
+    const n1HasComp = Object.values(defs[n1].elements??[]).some(el => el.type === 'cds.Composition')
+    const n2HasComp = Object.values(defs[n2].elements??[]).some(el => el.type === 'cds.Composition')
     if (n1HasComp && !n2HasComp)  return -1
     if (!n1HasComp && n2HasComp)  return 1
     return 0
   })
 
   // requested entities shall always be created, so remove it from reference data
-  Object.entries(referenceData).filter(([, name]) => entityNames.includes(name)).forEach(([file]) => delete referenceData[file])
+  Object.entries(referenceData).filter(([, name]) => names.includes(name)).forEach(([file]) => delete referenceData[file])
 
   addSemantics(csn)
 
-  for (const name of entityNames) {
+  for (const name of names) {
     if (!data[name] // removed on purpose because records are created inline through compositions
       || data[name].length >= numRecords) { // numRecords already created by following associations
       continue
@@ -47,26 +49,26 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
     let numRecordsToGenerate // numRecords might be reduced if some records were created by following associations
     let records = []
     if (data[name].length > 0) {
-      numRecordsToGenerate = numRecords - data[name].length 
+      numRecordsToGenerate = numRecords - data[name].length
       records = Array(numRecordsToGenerate).fill({}).map(() => ({}))
     } else {
       numRecordsToGenerate = numRecords
       records = data[name] = Array(numRecordsToGenerate).fill({}).map(() => ({}))
     }
-    const entity = defs[name]
+    const artifact = defs[name]
 
     const idNum = randomNumber()
     for (let i = 0; i < numRecordsToGenerate; i++) {
-      fillRecord(records[i], idNum+i, entity, csn, data, null, 0, referenceData)
+      fillRecord(records[i], idNum+i, artifact, csn, data, null, 0, referenceData)
     }
-    data[name] = data[name].concat(records) // append the new records to the possibly existingand referenced records
+    data[name] = data[name].concat(records) // append the new records to the possibly existing and referenced records
     // remove records w/ duplicate keys. This can happen if the key is an enum (and we have less enum values than requested records).
-    data[name] = uniqRecords(data[name], entity)
+    data[name] = uniqRecords(data[name], artifact)
   }
   for (let [key, d] of Object.entries(data)) {
     if (contentType === 'json' && d.deleteReference && !d.keepReferece) {
       delete data[key]
-    } 
+    }
     delete d.keepReferece
     delete d.deleteReference
     uniqRecords(d, csn.definitions[key])
@@ -74,13 +76,13 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
   return data
 }
 
-function fillRecord(record, recordID, entity, csn, data, parentEntity, depth, referenceData) {
+function fillRecord(record, recordID, artifact, csn, data, parent, depth, referenceData) {
   Object.defineProperty(record, '$id', {value: recordID, enumerable: false})
-  if (data[entity.name]) data[entity.name].push(record) // add id to data, to be referenced by associations to prevent circular dependencies
+  if (data[artifact.name]) data[artifact.name].push(record) // add id to data, to be referenced by associations to prevent circular dependencies
 
-  const { elements } = entity
-  Object.values(elements).sort(asJson.elementsSorter(csn)).forEach(el => {
-    record[el.name] = dataForField(el, entity, csn, record, data, parentEntity, depth, referenceData)
+  const elems = Object.values(artifact.elements ?? artifact.params).sort(asJson.elementsSorter(csn))
+  elems.forEach(el => {
+    record[el.name] = dataForField(el, artifact, csn, record, data, parent, depth, referenceData)
   })
   return record
 }
@@ -110,7 +112,7 @@ asJson.elementsSorter = function (csn) {
 }
 
 
-function dataForField(element, entity, csn, record, data, parentEntity, depth, referenceData) {
+function dataForField(element, artifact, csn, record, data, parent, depth, referenceData) {
   if (element.virtual || (element['@Core.Computed'] && element.value))
     return
   if (record[element.name] !== undefined)
@@ -119,12 +121,12 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
   if (element.items?.elements)  // `array of` / `many` with complex type
     return [ fillRecord({}, record['$id'], element.items, csn, data, null, depth+1, referenceData) ]
   else if (element.items?.type) // `array of` / `many` with simple type
-    return [ dataForField(element.items, entity, csn, record, data, null, depth+1, referenceData) ]
+    return [ dataForField(element.items, artifact, csn, record, data, null, depth+1, referenceData) ]
 
   if (element.is_struct) {
     let struct = {}
     for (const el of element.elements) {
-      struct[el.name] = dataForField(el, entity, csn, record, data, null, depth+1, referenceData)
+      struct[el.name] = dataForField(el, artifact, csn, record, data, null, depth+1, referenceData)
     }
     return struct
   }
@@ -166,11 +168,11 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
         const enumName = randomFromList(Object.keys(element.enum))
         const value = element.enum[enumName].val ?? element.enum[enumName].value ?? enumName
         // key of common.CodeList, also fill name and descr with enum name
-        if (element.key && entity.elements.name && entity.elements.descr)
+        if (element.key && artifact.elements.name && artifact.elements.descr)
           record.name = record.descr = enumName
         return value
       }
-      if (entity['@Communication.Contact.email']?.some(mail => mail.address?.['='] === element.name)
+      if (artifact['@Communication.Contact.email']?.some(mail => mail.address?.['='] === element.name)
         || element['@Communication.IsEmailAddress']
         || element['@cds.on.insert']?.['='] === '$user'
         || element['@cds.on.update']?.['='] === '$user') {
@@ -180,9 +182,9 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
       let str = `${element.name}-${record['$id']}`
 
       if (element.key) {
-        str = `${entity.name.split('.').pop()}-${record['$id']}`
-        if (element.name === 'locale' && entity.name.endsWith('texts')) {
-          const record = randomFromReferenceData(entity, csn, referenceData)
+        str = `${artifact.name.split('.').pop()}-${record['$id']}`
+        if (element.name === 'locale' && artifact.name.endsWith('texts')) {
+          const record = randomFromReferenceData(artifact, csn, referenceData)
           if (record)  return record.locale
           return randomLanguage()
         }
@@ -237,15 +239,15 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
     }
     case 'cds.Composition': {
       const target = csn.definitions[element.target]
-      if (!target || entity.name === target.name || depth > MAX_ASSOC_DEPTH) return
-      
+      if (!target || artifact.name === target.name || depth > MAX_ASSOC_DEPTH) return
+
       let targetRecords = [] // in findKeysInOnCondition target records are linked to the entity, we don't want to overwrite any existing data
       if (data[target.name]) data[target.name].deleteReference = true // for json composites references are nested and will be deleted when writing to file
-    
+
       const targetRecordCount = element.is2many ? 2 : 1 // TODO: make this configurable
       const targetRecordID = randomNumber()
       for (let i = 0; i < targetRecordCount; i++) {
-        const newRecord = fillRecord({}, targetRecordID+i, target, csn, data, entity, depth+1, referenceData)
+        const newRecord = fillRecord({}, targetRecordID+i, target, csn, data, artifact, depth+1, referenceData)
         if (newRecord) targetRecords.push(newRecord)
       }
 
@@ -259,8 +261,8 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
       }
       uniqRecords(targetRecords, target)
 
-      // set the entire target record inline
-      return element.is2many ? targetRecords : targetRecords[0]
+      // consistent return data type: array
+      return element.is2many ? targetRecords : [targetRecords[0]]
     }
     case 'cds.Association': {
       if (element.is2many)
@@ -280,16 +282,16 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
           targetRecords = data[target.name] = []
         else if (!targetRecords) // target entity is not in the list of entities to be created
           return
-        
+
         if (targetRecords.length > 0) { // use record generated by following asociation
           targetRecord = targetRecords.at(-1)  // make sure the localized record references the newly generated texts
         } else {
-          targetRecord = fillRecord({}, randomNumber(), target, csn, data, entity, depth+1, referenceData)
+          targetRecord = fillRecord({}, randomNumber(), target, csn, data, artifact, depth+1, referenceData)
           if (targetRecord) {
             targetRecords.push(targetRecord)
             uniqRecords(targetRecords, target)
           }
-          if (parentEntity && (parentEntity.name != entity.name)) data[target.name].keepReferece = true
+          if (parent && (parent.name != artifact.name)) data[target.name].keepReferece = true
         }
       }
 
@@ -307,8 +309,10 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
       return
     case 'cds.Vector': // TODO add Vector
       return
+    case 'cds.Map':
+      return {}
     default: {
-      console.error(`Unknown type ${element._type} (${element.type}) in '${entity.name}:${element.name}'`)
+      console.error(`Unknown type ${element._type} (${element.type}) in '${artifact.name}:${element.name}'`)
       return
     }
   }
@@ -393,14 +397,14 @@ function findKeysInOnCondition(assocElement, target) {
   return [ownKey, ownKeyStructured, targetKey]
 }
 
-function uniqRecords(records, entity) {
-  const keys = Object.keys(entity.keys||{})
-  if (keys.length === 0)  return records
+function uniqRecords(records, artifact) {
+  const keys = Object.keys(artifact.keys||{})
+  if (keys.length === 0)  keys.push('$id') // no keys (e.g. in actions) -> use record's $id
   const keySet = new Set()
   for (let i = 0; i < records.length; i++) {
     const key = keys.map(k => records[i][k]).join('|')
     if (keySet.has(key)) {
-      // console.debug('Removing', keys, key, 'from', entity.name)
+      // console.debug('Removing', keys, key, 'from', artifact.name)
       records.splice(i, 1)
       i--
     }

package/lib/init/template/enterprise-messaging-shared/index.js

@@ -34,7 +34,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
     const project = readProject()
     const { configFile, isNodejs } = project
     if (isNodejs) {
-      project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+      project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
       project.cloudevents = cds.cli.options.cloudevents
       await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
     }

package/lib/init/template/file-based-messaging/index.js

@@ -21,7 +21,7 @@ module.exports = class FileBasedMessagingTemplate extends require('../../plugin'
   async run() {
     const project = readProject()
     const { configFile } = project
-    project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
   }
 }

package/lib/init/template/hana/files/db/package.json

@@ -5,7 +5,7 @@
     "@sap/hdi-deploy": "^5"
   },
   "engines": {
-    "node": "^20.0.0"
+    "node": "^22.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js --use-hdb",

package/lib/init/template/hana/files/package.json.hbs

@@ -1,7 +1,9 @@
 {
+  {{#isNodejs}}
   "dependencies": {
     "@cap-js/hana": "^1"
   },
+  {{/isNodejs}}
   {{#isNodejs}}
   "cds": {
   {{/isNodejs}}

package/lib/init/template/hana/index.js

@@ -20,7 +20,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
     async run() {
         const project = readProject()
         const { isJava, configFile, db } = project
-        project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+        project.shortcut = typeof (await read(configFile)).cds?.requires?.db !== 'object'
 
         // REVISIT: Let cds build generate those by default
         await merge(__dirname, 'files/src/.hdiconfig').into(join(db.folder, 'src/.hdiconfig'))

package/lib/init/template/handler/index.js

@@ -5,7 +5,7 @@ const mvn = require('../../mvn')
 module.exports = class Handler extends require('../../plugin') {
 
   static help() {
-    return 'add handler stubs for actions and functions (Java)' 
+    return 'add handler stubs for actions and functions (Java)'
   }
 
   options() {

package/lib/init/template/html5-repo/files/app-package.json.hbs

@@ -8,13 +8,13 @@
     "start": "ui5 serve"
   },
   "devDependencies": {
-    {{#hasWorkzone}}"@sap/ui5-builder-webide-extension": "^1.1.9",{{/hasWorkzone}}
+    {{#hasWorkzoneStandard}}"@sap/ui5-builder-webide-extension": "^1.1.9",{{/hasWorkzoneStandard}}
     "@ui5/cli": "^4",
     "ui5-task-zipper": "^3"
   },
   "ui5": {
     "dependencies": [
-      {{#hasWorkzone}}"@sap/ui5-builder-webide-extension",{{/hasWorkzone}}
+      {{#hasWorkzoneStandard}}"@sap/ui5-builder-webide-extension",{{/hasWorkzoneStandard}}
       "ui5-task-zipper"
     ]
   }

package/lib/init/template/html5-repo/files/ui5-deploy.yaml.hbs

@@ -13,13 +13,13 @@ builder:
       - "/test/**"
       - "/localService/**"
   customTasks:
-    {{#hasWorkzone}}
+    {{#hasWorkzoneStandard}}
     - name: webide-extension-task-updateManifestJson
       afterTask: replaceVersion
       configuration:
         appFolder: webapp
         destDir: dist
-    {{/hasWorkzone}}
+    {{/hasWorkzoneStandard}}
     - name: ui5-task-zipper
       afterTask: generateVersionInfo
       configuration:

package/lib/init/template/http/index.js

@@ -130,9 +130,12 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       for (const e of service.entities) {
         payload[e.name] = []
       }
+      for (const a of service.actions) {
+        payload[a.name] = []
+      }
     }
     // csn.all('entity').reduce((all, e) => { all[e.name] = []; return all }, {})
-    await asJson(payload, csn, 1)
+    await asJson(payload, csn, 1, {referenceData: []})
     for (const p in payload) {
       delete payload[p][0].texts
       delete payload[p][0].localized
@@ -195,12 +198,8 @@ module.exports = class HttpTemplate extends require('../../plugin') {
 
           let actionPayload = {}
           if (a.params) {
-            for (const [key, value] of Object.entries(a.params)) {
-              actionPayload[key] = value.type === 'cds.Integer' ? 1
-                : value.type === 'string' ? 'sample string'
-                  // TODO reference an object that has been generated
-                  : typeof value.type === 'object' && value.type.ref ? payload[value.type.ref[0]][0][value.type.ref[1]]
-                    : null
+            for (const pName of Object.keys(a.params)) {
+              actionPayload[pName] = payload[a.name]?.[0]?.[pName] ?? null
             }
           }
           requests.push(`\n### ${simpleNameAction}\n# @name ${simpleNameAction}_POST\nPOST ${url}\n${headers}\n\n${JSON.stringify(actionPayload, null, 2)}\n`)

package/lib/init/template/local-messaging/index.js

@@ -22,7 +22,7 @@ module.exports = class LocalMessagingTemplate extends require('../../plugin') {
   async run() {
     const project = readProject()
     const { configFile } = project
-    project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
   }
 }

package/lib/init/template/nodejs/files/.vscode/extensions.json

@@ -1,8 +1,4 @@
 {
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
 		"SAPSE.vscode-cds",
 		"dbaeumer.vscode-eslint",
@@ -11,7 +7,6 @@
 		"qwtel.sqlite-viewer",
 		"humao.rest-client"
 	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [
 
 	]

package/lib/init/template/nodejs/files/.vscode/settings.json

@@ -8,4 +8,4 @@
     // "tab",
     // "tsv"
   ]
-}
+}

package/lib/init/template/nodejs/files/.vscode/tasks.json

@@ -1,6 +1,4 @@
 {
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
   "version": "2.0.0",
   "tasks": [
     {

package/lib/init/template/nodejs/files/package.json.hbs

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@cap-js/sqlite": "^1",
-    "@cap-js/cds-types": "^0.6"
+    "@cap-js/cds-types": "^0.7.0"
   },
   "scripts": {
     "start": "cds-serve"

package/lib/init/template/postgres/index.js

@@ -24,7 +24,7 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
   async run() {
     const project = readProject()
     const { configFile, isJava } = project
-    project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+    project.shortcut = typeof (await read(configFile)).cds?.requires?.db !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into('package.json', { project })
     if (isJava) await mvn.add('postgresql')
   }

package/lib/init/template/redis-messaging/index.js

@@ -28,7 +28,7 @@ module.exports = class RedisMessagingTemplate extends require('../../plugin') {
   async run() {
     const project = readProject()
     const { configFile } = project
-    project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
   }
 }

package/lib/init/template/side-by-side-extensibility/files/mta.yaml.hbs

@@ -0,0 +1,40 @@
+---
+modules:
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
+    provides:
+      - name: srv-api # required by consumers of CAP services (e.g. approuter)
+        properties:
+          srv-url: ${default-url}
+
+  - name: {{appName}}-destinations
+    type: com.sap.application.content
+    requires:
+      - name: {{appName}}-auth
+        parameters:
+          service-key:
+            name: {{appName}}-auth-key
+      - name: srv-api
+      - name: {{appName}}-destination
+        parameters:
+          content-target: true
+    build-parameters:
+      no-source: true
+    parameters:
+      content:
+        subaccount:
+          existing_destinations_policy: update
+          destinations:
+            - Name: {{appName}}-side-by-side-extensibility
+              URL: ~{srv-api/srv-url}
+              Authentication: OAuth2ClientCredentials
+              TokenServiceInstanceName: {{appName}}-auth
+              TokenServiceKeyName: {{appName}}-auth-key
+
+resources:
+  - name: {{appName}}-destination
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: destination
+      service-plan: lite