@sap/cds-dk 6.6.2 → 6.7.0

package/lib/init/template/_merging/registry-mta.js

@@ -1,20 +1,26 @@
 // Registry of sequence matchers in mta.yaml files
 
-const srvNode = {
+const srvNode = path => ({
     in: 'modules',
     where: [{
         property: 'type',
-        isEqualTo: 'nodejs'
+        isEqualTo: 'nodejs',
+    }, {
+        property: 'path',
+        isEqualTo: path
     }],
-}
+})
 
-const srvJava = {
+const srvJava = path => ({
     in: 'modules',
     where: [{
         property: 'type',
         isEqualTo: 'java'
+    }, {
+        property: 'path',
+        isEqualTo: path
     }],
-}
+})
 
 const approuter = {
     in: 'modules',
@@ -115,8 +121,8 @@ const saasRegistry = {
     }]
 }
 
-const srvAPI = {
-    in: 'provides',
+const srvAPI = srv => ({
+    in: [srv, 'provides'],
     where: [{
         property: 'name',
         isEqualTo: 'srv-api'
@@ -124,31 +130,20 @@ const srvAPI = {
         property: 'properties.srv-url',
         isEqualTo: '${default-url}'
     }]
-}
+})
 
-const mtxSidecar = {
+const mtxSidecar4 = path => ({
     in: 'modules',
     where: [{
         property: 'type',
         isEqualTo: `nodejs`
     }, {
         property: 'path',
-        isEqualTo: `mtx/sidecar`
-    }]
-}
-
-const providedMtxAPISrv = {
-    in: [srvNode, 'provides'],
-    where: [{
-        property: 'name',
-        isEqualTo: 'mtx-api'
-    }, {
-        property: 'properties.mtx-url',
-        isEqualTo: '${default-url}'
+        isEqualTo: path // 'gen/mtx/sidecar' REVISIT: Same build destination for Java/Node.js would simplify this a lot
     }]
-}
+})
 
-const providedMtxAPISidecar = {
+const providedMtxAPISidecar4 = mtxSidecar => ({
     in: [mtxSidecar, 'provides'],
     where: [{
         property: 'name',
@@ -157,7 +152,7 @@ const providedMtxAPISidecar = {
         property: 'properties.mtx-url',
         isEqualTo: '${default-url}'
     }]
-}
+})
 
 const requiredMtxAPI = {
     in: [approuter, 'requires'],
@@ -184,8 +179,8 @@ const providedAppAPI = {
     }],
 }
 
-const requiredAppAPI = {
-    in: [srvNode, 'requires'],
+const requiredAppAPI = module => ({
+    in: [module, 'requires'],
     where: [{
         property: 'name',
         isEqualTo: 'app-api'
@@ -193,31 +188,23 @@ const requiredAppAPI = {
         property: 'properties.SUBSCRIPTION_URL',
         isEqualTo: '~{app-protocol}://\\${tenant_subdomain}-~{app-uri}'
     }]
-}
+})
 
-const providedMtxSidecarAPI = {
-    in: [mtxSidecar, 'provides'],
-    where: [{
-        property: 'properties.url',
-        isEqualTo: '${default-url}'
-    }]
-}
-
-const requiredMtxSidecarAPI = {
-    in: [srvJava, 'requires'],
+const requiredMtxSidecarAPI = srv => ({
+    in: [srv, 'requires'],
     where: [{
         property: 'properties.CDS_MULTITENANCY_SIDECAR_URL',
-        isEqualTo: '~{url}'
+        isEqualTo: '~{mtx-url}'
     }]
-}
+})
 
-const requiredJavaApprouterAPI = {
-    in: [srvJava, 'requires'],
+const requiredJavaApprouterAPI = srv => ({
+    in: [srv, 'requires'],
     where: [{
         property: 'properties.CDS_MULTITENANCY_APPUI_URL',
         isEqualTo: '~{url}'
     }]
-}
+})
 
 const providedJavaApprouterAPI = {
     in: [approuter, 'requires'],
@@ -267,11 +254,9 @@ module.exports = {
     serviceManager,
     saasRegistry,
     srvAPI,
-    mtxSidecar,
-    providedMtxAPISrv,
-    providedMtxAPISidecar,
+    mtxSidecar4,
+    providedMtxAPISidecar4,
     requiredMtxAPI,
-    providedMtxSidecarAPI,
     requiredMtxSidecarAPI,
     providedAppAPI,
     requiredAppAPI,

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

@@ -1,7 +1,8 @@
 ---
 modules:
   - name: {{cap.appName}}-srv
-    type: {{cap.pLanguage}}
+    type: {{cap.language}}
+    path: {{& cap.srvPath}}
     {{#cap.isJava}}
     {{#cap.isMultitenant}}
     properties:
@@ -10,13 +11,6 @@ modules:
     {{/cap.isJava}}
     requires:
       - name: {{cap.appName}}-auth
-    {{#cap.isNodejs}}
-    {{#cap.isMultitenant}}
-      - name: app-api
-        properties:
-          SUBSCRIPTION_URL: ~{app-protocol}://\${tenant_subdomain}-~{app-uri}
-    {{/cap.isMultitenant}}
-    {{/cap.isNodejs}}
     {{#cap.isJava}}
       - name: app-api
         properties:
@@ -64,6 +58,16 @@ modules:
           url: ${default-url}
     {{/cap.isJava}}
 
+  {{#cap.isMultitenant}}
+  - name: {{cap.appName}}-mtx
+    type: nodejs
+    path: {{#cap.isNodejs}}gen/{{/cap.isNodejs}}mtx/sidecar
+    requires:
+      - name: app-api
+        properties:
+          SUBSCRIPTION_URL: ~{app-protocol}://\${tenant_subdomain}-~{app-uri}
+  {{/cap.isMultitenant}}
+
 resources:
   - name: {{cap.appName}}-auth
     type: org.cloudfoundry.managed-service

package/lib/init/template/approuter/files/xs-app.json.hbs

@@ -1,5 +1,4 @@
 {
-  "authenticationMethod": "route",
   "routes": [
     {{#cap.isExtensible}}
     {
@@ -12,14 +11,12 @@
       "source": "^/app/(.*)$",
       "target": "$1",
       "localDir": ".",
-      "authenticationType": "xsuaa",
       "cacheControl": "no-cache, no-store, must-revalidate"
     },
     {
       "source": "^/(.*)$",
       "target": "$1",
       "destination": "srv-api",
-      "authenticationType": "xsuaa",
       "csrfProtection": true
     }
   ]

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

@@ -3,7 +3,7 @@ const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, sortDependencies } = require('../../util/merge')
 const { OPTION_XSUAA, PROJECT_TYPE } = require('../../constants')
 const {
-    srvNode, srvJava, approuter, // Modules
+    srvNode, srvJava, mtxSidecar4, approuter, // Modules
     xsuaa, // BTP Services
     requiredMtxAPI, requiredJavaApprouterAPI, providedJavaApprouterAPI, // APIs
     requiredAppAPI, providedAppAPI,
@@ -24,7 +24,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
     async run() {
         const projectDescriptor = await readProject(this.options)
         const { for: forProfile } = projectDescriptor.cap
-        const appPath = join(this.projectPath, projectDescriptor.ui.appPath ?? 'app')
+        const appPath = projectDescriptor.ui.appPath ?? 'app'
         const appPackageJSONPath = join(appPath, 'package.json')
 
         await mergeJSON(appPackageJSONPath, join(__dirname, 'files', 'package.json'))
@@ -35,17 +35,15 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
         const projectType = this.getProjectType()
         switch (projectType) {
             case PROJECT_TYPE.java: {
-                const cdsrcJSONPath = join(this.projectPath, '.cdsrc.json')
                 const cdsTemplateFile = forProfile ? 'cds.cdsrc.json.hbs' : 'cds.cdsrc.json'
                 const cdsPackageJSONPath = join(__dirname, 'files', cdsTemplateFile)
-                await mergeJSON(cdsrcJSONPath, cdsPackageJSONPath, projectDescriptor)
+                await mergeJSON('.cdsrc.json', cdsPackageJSONPath, projectDescriptor)
                 break
             }
             case PROJECT_TYPE.nodejs: {
-                const packageJSONPath = join(this.projectPath, 'package.json')
                 const cdsTemplateFile = forProfile ? 'cds.package.json.hbs' : 'cds.package.json'
                 const cdsPackageJSONPath = join(__dirname, 'files', cdsTemplateFile)
-                await mergeJSON(packageJSONPath, cdsPackageJSONPath, projectDescriptor)
+                await mergeJSON('package.json', cdsPackageJSONPath, projectDescriptor)
                 break
             }
         }
@@ -55,16 +53,18 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
 
     async runDependentMerging(context = {}) {
         const projectDescriptor = await readProject(this.options)
-        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm } = projectDescriptor.cap
+        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath } = projectDescriptor.cap
 
         if (hasMta) {
-            const srv = isNodejs ? srvNode : srvJava
-            const apis = isJava ? [requiredJavaApprouterAPI, providedJavaApprouterAPI] : []
-            if (isNodejs && isMultitenant) apis.push(requiredMtxAPI, requiredAppAPI, providedAppAPI)
+            const srv = (isNodejs ? srvNode : srvJava)(srvPath)
+            const apis = isJava ? [requiredJavaApprouterAPI(srv), providedJavaApprouterAPI] : []
+            const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
+            if (isNodejs && isMultitenant) apis.push(requiredMtxAPI, requiredAppAPI(mtxSidecar), providedAppAPI)
             if (isJava && isMultitenant) apis.push(requiredMtxAPI)
-            const additions = [srv, approuter, xsuaa, ...apis]
-            const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
-            await mergeYAML(mtaYAMLPath, join(__dirname, 'files', 'mta.yaml.hbs'), projectDescriptor, {
+            const modules = [srv, approuter]
+            if (isMultitenant) modules.push(mtxSidecar)
+            const additions = [...modules, xsuaa, ...apis]
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), projectDescriptor, {
                 additions,
                 relationships: [{
                     insert: [xsuaa, 'name'],
@@ -80,30 +80,22 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
             let isIndependentCommand = false;
             if (Object.keys(context).length == 0) {
                 isIndependentCommand = true;
-                context.projectPath = this.projectPath;
-                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'));
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'));
             }
 
             await mergeYAML(
-                join(this.projectPath, 'chart', 'values.yaml'),
+                join('chart', 'values.yaml'),
                 join(__dirname, 'files', 'values.yaml.hbs'),
                 projectDescriptor
             )
 
+            // add dependency entry in chart.yaml
+            const HelmTemplate = require(`../helm`);
+            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            await helmTemplate.addDependency('web-application', 'approuter');
+
             await mergeYAML(
-                join(this.projectPath, 'chart', 'Chart.yaml'),
-                join(__dirname, 'files', 'chart.yaml'),
-                projectDescriptor,
-                { additions: [{
-                    in: `dependencies`,
-                    where: [{
-                        property: 'alias',
-                        isEqualTo: 'approuter'
-                    }]
-                }]}
-            )
-            await mergeYAML(
-                join(this.projectPath, 'chart', 'values.yaml'),
+                join('chart', 'values.yaml'),
                 {
                   approuter: {
                     envFrom: [
@@ -122,17 +114,17 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
 
             await copyAndTrack(
                 join(__dirname, 'files', fileName),
-                join(this.projectPath, 'chart', 'templates', 'approuter-configmap.yaml'),
+                join('chart', 'templates', 'approuter-configmap.yaml'),
                 context,
-                true
+                { force: true }
             )
 
-            if (isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData);
+            if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }
 
-        const appPath = join(this.projectPath, projectDescriptor.ui.appPath ?? 'app')
+        const xsAppPath = join(projectDescriptor.ui.appPath ?? 'app', 'xs-app.json')
         const additions = isExtensible && isJava ? [{ ...approuterExtensibilityJava, at: 0 }] :
                           isExtensible && isNodejs ? [{ ...approuterExtensibility, at: 0 }] : []
-        await mergeJSON(join(appPath, 'xs-app.json'), join(__dirname, 'files', 'xs-app.json.hbs'), projectDescriptor, { additions })
+        await mergeJSON(xsAppPath, join(__dirname, 'files', 'xs-app.json.hbs'), projectDescriptor, { additions })
     }
 }

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

@@ -1,7 +1,8 @@
 ---
 modules:
  - name: {{cap.appName}}-srv
-   type: {{cap.pLanguage}}
+   type: {{cap.language}}
+   path: {{& cap.srvPath}}
    requires:
     - name: {{cap.appName}}-auditlog
 

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

@@ -16,13 +16,12 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
 
     async runDependentMerging(context = {}) {
         const projectDescriptor = await readProject(this.options)
-        const { isNodejs, hasMta, hasHelm } = projectDescriptor.cap
+        const { isNodejs, hasMta, hasHelm, srvPath } = projectDescriptor.cap
 
         if (hasMta) {
-            const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
-            const srv = isNodejs ? srvNode : srvJava
+            const srv = (isNodejs ? srvNode : srvJava)(srvPath)
             await mergeYAML(
-                mtaYAMLPath,
+                'mta.yaml',
                 join(__dirname, 'files', 'mta.yaml.hbs'),
                 projectDescriptor,
                 {
@@ -40,12 +39,11 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
             let isIndependentCommand = false
             if(Object.keys(context).length == 0){
                 isIndependentCommand = true
-                context.projectPath = this.projectPath
-                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
             }
 
             await mergeYAML(
-                join(this.projectPath, 'chart', 'values.yaml'),
+                join('chart', 'values.yaml'),
                 {
                     srv: { bindings: {
                         auditlog: { serviceInstanceName: 'auditlog' }
@@ -56,27 +54,16 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
                     }
                 }
             )
-            
+
             // copy service instance chart if it is not present
             const HelmTemplate = require(`../helm`);
             const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
             // add dependency entry in chart.yaml
-            await mergeYAML(
-                join(this.projectPath, 'chart', 'Chart.yaml'),
-                join(__dirname, 'files', 'auditlog.yaml'),
-                projectDescriptor,
-                { additions: [{
-                    in: `dependencies`,
-                    where: [{
-                        property: 'alias',
-                        isEqualTo: 'auditlog'
-                    }]
-                }]}
-            )
+            await helmTemplate.addDependency('service-instance', 'auditlog');
 
-            if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+            if(isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }
 }

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

@@ -1,21 +1,21 @@
 # Generated manifest.yml based on template version 0.1.0
 # appName = {{cap.appName}}
-# language={{cap.pLanguage}}
+# language={{cap.language}}
 # multitenancy={{cap.isMultitenant}}
 ---
 applications:
 # -----------------------------------------------------------------------------------
 # Backend Service
 # -----------------------------------------------------------------------------------
-- name: {{cap.appName}}-{{cap.srv.name}}
+- name: {{cap.appName}}-{{cap.srvName}}
   random-route: true  # for development only
 {{#cap.isNodejs}}
-  path: {{& cap.srv.path}}
+  path: {{& cap.srvPath}}
   memory: 256M
   buildpack: nodejs_buildpack
 {{/cap.isNodejs}}
 {{#cap.isJava}}
-  path: {{& cap.srv.path}}/target/{{cap.srv.ext.archiveName}}
+  path: {{& cap.srvPath}}/target/{{cap.srvExt.archiveName}}
   memory: 1G
   disk_quota: 512M
   env:

package/lib/init/template/cf-manifest/index.js

@@ -1,4 +1,5 @@
 const { join } = require('path')
+const cds = require('../../../cds')
 const { exists } = require('../../../cds').utils
 const { readProject } = require('../../util/projectReader')
 const { copyFiles } = require('../../util/templateUtil')
@@ -19,6 +20,6 @@ module.exports = class CfManifestTemplate extends require('../templateBase') {
 
     async run() {
         const projectDescriptor = await readProject()
-        await copyFiles(join(__dirname, 'files'), this.projectPath, projectDescriptor, this.options.force);
+        await copyFiles(join(__dirname, 'files'), cds.root, projectDescriptor, this.options.force);
     }
 }

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

@@ -18,12 +18,11 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
             let isIndependentCommand = false
             if(Object.keys(context).length == 0){
                 isIndependentCommand = true
-                context.projectPath = this.projectPath
-                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
             }
 
             await mergeYAML(
-                join(this.projectPath, 'chart', 'values.yaml'),
+                join('chart', 'values.yaml'),
                 join(__dirname, 'files', 'values.yaml.hbs'),
                 projectDescriptor,
                 { additions: [{
@@ -35,9 +34,9 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
                 }]}
             )
             const filesPath = join(__dirname, 'files')
-            const templatesPath = join(this.projectPath, 'chart', 'templates')
+            const templatesPath = join('chart', 'templates')
             await copyAndTrack(join(filesPath, 'connectivity-proxy-info.yaml'), join(templatesPath, 'connectivity-proxy-info.yaml'), context)
-            if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+            if(isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }
 }

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

@@ -3,7 +3,7 @@ const cds = require('../../../cds')
 const { exists, fs } = cds.utils
 const { resolve, join, relative }  = require('path');
 const LOG = console
-const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) && console.debug
+const DEBUG = cds.debug('cli')
 
 module.exports = class DataTemplate extends require('../templateBase') {
 
@@ -12,13 +12,16 @@ module.exports = class DataTemplate extends require('../templateBase') {
 
     let dest = (typeof this.options.out === 'string') // target folder
       ? this.options.out
-      : getDefaultTargetFolder(env, this.projectPath);
-    dest = resolve(this.projectPath, dest);
+      : getDefaultTargetFolder(env);
+    dest = resolve(cds.root, dest);
 
     const nameFilter = asRegex(this.options['data:for'] || this.options.for)
     const force = this.options.force;
 
-    let csn = await cds.compile.to.csn(cds.env.roots); // normal CSN
+    let csn = await cds.compile.to.csn(cds.env.roots) // normal CSN
+
+    // Skip of unused reuse entities like Language, Country, Currency
+    csn = cds.minify(csn)
 
     // Also include 'external' entities w/ cds.persistence.skip (similar to 'mocked' option of serve).
     // Could be too much sometimes, but don't want to bother users w/ a separate option for this.
@@ -31,7 +34,7 @@ module.exports = class DataTemplate extends require('../templateBase') {
       .filter (e => e.name.match(nameFilter)) // --for prefix|regex
       .filter (e => !e.query) // exclude entities with queries (projection on, select from ...)
       .filter (e => e.name !== 'DRAFT.DraftAdministrativeData' && !e.name.endsWith('.drafts')) // exclude draft stuff
-      .forEach(e => processEntity(e, dest, this.projectPath, csn, force));
+      .forEach(e => processEntity(e, dest, csn, force));
   }
 }
 
@@ -39,7 +42,7 @@ function includeExternalEntities(model) {
   for (let each in model.definitions) {
     const def = model.definitions[each]
     if (def['@cds.persistence.skip'] === true) {
-      DEBUG && DEBUG('Including skipped entity '+each)
+      DEBUG?.('Including skipped entity '+each)
       delete def['@cds.persistence.skip']
     }
   }
@@ -62,7 +65,7 @@ function asRegex(spec) {
   return /.*/
 }
 
-function processEntity (entity, dest, projectPath, csn, force) {
+function processEntity (entity, dest, csn, force) {
   let dataFileName;
   const namespace = getNamespace(csn, entity.name);
   if (!namespace || namespace == entity.name) {
@@ -80,34 +83,28 @@ function processEntity (entity, dest, projectPath, csn, force) {
     const dataFileNameOldFormat = dataFileName.replace('.texts.csv','_texts.csv');
     const dataFilePathOldFormat = join(dest, dataFileNameOldFormat);
     if (exists(dataFilePathOldFormat)) {
-      createDataFile(true, dataFilePathOldFormat, dest, projectPath, force, entity);
+      createDataFile(true, dataFilePathOldFormat, dest, force, entity);
       return;
     }
   }
 
   const dataFilePath = join(dest, dataFileName);
-  createDataFile(exists(dataFilePath), dataFilePath, dest, projectPath, force, entity);
+  createDataFile(exists(dataFilePath), dataFilePath, dest, force, entity);
 }
 
-function getDefaultTargetFolder (env, projectPath) {
-  const dbFolder = env.folders.db;
+function getDefaultTargetFolder (env) {
+  const { db } = env.folders
   // csv files should be located in the 'db/data' folder unless a 'db/csv' folder already exists
-  let mockDataFolder;
-  if (exists(join(projectPath, dbFolder, 'csv'))) {
-    mockDataFolder = 'csv';
-  } else {
-    mockDataFolder = 'data';
-  }
-  return join(dbFolder, mockDataFolder);
+  return join(db, exists(join(db, 'csv')) ? 'csv' : 'data')
 }
 
 
-function createDataFile (isFileExists, dataFilePath, dest, projectPath, force, entity) {
+function createDataFile (isFileExists, dataFilePath, dest, force, entity) {
   let relFilePath = dataFilePath;
-  if (dataFilePath.indexOf(projectPath) == 0) {
+  if (dataFilePath.indexOf(cds.root) === 0) {
     // use relative path in log (for readability), only when data files are added within the project
     // (potentially can be located anywhere using the --out parameter)
-    relFilePath = relative(projectPath, dataFilePath);
+    relFilePath = relative(cds.root, dataFilePath);
   }
   if (isFileExists && !force) {
     LOG.info(`Skipping ${relFilePath}`);
@@ -134,7 +131,7 @@ function prepareDataFileContent (entity) {
       if (!persistenceKeyNames.includes(k1) && persistenceKeyNames.includes(k2))  return 1
       return 0 // preserve original order otherwise
     })
-    .join(';')
+    .join(',') // using comma as csv separator by default
 }
 
 // Logic is taken from cds-compile

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

@@ -36,11 +36,10 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
             let isIndependentCommand = false
             if(Object.keys(context).length == 0){
                 isIndependentCommand = true
-                context.projectPath = this.projectPath
-                context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
+                context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
             }
             await mergeYAML(
-                join(this.projectPath, 'chart', 'values.yaml'),
+                join('chart', 'values.yaml'),
                 {
                     ...binding,
                     ...html5Binding,
@@ -54,27 +53,16 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
                     }
                 }
             )
-            
+
             // copy service instance chart if it is not present
             const HelmTemplate = require(`../helm`);
             const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
             // add dependency entry in chart.yaml
-            await mergeYAML(
-                join(this.projectPath, 'chart', 'Chart.yaml'),
-                join(__dirname, 'files', 'destination.yaml'),
-                projectDescriptor,
-                { additions: [{
-                    in: `dependencies`,
-                    where: [{
-                        property: 'alias',
-                        isEqualTo: 'destination'
-                    }]
-                }]}
-            )
+            await helmTemplate.addDependency('service-instance', 'destination');
 
-            if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+            if(isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }
 }

package/lib/init/template/enterprise-messaging/files/mta.yaml.hbs

@@ -1,7 +1,8 @@
 ---
 modules:
  - name: {{cap.appName}}-srv
-   type: {{cap.pLanguage}}
+   type: {{cap.language}}
+   path: {{& cap.srvPath}}
    requires:
     - name: {{cap.appName}}-messaging