@sap/cds-dk 7.0.2 → 7.1.0

package/lib/init/index.js

@@ -2,11 +2,10 @@ const path = require('path');
 
 const term = require('../util/term');
 
-const { OPTIONS, COMMAND_ADD, COMMAND_INIT, PROJECT_FILES, REGEX_PROJECT_NAME } = require('./constants')
-const { NODEJS, JAVA, HANA, MTA,PIPELINE, SAMPLES, CF_MANIFEST } = OPTIONS
+const { OPTIONS, COMMAND_INIT, PROJECT_FILES, REGEX_PROJECT_NAME } = require('./constants')
+const { NODEJS, JAVA, HANA, MTA,PIPELINE, TINY_SAMPLE, CF_MANIFEST } = OPTIONS
 
 const cds = require('../cds'), { exists, readdir } = cds.utils
-const LOG = console
 const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) ? console.debug : undefined
 
 module.exports = class CDSGenerator {
@@ -28,7 +27,7 @@ module.exports = class CDSGenerator {
 
                         return true;
                     } catch (err) {
-                        return err.message;
+                        return err;
                     }
                 },
                 guiOptions: {
@@ -75,7 +74,7 @@ module.exports = class CDSGenerator {
                 description: `Add sample content to your project.`,
                 default: '',
                 choices: [
-                    { name: 'Basic Sample Files', value: SAMPLES }
+                    { name: 'Basic Sample Files', value: TINY_SAMPLE }
                 ],
                 multiple: true,
                 target: 'add',
@@ -90,67 +89,68 @@ module.exports = class CDSGenerator {
      * @param {string} facets, comma separated list of templates, no blanks
      * @param {any} options, additional options
      */
-    async addCmd(facets, options = {}) {
-        options._cmd = COMMAND_ADD;
-        options.add = facets;
-
+    async addCmd(facets) {
         if (!facets) throw 'You must specify a facet to add to the project.'
 
-        this._initialize(null, options);
-        this._greetings(options._cmd);
+        this._initialize(null);
+        this._greetings();
 
         if (!PROJECT_FILES.find(exists)) {
             throw `The current folder doesn't seem to contain a project. None of the following files found: ${PROJECT_FILES.join(', ')}.`
         }
 
-        await this._process(options);
-        await this.stepEnd(options);
+        await this._process();
+        await this.stepEnd();
     }
 
     /**
      * @param {string} projectName, the project name
-     * @param {any} options, additional options
      */
-    async initCmd(projectName, options = {}) {
-        await this.stepInit(projectName, options);
+    async initCmd(projectName) {
+        await this.stepInit(projectName);
         await this.stepEnd();
     }
 
-    async stepInit(projectName, options = {}) {
-        options._cmd = COMMAND_INIT;
+    async stepInit(projectName, options) {
+
+        if (!cds.cli?.command) {
+            // called from CAP generator
+            cds.cli = {
+                command: COMMAND_INIT,
+                // keep caller independent from internal names
+                options: {
+                    cwd: options.cwd,
+                    add: options.add
+                }
+            }
+        }
 
-        this._initialize(projectName, options);
-        this._greetings(options._cmd);
+        this._initialize(projectName);
+        this._greetings();
 
         await this._process();
     }
 
-    _initialize(projectName, options = {}) {
-        // deprecated, only for compatibility
-        if (options.verbose) {
-            LOG.warn(`Parameter 'verbose' is no longer supported. Use environment variable 'DEBUG=true' to obtain detailed output.`);
-        }
-
+    _initialize(projectName) {
+        const { options } = cds.cli
         this.cwd = options.cwd || process.cwd();
         cds.root = path.resolve(this.cwd, projectName || '.');
         this.projectName = path.basename(cds.root);
 
-        this.options = options;
         this._cleanupOptions();
     }
 
     _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 ${term.bold(folderName)}\n`);
-                break;
-            }
+        if (cds.cli.command === COMMAND_INIT) {
+            const relativeProjectPath = path.relative(this.cwd, cds.root)
+            const folderName = relativeProjectPath ? `.${path.sep}${relativeProjectPath}` : 'current folder'
+            console.log(`Creating new CAP project in ${term.bold(folderName)}\n`)
         }
-
-        if (this.options.force) {
-            LOG.info(`Using '--force' ... existing files will be overwritten`);
+        if (cds.cli.options.for && typeof cds.cli.options.for !== 'string') {
+            throw 'The --for argument must not be empty.'
+        }
+        if (cds.cli.options.force) {
+            console.log(`Using '--force' ... existing files will be overwritten`)
         }
     }
 
@@ -161,22 +161,21 @@ module.exports = class CDSGenerator {
         await this._fillTemplateList();
 
         for (const template of this.templateList) {
-            const msg = `Adding feature '${template.name}'...`;
-            LOG.info(msg);
+            console.log(`Adding feature '${template.name}'...`);
             await template.run();
+            await template.runDependentMerging();
             await template.runRelatedMerging();
         }
 
         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`)
+            console.log(`\nSuccessfully created project. Continue with '${term.bold('cd '+relativeProjectPath)}'.\n`)
         } else {
-            LOG.info(`\nSuccessfully added features to your project.`)
+            console.log(`\nSuccessfully added features to your project.`)
         }
     }
 
     async _createTemplate(filename) {
-
         try {
             const TemplateClass = require(`./template/${filename}`);
             return new TemplateClass(this);
@@ -191,7 +190,7 @@ module.exports = class CDSGenerator {
                     );
                 const fuzzySearch = require('../../bin/util/fuzzySearch');
                 const [bestMatch] = fuzzySearch(filename, entries);
-                LOG.info(`Unknown facet '${term.bold(filename)}'. Did you mean ${term.bold(`cds add ${bestMatch}`)}?\n\nHaven't found the proper facet yet? Here are all supported facets:\n\n  ${term.bold(entries.join('\n  '))}\n`);
+                console.log(`Unknown facet '${term.bold(filename)}'. Did you mean ${term.bold(`cds add ${bestMatch}`)}?\n\nHaven't found the proper facet yet? Here are all supported facets:\n\n  ${term.bold(entries.join('\n  '))}\n`);
                 process.exit(1);
             }
             throw err;
@@ -199,21 +198,23 @@ module.exports = class CDSGenerator {
     }
 
     async _fillTemplateList() {
-        const templates = new Map();
-        for (let option of this.options.add) {
+        const templates = new Map
+        const { command, options, argv } = cds.cli
+
+        const facets = command === COMMAND_INIT ? options.add : new Set(argv[0].split(','))
+
+        for (let facet of facets) {
             // Compat
-            if (option === 'sample-tiny') option = 'tiny-sample'
-            if (option === 'kibana-logging') option = 'kibana'
+            if (facet === 'sample-tiny') facet = 'tiny-sample'
+            if (facet === 'kibana-logging') facet = 'kibana'
 
-            if (!templates.has(option)) {
-                const template = await this._createTemplate(option);
+            if (!templates.has(facet)) {
+                const template = await this._createTemplate(facet)
                 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) // REVISIT: Ugly add.add
-                    }
+                    DEBUG?.(`Adding feature '${template.name}'`)
+                    templates.set(facet, template)
+                    const dependencies = await template.getDependencies()
+                    dependencies?.forEach(d => facets.add(d))
                 }
             }
         }
@@ -227,6 +228,7 @@ module.exports = class CDSGenerator {
         DEBUG?.(`Features: ${this.templateList.map(({name}) => name).join(', ')}`);
     }
 
+    // CAP Generator API
     async stepEnd() {
         for (const template of this.templateList) {
             await template.finalize();
@@ -236,56 +238,59 @@ module.exports = class CDSGenerator {
     _cleanupOptions() {
         let tokens = [];
 
-        if (typeof this.options.add === 'string') {
-            tokens = this.options.add.split(/[,\s+]/g);
+        const { options } = cds.cli
+        if (typeof options.add === 'string') {
+            tokens = options.add.split(/[,\s+]/g);
 
-        } else if (Array.isArray(this.options.add)) {
-            tokens = this.options.add
+        } else if (Array.isArray(options.add)) {
+            tokens = options.add
 
-        } else if (this.options.add instanceof Set) {
-            tokens = [...this.options.add];
+        } else if (options.add instanceof Set) {
+            tokens = [...options.add];
         }
 
         const trimmedTokens = tokens.map((token) => {
             token = token.replace(/\s+/g, '');
             const tokens = token.split(':'), [facet] = tokens
             if (tokens.length > 1) {
-                if (this.options[facet]) {
-                    this.options[facet].add(token);
+                if (options[facet]) {
+                    options[facet].add(token);
                 } else {
-                    this.options[facet] = new Set([token]);
+                    options[facet] = new Set([token]);
                 }
             }
             return facet;
         }).filter(Boolean);
 
         // set is ordered ... always
-        this.options.add = new Set(trimmedTokens);
+        options.add = new Set(trimmedTokens);
 
-        if (this.options._cmd === COMMAND_INIT && !this.options.add.has(JAVA)) {
-            this.options.add.add(NODEJS);
+        if (cds.cli.command === COMMAND_INIT && !options.add.has(JAVA)) {
+            options.add.add(NODEJS);
         }
 
         this._checkAdditionalOptions();
     }
 
     _checkAdditionalOptions() {
-        for (const [key] of Object.entries(this.options)) {
-            const keySplit = key.split(/:/);
+        const { options } = cds.cli
+        for (const [key] of Object.entries(options)) {
+            const keySplit = key.split(/:/)
             if (keySplit.length === 2) {
-                if (!this.options.add.has(keySplit[0])) {
-                    LOG.warn(`ignoring option ${key} since ${keySplit[0]} is not part of specified feature list: ${Array.from(this.options.add).join(', ')}`);
+                if (!options.add.has(keySplit[0])) {
+                    console.log(`ignoring option ${key} since ${keySplit[0]} is not part of specified feature list: ${Array.from(options.add).join(', ')}`)
                 }
             }
         }
     }
 
     async _validateOptions() {
-        if (this.options.force) {
+        const { options, command } = cds.cli
+        if (options.force) {
             return;
         }
 
-        if (this.options._cmd === COMMAND_INIT) {
+        if (command === COMMAND_INIT) {
             await this._validateProjectName(this.projectName);
             await this._validateProjectFolder(this.cwd);
         }

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

@@ -28,16 +28,15 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const { appPath = 'app' } = await readProject(this.options)
+        const { appPath = 'app' } = await readProject()
         const appPackageJSONPath = join(appPath, 'package.json')
         await mergeJSON(appPackageJSONPath, join(__dirname, 'files', 'package.json'))
         await sort(appPackageJSONPath, 'dependencies')
         await mergeJSON(join(appPath, 'default-env.json'), join(__dirname, 'files', 'default-env.json'))
-        await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath, appPath } = project
 
         if (hasMta) {
@@ -76,7 +75,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
 
             // add dependency entry in chart.yaml
             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', 'approuter');
 
             await mergeYAML(

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

@@ -13,15 +13,14 @@ module.exports = class AuditlogTemplate 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?.['audit-log']?.kind
         await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-        await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isNodejs, hasMta, hasHelm, srvPath } = project
 
         if (hasMta) {
@@ -63,7 +62,7 @@ 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);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
             // add dependency entry in chart.yaml

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

@@ -7,7 +7,7 @@ applications:
 # -----------------------------------------------------------------------------------
 # Backend Service
 # -----------------------------------------------------------------------------------
-- name: {{appName}}-{{srvName}}
+- name: {{appName}}-srv
   random-route: true  # for development only
 {{#isNodejs}}
   path: {{& srvPath}}
@@ -15,42 +15,34 @@ applications:
   buildpack: nodejs_buildpack
 {{/isNodejs}}
 {{#isJava}}
-  path: {{& srvPath}}/target/{{srvExt.archiveName}}
+  path: {{& srvPath}}/target/{{archiveName}}
   memory: 1G
   disk_quota: 512M
   env:
     SPRING_PROFILES_ACTIVE: cloud
   buildpack: java_buildpack
 {{/isJava}}
-{{#hasRequires}}
   services:
-{{#requires}}
-{{#resource.isHana}}
-  - {{resource.name}}
-{{/resource.isHana}}
-{{#resource.isXsuaa}}
-  - {{resource.name}}
-{{/resource.isXsuaa}}
-{{/requires}}
-{{/hasRequires}}
+{{#hasHana}}
+  - {{appName}}-db
+{{/hasHana}}
+{{#hasXsuaa}}
+  - {{appName}}-auth
+{{/hasXsuaa}}
 
-{{#needsSidecar}}
+{{#hasHana}}
+{{^isMultitenant}}
 # -----------------------------------------------------------------------------------
 # HANA Database Content Deployer App
 # -----------------------------------------------------------------------------------
-- name: {{appName}}-{{db.0.name}}-deployer
-  path: {{& db.0.path}}
+- name: {{appName}}-{{db.name}}-deployer
+  path: {{& db.path}}
   no-route: true
   health-check-type: process
   memory: 256M
   instances: 1
   buildpack: nodejs_buildpack
-{{#hasRequires}}
   services:
-{{#requires}}
-{{#resource.isHana}}
-  - {{resource.name}}
-{{/resource.isHana}}
-{{/requires}}
-{{/hasRequires}}
-{{/needsSidecar}}
+  - {{appName}}-db
+{{/isMultitenant}}
+{{/hasHana}}

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

@@ -2,21 +2,26 @@
 # appName = {{appName}}
 ---
 create-services:
-{{#requires}}
-# ------------------------------------------------------------
-  - name:   {{resource.name}}
-{{#resource.isHana}}
-{{#resource.isPlainHana}}
-    broker: {{resource.service}}  # 'hanatrial' on trial landscapes
-    plan: "hdi-shared"
-{{/resource.isPlainHana}}
-{{/resource.isHana}}
-{{#resource.isXsuaa}}
-    broker: {{resource.service}}
+{{#hasHana}}
+{{#isMultitenant}}
+  - name: {{appName}}-db
+    broker: service-manager
+    plan: container
+{{/isMultitenant}}
+{{^isMultitenant}}
+  - name: {{appName}}-db
+    broker: hana
+    plan: hdi-shared
+{{/isMultitenant}}
+{{/hasHana}}
+{{#hasXsuaa}}
+  - name: {{appName}}-auth
+    broker: xsuaa
     plan: application
-{{/resource.isXsuaa}}
-{{#resource.vcap.name}}
-    broker: {{resource.service}}
-    plan: {{resource.vcap.name}}
-{{/resource.vcap.name}}
-{{/requires}}
+    parameters: xs-security.json
+{{/hasXsuaa}}
+{{#hasAuditlog}}
+  - name: {{appName}}-auditlog
+    broker: auditlog
+    plan: application
+{{/hasAuditlog}}

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

@@ -9,7 +9,7 @@ const SERVICES_MANIFEST_FILE = 'services-manifest.yml'
 module.exports = class CfManifestTemplate extends require('../templateBase') {
 
     async canRun() {
-        if (this.options.force) {
+        if (cds.cli.options.force) {
             return true
         }
         if (exists(MANIFEST_FILE) || exists(SERVICES_MANIFEST_FILE)) {
@@ -20,6 +20,6 @@ module.exports = class CfManifestTemplate extends require('../templateBase') {
 
     async run() {
         const project = await readProject()
-        await copyFiles(join(__dirname, 'files'), cds.root, project, this.options.force)
+        await copyFiles(join(__dirname, 'files'), cds.root, project, true)
     }
 }

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

@@ -11,14 +11,13 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
     }
 
     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(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isJava, srvPath, hasHelm, hasMta } = project
 
         if (hasMta) {

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

@@ -2,25 +2,24 @@
 const cds = require('../../../cds')
 const { exists, fs } = cds.utils
 const { resolve, join, relative }  = require('path');
-const LOG = console
 const DEBUG = cds.debug('cli')
 
 module.exports = class DataTemplate extends require('../templateBase') {
 
   async run() {
-    if (this.options['for']) {
+    if (cds.cli.options.for) {
       throw `\nError: Did you mean \`... --data:for\` ?`
     }
 
     const env = await this.getEnv();
 
-    let dest = (typeof this.options.out === 'string') // target folder
-      ? this.options.out
+    let dest = (typeof cds.cli.options.out === 'string') // target folder
+      ? cds.cli.options.out
       : getDefaultTargetFolder(env);
     dest = resolve(cds.root, dest);
 
-    const nameFilter = asRegex(this.options['data:for'])
-    const force = this.options.force;
+    const nameFilter = asRegex(cds.cli.options['data:for'])
+    const { force } = cds.cli.options
 
     let csn = await cds.compile.to.csn(cds.env.roots) // normal CSN
 
@@ -111,7 +110,7 @@ function createDataFile (isFileExists, dataFilePath, dest, force, entity) {
     relFilePath = relative(cds.root, dataFilePath);
   }
   if (isFileExists && !force) {
-    LOG.info(`Skipping ${relFilePath}`);
+    console.log(`Skipping ${relFilePath}`);
   }
   else {
     // continue only if file not already exists, or '--force' option provided
@@ -119,7 +118,7 @@ function createDataFile (isFileExists, dataFilePath, dest, force, entity) {
     if (dataFileContent && dataFileContent.length) {
       if (!exists(dest))  fs.mkdirSync(dest, {recursive: true})
       fs.writeFileSync(dataFilePath, dataFileContent);
-      isFileExists ? LOG.info(`Overwriting `+relFilePath) : LOG.info(`Creating `+relFilePath)
+      isFileExists ? console.log(`Overwriting `+relFilePath) : console.log(`Creating `+relFilePath)
     }
   }
 }

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

@@ -15,14 +15,13 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
     }
 
     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(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isJava, hasHelm, hasDestination, hasMta, srvPath, hasHtml5Repo } = project
 
         if (hasMta) {
@@ -36,7 +35,6 @@ module.exports = class DestinationTemplate extends require('../templateBase') {
         }
 
         if (hasHelm) {
-            //const env = await this.getEnv()
             const binding = hasDestination && { srv: { bindings: { destination: { serviceInstanceName: 'destination' }}}}
             const html5Binding = hasHtml5Repo && { 'html5-apps-deployer': { bindings: { destination: { serviceInstanceName: 'destination' }}}}
 
@@ -64,7 +62,7 @@ module.exports = class DestinationTemplate 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);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
             // add dependency entry in chart.yaml

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

@@ -10,7 +10,7 @@ const { srvNode4, srvJava4, enterpriseMessaging } = require('../_merging/registr
 module.exports = class EnterpriseMessagingTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { isJava } = await readProject(this.options)
+    const { isJava } = await readProject()
     if (isJava) throw `'cds add enterprise-messaging' is not available for Java yet`
     return true
   }
@@ -20,14 +20,13 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
   }
 
   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(context = {}) {
-    const project = await readProject(this.options)
+    const project = await readProject()
     const { hasXsuaa, hasHelm, hasMta, isNodejs, srvPath, appName } = project
 
     if (hasMta) {
@@ -81,7 +80,7 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
 
       // copy service instance 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('service-instance');
 
       // add dependency entry in chart.yaml

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

@@ -8,7 +8,7 @@ const { srvNode4, srvJava4, enterpriseMessaging } = require('../_merging/registr
 module.exports = class EnterpriseMessagingSharedTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { hasMta, hasHelm, isJava }  = await readProject(this.options)
+    const { hasMta, hasHelm, isJava }  = await readProject()
     if (isJava)             throw `'cds add enterprise-messaging-shared' is not available for Java yet`
     if (hasHelm && !hasMta) throw `'cds add enterprise-messaging-shared' is not available for Kyma yet`
     return true
@@ -19,16 +19,15 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../tem
   }
 
   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 mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.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) {

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

@@ -21,14 +21,13 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
   }
 
   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 { hasXsuaa } = project
     if (hasXsuaa) {
       await mergeJSON(