@sap/cds-dk 9.4.1 → 9.4.3

package/lib/init/template/ias/files/mta.yaml.hbs

@@ -57,6 +57,9 @@ resources:
       service-name: {{appName}}-ias
       service-plan: application
       config:
+        provided-apis:
+          - name: {{appName}}-ias-api
+            description: API exposed by the application
         display-name: {{appName}}
         oauth2-configuration:
           token-policy:

package/lib/init/template/ias/files/values.yaml.hbs

@@ -44,13 +44,16 @@ identity:
     {{#hasXsuaa}}
     xsuaa-cross-consumption: true
     {{/hasXsuaa}}
+    provided-apis:
+      - name: {{appName}}-ias-api
+        description: API exposed by the application
     oauth2-configuration:
       token-policy:
         access-token-format: "jwt"
     {{#hasApprouter}}
       redirect-uris:
         {{=<% %>=}}
-        - https://*.{{ tpl .Values.global.domain . }}/login/callback
+        - https://*.{{ tpl .Values.global.domain . }}/**
         <%={{ }}=%>
       post-logout-redirect-uris:
         {{=<% %>=}}

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

@@ -1,6 +1,6 @@
 const { readProject } = require('../../projectReader')
 const { merge, sort } = require('../../merge')
-const { srv4, approuter, mtxSidecar4 } = require('../../registries/mta')
+const { srv4, approuter, ias, mtxSidecar4 } = require('../../registries/mta')
 const cds = require('../../../cds')
 const { exists, read } = cds.utils
 
@@ -21,16 +21,16 @@ module.exports = class IasTemplate extends require('../../plugin') {
         const project = readProject()
         const { configFile, isNodejs } = project
         project.profile ??= 'production'
-        project.shortcut = typeof (await read(configFile)).cds?.requires?.auth !== 'object'
+        project.shortcut = exists(configFile) ? typeof (await read(configFile)).cds?.requires?.db !== 'object' : true
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project, forceOverwrite: true })
         if (isNodejs) await sort('package.json', 'dependencies')
     }
 
     async combine() {
         const project = readProject()
-        const { isJava, hasMta, hasCfManifest, hasHelm, hasHelmUnifiedRuntime, hasApprouter, hasMultitenancy, srvPath } = project
+        const { isJava, addMta, hasMta, addCfManifest, addHelm, addHelmUnifiedRuntime, addApprouter, addMultitenancy, srvPath } = project
 
-        if (hasMultitenancy) {
+        if (addMultitenancy) {
             const conf = exists('mtx/sidecar/package.json') ? await read('mtx/sidecar/package.json') : {}
             conf.cds ??= {}
             const profile = conf.cds.profile
@@ -43,15 +43,14 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/sidecar.package.json.hbs').into('mtx/sidecar/package.json')
         }
 
-        if (hasMta) {
+        if (addMta || (addApprouter || addMultitenancy) && hasMta) {
             const srv = srv4(srvPath)
-            const identity = { in: 'resources', where: { 'parameters.service': 'identity' } }
             const srvIdentityBinding = { in: [srv, 'requires'], where: { 'parameters.config.app-identifier': 'srv' } }
             const srvCertUrlApi = { in: [srv, 'provides'], where: { 'name': 'srv-api' } }
-            const additions = [srv, identity, srvIdentityBinding, srvCertUrlApi]
+            const additions = [srv, ias, srvIdentityBinding, srvCertUrlApi]
             const overwrites = []
 
-            if (hasApprouter) {
+            if (addApprouter) {
                 additions.push(approuter)
                 additions.push({ in: [approuter, 'requires'], where: { 'parameters.config.app-identifier': 'approuter' }})
                 const approuterSrvApi = { in: [approuter, 'requires'], where: { 'name': 'srv-api' } }
@@ -60,7 +59,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 (addMultitenancy) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 const mtxIdentityBinding = { in: [mtxSidecar, 'requires'], where: { 'parameters.config.app-identifier': 'mtx' } }
                 additions.push(mtxSidecar, mtxIdentityBinding)
@@ -68,13 +67,13 @@ module.exports = class IasTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             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 (hasCfManifest) {
+        if (addCfManifest) {
             await this.#combineWithCfManifest(project) // REVISIT: we shouldn't overly promote cf-manifest
         }
     }

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

@@ -28,9 +28,9 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, srvPath, hasHelm, hasHelmUnifiedRuntime } = project
+    const { addMta, srvPath, addHelm, addHelmUnifiedRuntime } = project
 
-    if (hasMta) {
+    if (addMta) {
       const srv = srv4(srvPath)
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
           project,
@@ -42,7 +42,7 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
       })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
     }
   }

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

@@ -1,5 +1,5 @@
 const cds = require('../../../cds')
-const { read } = cds.utils
+const { read, exists } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 
@@ -22,7 +22,7 @@ module.exports = class LocalMessagingTemplate extends require('../../plugin') {
   async run() {
     const project = readProject()
     const { configFile } = project
-    project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
+    project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
   }
 }

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

@@ -12,10 +12,6 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
         return !!env.requires['malware-scanner']
     }
 
-    async canRun() {
-        return true
-    }
-
     async run() {
         const project = readProject()
         const { isNodejs } = project
@@ -26,9 +22,9 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasMta, hasHelm, hasHelmUnifiedRuntime, srvPath } = project
+        const { addMta, addHelm, addHelmUnifiedRuntime, srvPath } = project
 
-        if (hasMta) {
+        if (addMta) {
             const srv = srv4(srvPath)
             const additions = [srv, malwareScanner ]
             const relationships = [{
@@ -40,7 +36,7 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
             })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
         }
     }

package/lib/init/template/mta/files/mta.yaml.hbs

@@ -43,6 +43,16 @@ modules:
         properties:
           srv-url: ${default-url}
     requires: []
+{{#externalServices}}
+  - name: {{name}}
+    type: nodejs
+    path: {{& path }}
+    parameters:
+      instances: 1
+      buildpack: nodejs_buildpack
+    build-parameters:
+      builder: npm-ci
+{{/externalServices}}
 
 resources:
   []

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

@@ -19,9 +19,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
   }
 
   static hasInProduction(env) {
-    const { options } = cds.cli.options
-    // REVISIT: Check if this can be simplified
-    return options?.add?.has('mtx') || options?.add?.has('multitenancy') || !!env.requires?.multitenancy || false
+    return env.requires?.multitenancy
   }
 
   async run() {
@@ -44,12 +42,12 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
   async combine() {
     const project = readProject()
     const {
-      isNodejs, isJava, hasMta, hasHelm, hasHelmUnifiedRuntime,
-      hasXsuaa, hasIas, hasHana, hasContainerize, hasApprouter,
+      isNodejs, isJava, addMta, hasMta, addHelm, addHelmUnifiedRuntime,
+      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, addContainerize, hasApprouter,
       srvPath, appName
     } = project
 
-    if (hasMta) {
+    if (addMta || (addIas || addXsuaa) && hasMta) {
       const srv = srv4(srvPath)
       const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
       const modules = [srv, mtxSidecar]
@@ -60,7 +58,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       if (isJava) apis.push(requiredMtxSidecarApi4(srv))
       const additions = [...modules, ...services, ...apis]
       const relationships = []
-      if (hasXsuaa) {
+      if (addXsuaa) {
         relationships.push({
           insert: [saasRegistry, 'name'],
           into: [isJava ? srv : mtxSidecar, 'requires', 'name']
@@ -82,7 +80,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       await merge(templateMtaPath).into('mta.yaml', { with: project, additions, relationships })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
       const applicationWorkload = hasApprouter ? 'approuter' : 'srv'
       await merge({
@@ -96,7 +94,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       }).into('chart/values.yaml',{ forceOverwrite: true })
     }
 
-    if (hasContainerize) {
+    if (addContainerize) {
       const deletions = []
       if (hasHana) {
         deletions.push({
@@ -113,7 +111,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions, deletions })
     }
 
-    if (hasXsuaa) {
+    if (addXsuaa) {
       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() {
     const project = readProject()
-    const { hasMta } = project
+    const { addMta } = project
 
-    if (hasMta) {
+    if (addMta) {
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions: [notificationTypesDeployer] })
     }
   }

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

@@ -24,12 +24,16 @@ module.exports = class PipelineTemplate extends require('../../plugin') {
     }
 
     async run() {
-        await copy(join(__dirname, 'files')).to(cds.root)
+        await Promise.all([
+            copy(join(__dirname, 'files', '.pipeline')).to(join(cds.root, '.pipeline')),
+            copy(join(__dirname, 'files', 'Jenkinsfile')).to(join(cds.root, 'Jenkinsfile'))
+        ])
 
         const project = readProject()
         const { apps, appPath, hasUI5 } = project
 
         if (hasUI5) { // UI5 integration might be needed even without HTML5 repo
+            console.log('Adding UI5 integration to the pipeline for the detected UI5 apps...')
             for (const { app } of apps) {
                 project.app = app
                 await Promise.all([

package/lib/init/template/portal/files/mta.yaml.hbs

@@ -73,3 +73,9 @@ resources:
     type: org.cloudfoundry.managed-service
     parameters:
       service: identity
+
+  - name: {{appName}}-html5-repo-host
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: html5-apps-repo
+      service-plan: app-host

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

@@ -28,13 +28,13 @@ module.exports = class PortalTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { appName, isJava, hasMta, srvPath, hasHtml5Repo, hasXsuaa, hasApprouter, hasMultitenancy, hasHelm, hasHelmUnifiedRuntime, hasContainerize } = project
+    const { appName, isJava, addMta, hasMta, srvPath, addHtml5Repo, addXsuaa, addApprouter, addMultitenancy, addHelm, addHelmUnifiedRuntime, addContainerize, hasApprouter, hasHtml5Repo } = project
 
-    if (hasMultitenancy) {
+    if (addMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
     }
 
-    if (hasMta) {
+    if (addMta || (addXsuaa || addHtml5Repo || addApprouter || addMultitenancy) && hasMta) {
       const srv = srv4(srvPath)
       const additions = [srv, portal, appDeployer, portalDeployer]
       const relationships = [{
@@ -45,7 +45,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
         into: [portalDeployer, 'requires', 'name']
       }]
 
-      if (hasXsuaa) {
+      if (addXsuaa) {
         additions.push(xsuaa)
         relationships.push({
           insert: [xsuaa, 'name'],
@@ -68,7 +68,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
         })
       }
 
-      if (hasMultitenancy) {
+      if (addMultitenancy) {
         relationships.push({
           insert: [portal, 'name'],
           into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
@@ -80,7 +80,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
       })
     }
 
-    if (hasContainerize) {
+    if (addContainerize) {
       const additions = [{
           in: 'modules',
           where: { name: `${appName}-portal-deployer` }
@@ -88,7 +88,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
       await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
     }
   }

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

@@ -1,5 +1,5 @@
 const cds = require('../../../cds')
-const { read } = cds.utils
+const { read, exists } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const mvn = require('../../mvn')
@@ -24,16 +24,16 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
   async run() {
     const project = readProject()
     const { configFile, isJava } = project
-    project.shortcut = typeof (await read(configFile)).cds?.requires?.db !== 'object'
+    project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.db !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into('package.json', { project })
     if (isJava) await mvn.add('postgresql')
   }
 
   async combine() {
     const project = readProject()
-    const { hasMta, srvPath } = project
+    const { addMta, srvPath } = project
 
-    if (hasMta) {
+    if (addMta) {
       const srv = srv4(srvPath)
       await merge(__dirname, 'files/mta.yml.hbs').into('mta.yaml', {
         project,

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

@@ -27,9 +27,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, srvPath } = project
+    const { addMta, srvPath } = project
 
-    if (hasMta) {
+    if (addMta) {
       const srv = srv4(srvPath)
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
         project,

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

@@ -1,5 +1,5 @@
 const cds = require('../../../cds')
-const { read } = cds.utils
+const { read, exists } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 
@@ -28,7 +28,7 @@ module.exports = class RedisMessagingTemplate extends require('../../plugin') {
   async run() {
     const project = readProject()
     const { configFile } = project
-    project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
+    project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
   }
 }

package/lib/init/template/sample/files/app/admin-books/fiori-service.cds

@@ -109,8 +109,8 @@ extend service AdminService {
 }
 
 // Workaround for Fiori popups for asking user to enter a valid UUID on Create
-annotate AdminService.Authors : ID with  @Core.Computed  @odata.Type: 'Edm.String';
-annotate AdminService.Books : ID with  @Core.Computed  @odata.Type: 'Edm.String';
+annotate AdminService.Authors : ID with  @Core.Computed;
+annotate AdminService.Books : ID with  @Core.Computed;
 
 // Show Genre as drop down, not a dialog
 annotate AdminService.Books with {

package/lib/init/template/sample/files/javascript/admin-service.js.hbs

@@ -0,0 +1,24 @@
+{{#isESM}}
+import cds from '@sap/cds'
+
+export class AdminService extends cds.ApplicationService { init() {
+{{/isESM}}
+{{^isESM}}
+const cds = require('@sap/cds')
+
+module.exports = class AdminService extends cds.ApplicationService { init() {
+{{/isESM}}
+
+  const { Books } = this.entities
+
+  /**
+   * Generate IDs for new Books drafts
+   */
+  this.before ('NEW', Books.drafts, async (req) => {
+    if (req.data.ID) return
+    const { ID:id1 } = await SELECT.one.from(Books).columns('max(ID) as ID')
+    const { ID:id2 } = await SELECT.one.from(Books.drafts).columns('max(ID) as ID')
+    req.data.ID = Math.max(id1||0, id2||0) + 1
+  })
+  return super.init()
+}}

package/lib/init/template/sample/files/javascript/cat-service.js.hbs

@@ -0,0 +1,43 @@
+{{#isESM}}
+import cds from '@sap/cds'
+
+export class CatalogService extends cds.ApplicationService { init() {
+{{/isESM}}
+{{^isESM}}
+const cds = require('@sap/cds')
+
+module.exports = class CatalogService extends cds.ApplicationService { init() {
+{{/isESM}}
+
+  const { Books } = cds.entities('sap.capire.bookshop')
+  const { ListOfBooks } = this.entities
+
+  // Add some discount for overstocked books
+  this.after('each', ListOfBooks, book => {
+    if (book.stock > 111) book.title += ` -- 11% discount!`
+  })
+
+  // Reduce stock of ordered books if available stock suffices
+  this.on('submitOrder', async req => {
+    let { book:id, quantity } = req.data
+    let book = await SELECT.one.from (Books, id, b => b.stock)
+
+    // Validate input data
+    if (!book) return req.error (404, `Book #${id} doesn't exist`)
+    if (quantity < 1) return req.error (400, `quantity has to be 1 or more`)
+    if (!book.stock || quantity > book.stock) return req.error (409, `${quantity} exceeds stock for book #${id}`)
+
+    // Reduce stock in database and return updated stock value
+    await UPDATE (Books, id) .with ({ stock: book.stock -= quantity })
+    return book
+  })
+
+  // Emit event when an order has been submitted
+  this.after('submitOrder', async (_,req) => {
+    let { book, quantity } = req.data
+    await this.emit('OrderedBook', { book, quantity, buyer: req.user.id })
+  })
+
+  // Delegate requests to the underlying generic service
+  return super.init()
+}}

package/lib/init/template/sample/files/typescript/admin-service.ts.hbs

@@ -0,0 +1,16 @@
+import cds from '@sap/cds'
+
+import { Authors, Books } from '#cds-models/AdminService'
+
+export class AdminService extends cds.ApplicationService { init(){
+  this.before (['NEW','CREATE'], Authors, genid)
+  this.before (['NEW','CREATE'], Books, genid)
+  return super.init()
+}}
+
+/** Generate primary keys for target entity in request */
+async function genid (req:any) {
+  if (req.data.ID) return
+  const {id} = await SELECT.one.from(req.target).columns('max(ID) as id')
+  req.data.ID = id + 4 // Note: that is not safe! ok for this sample only.
+}

package/lib/init/template/sample/files/typescript/cat-service.ts.hbs

@@ -0,0 +1,31 @@
+import cds from '@sap/cds'
+
+import { Books } from '#cds-models/sap/capire/bookshop'
+import { submitOrder, ListOfBooks } from '#cds-models/CatalogService'
+
+export class CatalogService extends cds.ApplicationService { async init() {
+
+  // Add some discount for overstocked books
+  this.after('each', ListOfBooks, book => {
+    if (book?.stock === undefined || book.stock === null) return
+    if (book?.stock > 111) book.title += ` -- 11% discount!`
+  })
+
+  // Reduce stock of ordered books if available stock suffices
+  this.on(submitOrder, async req => {
+    let { book:id, quantity } = req.data
+    let book = await SELECT.from (Books, id!, b => b.stock)
+
+    // Validate input data
+    if (!book) return req.error (404, `Book #${id} doesn't exist`)
+    if (!quantity || quantity < 1) return req.error (400, `quantity has to be 1 or more`)
+    if (quantity > book.stock!) return req.error (409, `${quantity} exceeds stock for book #${id}`)
+
+    // Reduce stock in database and return updated stock value
+    await UPDATE (Books, id) .with ({ stock: book.stock! -= quantity })
+    return book
+  })
+
+  // Delegate requests to the underlying generic service
+  return super.init()
+}}

package/lib/init/template/test/files/test/test.xs.hbs

@@ -13,7 +13,7 @@ const { GET, POST, expect, axios } = cds.test (__dirname+'/..')
 axios.defaults.auth = { username: '{{user}}', password: '{{password}}' }
 {{/user}}
 
-describe('OData APIs', () => {
+describe('{{serviceName}} OData APIs', () => {
 
 {{#entities}}{{=<% %>=}}
   it('serves <%name%>', async () => {

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

@@ -69,7 +69,7 @@ async function createNodeTest(proj) {
       .filter(([name]) =>  name.match(nameFilter))
       .filter(([name]) => !name.match(/[._]texts$/))
       .filter(([, e])  => !e['@cds.autoexposed']) // only consider non-autoexposed entities to reduce clutter
-      .map(([, e]) => e)
+      .map(([name, e]) => {e._nameUnqualified = name; return e})
 
     let entity // use one entity only (don't want to make users test all entities)
     if (entities.length) entity = entities[0]
@@ -99,7 +99,7 @@ async function createNodeTest(proj) {
 
       proj.entities = [{
         name: entity.name,
-        urlPath: `/${sInfo.endpoints[0].path}${entity.name}`,
+        urlPath: `/${sInfo.endpoints[0].path}${entity._nameUnqualified}`,
         selectString: selectElements.join(','),
         elementsString: JSON.stringify(
           Object.entries(sampleData[entity.name][0])

package/lib/init/template/tiny-sample/index.js

@@ -14,7 +14,7 @@ module.exports = class TinySampleTemplate extends require('../../plugin') {
     async run() {
         const { isJava } = readProject()
         if (isJava) {
-            if (!cds.cli.options.add.has(JAVA)) {
+            if (!cds.cli.options.add?.has(JAVA)) {
                 await mvn.add('tiny_sample')
             }
         } else {

package/lib/init/template/workzone-standard/index.js

@@ -26,7 +26,7 @@ module.exports = class extends require('../../plugin') {
   }
 
   static hasInProduction(env) {
-    return !!env.requires?.workzone || cds.cli.options.add.has('workzone-standard')
+    return !!env.requires?.workzone || cds.cli.options.add?.has('workzone-standard')
   }
 
   async run() {
@@ -41,7 +41,7 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { isJava, hasMta, srvPath, apps, appPath, appUIPaths, hasMultitenancy, strippedAppName } = project
+    const { isJava, addMta, hasMta, srvPath, apps, appPath, appUIPaths, addMultitenancy, strippedAppName } = project
 
     await Promise.all(appUIPaths.map(async p => {
       project.uiApp = p
@@ -67,7 +67,7 @@ module.exports = class extends require('../../plugin') {
       await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions, overwrites })
     }))
 
-    if (hasMultitenancy) {
+    if (addMultitenancy) {
       const mtxPackageJson = await read('mtx/sidecar/package.json')
       mtxPackageJson.cds ??= {}
       mtxPackageJson.cds.requires ??= {}
@@ -78,14 +78,14 @@ module.exports = class extends require('../../plugin') {
       await write('mtx/sidecar/package.json', mtxPackageJson, { spaces: 2 })
     }
 
-    if (hasMta) {
+    if (addMta || addMultitenancy && hasMta) {
       const srv = srv4(srvPath)
       const additions = [srv, destinations, destination, {
         in: [destination, 'requires'],
         where: { name: 'srv-api' }
       }]
       const relationships = []
-      if (hasMultitenancy) {
+      if (addMultitenancy) {
         additions.push(html5RepoHost)
         relationships.push({
           insert: [html5RepoHost, 'name'],
@@ -93,7 +93,6 @@ module.exports = class extends require('../../plugin') {
         })
       }
 
-
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions, relationships })
     }
   }

package/lib/init/template/xsuaa/files/mta.yaml.hbs

@@ -6,13 +6,11 @@ modules:
     requires:
       - name: {{appName}}-auth
 
-{{#hasMultitenancy}}
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
     requires:
       - name: {{appName}}-auth
-{{/hasMultitenancy}}
 
 resources:
   - name: {{appName}}-auth{{#servicePlan}}-{{servicePlan}}{{/servicePlan}}