@sap/cds-dk 10.1.2 → 10.2.1

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

@@ -35,13 +35,12 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
         const project = readProject(facet)
         const {
             isNodejs, isJava,
-            addIas, addXsuaa, hasXsuaa, hasIas, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
-            addMta, hasMta, hasMultitenancy,
-            addKyma, hasKyma, srv, approuterPath
+            hasMTXRoute, hasMTXRouteJava, hasMultitenancy,
+            affected, srv, approuterPath
         } = project
 
 
-        if (addMta || (addMultitenancy || addXsuaa || addIas) && hasMta) {
+        if (affected('mta', 'multitenancy', 'xsuaa', 'ias')) {
             const srvModule = srv4(srv.path)
             const apis = isJava && hasMultitenancy ? [requiredJavaApprouterApi4(srvModule), providedJavaApprouterApi] : []
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
@@ -52,13 +51,13 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             const additions = [...modules, ...apis]
             const relationships = []
             const deletions = []
-            if (hasXsuaa) {
+            if (affected('xsuaa', 'mta')) {
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
-            if (hasIas) {
+            if (affected('ias', 'mta')) {
                 relationships.push({
                     insert: [ias, 'name'],
                     into: [approuter, 'requires', 'name']
@@ -73,15 +72,15 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             })
         }
 
-        if(addKyma) {
+        if (affected('kyma')) {
           await KymaTemplate.mergeDependency('web-application', 'approuter')
         }
 
-        if (addKyma || (addMultitenancy && hasKyma)) {
+        if (affected('kyma', 'multitenancy')) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-approuter` }
@@ -89,9 +88,16 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
 
-        const xsAppPath = join(approuterPath, 'xs-app.json')
-        const additions = hasMTXRoute ? [{ ...approuterMTXRoute, at: 0 }] : []
-        if (hasMTXRouteJava) additions.push({ ...approuterMTXRouteJava, at: 0 })
-        await merge(__dirname, 'files/xs-app.json.hbs').into(xsAppPath, { project, additions })
+        if (affected('approuter', 'html5-repo', 'multitenancy', 'extensibility', 'portal')) {
+            const xsAppPath = join(approuterPath, 'xs-app.json')
+            const additions = [{ in: 'routes', where: { source: '^/(.*)$', destination: 'srv-api' } }]
+            if (hasMTXRoute) additions.push({ ...approuterMTXRoute, at: 0 })
+            if (hasMTXRouteJava) additions.push({ ...approuterMTXRouteJava, at: 0 })
+            const deletions = [
+                { item: { in: 'routes', where: { source: '^/?odata/(.*)$', target: '/odata/$1', destination: 'srv-api' } } },
+                { item: { in: 'routes', where: { source: '^(.*)$', target: '$1', service: 'html5-apps-repo-rt' } } }
+            ]
+            await merge(__dirname, 'files/xs-app.json.hbs').into(xsAppPath, { project, additions, deletions })
+        }
     }
 }

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

@@ -27,9 +27,9 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMta, addKyma, srv } = project
+        const { affected, srv } = project
 
-        if (addMta) {
+        if (affected('mta')) {
             const srvModule = srv4(srv.path)
             const additions = [srvModule, attachments]
             const relationships = [{
@@ -41,7 +41,7 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
             })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
             await KymaTemplate.mergeDependency('service-instance', 'attachments')
         }

package/lib/init/template/audit-logging/index.js

@@ -34,15 +34,15 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { addMta, addKyma, addMultitenancy, srv } = project
+    const { affected, srv } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
 
-    if (addMultitenancy) {
+    if (affected('multitenancy')) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
     }
 
-    if (addMta) {
+    if (affected('mta')) {
       const srvModule = srv4(srv.path)
       await merge(join(__dirname, 'files/mta.yaml.hbs')).into('mta.yaml', {
         with: project,
@@ -54,7 +54,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
         ]
       })
     }
-    if (addKyma) {
+    if (affected('kyma')) {
       await merge({
         srv: { bindings: { auditlog: { serviceInstanceName: 'auditlog' }}},
         auditlog: {

package/lib/init/template/cloud-logging/index.js

@@ -1,4 +1,5 @@
 const cds = require('../../../cds')
+const { read, write } = cds.utils
 const { merge, sort } = require('../../merge')
 
 const mvn = require('../../mvn')
@@ -31,6 +32,11 @@ module.exports = class extends require('../../plugin') {
     if (isNodejs) {
       project.profile ??= 'production'
       await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
+      if (project.withTelemetry) {
+        const packageJson = await read('package.json')
+        delete packageJson.cds.requires['cloud-logging']
+        await write('package.json', packageJson, { spaces: 2 })
+      }
       await sort('package.json', 'dependencies')
     } else if (isJava) {
       await merge(__dirname, 'files/java-cdsrc.json.hbs').into('.cdsrc.json', { with: project })
@@ -40,9 +46,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { hasMta, addMta, addKyma, addApprouter, hasApprouter, isJava, addMultitenancy, hasMultitenancy, srv } = project
+    const { affected, isJava, srv } = project
 
-    if (addMta || (addMultitenancy || addApprouter) && hasMta) {
+    if (affected('mta', 'multitenancy', 'approuter')) {
       const cloudLogging = {
         in: 'resources',
         where: {
@@ -52,20 +58,20 @@ module.exports = class extends require('../../plugin') {
       }
       const additions = [cloudLogging], relationships = []
       const srvModule = srv4(srv.path)
-      if (addMta) {
+      if (affected('mta')) {
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [srvModule, 'requires', 'name']
         })
       }
-      if (hasMultitenancy) {
+      if (affected('multitenancy', 'mta')) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [mtxSidecar, 'requires', 'name']
         })
       }
-      if (hasApprouter) {
+      if (affected('approuter', 'mta')) {
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [approuter, 'requires', 'name']
@@ -77,7 +83,7 @@ module.exports = class extends require('../../plugin') {
         with: project, additions, relationships
       })
     }
-    if (addKyma) {
+    if (affected('kyma')) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml')
       await KymaTemplate.mergeDependency('service-instance', 'cloud-logging')
     }

package/lib/init/template/completion/completionSetup.js

@@ -12,9 +12,28 @@ const SUPPORTED_LINUX_SHELLS = ['bash', 'fish', 'gitbash', 'zsh'];
 const SUPPORTED_WINDOWS_SHELLS = ['ps'];
 const SUPPORTED_SHELLS = [...SUPPORTED_LINUX_SHELLS, ...SUPPORTED_WINDOWS_SHELLS].sort();
 
+// Single source of truth for the shell → generated-script basename mapping.
+const SCRIPT_FILES = { bash: 'cds.sh', gitbash: 'cds.sh', fish: 'cds.fish', ps: 'cds.ps1', zsh: 'cds.zsh' };
+
+// The one place the installer references the runtime scripts' location.
+const SCRIPTS_DIR = path.join(__dirname, '../../../../bin/completion/scripts');
+
 
 module.exports = new class CompletionSetup {
     supportedShells = SUPPORTED_SHELLS
+    scriptFiles = SCRIPT_FILES
+
+    resolveScriptPath(shell) {
+        if (!shell) {
+            throw 'Internal error: option --shell is missing';
+        }
+
+        if (!SCRIPT_FILES[shell]) {
+            throw `Internal error: unsupported shell: ${shell}, supported shells are ${this.supportedShells.join(', ')}`;
+        }
+
+        return path.join(SCRIPTS_DIR, SCRIPT_FILES[shell]);
+    }
 
     resolveShell(options) {
         return options?.shell
@@ -124,12 +143,6 @@ module.exports = new class CompletionSetup {
         console.log(`\nSource your shell using\n${bold('. $PROFILE')}\nto activate the changes.`);
     }
 
-    // Returns the absolute path to the pre-generated cache file bundled with this package.
-    resolveScriptPath(shell) {
-        const cacheFiles = { bash: 'cds.sh', gitbash: 'cds.sh', fish: 'cds.fish', ps: 'cds.ps1', zsh: 'cds.zsh' };
-        return path.join(__dirname, '../../../../bin/completion/scripts', cacheFiles[shell]);
-    }
-
     // Generates the snippet written to the user's shell profile. The script path is hardcoded at
     // install time to avoid spawning a subprocess on every shell startup.
     getScript(shell, scriptPath) {

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

@@ -20,9 +20,9 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { srv, addKyma, addMta } = project
+        const { srv, affected } = project
 
-        if (addMta) {
+        if (affected('mta')) {
             const srvModule = srv4(srv.path)
             const additions = [srvModule, connectivity]
             const relationships = [{
@@ -32,7 +32,7 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, relationships })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', {
                 project,
                 additions: [{

package/lib/init/template/data/as-csv.js

@@ -39,7 +39,8 @@ module.exports = async (data={}, csn, { headerOnly=false, keysOnly=false, separa
               if (targetRecord) for (const k of element.keys) fk[k.ref[k.ref.length - 1]] = targetRecord[k.ref[k.ref.length - 1]]
               const {headers: fkHeaders, records: fkRecords} = resolveStruct(fk, name)
               if (i === 0) header.push(...fkHeaders)
-              record.push(...(keysOnly && !element.key ? fkRecords.map(() => '') : fkRecords))
+              // keep foreign keys even in keys-only mode, to preserve referential integrity
+              record.push(...fkRecords)
             }
           }
           else if (element._type === 'cds.Association') {
@@ -51,8 +52,8 @@ module.exports = async (data={}, csn, { headerOnly=false, keysOnly=false, separa
             if (i === 0) {
               header.push(...fkHeaders)
             }
-            // foreign keys of key associations are part of the primary key and must be kept
-            record.push(...(keysOnly && !element.key ? fkRecords.map(() => '') : fkRecords))
+            // keep foreign keys even in keys-only mode, to preserve referential integrity
+            record.push(...fkRecords)
           }
           else if (element.is_struct && element.type !== 'cds.Map') {
             const {headers: structHeaders, records: structRecords} = resolveStruct(value, name);
@@ -69,7 +70,9 @@ module.exports = async (data={}, csn, { headerOnly=false, keysOnly=false, separa
         records.push(record.join(separator))
       }
       let res = header.join(separator)
-      if (!headerOnly)
+      // 'keys only' (headerOnly) still emits rows for model-defined code lists (enum keys),
+      // since those keys/values come from the model, not from random generation.
+      if (!headerOnly || entityData.fromModel)
         res += '\n' + records.join('\n')
 
       if (!res.endsWith('\n')) res += '\n'

package/lib/init/template/data/as-json.js

@@ -32,6 +32,13 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
   // sort all entities first that are referenced by others, so that dependant entities can be created after them
   const { definitions: defs } = csn
   const names = Object.keys(data).sort((n1, n2) => {
+    // Enum code lists have a fixed, model-defined set of keys. Generate them first,
+    // so that associations referencing them reuse these records (one per enum value)
+    // instead of eagerly creating a random one.
+    const n1IsEnum = !!enumKeyOf(defs[n1])
+    const n2IsEnum = !!enumKeyOf(defs[n2])
+    if (n1IsEnum && !n2IsEnum)  return -1
+    if (!n1IsEnum && n2IsEnum)  return 1
     const n1HasComp = Object.values(defs[n1].elements??[]).some(el => el.type === 'cds.Composition')
     const n2HasComp = Object.values(defs[n2].elements??[]).some(el => el.type === 'cds.Composition')
     if (n1HasComp && !n2HasComp)  return -1
@@ -45,11 +52,20 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
   addSemantics(csn)
 
   for (const name of names) {
-    if (!data[name] // removed on purpose because records are created inline through compositions
-      || data[name].length >= numRecords) { // numRecords already created by following associations
+    if (!data[name])  continue // removed on purpose because records are created inline through compositions
+
+    const artifact = defs[name]
+
+    // Code lists with an enum key have a fixed, model-defined set of keys.
+    // Generate exactly one record per enum value so the sample data matches all code list keys.
+    const enumKey = enumKeyOf(artifact)
+    if (enumKey) {
+      if (data[name].length === 0)  fillEnumCodeList(name, artifact, enumKey, csn, data, referenceData)
       continue
     }
 
+    if (data[name].length >= numRecords)  continue // numRecords already created by following associations
+
     let numRecordsToGenerate // numRecords might be reduced if some records were created by following associations
     let records = []
     if (data[name].length > 0) {
@@ -59,7 +75,6 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
       numRecordsToGenerate = numRecords
       records = data[name] = Array(numRecordsToGenerate).fill({}).map(() => ({}))
     }
-    const artifact = defs[name]
 
     const idNum = randomNumber()
     for (let i = 0; i < numRecordsToGenerate; i++) {
@@ -80,13 +95,29 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
   return data
 }
 
-function fillRecord(record, recordID, artifact, csn, data, parent, depth, referenceData) {
+/* Fills the given code-list entity with exactly one record per enum value, so the
+   generated data matches all model-defined code list keys. Values come from the model
+   (explicit enum value, else the enum name). The records are stored in data[name] and
+   marked as `fromModel` so they survive 'keys only' (headerOnly) CSV generation. */
+function fillEnumCodeList(name, artifact, enumKey, csn, data, referenceData) {
+  const enumValues = Object.keys(enumKey.enum)
+  const idNum = randomNumber()
+  data[name] = [] // fillRecord pushes each created record here (for circular-ref resolution)
+  for (let i = 0; i < enumValues.length; i++)
+    fillRecord({}, idNum+i, artifact, csn, data, null, 0, referenceData, i)
+  data[name] = uniqRecords(data[name], artifact)
+  // model-defined code lists keep their rows even in 'keys only' (headerOnly) CSV mode
+  Object.defineProperty(data[name], 'fromModel', { value: true, enumerable: false })
+  return data[name]
+}
+
+function fillRecord(record, recordID, artifact, csn, data, parent, depth, referenceData, enumIndex) {
   Object.defineProperty(record, '$id', {value: recordID, enumerable: false})
   if (data[artifact.name]) data[artifact.name].push(record) // add id to data, to be referenced by associations to prevent circular dependencies
 
   const elems = Object.values(artifact.elements ?? artifact.params ?? {}).sort(asJson.elementsSorter(csn))
   elems.forEach(el => {
-    record[el.name] = dataForField(el, artifact, csn, record, data, parent, depth, referenceData)
+    record[el.name] = dataForField(el, artifact, csn, record, data, parent, depth, referenceData, enumIndex)
   })
   return record
 }
@@ -116,7 +147,7 @@ asJson.elementsSorter = function (csn) {
 }
 
 
-function dataForField(element, artifact, csn, record, data, parent, depth, referenceData) {
+function dataForField(element, artifact, csn, record, data, parent, depth, referenceData, enumIndex) {
   if (element.virtual || (element['@Core.Computed'] && element.value))
     return
   if (record[element.name] !== undefined)
@@ -180,7 +211,11 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
         return fakerValue(element['@data.gen'], csn)
       }
       if (element.enum) {
-        const enumName = randomFromList(Object.keys(element.enum))
+        const enumNames = Object.keys(element.enum)
+        // pick a distinct enum value by index when iterating a code list, else random
+        const enumName = (element.key && enumIndex !== undefined)
+          ? enumNames[enumIndex % enumNames.length]
+          : randomFromList(enumNames)
         const value = element.enum[enumName].val ?? element.enum[enumName].value ?? enumName
         // key of common.CodeList, also fill name and descr with enum name
         if (element.key && artifact.elements.name && artifact.elements.descr)
@@ -228,13 +263,19 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
     case 'cds.Int64':
     case 'cds.Integer64':
     case 'cds.Integer': {
-      if (element.key)
-        return record['$id']
       if (element.enum) {
-        const enumName = randomFromList(Object.keys(element.enum))
+        const enumNames = Object.keys(element.enum)
+        const enumName = (element.key && enumIndex !== undefined)
+          ? enumNames[enumIndex % enumNames.length]
+          : randomFromList(enumNames)
         const value = element.enum[enumName].val ?? element.enum[enumName].value ?? enumName
+        // key of common.CodeList, also fill name and descr with enum name
+        if (element.key && artifact.elements?.name && artifact.elements?.descr)
+          record.name = record.descr = enumName
         return parseInt(value)
       }
+      if (element.key)
+        return record['$id']
       const range = {from: 0, to: 100}
       annotatedIntRange(element, range)
       return randomIntInRange(range)
@@ -315,17 +356,23 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
           const ready = targetRecords.filter(r => targetKeys.every(k => r[k] !== undefined))
           targetRecord = ready.length ? ready[pickIndex(record['$id'], element.name, ready.length)] : targetRecords.at(-1)
         } else {
-          // a key association needs distinct targets across rows, else the composite key collapses to one row;
-          // seed a pool up to the requested record count so later rows can spread across it
-          let poolSize = element.key && target.name !== artifact.name ? requestedRecords : 1
-          // a self-referential link (2+ key associations to the same target) needs at least 2 targets to pair distinct rows
-          const keyAssocsToTarget = Object.values(artifact.elements).filter(e => e.key && e.target === element.target).length
-          if (keyAssocsToTarget > 1) poolSize = Math.max(poolSize, keyAssocsToTarget)
-          for (let p = 0; p < poolSize; p++) {
-            const rec = fillRecord({}, randomNumber(), target, csn, data, artifact, depth+1, referenceData)
-            if (rec) targetRecords.push(rec)
+          const targetEnumKey = enumKeyOf(target)
+          if (targetEnumKey) {
+            // enum code list: create the full, model-defined key set and reference one of them
+            targetRecords = fillEnumCodeList(target.name, target, targetEnumKey, csn, data, referenceData)
+          } else {
+            // a key association needs distinct targets across rows, else the composite key collapses to one row;
+            // seed a pool up to the requested record count so later rows can spread across it
+            let poolSize = element.key && target.name !== artifact.name ? requestedRecords : 1
+            // a self-referential link (2+ key associations to the same target) needs at least 2 targets to pair distinct rows
+            const keyAssocsToTarget = Object.values(artifact.elements).filter(e => e.key && e.target === element.target).length
+            if (keyAssocsToTarget > 1) poolSize = Math.max(poolSize, keyAssocsToTarget)
+            for (let p = 0; p < poolSize; p++) {
+              const rec = fillRecord({}, randomNumber(), target, csn, data, artifact, depth+1, referenceData)
+              if (rec) targetRecords.push(rec)
+            }
+            uniqRecords(targetRecords, target)
           }
-          uniqRecords(targetRecords, target)
           targetRecord = targetRecords.length ? targetRecords[pickIndex(record['$id'], element.name, targetRecords.length)] : undefined
           if (parent && (parent.name != artifact.name)) data[target.name].keepReference = true
         }
@@ -443,6 +490,16 @@ function findKeysInOnCondition(assocElement, target) {
   return [ownKey, ownKeyStructured, targetKey]
 }
 
+/* returns the single key element of a code list that is typed as an enum, if any.
+   Such entities (e.g. `sap.common.CodeList` extensions with `key code: String enum {...}`)
+   have a fixed, model-defined set of keys. */
+function enumKeyOf(artifact) {
+  const keys = Object.values(artifact?.keys ?? {})
+  // only treat as enum code list if the (single) key is an enum
+  if (keys.length === 1 && keys[0].enum && Object.keys(keys[0].enum).length > 0)
+    return keys[0]
+}
+
 function uniqRecords(records, artifact) {
   const keys = Object.keys(artifact.keys||{})
   if (keys.length === 0)  keys.push('$id') // no keys (e.g. in actions) -> use record's $id

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

@@ -25,22 +25,25 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addApprouter, hasApprouter, addMultitenancy, hasMultitenancy, addKyma, addMta, hasMta, srv, isJava } = project
+        const { affected, srv, isJava } = project
 
-        if (addMta || (addApprouter || addMultitenancy) && hasMta) {
+        if (affected('mta', 'approuter', 'multitenancy')) {
             const srvModule = srv4(srv.path)
             const additions = [srvModule, destination]
-            const relationships = [{
-                insert: [destination, 'name'],
-                into: [srvModule, 'requires', 'name']
-            }]
-            if (hasApprouter) {
+            const relationships = []
+            if (affected('mta')) {
+                relationships.push({
+                    insert: [destination, 'name'],
+                    into: [srvModule, 'requires', 'name']
+                })
+            }
+            if (affected('approuter', 'mta')) {
                 relationships.push({
                     insert: [destination, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
-            if (hasMultitenancy) {
+            if (affected('multitenancy', 'mta')) {
                 relationships.push({
                     insert: [destination, 'name'],
                     into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
@@ -49,7 +52,7 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions, relationships })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
             await KymaTemplate.mergeDependency('service-instance', 'destination')
         }

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

@@ -25,9 +25,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { appName, addMta, addKyma, isJava, addMultitenancy, srv } = project
+    const { appName, affected, isJava, srv } = project
 
-    if (addMta || addMultitenancy) {
+    if (affected('mta', 'multitenancy')) {
       const dynatrace = {
         in: 'resources',
         where: {
@@ -36,14 +36,14 @@ module.exports = class extends require('../../plugin') {
         }
       }
       const additions = [dynatrace], relationships = []
-      if (addMta) {
+      if (affected('mta')) {
         const srvModule = srv4(srv.path)
         relationships.push({
           insert: [dynatrace, 'name'],
           into: [srvModule, 'requires', 'name']
         })
       }
-      if (addMultitenancy) {
+      if (affected('multitenancy')) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
         relationships.push({
           insert: [dynatrace, 'name'],
@@ -56,7 +56,7 @@ module.exports = class extends require('../../plugin') {
       })
     }
 
-    if (addKyma) {
+    if (affected('kyma')) {
       await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
       await KymaTemplate.mergeDependency('service-instance', 'dynatrace')
     }

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

@@ -55,9 +55,9 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
 
   async combine(facet) {
     const project = readProject(facet)
-    const { addXsuaa, hasXsuaa, addKyma, addMta, srv, appName } = project
+    const { affected, srv, appName } = project
 
-    if (addMta) {
+    if (affected('mta')) {
       const srvModule = srv4(srv.path)
       await merge(this._dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
         project,
@@ -71,8 +71,8 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
       })
     }
 
-    if (addXsuaa || (addMta && hasXsuaa)) {
-      if (addMta) {
+    if (affected('xsuaa', 'mta')) {
+      if (affected('mta')) {
         await merge(this._dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
           project,
           additions: [xsuaa]
@@ -92,11 +92,11 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
       })
     }
 
-    if (addKyma) {
+    if (affected('kyma')) {
       await merge(this._dirname, 'files', 'values.yaml').into('chart/values.yaml')
       await KymaTemplate.mergeDependency('service-instance', 'event-mesh')
     }
 
-    if (addKyma || addMta) await merge(this._dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })
+    if (affected('kyma') || affected('mta')) await merge(this._dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })
   }
 }

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

@@ -19,9 +19,9 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../ent
 
   async combine(facet) {
     const project = readProject(facet)
-    const { addMta, addKyma, srv } = project
+    const { affected, srv } = project
 
-    if (addMta) {
+    if (affected('mta')) {
       const srvModule = srv4(srv.path)
       await merge(this._dirname, 'files', 'mta.yaml.hbs').into('mta.yaml', {
         project,
@@ -35,11 +35,11 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../ent
       })
     }
 
-    if (addKyma) {
+    if (affected('kyma')) {
       await merge(this._dirname, 'files/values.yaml').into('chart/values.yaml')
       await KymaTemplate.mergeDependency('service-instance', 'event-mesh')
     }
 
-    if (addKyma || addMta) await merge(this._dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })
+    if (affected('kyma') || affected('mta')) await merge(this._dirname, 'files/event-mesh.json.hbs').into('event-mesh.json', { project })
   }
 }

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

@@ -26,8 +26,8 @@ module.exports = class ExtensibilityTemplate extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { addXsuaa } = project
-    if (addXsuaa) {
+    const { affected } = project
+    if (affected('xsuaa')) {
       await merge(__dirname, 'files', 'xs-security.json.hbs').into('xs-security.json', {
         project,
         additions: [