@sap/cds-dk 7.0.2 → 7.1.0

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

@@ -6,7 +6,7 @@ const { mergeJSON } = require('../../util/merge')
 module.exports = class FileBasedMessagingTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { isJava } = await readProject(this.options)
+    const { isJava } = await readProject()
     if (isJava) throw `'cds add file-based-messaging' is not available for Java yet`
     return true
   }
@@ -16,7 +16,7 @@ module.exports = class FileBasedMessagingTemplate extends require('../templateBa
   }
 
   async run() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     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/files/mta.yaml.hbs

@@ -9,7 +9,7 @@ modules:
 {{^isMultitenant}}
   - name: {{appName}}-db-deployer
     type: hdb
-    path: {{& db.0.path}}
+    path: {{& db.path}}
     parameters:
       buildpack: nodejs_buildpack
 {{#isJava}}

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

@@ -1,17 +1,15 @@
-const { join } = require('path');
+const { join } = require('path')
 const cds = require('../../../cds')
 const { read, write, exists, rmdir } = cds.utils
-const commandUtil = require('../../../util/command');
-const mvnArchetypes = require('../../util/mvn');
-const term = require('../../../util/term');
+const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, removeFromYAML, removeFromYAMLArray } = require('../../util/merge')
+const mvn = require('../../util/mvn')
 const { parseMd5File, writeMd5File } = require('../../util/md5')
 const { copyFiles } = require('../../util/template')
-const { readProject } = require('../../util/projectReader');
 
-const { OPTIONS: { JAVA }, URLS } = require('../../constants');
+const { OPTIONS: { JAVA } } = require('../../constants')
 
-const { srvNode4, srvJava4, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../_merging/registry-mta');
+const { srvNode4, srvJava4, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../_merging/registry-mta')
 
 module.exports = class HanaTemplate extends require('../templateBase') {
 
@@ -20,56 +18,40 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
-        const { isJava, configFile } = project
+        const project = await readProject()
+        const { isJava, configFile, db } = project
         project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
 
-        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')
+        const hdiConfigPath = join(db.folder, 'src', '.hdiconfig')
         const hdiConfigTemplatePath = join(__dirname, 'files', 'src', '.hdiconfig')
         await mergeJSON(hdiConfigPath, hdiConfigTemplatePath)
 
         // REVISIT: Let csd build generate by default
-        const undeployJSONPath = join(env.folders.db, 'undeploy.json')
+        const undeployJSONPath = join(db.folder, 'undeploy.json')
         const undeployJSONTemplatePath = join(__dirname, 'files', 'undeploy.json')
         await mergeJSON(undeployJSONPath, undeployJSONTemplatePath)
 
         if (isJava) {
-            await copyFiles(join(__dirname, 'files', 'db'), env.folders.db, {}, this.options.force)
-            await this._updatePomXml()
+            await copyFiles(join(__dirname, 'files', 'db'), db.folder, {}, cds.cli.options.force)
+            // REVISIT: shouldn't behave differently during cds init
+            // if called during cds init the project generation call to AT will add settings
+            if (!cds.cli.options.add.has(JAVA)) await mvn.execMvn(mvn.getAddHanaCmdArgs())
         }
 
-        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project, { forceOverwrite: true })
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project, { forceOverwrite: true }) // REVISIT: forceOverwrite: true as default?
 
-        const packageJson = exists('package.json') ? await read('package.json') : undefined
+        const packageJson = exists('package.json') ? await read('package.json') : null
         if (packageJson?.dependencies) {
             delete packageJson.dependencies['@sap/hana-client']
             await write('package.json', packageJson, { spaces: 2 })
         }
-        await this.runDependentMerging()
-    }
-
-    async removeEntriesFromContext(context, key) {
-        Object.keys(context.oldTrackingData).forEach(fileName => {
-            if (fileName.startsWith(key)) {
-              delete context.oldTrackingData[fileName];
-            }
-        });
-
-        Object.keys(context.newTrackingData).forEach(fileName => {
-            if (fileName.startsWith(key)) {
-              delete context.newTrackingData[fileName];
-            }
-        });
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { hasMta, hasHelm, hasHtml5Repo, isJava, isMultitenant, srvPath } = project
 
-
         if (hasMta) {
             const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
             const db = isMultitenant ? serviceManager : hdiContainer
@@ -92,26 +74,23 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                 into: [srv, 'requires', 'name']
             }]
 
-            if (!isMultitenant) {
+            if (isMultitenant) {
                 relationships.push({
-                    insert: [hdiContainer, 'name'],
-                    into: [hdbDeployer, 'requires', 'name']
+                    insert: [serviceManager, 'name'],
+                    into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
                 })
             } else {
                 relationships.push({
-                    insert: [serviceManager, 'name'],
-                    into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
+                    insert: [hdiContainer, 'name'],
+                    into: [hdbDeployer, 'requires', 'name']
                 })
             }
 
-            const modules = !isMultitenant ? [srv, hdbDeployer] : [srv]
+            const modules = isMultitenant ? [srv] : [srv, hdbDeployer]
 
-            await mergeYAML(
-                'mta.yaml',
-                join(__dirname, 'files', 'mta.yaml.hbs'),
-                project,
-                { additions: [...modules, db].filter(a => a), deletions, relationships }
-            )
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), project, {
+                additions: [...modules, db].filter(a => a), deletions, relationships
+            })
         }
 
         if (hasHelm) {
@@ -123,7 +102,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             }
 
             const HelmTemplate = require(`../helm`);
-            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
 
             if(isMultitenant){
                 shouldUpdateTrackingFile = true;
@@ -137,7 +116,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                 // remove content-deployment subchart if html5Repo doesn't exist
                 if(!hasHtml5Repo) {
                     const contentDeploymentEntriesPattern = "charts/content-deployment/"
-                    await this.removeEntriesFromContext(context, contentDeploymentEntriesPattern);
+                    this.removeEntriesFromContext(context, contentDeploymentEntriesPattern);
 
                     const contentDeploymentSubchartPath = join('chart', 'charts', 'content-deployment');
                     if(exists(contentDeploymentSubchartPath)) {
@@ -193,21 +172,18 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         }
     }
 
-    async _updatePomXml() {
-        // if called during cds init the project generation call to AT will add settings
-        if (!this.options.add.has(JAVA)) {
-            const mvnAddHanaArgs = mvnArchetypes.getAddHanaCmdArgs(this.options);
-            try {
-                await commandUtil.spawnCommand('mvn', mvnAddHanaArgs, {
-                    cwd: cds.root
-                });
-            } 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 `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
-                }
-                throw err;
+    // REVISIT: tracking data massaging is getting too much -> revisit md5 tracking
+    removeEntriesFromContext(context, key) {
+        Object.keys(context.oldTrackingData).forEach(fileName => {
+            if (fileName.startsWith(key)) {
+              delete context.oldTrackingData[fileName]
             }
-        }
+        })
+
+        Object.keys(context.newTrackingData).forEach(fileName => {
+            if (fileName.startsWith(key)) {
+              delete context.newTrackingData[fileName]
+            }
+        })
     }
 }

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

@@ -1,13 +1,14 @@
 const { join } = require('path');
-const { exists, rimraf } = require('../../../cds').utils;
+const cds = require('../../../cds')
+const { exists, rimraf } = cds.utils
 const { readProject } = require('../../util/projectReader');
 const { mergeYAML } = require('../../util/merge')
 const { parseMd5File, writeMd5File, copyAndTrack } = require('../../util/md5')
 
 module.exports = class HelmTemplate extends require('../templateBase') {
 
-    constructor(generator, oldTrackingData = undefined, newTrackingData = {}) {
-        super(generator)
+    constructor(oldTrackingData = undefined, newTrackingData = {}) {
+        super()
         this.oldTrackingData = oldTrackingData;
         this.newTrackingData = newTrackingData;
     }
@@ -16,18 +17,19 @@ module.exports = class HelmTemplate extends require('../templateBase') {
         return ['hana', 'xsuaa', 'auditlog', 'enterprise-messaging', 'destination' , 'multitenancy', 'extensibility', 'approuter', 'connectivity']
     }
 
-    static hasFacet(_, options) {
+    static hasFacet() {
         // REVISIT: this works, but could be semantically nicer with a 'shouldRunDependentMerging' or the like
-        if (options?.add.has('mta') && !options?.add.has('helm')) return false
+        const { add } = cds.cli.options
+        if (add.has('mta') && !add.has('helm')) return false
         return exists(join('chart', 'values.yaml'))
     }
 
     async canRun() {
-        if (this.options.force) {
+        if (cds.cli.options.force) {
             await rimraf(join('chart'))
-            return true;
+            return true
         }
-        return true;
+        return true
     }
 
     async addSubChart(subchart, force = false) {
@@ -47,11 +49,11 @@ module.exports = class HelmTemplate extends require('../templateBase') {
     }
 
     async isInternal() {
-        return !exists(join('chart', 'charts', 'web-application')) || this.options['internal-unified-runtime-charts'];
+        return !exists(join('chart', 'charts', 'web-application')) || cds.cli.options['internal-unified-runtime-charts'];
     }
 
     async addDependency(name, alias){
-        const project = await readProject(this.options);
+        const project = await readProject();
         const isInternal = await this.isInternal();
         await mergeYAML(
             join('chart', 'Chart.yaml'),
@@ -77,8 +79,8 @@ module.exports = class HelmTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
-        const isInternal = this.options['internal-unified-runtime-charts'] !== undefined && this.options['internal-unified-runtime-charts'];
+        const project = await readProject()
+        const isInternal = cds.cli.options['internal-unified-runtime-charts'] !== undefined && cds.cli.options['internal-unified-runtime-charts'];
         this.oldTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'));
         await this.addSubChart('web-application', !isInternal);
         await copyAndTrack(
@@ -100,7 +102,6 @@ module.exports = class HelmTemplate extends require('../templateBase') {
             join(__dirname, 'files', 'values.yaml.hbs'),
             project
         )
-        await this.runDependentMerging();
         await writeMd5File(join('chart', '.cds-add-helm-files.md5'), this.newTrackingData);
     }
-};
+}

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

@@ -13,7 +13,7 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
     }
 
     async canRun() {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { hasMta, hasHelm } = project
         if (!hasHelm && hasMta) {
             throw `'cds add html5-repo' is not available for Cloud Foundry yet`
@@ -26,12 +26,8 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
         return exists(join('chart', 'templates', 'html5-apps-deployer-configmap.yaml'))
     }
 
-    async run() {
-        await this.runDependentMerging()
-    }
-
     async runDependentMerging(context = {}) {
-        const { appName, hasHelm } = await readProject(this.options)
+        const { appName, hasHelm } = await readProject()
 
         if (hasHelm) {
             //in case facet is being added to the already exisiting charts folder
@@ -78,7 +74,7 @@ module.exports = class Html5RepoTemplate extends require('../templateBase') {
 
             // copy content deployment chart if it is not present
             const HelmTemplate = require(`../helm`);
-            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('content-deployment');
 
             // add dependency entry in chart.yaml

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

@@ -23,13 +23,13 @@ module.exports = class JavaTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const { cmdLine, artifactId, archetypeVersion } = await mvn.getGenerateCmdArgs(this.projectName, this.options)
+        const { cmdLine, artifactId, archetypeVersion } = await mvn.getGenerateCmdArgs(path.basename(cds.root))
         console.log(`Using Maven archetype version ${archetypeVersion}`)
 
-        const temp = await fs.promises.mkdtemp(join(os.tmpdir(), `${this.projectName}_`))
+        const temp = await fs.promises.mkdtemp(join(os.tmpdir(), `${path.basename(cds.root)}_`))
         try {
             await cmd.spawnCommand('mvn', cmdLine, { cwd: temp })
-            await copy(join(temp, artifactId), this.projectPath);
+            await copy(join(temp, artifactId), cds.root);
         } catch (err) {
             if (err.code === 'ENOENT' && err.path === 'mvn') {
                 throw `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`

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

@@ -10,21 +10,20 @@ module.exports = class KibanaTemplate extends require('../templateBase') {
     }
 
     async canRun() {
-        const { hasMta, hasHelm, isJava } = await readProject(this.options)
+        const { hasMta, hasHelm, isJava } = await readProject()
         if (hasHelm && !hasMta) throw `'cds add kibana' is not available for Kyma yet`
         if (isJava) throw `'cds add kibana' is not available for Java yet`
         return true
     }
 
     async run() {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { configFile } = project
         await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-        await this.runDependentMerging()
     }
 
     async runDependentMerging() {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { hasMta, hasApprouter, isJava, isMultitenant, srvPath } = project
 
         if (hasMta) {

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

@@ -10,7 +10,6 @@ const { LINT_DEV, LINT_GLOBAL } = require("../../constants").OPTIONS;
 const { getConfigPath, getFileExtensions } = require("@sap/eslint-plugin-cds/lib/api");
 const cds = require("../../../cds");
 const { mkdirp, exists } = cds.utils;
-const LOG = console;
 
 const IS_WIN = os.platform() === "win32";
 const ALLOWED_FILE_EXTENSIONS = getFileExtensions();
@@ -19,8 +18,8 @@ const VSCODE_FILE_ASSOCIATIONS = {
 }
 
 module.exports = class LintTemplate extends require('../templateBase') {
-  constructor(generator) {
-    super(generator);
+  constructor() {
+    super();
     this.customPath = path.join(cds.root, ".eslint");
     this.docsPath = path.join(this.customPath, "docs");
     this.rulesPath = path.join(this.customPath, "rules");
@@ -32,13 +31,14 @@ module.exports = class LintTemplate extends require('../templateBase') {
   }
 
   async canRun() {
-    if (this.options.lint) {
+    const { lint } = cds.cli.options
+    if (lint) {
       // If custom rule example is requested, also trigger
       // "custom" rule type of setup
-      if (this.options.lint.has(LINT_DEV)) {
+      if (lint.has(LINT_DEV)) {
         this.customRuleExample = true;
       }
-      if (this.options.lint.has(LINT_GLOBAL)) {
+      if (lint.has(LINT_GLOBAL)) {
         this.lintType = "global";
       }
     }
@@ -98,21 +98,21 @@ module.exports = class LintTemplate extends require('../templateBase') {
           "names"
         ].join(" ")}`;
 
-        if (this.options.force) {
-          LOG.info(
+        if (cds.cli.options.force) {
+          console.log(
             `\n\nAlmost done - installing ${this.missingNpmDependencies["names"].length} npm dependencies:\n${task}`
           );
           this._runTask(task);
         } else {
-          LOG.info(
+          console.log(
             `\n\nAlmost done - ${term.warn(
               `you are missing ${this.missingNpmDependencies["names"].length} npm dependencies`
             )}:\n`
           );
           this.missingNpmDependencies["msgs"].forEach((msg, i) => {
-            LOG.info(`(${i + 1}) ${msg}`);
+            console.log(`(${i + 1}) ${msg}`);
             if (i === this.missingNpmDependencies["msgs"].length - 1) {
-              LOG.info("\n");
+              console.log("\n");
             }
           });
           await this._promptInstallDependencies(task);
@@ -187,11 +187,11 @@ module.exports = class LintTemplate extends require('../templateBase') {
         clearTimeout(timerID);
         received = answer.trim().toLowerCase();
         // If user confirms or force flag is set, install dependencies
-        if (["y", "yes"].includes(received) || this.options.force) {
+        if (["y", "yes"].includes(received) || cds.cli.options.force) {
           resolve(this._runTask(task));
           // If use declines or question timeout is reached, print todos
         } else if (["n", "no"].includes(received.toLowerCase())) {
-          LOG.info(todos);
+          console.log(todos);
           resolve();
         } else {
           // Close and restart question (with new timeout)

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

@@ -7,7 +7,8 @@ const { mergeJSON, sort } = require('../../util/merge')
 
 module.exports = class MtaTemplate extends require('../templateBase') {
 
-    static hasFacet(_, options) {
+    static hasFacet() {
+        const { options } = cds.cli
         if (!options?.add.has('mta') && options?.add.has('helm')) return false
         return exists('mta.yaml')
     }
@@ -17,7 +18,7 @@ module.exports = class MtaTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
+        const project = await readProject()
         if (!exists('mta.yaml')) {
             await copyRenderedYAML(join(__dirname, 'files', 'mta.yaml.hbs'), 'mta.yaml', project)
         }

package/lib/init/template/multitenancy/files/package.sidecar.json.hbs

@@ -13,7 +13,7 @@
   },
   "scripts": {
     "start": "cds-serve"{{#isJava}},
-    "build": "cds build ../.. --for mtx-sidecar --production && cd gen && npm ci"{{/isJava}}
+    "build": "cds build ../.. --for mtx-sidecar --production && npm ci --prefix gen"{{/isJava}}
   },
   "cds": {
     "profile": "mtx-sidecar"

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

@@ -15,8 +15,9 @@ const {
 
 module.exports = class MultitenancyTemplate extends require('../templateBase') {
 
-  static hasFacet(env, options) {
+  static hasFacet(env) {
     // REVISIT: Check if this can be simplified
+    const { options } = cds.cli.options
     return options?.add?.has('mtx') || options?.add?.has('multitenancy') ||
            !!env.requires?.multitenancy || !!env.requires?.db?.multiTenant ||
            exists(join('mtx', 'sidecar')) || false
@@ -27,7 +28,7 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
   }
 
   async run() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { isNodejs, isJava, configFile } = project
     await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)
     if (isJava) {
@@ -37,11 +38,10 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
     }
     if (isNodejs) await sort('package.json', 'dependencies')
     await copyRenderedJSON(join(__dirname, 'files', 'package.sidecar.json.hbs'), join('mtx', 'sidecar', 'package.json'), project)
-    await this.runDependentMerging()
   }
 
   async runDependentMerging(context = {}) {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { isNodejs, isJava, hasMta, hasHelm, hasXsuaa, hasHana, srvPath } = project
 
     if (hasMta) {
@@ -93,11 +93,7 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
         context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
       }
 
-      await mergeYAML(
-        join('chart', 'values.yaml'),
-        join(__dirname, 'files', 'values.yaml.hbs'),
-        project
-      )
+      await mergeYAML(join('chart', 'values.yaml'), join(__dirname, 'files', 'values.yaml.hbs'), project)
 
       const envFromObject = {
         envFrom: [
@@ -130,7 +126,7 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
 
       // REVISIT: Don't reference other templates except for the safe `runDependentMerging` -> low coupling, high cohesion
       const HelmTemplate = require(`../helm`);
-      const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+      const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
 
       await helmTemplate.addDependency('web-application', 'sidecar');
 
@@ -159,33 +155,16 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
     }
 
     if (hasXsuaa) {
-      await mergeJSON(
-        'xs-security.json',
-        join(__dirname, 'files', 'xs-security.json.hbs'),
-        project,
-        {
-          additions: [{
-            in: 'scopes',
-            where: [{ property: 'name', isEqualTo: '$XSAPPNAME.mtcallback' }],
-          }]
-        }
-      )
-    }
-
-    if (hasXsuaa && hasHelm) {
-      await mergeYAML(
-          join('chart', 'values.yaml'),
-          {
-              xsuaa: {
-                  parameters: {
-                      'tenant-mode': 'shared'
-                  }
-              }
-          },
-          null,
-          { forceOverwrite: true }
-      )
-      if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+      await mergeJSON('xs-security.json',join(__dirname, 'files', 'xs-security.json.hbs'), project, {
+        additions: [{
+          in: 'scopes',
+          where: [{ property: 'name', isEqualTo: '$XSAPPNAME.mtcallback' }],
+        }]
+      })
+      if (hasHelm) {
+        await mergeYAML(join('chart', 'values.yaml'), { xsuaa: { parameters: { 'tenant-mode': 'shared' }}}, null, { forceOverwrite: true })
+        if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+      }
     }
   }
 }

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

@@ -1,10 +1,9 @@
 const { join } = require('path')
 const cds = require('../../../cds')
-const { exists, mkdirp } = cds.utils
+const { exists, mkdirp, path } = cds.utils
 const { URLS, OPTIONS: { NODEJS, JAVA }, COMMAND_ADD } = require('../../constants')
 const term = require('../../../util/term')
 const { copyFiles } = require('../../util/template')
-const LOG = console
 
 module.exports = class NodejsTemplate extends require('../templateBase') {
 
@@ -24,13 +23,12 @@ module.exports = class NodejsTemplate extends require('../templateBase') {
 
     async run() {
         const { db, srv, app } = (await this.getEnv()).folders
-        const { projectPath, projectName } = this
-        await copyFiles(join(__dirname, 'files'), projectPath, { projectName }, this.options.force)
+        await copyFiles(join(__dirname, 'files'), cds.root, { projectName: path.basename(cds.root) }, cds.cli.options.force)
         await Promise.all([db, srv, app].map(p => mkdirp(p)))
     }
 
     async finalize() {
-        LOG.info(`Find samples on ${term.link(URLS.SAMPLES)}`)
-        LOG.info(`Learn about next steps at ${term.link(URLS.CAPIRE)}`)
+        console.log(`Find samples on ${term.link(URLS.SAMPLES)}`)
+        console.log(`Learn about next steps at ${term.link(URLS.CAPIRE)}`)
     }
 }

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

@@ -3,13 +3,12 @@ const cds = require('../../../cds')
 const { exists } = cds.utils
 const { copyFiles } = require('../../util/template')
 const { URLS } = require('../../constants')
-const LOG = console
 
 module.exports = class PipelineTemplate extends require('../templateBase') {
 
 
     async canRun() {
-        if (this.options.force) {
+        if (cds.cli.options.force) {
             return true;
         }
 
@@ -21,10 +20,10 @@ module.exports = class PipelineTemplate extends require('../templateBase') {
     }
 
     async run() {
-        await copyFiles(join(__dirname, 'files'), cds.root, {}, this.options.force);
+        await copyFiles(join(__dirname, 'files'), cds.root, {}, true);
     }
 
     async finalize() {
-        LOG.info(`For information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
+        console.log(`For information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
     }
 }

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

@@ -8,7 +8,7 @@ const { srvNode4, srvJava4, redis } = require('../_merging/registry-mta')
 module.exports = class RedisMessagingTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { hasMta, hasHelm, isJava } = await readProject(this.options)
+    const { hasMta, hasHelm, isJava } = await readProject()
     if (isJava)             throw `'cds add redis-messaging' is not available for Java yet`
     if (hasHelm && !hasMta) throw `'cds add redis-messaging' is not available for Kyma yet`
     return true
@@ -19,15 +19,14 @@ module.exports = class RedisMessagingTemplate extends require('../templateBase')
   }
 
   async run() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { configFile } = project
     project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-    await this.runDependentMerging()
   }
 
   async runDependentMerging() {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { hasMta, isNodejs, srvPath } = project
 
     if (hasMta) {