@sap/cds-dk 6.2.3 → 6.3.0

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

@@ -1,6 +1,6 @@
 const { join } = require('path')
-const TemplateBase = require('../templateBase')
 const ProjectReader = require('../../util/projectReader')
+const { mergeJSON, mergeYAML, sortDependencies } = require('../../util/merge')
 const { OPTION_XSUAA, PROJECT_TYPE } = require('../../constants')
 const {
     srvNode, srvJava, approuter, // Modules
@@ -10,17 +10,21 @@ const {
     approuterExtensibility, approuterExtensibilityJava // xs-app.json config
 } = require('../_merging/registry-mta')
 
-module.exports = class ApprouterTemplate extends TemplateBase {
+module.exports = class ApprouterTemplate extends require('../templateBase') {
 
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(this)
+        this.projectReader = new ProjectReader(projectPath)
     }
 
-    async checkEnabled() {
+    static hasFacet(env) {
+        return !!env.requires?.approuter
+    }
+
+    async canRun() {
         const projectDescriptor = await this.projectReader.read(this.options)
-        const { hasMtaDeployment, hasHelmDeployment } = projectDescriptor.cap
-        if (hasHelmDeployment && !hasMtaDeployment) {
+        const { hasMta, hasHelm } = projectDescriptor.cap
+        if (hasHelm && !hasMta) {
             throw `'cds add approuter' is not available for Kyma yet`
         }
         return true
@@ -30,53 +34,16 @@ module.exports = class ApprouterTemplate extends TemplateBase {
         return [OPTION_XSUAA]
     }
 
-    async runDependentMerging() {
-        const projectDescriptor = await this.projectReader.read(this.options)
-        const { isNodejs, isJava, isExtensible, isMultitenant, hasMtaDeployment } = projectDescriptor.cap
-
-        if (hasMtaDeployment) {
-            const srv = isNodejs ? srvNode : srvJava
-            const apis = isJava ? [requiredJavaApprouterAPI, providedJavaApprouterAPI] : []
-            if (isNodejs && isMultitenant) apis.push(requiredMtxAPI, requiredAppAPI, providedAppAPI)
-            if (isJava && isMultitenant) apis.push(requiredMtxAPI)
-            const additions = [srv, approuter, xsuaa, ...apis]
-            const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
-            await this.templateUtil.mergeYAML(mtaYAMLPath, `${__dirname}/files/mta.yaml.hbs`, projectDescriptor, {
-                additions,
-                relationships: [{
-                    insert: [xsuaa, 'name'],
-                    into: [srv, 'requires', 'name']
-                }, {
-                    insert: [xsuaa, 'name'],
-                    into: [approuter, 'requires', 'name']
-                }],
-            })
-        }
-
-        const appPath = join(this.projectPath, projectDescriptor.ui.appPath || 'app')
-        const additions = isExtensible && isJava ? [{ ...approuterExtensibilityJava, at: 0 }] :
-                          isExtensible && isNodejs ? [{ ...approuterExtensibility, at: 0 }] : []
-        await this.templateUtil.mergeJSON(
-            `${appPath}/xs-app.json`,
-            `${__dirname}/files/xs-app.json.hbs`,
-            projectDescriptor,
-            { additions }
-        )
-    }
-
     async run() {
         const projectDescriptor = await this.projectReader.read(this.options)
         const { for: forProfile } = projectDescriptor.cap
         const appPath = join(this.projectPath, projectDescriptor.ui.appPath || 'app')
         const appPackageJSONPath = join(appPath, 'package.json')
 
-        await this.templateUtil.mergeJSON(appPackageJSONPath, join(__dirname, 'files', 'package.json'))
-        await this.templateUtil.sortDependencies(appPackageJSONPath)
+        await mergeJSON(appPackageJSONPath, join(__dirname, 'files', 'package.json'))
+        await sortDependencies(appPackageJSONPath)
 
-        await this.templateUtil.mergeJSON(
-            `${appPath}/default-env.json`,
-            `${__dirname}/files/default-env.json`
-        )
+        await mergeJSON(`${appPath}/default-env.json`, `${__dirname}/files/default-env.json`)
 
         const projectType = await this.getProjectType()
         switch (projectType) {
@@ -84,18 +51,47 @@ module.exports = class ApprouterTemplate extends TemplateBase {
                 const cdsrcJSONPath = join(this.projectPath, '.cdsrc.json')
                 const cdsTemplateFile = forProfile ? 'cds.cdsrc.json.hbs' : 'cds.cdsrc.json'
                 const cdsPackageJSONPath = join(__dirname, 'files', cdsTemplateFile)
-                await this.templateUtil.mergeJSON(cdsrcJSONPath, cdsPackageJSONPath, projectDescriptor)
+                await mergeJSON(cdsrcJSONPath, 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 this.templateUtil.mergeJSON(packageJSONPath, cdsPackageJSONPath, projectDescriptor)
+                await mergeJSON(packageJSONPath, cdsPackageJSONPath, projectDescriptor)
                 break
             }
         }
 
         await this.runDependentMerging()
     }
+
+    async runDependentMerging() {
+        const projectDescriptor = await this.projectReader.read(this.options)
+        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta } = projectDescriptor.cap
+
+        if (hasMta) {
+            const srv = isNodejs ? srvNode : srvJava
+            const apis = isJava ? [requiredJavaApprouterAPI, providedJavaApprouterAPI] : []
+            if (isNodejs && isMultitenant) apis.push(requiredMtxAPI, requiredAppAPI, providedAppAPI)
+            if (isJava && isMultitenant) apis.push(requiredMtxAPI)
+            const additions = [srv, approuter, xsuaa, ...apis]
+            const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
+            await mergeYAML(mtaYAMLPath, `${__dirname}/files/mta.yaml.hbs`, projectDescriptor, {
+                additions,
+                relationships: [{
+                    insert: [xsuaa, 'name'],
+                    into: [srv, 'requires', 'name']
+                }, {
+                    insert: [xsuaa, 'name'],
+                    into: [approuter, 'requires', 'name']
+                }],
+            })
+        }
+
+        const appPath = join(this.projectPath, projectDescriptor.ui.appPath || 'app')
+        const additions = isExtensible && isJava ? [{ ...approuterExtensibilityJava, at: 0 }] :
+                          isExtensible && isNodejs ? [{ ...approuterExtensibility, at: 0 }] : []
+        await mergeJSON(`${appPath}/xs-app.json`, `${__dirname}/files/xs-app.json.hbs`, projectDescriptor, { additions })
+    }
 }

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

@@ -1,13 +1,17 @@
 const path = require('path')
-const TemplateBase = require('../templateBase')
+const { copy } = require('../../../cds').utils
 const ProjectReader = require('../../util/projectReader')
+const { mergeYAML } = require('../../util/merge')
 const { srvNode, srvJava, auditlog } = require('../_merging/registry-mta')
-const cds = require('../../../cds'), { fs } = cds.utils
 
-module.exports = class AuditlogTemplate extends TemplateBase {
+module.exports = class AuditlogTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(this)
+        this.projectReader = new ProjectReader(projectPath)
+    }
+
+    static hasFacet() {
+        return false // TODO: Need a `cds.requires.auditlog` or some other way to detect if enabled.
     }
 
     async run() {
@@ -16,12 +20,12 @@ module.exports = class AuditlogTemplate extends TemplateBase {
 
     async runDependentMerging() {
         const projectDescriptor = await this.projectReader.read(this.options)
-        const { isNodejs, hasMtaDeployment, hasHelmDeployment } = projectDescriptor.cap
+        const { isNodejs, hasMta, hasHelm } = projectDescriptor.cap
 
-        if (hasMtaDeployment) {
+        if (hasMta) {
             const mtaYAMLPath = path.join(this.projectPath, 'mta.yaml')
             const srv = isNodejs ? srvNode : srvJava
-            await this.templateUtil.mergeYAML(
+            await mergeYAML(
                 mtaYAMLPath,
                 `${__dirname}/files/mta.yaml.hbs`,
                 projectDescriptor,
@@ -35,8 +39,8 @@ module.exports = class AuditlogTemplate extends TemplateBase {
             )
         }
 
-        if (hasHelmDeployment) {
-            await this.templateUtil.mergeYAML(
+        if (hasHelm) {
+            await mergeYAML(
                 path.join(this.projectPath, 'chart', 'values.yaml'),
                 {
                     srv: { bindings: {
@@ -49,7 +53,7 @@ module.exports = class AuditlogTemplate extends TemplateBase {
                 },
                 null, { forceOverwrite: true }
             )
-            await fs.copy(path.join(__dirname, 'files', 'auditlog.yaml'), path.join(this.projectPath, 'chart', 'templates', 'auditlog.yaml'))
+            await copy(path.join(__dirname, 'files', 'auditlog.yaml'), path.join(this.projectPath, 'chart', 'templates', 'auditlog.yaml'))
         }
     }
 }

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

@@ -1,20 +1,18 @@
 const path = require('path')
-const TemplateBase = require('../templateBase');
+const { exists } = require('../../../cds').utils
 const ProjectReader = require('../../util/projectReader');
-
+const { copyFiles } = require('../../util/templateUtil')
 const { OPTION_CF_MANIFEST } = require('../../constants')
-const MANIFEST = 'manifest'
-const SERVICES_MANIFEST = 'services-manifest'
-const MANIFEST_FILE = MANIFEST + '.yml'
-const SERVICES_MANIFEST_FILE = SERVICES_MANIFEST + '.yml'
+const MANIFEST_FILE = 'manifest.yml'
+const SERVICES_MANIFEST_FILE = 'services-manifest.yml'
 
-module.exports = class ManifestTemplate extends TemplateBase {
+module.exports = class ManifestTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(this)
+        this.projectReader = new ProjectReader(projectPath)
     }
 
-    async checkEnabled() {
+    async canRun() {
         if (!this.options.add.has(OPTION_CF_MANIFEST)) {
             return false;
         }
@@ -23,7 +21,7 @@ module.exports = class ManifestTemplate extends TemplateBase {
             return true;
         }
 
-        if (await this.fsUtil.pathExists(path.join(this.projectPath, MANIFEST_FILE)) || await this.fsUtil.pathExists(path.join(this.projectPath, SERVICES_MANIFEST_FILE))) {
+        if (exists(path.join(this.projectPath, MANIFEST_FILE)) || exists(path.join(this.projectPath, SERVICES_MANIFEST_FILE))) {
             throw new Error(`File ${MANIFEST_FILE} or ${SERVICES_MANIFEST_FILE} already exist in current folder. Use --force to overwrite.`);
         }
         return true;
@@ -31,6 +29,6 @@ module.exports = class ManifestTemplate extends TemplateBase {
 
     async run() {
         const projectDescriptor = await this.projectReader.read()
-        await this.templateUtil.copyFiles('.', this.projectPath, projectDescriptor, this.options.force);
+        await copyFiles(path.join(__dirname, 'files'), this.projectPath, projectDescriptor, this.options.force);
     }
 }

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

@@ -1,12 +1,12 @@
 const path = require('path')
-const TemplateBase = require('../templateBase')
 const ProjectReader = require('../../util/projectReader')
-const cds = require('../../../cds'), { fs } = cds.utils
+const { mergeYAML } = require('../../util/merge')
+const cds = require('../../../cds'), { copy } = cds.utils
 
-module.exports = class ConnectivityTemplate extends TemplateBase {
+module.exports = class ConnectivityTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(this)
+        this.projectReader = new ProjectReader(projectPath)
     }
 
     async run() {
@@ -15,10 +15,10 @@ module.exports = class ConnectivityTemplate extends TemplateBase {
 
     async runDependentMerging() {
         const projectDescriptor = await this.projectReader.read(this.options)
-        const { hasHelmDeployment } = projectDescriptor.cap
+        const { hasHelm } = projectDescriptor.cap
 
-        if (hasHelmDeployment) {
-            await this.templateUtil.mergeYAML(
+        if (hasHelm) {
+            await mergeYAML(
                 path.join(this.projectPath, 'chart', 'values.yaml'),
                 path.join(__dirname, 'files', 'values.yaml.hbs'),
                 projectDescriptor,
@@ -33,9 +33,9 @@ module.exports = class ConnectivityTemplate extends TemplateBase {
             )
             const filesPath = path.join(__dirname, 'files')
             const templatesPath = path.join(this.projectPath, 'chart', 'templates')
-            await fs.copy(path.join(filesPath, 'connectivity-binding.yaml'), path.join(templatesPath, 'connectivity-binding.yaml'))
-            await fs.copy(path.join(filesPath, 'connectivity-proxy-info.yaml'), path.join(templatesPath, 'connectivity-proxy-info.yaml'))
-            await fs.copy(path.join(filesPath, 'connectivity.yaml'), path.join(templatesPath, 'connectivity.yaml'))
+            await copy(path.join(filesPath, 'connectivity-binding.yaml'), path.join(templatesPath, 'connectivity-binding.yaml'))
+            await copy(path.join(filesPath, 'connectivity-proxy-info.yaml'), path.join(templatesPath, 'connectivity-proxy-info.yaml'))
+            await copy(path.join(filesPath, 'connectivity.yaml'), path.join(templatesPath, 'connectivity.yaml'))
         }
     }
 }

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

@@ -1,9 +1,11 @@
-const TemplateBase = require('../templateBase');
-const cds = require('../../../cds');
-const {resolve, join, relative}  = require('path');
-const fs = require('fs');
 
-module.exports = class DataTemplate extends TemplateBase {
+const cds = require('../../../cds')
+const { exists, fs } = cds.utils
+const { resolve, join, relative }  = require('path');
+const LOG = console
+const DEBUG = /\bcli\b/.test(process.env.DEBUG) && console.debug
+
+module.exports = class DataTemplate extends require('../templateBase') {
   constructor(projectPath, generator) {
     super(projectPath, generator, __dirname);
   }
@@ -18,14 +20,13 @@ module.exports = class DataTemplate extends TemplateBase {
 
     const nameFilter = asRegex(this.options['data:for'] || this.options.for)
     const force = this.options.force;
-    const logger = this.logger;
 
     cds.root = this.projectPath;
     let csn = await cds.compile.to.csn(cds.env.roots); // normal 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.
-    includeExternalEntities(csn, logger)
+    includeExternalEntities(csn)
 
     csn = cds.compile.for.sql(csn, { names:env.sql.names, messages:[] })  // CSN w/ persistence information
     csn = cds.reflect(csn); // reflected model (adds additional helper functions)
@@ -34,15 +35,15 @@ module.exports = class DataTemplate extends 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, logger));
+      .forEach(e => processEntity(e, dest, this.projectPath, csn, force));
   }
 }
 
-function includeExternalEntities(model, logger) {
+function includeExternalEntities(model) {
   for (let each in model.definitions) {
     const def = model.definitions[each]
     if (def['@cds.persistence.skip'] === true) {
-      logger.debug ('Including skipped entity '+each)
+      DEBUG && DEBUG('Including skipped entity '+each)
       delete def['@cds.persistence.skip']
     }
   }
@@ -65,7 +66,7 @@ function asRegex(spec) {
   return /.*/
 }
 
-function processEntity (entity, dest, projectPath, csn, force, logger) {
+function processEntity (entity, dest, projectPath, csn, force) {
   let dataFileName;
   const namespace = getNamespace(csn, entity.name);
   if (!namespace || namespace == entity.name) {
@@ -82,21 +83,21 @@ function processEntity (entity, dest, projectPath, csn, force, logger) {
     // otherwise use the new '.texts' format
     const dataFileNameOldFormat = dataFileName.replace('.texts.csv','_texts.csv');
     const dataFilePathOldFormat = join(dest, dataFileNameOldFormat);
-    if (fs.existsSync(dataFilePathOldFormat)) {
-      createDataFile(true, dataFilePathOldFormat, dest, projectPath, force, entity, logger);
+    if (exists(dataFilePathOldFormat)) {
+      createDataFile(true, dataFilePathOldFormat, dest, projectPath, force, entity);
       return;
     }
   }
 
   const dataFilePath = join(dest, dataFileName);
-  createDataFile(fs.existsSync(dataFilePath), dataFilePath, dest, projectPath, force, entity, logger);
+  createDataFile(exists(dataFilePath), dataFilePath, dest, projectPath, force, entity);
 }
 
 function getDefaultTargetFolder (env, projectPath) {
   const dbFolder = env.folders.db;
   // csv files should be located in the 'db/data' folder unless a 'db/csv' folder already exists
   let mockDataFolder;
-  if (fs.existsSync(join(projectPath, dbFolder, 'csv'))) {
+  if (exists(join(projectPath, dbFolder, 'csv'))) {
     mockDataFolder = 'csv';
   } else {
     mockDataFolder = 'data';
@@ -105,7 +106,7 @@ function getDefaultTargetFolder (env, projectPath) {
 }
 
 
-function createDataFile (isFileExists, dataFilePath, dest, projectPath, force, entity, logger) {
+function createDataFile (isFileExists, dataFilePath, dest, projectPath, force, entity) {
   let relFilePath = dataFilePath;
   if (dataFilePath.indexOf(projectPath) == 0) {
     // use relative path in log (for readability), only when data files are added within the project
@@ -113,15 +114,15 @@ function createDataFile (isFileExists, dataFilePath, dest, projectPath, force, e
     relFilePath = relative(projectPath, dataFilePath);
   }
   if (isFileExists && !force) {
-    logger.log(`Skipping ${relFilePath}`);
+    LOG.info(`Skipping ${relFilePath}`);
   }
   else {
     // continue only if file not already exists, or '--force' option provided
     const dataFileContent = prepareDataFileContent(entity);
     if (dataFileContent && dataFileContent.length) {
-      if (!fs.existsSync(dest))  fs.mkdirSync(dest, {recursive: true})
+      if (!exists(dest))  fs.mkdirSync(dest, {recursive: true})
       fs.writeFileSync(dataFilePath, dataFileContent);
-      isFileExists ? logger.log(`Overwriting `+relFilePath) : logger.log(`Creating `+relFilePath)
+      isFileExists ? LOG.info(`Overwriting `+relFilePath) : LOG.info(`Creating `+relFilePath)
     }
   }
 }

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

@@ -1,12 +1,17 @@
 const path = require('path')
-const TemplateBase = require('../templateBase')
 const ProjectReader = require('../../util/projectReader')
-const cds = require('../../../cds'), { fs } = cds.utils
+const { mergeYAML } = require('../../util/merge')
+const { copy } = require('../../../cds').utils
 
-module.exports = class DestinationsTemplate extends TemplateBase {
+module.exports = class DestinationsTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(this)
+        this.projectReader = new ProjectReader(projectPath)
+    }
+
+    static hasFacet(env) {
+        const kinds = { odata: 1, 'odata-v2': 1, 'odata-v4': 1, rest: 1 }
+        return Object.entries(env.requires).some(([service, require]) => !kinds[service] && kinds[require.kind])
     }
 
     async run() {
@@ -15,14 +20,14 @@ module.exports = class DestinationsTemplate extends TemplateBase {
 
     async runDependentMerging() {
         const projectDescriptor = await this.projectReader.read(this.options)
-        const { hasHelmDeployment, hasDestination, hasHtml5Repo } = projectDescriptor.cap
+        const { hasHelm, hasDestination, hasHtml5Repo } = projectDescriptor.cap
 
-        if (hasHelmDeployment) {
-            const env = await this.getEnv()
+        if (hasHelm) {
+            //const env = await this.getEnv()
             const binding = hasDestination && { srv: { bindings: { destination: { serviceInstanceName: 'destinations' }}}}
             const html5Binding = hasHtml5Repo && { html5_apps_deployer: { bindings: { destination: { serviceInstanceName: 'destination' }}}}
 
-            await this.templateUtil.mergeYAML(
+            await mergeYAML(
                 path.join(this.projectPath, 'chart', 'values.yaml'),
                 {
                     ...binding,
@@ -38,7 +43,7 @@ module.exports = class DestinationsTemplate extends TemplateBase {
                 },
                 null, { forceOverwrite: true }
             )
-            await fs.copy(path.join(__dirname, 'files', 'destination.yaml'), path.join(this.projectPath, 'chart', 'templates', 'destination.yaml'))
+            await copy(path.join(__dirname, 'files', 'destination.yaml'), path.join(this.projectPath, 'chart', 'templates', 'destination.yaml'))
         }
     }
 }

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

@@ -1,12 +1,17 @@
 const path = require('path')
-const cds = require('../../../cds'), { fs } = cds.utils
+const { copy } = require('../../../cds').utils
 const ProjectReader = require('../../util/projectReader')
+const { mergeJSON, mergeYAML } = require('../../util/merge')
 const { srvNode, srvJava, enterpriseMessaging } = require('../_merging/registry-mta')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../templateBase') {
   constructor(projectPath, generator) {
     super(projectPath, generator, __dirname)
-    this.projectReader = new ProjectReader(this)
+    this.projectReader = new ProjectReader(projectPath)
+  }
+
+  static hasFacet(env) {
+    return env.requires?.messaging === 'enterprise-messaging'
   }
 
   async run() {
@@ -16,18 +21,18 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
     const cdsTemplateFile = (isNodejs ? 'cds.package.json' : 'cdsrc.json') + (forProfile ? '.hbs' : '')
     const cdsTemplatePath = path.join(templatePath, cdsTemplateFile)
     const configPath = path.join(this.projectPath, isNodejs ? 'package.json' : '.cdsrc.json')
-    await this.templateUtil.mergeJSON(configPath, cdsTemplatePath, projectDescriptor)
+    await mergeJSON(configPath, cdsTemplatePath, projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging() {
     const projectDescriptor = await this.projectReader.read(this.options)
-    const { hasHelmDeployment, hasMtaDeployment, isNodejs } = projectDescriptor.cap
+    const { hasHelm, hasMta, isNodejs } = projectDescriptor.cap
 
-    if (hasMtaDeployment) {
+    if (hasMta) {
       const mtaYAMLPath = path.join(this.projectPath, 'mta.yaml')
       const srv = isNodejs ? srvNode : srvJava
-      await this.templateUtil.mergeYAML(
+      await mergeYAML(
           mtaYAMLPath,
           `${__dirname}/files/mta.yaml.hbs`,
           projectDescriptor,
@@ -41,13 +46,13 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
       )
     }
 
-    if (hasHelmDeployment) {
-      await this.templateUtil.mergeYAML(
+    if (hasHelm) {
+      await mergeYAML(
         path.join(this.projectPath, 'chart', 'values.yaml'),
         path.join(__dirname, 'files', 'values.yaml'),
         null, { forceOverwrite: true }
       )
-      await fs.copy(
+      await copy(
          path.join(__dirname, 'files', 'event-mesh.yaml'),
          path.join(this.projectPath, 'chart', 'templates', 'event-mesh.yaml')
       )

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

@@ -1,11 +1,16 @@
-const cds = require('../../../cds'), { fs, path } = cds.utils
-const TemplateBase = require('../templateBase')
+const cds = require('../../../cds')
+const { copy, path } = cds.utils
 const ProjectReader = require('../../util/projectReader')
+const { mergeJSON } = require('../../util/merge')
 
-module.exports = class ExtensibilityTemplate extends TemplateBase {
+module.exports = class ExtensibilityTemplate extends require('../templateBase') {
   constructor(projectPath, generator) {
     super(projectPath, generator, __dirname)
-    this.projectReader = new ProjectReader(this)
+    this.projectReader = new ProjectReader(projectPath)
+  }
+
+  static hasFacet(env) {
+    return !!env.requires?.extensibility
   }
 
   async run() {
@@ -13,15 +18,15 @@ module.exports = class ExtensibilityTemplate extends TemplateBase {
     const { for: forProfile, isJava } = projectDescriptor.cap
     const cdsConfigPath = path.join(this.projectPath, isJava ? '.cdsrc.json' : 'package.json')
     const cdsTemplateFile = forProfile ? (isJava ? 'cdsrc.json.hbs' : 'cds.package.json.hbs') : (isJava ? 'cdsrc.json' : 'cds.package.json')
-    await this.templateUtil.mergeJSON(cdsConfigPath, path.join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
+    await mergeJSON(cdsConfigPath, path.join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging() {
     const projectDescriptor = await this.projectReader.read()
-    const { hasXsuaa, hasHelmDeployment } = projectDescriptor.cap
+    const { hasXsuaa, hasHelm } = projectDescriptor.cap
     if (hasXsuaa) {
-      await this.templateUtil.mergeJSON(
+      await mergeJSON(
         path.join(this.projectPath, 'xs-security.json'),
         path.join(__dirname, 'files', 'xs-security.json.hbs'),
         projectDescriptor,
@@ -42,9 +47,9 @@ module.exports = class ExtensibilityTemplate extends TemplateBase {
         }
       )
     }
-    if (hasXsuaa && hasHelmDeployment) {
+    if (hasXsuaa && hasHelm) {
       // REVISIT: Shared xs-security.json location for Helm and MTA?
-      await fs.copy(
+      await copy(
         path.join(this.projectPath, 'xs-security.json'),
         path.join(this.projectPath, 'chart', 'xs-security.json')
       )