@sap/cds-dk 10.1.2 → 10.2.1

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

@@ -40,6 +40,12 @@ module.exports = class ExtensionProjectTemplate extends require('../../plugin')
       pkgJson.workspaces ??= []
       pkgJson.workspaces.push('.base')
     }
+
+    // Run the extension project on a dedicated port by default
+    pkgJson.cds ??= {}
+    pkgJson.cds.server ??= {}
+    pkgJson.cds.server.port ??= 4006
+
     await write('package.json', pkgJson, { spaces: 2 })
 
     if (force || !exists('.base/package.json')) {
@@ -76,6 +82,26 @@ module.exports = class ExtensionProjectTemplate extends require('../../plugin')
     }
 
   }
+
+  async finalize() {
+    // @cap-js/sqlite must be optional, else `cds push` fails for extensions
+    const SQLITE = '@cap-js/sqlite'
+    if (!exists('package.json')) return
+
+    const pkgJson = await read('package.json')
+    const version = pkgJson.dependencies?.[SQLITE] ?? pkgJson.devDependencies?.[SQLITE]
+    if (!version) return
+
+    if (pkgJson.dependencies) delete pkgJson.dependencies[SQLITE]
+    if (pkgJson.devDependencies) delete pkgJson.devDependencies[SQLITE]
+    if (pkgJson.dependencies && !Object.keys(pkgJson.dependencies).length) delete pkgJson.dependencies
+    if (pkgJson.devDependencies && !Object.keys(pkgJson.devDependencies).length) delete pkgJson.devDependencies
+
+    pkgJson.optionalDependencies ??= {}
+    pkgJson.optionalDependencies[SQLITE] ??= version
+
+    await write('package.json', pkgJson, { spaces: 2 })
+  }
 }
 
 function namespacify(s) {

package/lib/init/template/github-actions/index.js

@@ -51,15 +51,15 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { addMta, addKyma } = project, { force } = cds.cli.options
+    const { affected } = project, { force } = cds.cli.options
     project.sap = cds.cli.options.sap
-    if (addMta) {
+    if (affected('mta')) {
       const cf = '.github/workflows/cf.yaml'
       if (force || !exists(cf)) {
         await renderAndCopy(path.join(__dirname, 'files/workflows/cf.yaml.hbs'), cf, project)
       }
     }
-    if (addKyma) {
+    if (affected('kyma')) {
       const kyma = '.github/workflows/kyma.yaml'
       if (force || !exists(kyma)) {
         await renderAndCopy(path.join(__dirname, 'files/workflows/kyma.yaml.hbs'), kyma, project)

package/lib/init/template/hana/files/package.json.hbs

@@ -24,6 +24,9 @@
     {{#profile}}
     "[{{profile}}]": {
     {{/profile}}
+    {{^profile}}
+    "[production]": {
+    {{/profile}}
     {{#shortcut}}
       "db": "hana"
     {{/shortcut}}
@@ -32,9 +35,7 @@
         "kind": "hana"
       }
     {{/shortcut}}
-    {{#profile}}
     }
-    {{/profile}}
   }
   {{/isJava}}
 }

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

@@ -41,9 +41,9 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMta, hasMta, addMultitenancy, addKyma, isJava, hasKyma, hasMultitenancy, srv } = project
+        const { affected, isJava, hasKyma, hasMultitenancy, srv } = project
 
-        if (addMta || addMultitenancy && hasMta) {
+        if (affected('mta', 'multitenancy')) {
             const srvModule = srv4(srv.path)
             const db = hasMultitenancy ? serviceManager : hdiContainer
             const deletions = hasMultitenancy ? [{
@@ -83,11 +83,11 @@ module.exports = class HanaTemplate extends require('../../plugin') {
             })
         }
 
-        if (!hasMultitenancy && addKyma) {
+        if (affected('kyma') && !hasMultitenancy) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
 
-        if (addMultitenancy && hasKyma) {
+        if (affected('multitenancy') && hasKyma) {
             await merge('chart/values.yaml')
                 .remove(['hana-deployer', 'srv.bindings.db', 'hana'])
 
@@ -98,7 +98,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
                 ])
         }
 
-        if (addKyma && !hasMultitenancy) {
+        if (affected('kyma') && !hasMultitenancy) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-hana-deployer` }

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

@@ -51,9 +51,9 @@ module.exports = class HanaServerlessTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMta, hasMta, addMultitenancy, addKyma, isJava, hasMultitenancy, srv } = project
+        const { affected, isJava, hasMultitenancy, srv } = project
 
-        if (addMta || addMultitenancy && hasMta) {
+        if (affected('mta', 'multitenancy')) {
             const existingIdentity = await this._existingIdentityName()
             const srvModule = srv4(srv.path)
 
@@ -99,7 +99,7 @@ module.exports = class HanaServerlessTemplate extends require('../../plugin') {
             if (hasMultitenancy) await this._alignSidecarDbKind()
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             const KymaTemplate = require('../kyma')
             const existingIdentity = await this._existingIdentityInChart()
 

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -70,7 +70,9 @@ modules:
       build-result: dist
       builder: custom
       commands:
+        {{^hasNpmWorkspaces}}
         - npm ci
+        {{/hasNpmWorkspaces}}
         - npm run build
       {{/isStatic}}
       supported-platforms: []

package/lib/init/template/html5-repo/files/ui5.yaml.hbs

@@ -13,10 +13,6 @@ builder:
       - "/test/**"
       - "/localService/**"
   customTasks:
-    {{#isTypescript}}
-    - name: ui5-tooling-transpile-task
-      afterTask: replaceVersion
-    {{/isTypescript}}
     - name: ui5-task-zipper
       afterTask: generateVersionInfo
       configuration:

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

@@ -3,15 +3,12 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, html5RepoHost, html5Runtime, xsuaa, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
 const { srvApi, html5RepoApi } = require('../../registries/xs-app')
-const { exists, read } = require('../../../cds').utils
+const cds = require('../../../cds')
+const { exists, read, fs:{promises:{rename}} } = cds.utils
+const DestinationTemplate = require('../destination')
 
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
-    requires() {
-        const { hasKyma } = readProject()
-        if (hasKyma) return ['destination']
-    }
-
     static help() {
         return 'SAP BTP HTML5 Application Repository'
     }
@@ -36,41 +33,81 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         const project = readProject(facet)
         const {
             isJava, srv, appPath, apps,
-            hasApprouter, hasMta, addMta, hasKyma, hasXsuaa, hasMultitenancy, hasUI5,
-            addSample, addApprouter, addKyma, addMultitenancy, addWorkzoneStandard, addXsuaa, addIas
+            hasUI5, affected
         } = project
 
-        await Promise.all(apps.map(async ({ app }) => {
-            project.app = app
-            project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
-            const additions = [srvApi, html5RepoApi]
-            await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
-            const pJsonPath = join(appPath, app, 'package.json')
-            const pJson = exists(pJsonPath) ? await read(pJsonPath) : {}
-            project.ui5 = hasUI5 || pJson.devDependencies?.['@ui5/cli']
-            await merge(__dirname, 'files/app-package.json.hbs').into(pJsonPath, { project })
-        }))
+        if (affected('html5-repo', 'xsuaa', 'ias', 'sample', 'typescript', 'app-frontend', 'vue', 'react')) {
+            for (const { app } of apps) {
+                project.app = app
+                project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
+                const additions = [srvApi, html5RepoApi]
+                await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
+                const pJsonPath = join(appPath, app, 'package.json')
+                const pJson = exists(pJsonPath) ? await read(pJsonPath) : {}
+                project.ui5 = hasUI5 || pJson.devDependencies?.['@ui5/cli']
+                await merge(__dirname, 'files/app-package.json.hbs').into(pJsonPath, { project })
+            }
+
+            for (const { app } of apps) {
+                project.app = app
+                const pJsonPath = join(appPath, app, 'package.json')
+                const pJson = exists(pJsonPath) ? await read(pJsonPath) : {}
+                const ui5 = hasUI5 || pJson.devDependencies?.['@ui5/cli']
+                if (ui5) {
+                    const isTs = !!pJson.devDependencies?.typescript || !!pJson.dependencies?.typescript
+                    const additions = [{ in: 'builder.customTasks', where: { name: 'ui5-task-zipper' } }]
+                    const transpileTask = { in: 'builder.customTasks', where: { name: 'ui5-tooling-transpile-task' }, at: 0 }
+                    const ui5YamlPath = join(appPath, app, 'ui5.yaml')
+                    await merge(__dirname, 'files/ui5.yaml.hbs').into(ui5YamlPath, { project, additions, deletions: isTs ? [] : [{ item: transpileTask }] })
+                    if (isTs) await merge({ builder: { customTasks: [{ name: 'ui5-tooling-transpile-task', afterTask: 'replaceVersion' }] } }).into(ui5YamlPath, { additions: [transpileTask] })
+                }
+            }
+        }
+
+        if (affected('html5-repo', 'vue', 'react')) {
+            const addVite = cds.cli.argv[0] === 'react' || cds.cli.argv[0] === 'vue'
+            const into = cds.cli.options.into
+            const isRootLayout = addVite && (into === undefined || into === '' || into === '.')
+            const candidates = apps.map(({ app }) => ({ app, appPath: join(cds.root, appPath, app), isRoot: false }))
+            const rootAppPath = join(cds.root, appPath)
+            if (exists(join(rootAppPath, 'package.json'))) candidates.push({ app: '', appPath: rootAppPath, isRoot: true })
+            for (const { app, appPath: viteAppPath, isRoot } of candidates) {
+                project.app = app
+                if (!exists(join(viteAppPath, 'package.json'))) continue
+                const pJson = await read(join(viteAppPath, 'package.json'))
+                if (!pJson.devDependencies?.vite) continue
+                if (addVite && !isRootLayout && into !== app) continue
+                if (addVite && isRootLayout && !isRoot) continue
+
+                const fromXsApp = join(viteAppPath, 'xs-app.json')
+                const toXsApp = join(viteAppPath, 'public/xs-app.json')
+                if (exists(fromXsApp) && !exists(toXsApp)) await rename(fromXsApp, toXsApp)
+                const fromManifest = join(viteAppPath, 'webapp/manifest.json')
+                const toManifest = join(viteAppPath, 'public/manifest.json')
+                if (!exists(fromManifest) && !exists(toManifest)) {
+                    await merge(__dirname, 'files/manifest.json').into(fromManifest, { project })
+                }
+                if (exists(fromManifest) && !exists(toManifest)) await rename(fromManifest, toManifest)
+            }
+        }
 
-        for (const { app } of apps) {
-            project.app = app
-            const pJsonPath = join(appPath, app, 'package.json')
-            const pJson = exists(pJsonPath) ? await read(pJsonPath) : {}
-            const ui5 = hasUI5 || pJson.devDependencies?.['@ui5/cli']
-            if (ui5) {
-                const isTs = project.isTypescript || !!pJson.devDependencies?.typescript || !!pJson.dependencies?.typescript
-                const additions = [{ in: 'builder.customTasks', where: { name: 'ui5-task-zipper' } }]
-                if (isTs) additions.unshift({ in: 'builder.customTasks', where: { name: 'ui5-tooling-transpile-task' }, at: 0 })
-                project.isTypescript = isTs
-                await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project, additions })
+        if (affected('approuter', 'html5-repo', 'sample', 'react', 'vue', 'portal')) {
+            const app = project.apps.find(a => a.app === 'browse') ?? project.apps[0]
+            if (app) {
+                const xsAppPath = join(project.approuterPath, 'xs-app.json')
+                const xsApp = await read(xsAppPath)
+                const welcomeFile = `/${app.manifestAppId.replace(/[.-]/g, '')}/index.html`
+                if (!xsApp.welcomeFile || ['/fiori-apps.html', welcomeFile].includes(xsApp.welcomeFile)) {
+                    await merge({ welcomeFile: project.hasPortal ? '/cp.portal' : welcomeFile }).into(xsAppPath, { forceOverwrite: true })
+                }
             }
         }
 
-        if (addMultitenancy) {
-            await merge({ cds: { requires: { 'html5-repo': true } } }).into('mtx/sidecar/package.json')
+        if (affected('multitenancy')) {
+            await merge({ cds: { requires: { 'html5-host': true } } }).into('mtx/sidecar/package.json')
         }
 
-        const affected = addXsuaa || addApprouter || addWorkzoneStandard || addMultitenancy || addSample || addIas
-        if (addMta || affected && hasMta) {
+        if (affected('mta', 'xsuaa', 'approuter', 'workzone-standard', 'multitenancy', 'sample', 'ias')) {
             const srvModule = srv4(srv.path)
             project.apps = apps
             const hasApps = apps.length > 0
@@ -81,7 +118,6 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                     into: [appDeployer, 'requires', 'name'],
                 })
             }
-            const appModules = []
             for (const { app } of project.apps) {
                 const html5App = { in: 'modules', where: { type: 'html5', path: `${appPath}${app}` } }
                 relationships.push({
@@ -89,13 +125,13 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                     into: [appDeployer, 'build-parameters.requires'],
                 })
             }
-            if (hasApprouter) {
+            if (affected('approuter', 'mta')) {
                 relationships.push({
                     insert: [html5Runtime, 'name'],
                     into: [approuter, 'requires', 'name'],
                 })
             }
-            if (hasMultitenancy) {
+            if (affected('multitenancy', 'mta')) {
                 relationships.push({
                     insert: [html5Runtime, 'name'],
                     into: [isJava ? srvModule : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
@@ -105,7 +141,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                     into: [isJava ? srvModule : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
                 })
             }
-            if (hasXsuaa && hasApps) {
+            if (affected('xsuaa', 'mta') && hasApps) {
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [appDeployer, 'requires']
@@ -113,12 +149,16 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project,
-                additions: [srvModule, ...(hasApps ? [appDeployer] : []), html5RepoHost, ...appModules],
+                additions: [srvModule, ...(hasApps ? [appDeployer] : []), html5RepoHost],
                 relationships
             })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
+            cds.cli.options.add.add('destination')
+            const destination = new DestinationTemplate()
+            await destination.run()
+            await destination.combine('destination')
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-html5-deployer` }
@@ -126,7 +166,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
 
-        if (addKyma || affected && hasKyma) {
+        if (affected('kyma', 'xsuaa', 'approuter', 'workzone-standard', 'multitenancy', 'sample', 'ias')) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
     }

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

@@ -303,7 +303,7 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       const scalar = [...(keys || [])].filter(k => !k.is_struct && !notAddressable.has(k.type) && data[k.name] !== undefined)
       if (!scalar.length) return undefined
       const val = k => literal(k.type, data[k.name])
-      if (paren || scalar.length > 1) return `(${scalar.map(k => `${k.name}=${val(k)}`).join(',')})`
+      if (paren || scalar.length > 1 || scalar[0].type === 'cds.String') return `(${scalar.map(k => `${k.name}=${val(k)}`).join(',')})`
       return `/${val(scalar[0])}`
     }
 

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

@@ -24,9 +24,9 @@ module.exports = class IasTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { isJava, addMta, hasMta, addCfManifest, addKyma, addMultitenancy, hasApprouter, hasMultitenancy, srv } = project
+        const { isJava, affected, srv } = project
 
-        if (addMultitenancy) {
+        if (affected('multitenancy')) {
             const conf = exists('mtx/sidecar/package.json') ? await read('mtx/sidecar/package.json') : {}
             conf.cds ??= {}
             const profile = conf.cds.profile
@@ -39,14 +39,14 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/sidecar.package.json.hbs').into('mtx/sidecar/package.json')
         }
 
-        if (addMta || (hasApprouter || hasMultitenancy) && hasMta) {
+        if (affected('mta', 'approuter', 'multitenancy')) {
             const srvModule = srv4(srv.path)
             const srvIdentityBinding = { in: [srvModule, 'requires'], where: { 'parameters.config.app-identifier': 'srv' } }
             const srvCertUrlApi = { in: [srvModule, 'provides'], where: { 'name': 'srv-api' } }
             const additions = [srvModule, ias, srvIdentityBinding, srvCertUrlApi]
             const overwrites = []
 
-            if (hasApprouter) {
+            if (affected('approuter', 'mta')) {
                 additions.push(approuter)
                 additions.push({ in: [approuter, 'requires'], where: { 'parameters.config.app-identifier': 'approuter' }})
                 const approuterSrvApi = { in: [approuter, 'requires'], where: { 'name': 'srv-api' } }
@@ -55,7 +55,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
                 overwrites.push({ item: [approuterSrvApi, 'properties.forwardAuthCertificates'], withValue: true })
                 overwrites.push({ item: [approuterSrvApi, 'properties.strictSSL'], withValue: true })
             }
-            if (hasMultitenancy) {
+            if (affected('multitenancy', 'mta')) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 const mtxIdentityBinding = { in: [mtxSidecar, 'requires'], where: { 'parameters.config.app-identifier': 'mtx' } }
                 additions.push(mtxSidecar, mtxIdentityBinding)
@@ -63,13 +63,13 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             const identity = { in: 'dependencies', where: { 'alias': 'identity' } }
             await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { project, additions: [identity] })
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { project })
         }
 
-        if (addCfManifest) {
+        if (affected('cf-manifest')) {
             const srv = { in: 'applications', where: { 'name': `${project.appName}-srv` } }
             const identityBinding = { in: 'services', where: { 'parameters.app-identifier': 'srv' } }
             await merge(__dirname, 'files/manifest.yml.hbs').into('manifest.yml', { project, additions: [srv, identityBinding] })

package/lib/init/template/initial/files/.gitignore.hbs

@@ -2,6 +2,7 @@ node_modules/
 target/
 _out/
 gen/
+.cds/
 
 .cdsrc-private.json
 default-*.json

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

@@ -29,9 +29,9 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { addMta, srv, addKyma } = project
+    const { affected, srv } = project
 
-    if (addMta) {
+    if (affected('mta')) {
       const srvModule = srv4(srv.path)
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
           project,
@@ -43,7 +43,7 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
       })
     }
 
-    if (addKyma) {
+    if (affected('kyma')) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
       await KymaTemplate.mergeDependency("service-instance", "kafka")
     }

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

@@ -76,13 +76,11 @@ module.exports = class KymaTemplate extends require('../../plugin') {
   async combine(facet) {
     // REVISIT: This must be moved to the respective plugins
     const {
-      addHana, addHanaServerless, hasHanaServerless, addMultitenancy, addXsuaa, hasApprouter,
-      addApprouter, addIas, addAms, hasXsuaa, hasMultitenancy, addWorkzoneStandard,
-      addHtml5Repo, hasHtml5Repo, addAppFrontend
+      affected, hasHanaServerless, hasApprouter, hasXsuaa, hasMultitenancy, hasHtml5Repo
     } = readProject(facet)
 
-    if (addHtml5Repo || addWorkzoneStandard || addApprouter && hasHtml5Repo) {
-      if (addHtml5Repo) {
+    if (affected('html5-repo', 'workzone-standard', 'approuter')) {
+      if (affected('html5-repo')) {
         await KymaTemplate.mergeDependency('service-instance', 'content-agent-service')
         await KymaTemplate.mergeDependency('service-instance', 'html5-apps-repo-host')
         await KymaTemplate.mergeDependency('content-deployment', 'html5-apps-deployer')
@@ -91,13 +89,13 @@ module.exports = class KymaTemplate extends require('../../plugin') {
         await KymaTemplate.mergeDependency('service-instance', 'html5-apps-repo-runtime')
       }
     }
-    if (addAppFrontend) {
+    if (affected('app-frontend')) {
       await KymaTemplate.mergeDependency('service-instance', 'content-agent-service')
       await KymaTemplate.mergeDependency('service-instance', 'app-front')
       await KymaTemplate.mergeDependency('content-deployment', 'html5-apps-deployer')
     }
-    if (addMultitenancy || addXsuaa || addIas || addAms) {
-      if (addMultitenancy) {
+    if (['multitenancy', 'xsuaa', 'ias', 'ams'].some(facet => affected(facet))) {
+      if (affected('multitenancy')) {
         await KymaTemplate.mergeDependency('web-application', 'sidecar')
       }
       if (hasXsuaa && hasMultitenancy) {
@@ -106,7 +104,7 @@ module.exports = class KymaTemplate extends require('../../plugin') {
         await KymaTemplate.mergeDependency('service-instance', 'subscription-manager')
       }
     }
-    if (addHana || addHanaServerless || addMultitenancy) {
+    if (['hana', 'hana-serverless', 'multitenancy'].some(facet => affected(facet))) {
       if (hasHanaServerless) {
         await KymaTemplate.mergeDependency('service-instance', 'db')
       } else if (hasMultitenancy) {

package/lib/init/template/malware-scanner/index.js

@@ -23,9 +23,9 @@ module.exports = class MalwareScannerTemplate 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, malwareScanner ]
             const relationships = [{
@@ -37,7 +37,7 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
             })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
             await KymaTemplate.mergeDependency('service-instance', 'malware-scanner')
         }

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

@@ -21,8 +21,11 @@ module.exports = class MtaTemplate extends require('../../plugin') {
         if (project.isJava) await mvn.add('cf')
     }
 
-    async combine() {
-        const project = readProject()
-        await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project })
+    async combine(facet) {
+        const project = readProject(facet)
+        const { affected } = project
+        if (affected('mta')) {
+            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project })
+        }
     }
 }

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

@@ -31,7 +31,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       const packageJson = await read('package.json')
       packageJson.workspaces = ['mtx/sidecar']
       packageJson.devDependencies ??= {}
-      packageJson.devDependencies['@sap/cds-mtxs'] ??= '^3'
+      packageJson.devDependencies['@sap/cds-mtxs'] ??= '^4'
       await write('package.json', packageJson, { spaces: 2 })
       await sort('package.json', 'devDependencies')
       await mvn.add('mtx')
@@ -43,12 +43,11 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
   async combine(facet) {
     const project = readProject(facet)
     const {
-      isNodejs, isJava, addMta, hasMta,
-      addXsuaa, hasXsuaa, addIas, hasIas, addMultitenancy, hasHana, hasHanaServerless, addKyma, hasApprouter,
+      isNodejs, isJava, affected, hasXsuaa, hasIas, hasHana, hasHanaServerless, hasApprouter,
       srv, appName
     } = project
 
-    if (addMta || (addMultitenancy || addIas || addXsuaa) && hasMta) {
+    if (affected('mta', 'multitenancy', 'ias', 'xsuaa')) {
       const srvModule = srv4(srv.path)
       const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
       const modules = [srvModule, mtxSidecar]
@@ -84,7 +83,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       await merge(templateMtaPath).into('mta.yaml', { with: project, additions, relationships })
     }
 
-    if (addKyma) {
+    if (affected('kyma', 'approuter', 'ias', 'hana-serverless')) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
       const applicationWorkload = hasApprouter ? 'approuter' : 'srv'
       await merge({
@@ -116,7 +115,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     }
 
     // cds10 move to if above
-    if (addKyma) {
+    if (affected('kyma')) {
       const deletions = []
       if (hasHana) {
         deletions.push({
@@ -133,7 +132,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions, deletions })
     }
 
-    if (addXsuaa) {
+    if (affected('xsuaa')) {
       await merge(__dirname, 'files/xs-security.json.hbs').into('xs-security.json', {
         project,
         additions: [{

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

@@ -35,9 +35,9 @@ module.exports = class NotificationsTemplate extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { addMta } = project
+    const { affected } = project
 
-    if (addMta) {
+    if (affected('mta')) {
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions: [notificationTypesDeployer] })
     }
   }