@sap/cds-dk 7.0.0 → 7.0.2

package/lib/init/index.js

@@ -87,20 +87,20 @@ module.exports = class CDSGenerator {
     }
 
     /**
-     * @param {string} templates, comma separated list of templates, no blanks
+     * @param {string} facets, comma separated list of templates, no blanks
      * @param {any} options, additional options
      */
-    async addCmd(templates, options = {}) {
+    async addCmd(facets, options = {}) {
         options._cmd = COMMAND_ADD;
-        options.add = templates;
+        options.add = facets;
 
-        if (!templates) throw 'You must specify a facet to add to the project.'
+        if (!facets) throw 'You must specify a facet to add to the project.'
 
         this._initialize(null, options);
         this._greetings(options._cmd);
 
         if (!PROJECT_FILES.find(exists)) {
-            throw new Error(`The current folder doesn't seem to contain a project. None of the following files found: ${PROJECT_FILES.join(', ')}.`);
+            throw `The current folder doesn't seem to contain a project. None of the following files found: ${PROJECT_FILES.join(', ')}.`
         }
 
         await this._process(options);
@@ -139,24 +139,19 @@ module.exports = class CDSGenerator {
         this._cleanupOptions();
     }
 
-    _greetings(cmd) {
-        switch (cmd) {
+    _greetings() {
+        switch (cds.cli.command) {
             case COMMAND_INIT: {
                 const relativeProjectPath = path.relative(this.cwd, cds.root);
                 const folderName = (relativeProjectPath ? `.${path.sep}${relativeProjectPath}` : 'current folder');
-                LOG.info(`Creating new cap project in ${folderName}`);
+                LOG.info(`Creating new CAP project in ${term.bold(folderName)}\n`);
                 break;
             }
-            case COMMAND_ADD:
-                LOG.info(`Adding feature(s) to project in current folder`);
-                break;
         }
 
         if (this.options.force) {
-            LOG.info(`Using '--force' ... existing files will be overwritten...!`);
+            LOG.info(`Using '--force' ... existing files will be overwritten`);
         }
-
-        LOG.info();
     }
 
     async _process() {
@@ -172,11 +167,16 @@ module.exports = class CDSGenerator {
             await template.runRelatedMerging();
         }
 
-        LOG.info(`Done adding features`);
-        LOG.info();
+        if (cds.cli.command === COMMAND_INIT) {
+            const relativeProjectPath = path.relative(this.cwd, cds.root)
+            LOG.info(`\nSuccessfully created project. Continue with '${term.bold('cd '+relativeProjectPath)}'.\n`)
+        } else {
+            LOG.info(`\nSuccessfully added features to your project.`)
+        }
     }
 
     async _createTemplate(filename) {
+
         try {
             const TemplateClass = require(`./template/${filename}`);
             return new TemplateClass(this);
@@ -200,26 +200,28 @@ module.exports = class CDSGenerator {
 
     async _fillTemplateList() {
         const templates = new Map();
-        for (const option of this.options.add) {
+        for (let option of this.options.add) {
+            // Compat
+            if (option === 'sample-tiny') option = 'tiny-sample'
+            if (option === 'kibana-logging') option = 'kibana'
+
             if (!templates.has(option)) {
                 const template = await this._createTemplate(option);
-
                 if (await template.canRun()) {
                     DEBUG?.(`Adding feature '${template.name}'`);
-
                     templates.set(option, template);
                     const deps = await template.getDependencies();
                     if (deps) {
-                        deps.forEach(this.options.add.add, this.options.add)
+                        deps.forEach(this.options.add.add, this.options.add) // REVISIT: Ugly add.add
                     }
                 }
             }
         }
 
-        const cmds = Object.values(OPTIONS);
-        this.templateList = Array.from(templates.entries()).sort(([a], [b]) => {
-            return cmds.indexOf(a) - cmds.indexOf(b);
-        }).map((entry) => entry[1]);
+        const cmds = Object.values(OPTIONS)
+        this.templateList = Array.from(templates.entries())
+            .sort(([a], [b]) => cmds.indexOf(a) - cmds.indexOf(b))
+            .map((entry) => entry[1])
 
         // check debug to avoid lengthy computation when not in debug mode
         DEBUG?.(`Features: ${this.templateList.map(({name}) => name).join(', ')}`);
@@ -229,7 +231,6 @@ module.exports = class CDSGenerator {
         for (const template of this.templateList) {
             await template.finalize();
         }
-        LOG.info();
     }
 
     _cleanupOptions() {
@@ -247,18 +248,16 @@ module.exports = class CDSGenerator {
 
         const trimmedTokens = tokens.map((token) => {
             token = token.replace(/\s+/g, '');
-            const tokenSplit = token.split(':');
-            if (tokenSplit.length > 1) {
-                if (this.options[tokenSplit[0]]) {
-                    this.options[tokenSplit[0]].add(token);
+            const tokens = token.split(':'), [facet] = tokens
+            if (tokens.length > 1) {
+                if (this.options[facet]) {
+                    this.options[facet].add(token);
                 } else {
-                    this.options[tokenSplit[0]] = new Set([token]);
+                    this.options[facet] = new Set([token]);
                 }
             }
-            return tokenSplit[0];
-        }).filter((token) => {
-            return !!token;
-        });
+            return facet;
+        }).filter(Boolean);
 
         // set is ordered ... always
         this.options.add = new Set(trimmedTokens);
@@ -294,7 +293,7 @@ module.exports = class CDSGenerator {
 
     async _validateProjectName(projectName) {
         if (!projectName) {
-            throw new Error('Specify a project name.');
+            throw 'Specify a project name.'
         }
 
         // remove duplicates by using a set
@@ -303,9 +302,9 @@ module.exports = class CDSGenerator {
             case 0:
                 break;
             case 1:
-                throw new Error(`Project name ${projectName} contains an invalid character (${[...invalidChars].join(', ')}). Specify a different project name.`);
+                throw `Project name ${projectName} contains an invalid character (${[...invalidChars].join(', ')}). Specify a different project name.`
             default:
-                throw new Error(`Project name ${projectName} contains invalid characters (${[...invalidChars].join(', ')}). Specify a different project name.`);
+                throw `Project name ${projectName} contains invalid characters (${[...invalidChars].join(', ')}). Specify a different project name.`
         }
     }
 
@@ -318,7 +317,7 @@ module.exports = class CDSGenerator {
             } else {
                 message = `You seem to be trying to initialize an existing project. Use a different project name instead.`;
             }
-            throw new Error(`${message}\nDetails: File '${existingProjectFile}' exists in the project folder which indicates an existing project. Use ${term.bold('cds add')} to add more features.`);
+            throw `${message}\nDetails: File '${existingProjectFile}' exists in the project folder which indicates an existing project. Use ${term.bold('cds add')} to add more features.`
         }
     }
 }

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

@@ -93,7 +93,7 @@ const enterpriseMessaging = {
     }]
 }
 
-const kibanaLogging = {
+const kibana = {
     in: 'resources',
     where: [{
         property: 'type',
@@ -278,6 +278,6 @@ module.exports = {
     requiredAppApi4,
     providedJavaApprouterApi4,
     providedJavaApprouterApi,
-    kibanaLogging,
+    kibana,
     approuterExtensibility
 }

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

@@ -3,7 +3,7 @@ const { exists } = cds.utils
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, sort } = require('../../util/merge')
-const { XSUAA } = require('../../constants').OPTIONS
+const { XSUAA, KIBANA } = require('../../constants').OPTIONS
 const {
     srvNode4, srvJava4, mtxSidecar4, approuter, // Modules
     xsuaa, // BTP Services
@@ -23,6 +23,10 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
         return [XSUAA]
     }
 
+    getRelatedFacets() {
+        return [KIBANA]
+    }
+
     async run() {
         const { appPath = 'app' } = await readProject(this.options)
         const appPackageJSONPath = join(appPath, 'package.json')
@@ -33,8 +37,8 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await readProject(this.options)
-        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath } = projectDescriptor
+        const project = await readProject(this.options)
+        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath, appPath } = project
 
         if (hasMta) {
             const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
@@ -45,7 +49,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
             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, {
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), project, {
                 additions,
                 relationships: [{
                     insert: [xsuaa, 'name'],
@@ -67,7 +71,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
             await mergeYAML(
                 join('chart', 'values.yaml'),
                 join(__dirname, 'files', 'values.yaml.hbs'),
-                projectDescriptor
+                project
             )
 
             // add dependency entry in chart.yaml
@@ -88,7 +92,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
                     ]
                   }
                 },
-                projectDescriptor
+                project
             )
 
             const fileName = isMultitenant ? 'approuter-mtxs-configmap.yaml' : 'approuter-configmap.yaml';
@@ -113,8 +117,8 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
             if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }
 
-        const xsAppPath = join(projectDescriptor.appPath ?? 'app', 'xs-app.json')
+        const xsAppPath = join(appPath, 'xs-app.json')
         const additions = isExtensible ? [{ ...approuterExtensibility, at: 0 }] : []
-        await mergeJSON(xsAppPath, join(__dirname, 'files', 'xs-app.json.hbs'), projectDescriptor, { additions })
+        await mergeJSON(xsAppPath, join(__dirname, 'files', 'xs-app.json.hbs'), project, { additions })
     }
 }

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

@@ -13,23 +13,23 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const projectDescriptor = await readProject(this.options)
-        const { configFile } = projectDescriptor
-        projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.['audit-log']?.kind
-        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
+        const project = await readProject(this.options)
+        const { configFile } = project
+        project.shortcut = !(await read(configFile)).cds?.requires?.['audit-log']?.kind
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
         await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await readProject(this.options)
-        const { isNodejs, hasMta, hasHelm, srvPath } = projectDescriptor
+        const project = await readProject(this.options)
+        const { isNodejs, hasMta, hasHelm, srvPath } = project
 
         if (hasMta) {
             const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
             await mergeYAML(
                 'mta.yaml',
                 join(__dirname, 'files', 'mta.yaml.hbs'),
-                projectDescriptor,
+                project,
                 {
                     additions: [srv, auditlog],
                     relationships: [{

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

@@ -10,16 +10,16 @@ module.exports = class CfManifestTemplate extends require('../templateBase') {
 
     async canRun() {
         if (this.options.force) {
-            return true;
+            return true
         }
         if (exists(MANIFEST_FILE) || exists(SERVICES_MANIFEST_FILE)) {
-            throw new Error(`File ${MANIFEST_FILE} or ${SERVICES_MANIFEST_FILE} already exist in current folder. Use --force to overwrite.`);
+            throw `File ${MANIFEST_FILE} or ${SERVICES_MANIFEST_FILE} already exist in current folder. Use --force to overwrite.`
         }
-        return true;
+        return true
     }
 
     async run() {
-        const projectDescriptor = await readProject()
-        await copyFiles(join(__dirname, 'files'), cds.root, projectDescriptor, this.options.force);
+        const project = await readProject()
+        await copyFiles(join(__dirname, 'files'), cds.root, project, this.options.force)
     }
 }

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

@@ -11,15 +11,15 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const projectDescriptor = await readProject(this.options)
-        const { configFile } = projectDescriptor
-        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
+        const project = await readProject(this.options)
+        const { configFile } = project
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
         await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await readProject(this.options)
-        const { isJava, srvPath, hasHelm, hasMta } = projectDescriptor
+        const project = await readProject(this.options)
+        const { isJava, srvPath, hasHelm, hasMta } = project
 
         if (hasMta) {
             const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
@@ -28,7 +28,7 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
                 insert: [connectivity, 'name'],
                 into: [srv, 'requires', 'name']
             }]
-            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), projectDescriptor, { additions, relationships })
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), project, { additions, relationships })
         }
 
         if (hasHelm) {
@@ -41,7 +41,7 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
             await mergeYAML(
                 join('chart', 'values.yaml'),
                 join(__dirname, 'files', 'values.yaml.hbs'),
-                projectDescriptor,
+                project,
                 { additions: [{
                     in: 'srv.additionalVolumes',
                     where: [{

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

@@ -63,7 +63,7 @@ function asRegex(spec) {
         return new RegExp('^'+spec+'.*')
       }
     } catch (err) {
-      throw new Error (err.message) // user error, so cut off stack trace
+      throw err.message // user error, so cut off stack trace
     }
   }
   return /.*/

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

@@ -15,15 +15,15 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const projectDescriptor = await readProject(this.options)
-        const { configFile } = projectDescriptor
-        await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), projectDescriptor)
+        const project = await readProject(this.options)
+        const { configFile } = project
+        await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)
         await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await readProject(this.options)
-        const { isJava, hasHelm, hasDestination, hasMta, srvPath, hasHtml5Repo } = projectDescriptor
+        const project = await readProject(this.options)
+        const { isJava, hasHelm, hasDestination, hasMta, srvPath, hasHtml5Repo } = project
 
         if (hasMta) {
             const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
@@ -32,7 +32,7 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
                 insert: [destination, 'name'],
                 into: [srv, 'requires', 'name']
             }]
-            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), projectDescriptor, { additions, relationships })
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), project, { additions, relationships })
         }
 
         if (hasHelm) {

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

@@ -20,23 +20,23 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
   }
 
   async run() {
-    const projectDescriptor = await readProject(this.options)
-    const { configFile } = projectDescriptor
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
+    const project = await readProject(this.options)
+    const { configFile } = project
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
     await this.runDependentMerging()
   }
 
   async runDependentMerging(context = {}) {
-    const projectDescriptor = await readProject(this.options)
-    const { hasXsuaa, hasHelm, hasMta, isNodejs, srvPath, appName } = projectDescriptor
+    const project = await readProject(this.options)
+    const { hasXsuaa, hasHelm, hasMta, isNodejs, srvPath, appName } = project
 
     if (hasMta) {
-      await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), projectDescriptor)
+      await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), project)
       const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
       await mergeYAML(
           'mta.yaml',
           join(__dirname, 'files', 'mta.yaml.hbs'),
-          projectDescriptor,
+          project,
           {
               additions: [srv, enterpriseMessaging],
               relationships: [{
@@ -49,14 +49,14 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
 
     if (hasXsuaa) {
       if (hasMta) {
-        projectDescriptor['em-service-name'] = YAML.parse(await read('mta.yaml'))?.resources?.find(r => r?.parameters?.service === 'enterprise-messaging')?.name
+        project['em-service-name'] = YAML.parse(await read('mta.yaml'))?.resources?.find(r => r?.parameters?.service === 'enterprise-messaging')?.name
       } else {
-        projectDescriptor['em-service-name'] = `${appName}-messaging`
+        project['em-service-name'] = `${appName}-messaging`
       }
       await mergeJSON(
         'xs-security.json',
         join(__dirname, 'files', 'xs-security.json.hbs'),
-        projectDescriptor,
+        project,
         {
           additions: [{
             in: 'scopes',

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

@@ -19,24 +19,24 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../tem
   }
 
   async run() {
-    const projectDescriptor = await readProject(this.options)
-    const { configFile } = projectDescriptor
-    projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
-    await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), projectDescriptor)
+    const project = await readProject(this.options)
+    const { configFile } = project
+    project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), project)
     await this.runDependentMerging()
   }
 
   async runDependentMerging() {
-    const projectDescriptor = await readProject(this.options)
-    const { hasMta, isNodejs, srvPath } = projectDescriptor
+    const project = await readProject(this.options)
+    const { hasMta, isNodejs, srvPath } = project
 
     if (hasMta) {
       const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
       await mergeYAML(
           'mta.yaml',
           join(__dirname, 'files', 'mta.yaml.hbs'),
-          projectDescriptor,
+          project,
           {
               additions: [srv, enterpriseMessaging],
               relationships: [{

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

@@ -21,20 +21,20 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
   }
 
   async run() {
-    const projectDescriptor = await readProject(this.options)
-    const { configFile } = projectDescriptor
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
+    const project = await readProject(this.options)
+    const { configFile } = project
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
     await this.runDependentMerging()
   }
 
   async runDependentMerging() {
-    const projectDescriptor = await readProject(this.options)
-    const { hasXsuaa } = projectDescriptor
+    const project = await readProject(this.options)
+    const { hasXsuaa } = project
     if (hasXsuaa) {
       await mergeJSON(
         'xs-security.json',
         join(__dirname, 'files', 'xs-security.json.hbs'),
-        projectDescriptor,
+        project,
         {
           additions: [{
             in: 'scopes',

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

@@ -16,9 +16,9 @@ module.exports = class FileBasedMessagingTemplate extends require('../templateBa
   }
 
   async run() {
-    const projectDescriptor = await readProject(this.options)
-    const { configFile } = projectDescriptor
-    projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
+    const project = await readProject(this.options)
+    const { configFile } = project
+    project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
   }
 }

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

@@ -20,11 +20,11 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const projectDescriptor = await readProject(this.options)
-        const { isJava, configFile } = projectDescriptor
-        projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+        const project = await readProject(this.options)
+        const { isJava, configFile } = project
+        project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
 
-        const env = await this.getEnv() // REVISIT: Get info from projectDescriptor
+        const env = await this.getEnv() // REVISIT: Get info from project
 
         // REVISIT: Let cds build generate by default
         const hdiConfigPath = join(env.folders.db, 'src', '.hdiconfig')
@@ -41,7 +41,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             await this._updatePomXml()
         }
 
-        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor, { forceOverwrite: true })
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project, { forceOverwrite: true })
 
         const packageJson = exists('package.json') ? await read('package.json') : undefined
         if (packageJson?.dependencies) {
@@ -66,8 +66,8 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await readProject(this.options)
-        const { hasMta, hasHelm, hasHtml5Repo, isJava, isMultitenant, srvPath } = projectDescriptor
+        const project = await readProject(this.options)
+        const { hasMta, hasHelm, hasHtml5Repo, isJava, isMultitenant, srvPath } = project
 
 
         if (hasMta) {
@@ -109,7 +109,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             await mergeYAML(
                 'mta.yaml',
                 join(__dirname, 'files', 'mta.yaml.hbs'),
-                projectDescriptor,
+                project,
                 { additions: [...modules, db].filter(a => a), deletions, relationships }
             )
         }
@@ -159,7 +159,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                             }
                         ]
                     },
-                    projectDescriptor,
+                    project,
                     { deletions: [{
                         item: {
                             in: `dependencies`,
@@ -174,7 +174,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                 await mergeYAML(
                     join('chart', 'values.yaml'),
                     join(__dirname, 'files', 'values.yaml.hbs'),
-                    projectDescriptor
+                    project
                 )
 
                 // copy content deployment chart if it is not present
@@ -204,7 +204,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             } catch (err) {
                 // REVISIT: This should not have to be checked and tested in a facet implementation, move to Maven util
                 if (err.code === 'ENOENT' && err.path === 'mvn') {
-                    throw new Error(`Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`);
+                    throw `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
                 }
                 throw err;
             }

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

@@ -51,7 +51,7 @@ module.exports = class HelmTemplate extends require('../templateBase') {
     }
 
     async addDependency(name, alias){
-        const projectDescriptor = await readProject(this.options);
+        const project = await readProject(this.options);
         const isInternal = await this.isInternal();
         await mergeYAML(
             join('chart', 'Chart.yaml'),
@@ -65,7 +65,7 @@ module.exports = class HelmTemplate extends require('../templateBase') {
                     }
                 ]
             },
-            projectDescriptor,
+            project,
             { additions: [{
                 in: `dependencies`,
                 where: [{
@@ -77,7 +77,7 @@ module.exports = class HelmTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const projectDescriptor = await readProject(this.options)
+        const project = await readProject(this.options)
         const isInternal = this.options['internal-unified-runtime-charts'] !== undefined && this.options['internal-unified-runtime-charts'];
         this.oldTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'));
         await this.addSubChart('web-application', !isInternal);
@@ -90,7 +90,7 @@ module.exports = class HelmTemplate extends require('../templateBase') {
         await mergeYAML(
             join('chart', 'Chart.yaml'),
             join(__dirname, 'files', 'Chart.yaml.hbs'),
-            projectDescriptor
+            project
         )
 
         await this.addDependency('web-application', 'srv');
@@ -98,7 +98,7 @@ module.exports = class HelmTemplate extends require('../templateBase') {
         await mergeYAML(
             join('chart', 'values.yaml'),
             join(__dirname, 'files', 'values.yaml.hbs'),
-            projectDescriptor
+            project
         )
         await this.runDependentMerging();
         await writeMd5File(join('chart', '.cds-add-helm-files.md5'), this.newTrackingData);

package/lib/init/template/html5-repo/index.js

@@ -13,8 +13,8 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
     }
 
     async canRun() {
-        const projectDescriptor = await readProject(this.options)
-        const { hasMta, hasHelm } = projectDescriptor
+        const project = await readProject(this.options)
+        const { hasMta, hasHelm } = project
         if (!hasHelm && hasMta) {
             throw `'cds add html5-repo' is not available for Cloud Foundry yet`
         }