@sap/cds-dk 9.3.2 → 9.4.2

package/lib/init/template/app-frontend/files/mta.yaml.hbs

@@ -0,0 +1,64 @@
+---
+parameters:
+  deploy_mode: html5-repo
+modules:
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
+
+  - name: {{appName}}
+    type: approuter.nodejs
+    path: {{& approuterPath}}
+    requires:
+      - name: {{appName}}-html5-runtime
+
+  - name: {{appName}}-app-deployer
+    type: com.sap.application.content
+    path: {{#isNodejs}}gen{{/isNodejs}}{{#isJava}}.{{/isJava}}
+    build-parameters:
+      build-result: {{#isNodejs}}{{& appPath }}{{/isNodejs}}{{#isJava}}resources{{/isJava}}
+      requires:
+      {{#apps}}
+        - name: {{strippedAppName}}{{strippedApp}}
+          artifacts:
+            - {{app}}.zip
+          target-path: {{#isNodejs}}{{& appPath }}{{/isNodejs}}{{#isJava}}resources{{/isJava}}
+      {{/apps}}
+    requires:
+      - name: srv-api
+      {{#hasXsuaa}}
+      - name: {{appName}}-auth
+      {{/hasXsuaa}}
+      - name: {{appName}}-app-front
+        parameters:
+          content-target: true
+    parameters:
+      config:
+        destinations:
+        - name: srv-api
+          url: ~{srv-api/srv-url}
+          forwardAuthToken: true
+        {{#hasUI5}}
+        - name: ui5
+          url: https://ui5.sap.com
+        {{/hasUI5}}
+
+  {{#apps}}
+  - name: {{strippedAppName}}{{strippedApp}}
+    type: html5
+    path: {{& appPath}}{{app}}
+    build-parameters:
+      build-result: dist
+      builder: custom
+      commands:
+        - npm ci
+        - npm run build
+      supported-platforms: []
+  {{/apps}}
+
+resources:
+  - name: {{appName}}-app-front
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: app-front
+      service-plan: developer

package/lib/init/template/app-frontend/files/package.json.hbs

@@ -0,0 +1,17 @@
+{
+  {{#isNodejs}}
+  "cds": {
+  {{/isNodejs}}
+    "requires": {
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
+        "app-front": true
+      {{#profile}}
+      }
+      {{/profile}}
+    }
+  {{#isNodejs}}
+  }
+  {{/isNodejs}}
+}

package/lib/init/template/app-frontend/files/ui5-deploy.yaml.hbs

@@ -0,0 +1,25 @@
+---
+# yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
+specVersion: '3.1'
+metadata:
+  name: {{app}}
+type: application
+resources:
+  configuration:
+    propertiesFileSourceEncoding: UTF-8
+builder:
+  resources:
+    excludes:
+      - "/test/**"
+      - "/localService/**"
+  customTasks:
+    - name: ui5-task-zipper
+      afterTask: generateVersionInfo
+      configuration:
+        archiveName: {{app}}
+        additionalFiles:
+          - xs-app.json
+    {{#isTypescript}}
+    - name: ui5-tooling-transpile-task
+      afterTask: replaceVersion
+    {{/isTypescript}}

package/lib/init/template/app-frontend/files/ui5.yaml.hbs

@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
+specVersion: '3.1'
+metadata:
+  name: {{app}}
+type: application

package/lib/init/template/app-frontend/files/values.yaml.hbs

@@ -0,0 +1,20 @@
+---
+app-front:
+  serviceOfferingName: app-front
+  servicePlanName: developer
+html5-apps-deployer:
+  env:
+    SAP_CLOUD_SERVICE: {{strippedAppName}}.service
+  image:
+    repository: {{appName}}-html5-deployer
+  bindings:
+    app-front:
+      serviceInstanceName: app-front
+{{=<% %>=}}
+  envFrom:
+    - configMapRef:
+        name: "{{ .Release.Name }}-app-front-configmap"
+<%={{ }}=%>
+backendDestinations:
+  srv-api:
+    service: srv

package/lib/init/template/app-frontend/files/xs-app.json.hbs

@@ -0,0 +1,17 @@
+{
+  "welcomeFile": "/index.html",
+  "authenticationMethod": "route",
+  "routes": [
+    {
+      "source": "^/?odata/(.*)$",
+      "target": "/odata/$1",
+      "destination": "srv-api"{{#hasXsuaa}},
+      "authenticationType": "xsuaa"{{/hasXsuaa}},
+      "csrfProtection": false
+    },
+    {
+        "source": ".*",
+        "service": "app-front"
+    }
+  ]
+}

package/lib/init/template/app-frontend/index.js

@@ -0,0 +1,98 @@
+const { join } = require('path')
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+const { srv4, appDeployer, appFront } = require('../../registries/mta')
+const { odataApi } = require('../../registries/xs-app')
+const { renderAndCopy } = require('../../template')
+const { exists } = require('../../../cds').utils
+
+module.exports = class extends require('../../plugin') {
+
+    static help() {
+        return 'SAP BTP AppFront service' // TODO: Product name?
+    }
+
+    static hasInProduction(env) {
+        return !!env.requires['app-front']
+    }
+
+    async run() {
+        const project = readProject()
+        const { appUIPaths, apps, appPath, configFile, hasUI5 } = project
+        await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
+
+        if (hasUI5) {
+            for (const { app } of apps) {
+                project.app = app
+                await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project })
+            }
+            for (const { app } of apps) {
+                project.app = app
+                await merge(__dirname, 'files/ui5-deploy.yaml.hbs').into(join(appPath, app, 'ui5-deploy.yaml'), { project })
+            }
+        }
+
+        for (const { app } of apps) {
+            project.app = app
+            await merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app, 'package.json'), { project })
+            if (hasUI5) {
+                await renderAndCopy(join(__dirname, 'files/index.html.hbs'), join(appPath, app, 'webapp/index.html'), project)
+            }
+        }
+
+        // app deployer requires a manifest.json
+        await Promise.all(appUIPaths.map(p =>
+            merge(__dirname, 'files/manifest.json')
+                .into(join(appPath, p, 'webapp/manifest.json'), { project })
+        ))
+    }
+
+    async combine() {
+        const project = readProject()
+        const { srvPath, appPath, addMta, apps } = project
+
+        await Promise.all(apps.map(async ({ app }) => {
+            project.app = app
+            project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
+            const additions = [odataApi]
+            await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
+        }))
+
+        // later -> rather consider adding to app-front package.json
+        // if (hasMultitenancy) {
+        //  await merge({ cds: { requires: { 'app-front':true } } }).into('mtx/sidecar/package.json')
+        // }
+
+        if (addMta) {
+            const srv = srv4(srvPath)
+            project.apps = apps
+            const appModules = project.apps.map(app => ({
+                in: 'modules',
+                where: { type: 'html5', path: `${appPath}${app.app}` }
+            }))
+            const additions = [srv, appDeployer, appFront, ...appModules]
+            const relationships = [{
+                insert: [appFront, 'name'],
+                into: [appDeployer, 'requires', 'name'],
+            }]
+            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
+                with: project,
+                additions,
+                relationships
+            })
+        }
+
+        // When Helm support is added
+        // if (hasContainerize) {
+        //     const additions = [{
+        //         in: 'modules',
+        //         where: { name: `${project.appName}-content-deployer` }
+        //     }]
+        //     await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
+        // }
+        // if (hasHelm || hasHelmUnifiedRuntime) {
+        //     await renderAndCopy(join(__dirname, 'files/ui-resources'), 'ui-resources', project)
+        //     await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
+        // }
+    }
+}

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

@@ -28,16 +28,19 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
 
     async combine() {
         const project = readProject()
-        const { hasMta, hasApprouter, isJava, hasMultitenancy, srvPath } = project
+        const { addMta, addApprouter, isJava, addMultitenancy, srvPath } = project
 
-        if (hasMta) {
-            const srv = srv4(srvPath)
-            const additions = [srv, applicationLogging]
-            const relationships = [{
-                insert: [applicationLogging, 'name'],
-                into: [srv, 'requires', 'name']
-            }]
-            if (hasMultitenancy) {
+        if (addMta || addMultitenancy) {
+            const additions = [], relationships = []
+            if (addMta) {
+                const srv = srv4(srvPath)
+                additions.push(srv, applicationLogging)
+                relationships.push({
+                    insert: [applicationLogging, 'name'],
+                    into: [srv, 'requires', 'name']
+                })
+            }
+            if (addMultitenancy) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 additions.push(mtxSidecar)
                 relationships.push({
@@ -45,7 +48,7 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
                     into: [mtxSidecar, 'requires', 'name']
                 })
             }
-            if (hasApprouter) {
+            if (addApprouter) {
                 additions.push(approuter)
                 relationships.push({
                     insert: [applicationLogging, 'name'],

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

@@ -10,7 +10,6 @@ modules:
     {{/hasMultitenancy}}
     {{/isJava}}
     requires:
-      - name: {{appName}}-auth
     {{#isJava}}
       - name: app-api{{#hasMultitenancy}}
         properties:
@@ -84,4 +83,3 @@ resources:
         oauth2-configuration:
           redirect-uris:
             - https://*~{app-api/app-uri}/**
-

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

@@ -31,17 +31,23 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
     }
 
     async combine() {
-        const project = readProject(this.options)
-        const { isNodejs, isJava, hasMTXRoute, hasMultitenancy, hasXsuaa, hasMta, hasHelm, hasHelmUnifiedRuntime, hasMTXRouteJava, hasContainerize, srvPath, approuterPath } = project
+        const project = readProject()
+        const {
+            isNodejs, isJava,
+            addXsuaa, hasXsuaa, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
+            addMta, addHelm, addHelmUnifiedRuntime, hasMta, hasHelm, hasHelmUnifiedRuntime,
+            addContainerize, srvPath, approuterPath
+        } = project
 
-        if (hasMta) {
+
+        if (addMta || (addMultitenancy || addXsuaa) && hasMta) {
             const srv = srv4(srvPath)
-            const apis = isJava && hasMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
+            const apis = isJava && addMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-            if (isNodejs && hasMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
-            if (isJava && hasMultitenancy) apis.push(requiredMtxApi)
+            if (isNodejs && addMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
+            if (isJava && addMultitenancy) apis.push(requiredMtxApi)
             const modules = [srv, approuter]
-            if (hasMultitenancy) modules.push(mtxSidecar)
+            if (addMultitenancy) modules.push(mtxSidecar)
             const additions = [...modules, ...apis]
             if (hasXsuaa) additions.push(xsuaa)
             const relationships = []
@@ -57,11 +63,11 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime || addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
 
-        if (hasContainerize) {
+        if (addContainerize) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-approuter` }

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

@@ -1,6 +1,7 @@
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, attachments } = require('../../registries/mta')
+const { mvn } = require('../../add')
 
 module.exports = class AttachmentsTemplate extends require('../../plugin') {
 
@@ -16,25 +17,18 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
         return !!env.requires?.attachments || readProject().dependencies?.['@cap-js/attachments']
     }
 
-    async canRun() {
-        const { isJava } = readProject()
-        if (isJava) throw `'cds add attachments' is not available for Java yet`
-        return true
-    }
-
     async run() {
         const project = readProject()
-        const { isNodejs } = project
-        if (isNodejs) {
-            await merge(__dirname, 'files/package.json.hbs').into('package.json')
-        }
+        const { isNodejs, isJava } = project
+        if (isNodejs) await merge(__dirname, 'files/package.json.hbs').into('package.json')
+        if (isJava) await mvn.add('attachments')
     }
 
     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, attachments]
             const relationships = [{
@@ -46,7 +40,7 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
             })
         }
 
-        if (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
         }
     }

package/lib/init/template/audit-logging/files/package.json.hbs

@@ -4,4 +4,9 @@
     "@cap-js/audit-logging": ">=0"
   }
   {{/isNodejs}}
+  {{#isJava}}
+  "requires": {
+      "audit-log": true
+  }
+  {{/isJava}}
 }

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

@@ -33,15 +33,15 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, hasHelm, hasMultitenancy, srvPath } = project
+    const { addMta, addHelm, addMultitenancy, srvPath } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
 
-    if (hasMultitenancy) {
+    if (addMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
     }
 
-    if (hasMta) {
+    if (addMta) {
       const srv = srv4(srvPath)
       await merge(join(__dirname, 'files/mta.yaml.hbs')).into('mta.yaml', {
         with: project,
@@ -53,7 +53,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
         ]
       })
     }
-    if (hasHelm) {
+    if (addHelm) {
       await merge({
         srv: { bindings: { auditlog: { serviceInstanceName: 'auditlog' }}},
         auditlog: {

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

@@ -37,9 +37,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { hasMta, hasHelm, hasHelmUnifiedRuntime, hasApprouter, isJava, hasMultitenancy, srvPath } = project
+    const { hasMta, addMta, addHelm, addHelmUnifiedRuntime, addApprouter, isJava, addMultitenancy, srvPath } = project
 
-    if (hasMta) {
+    if (addMta || (addMultitenancy || addApprouter) && hasMta) {
       const cloudLogging = {
         in: 'resources',
         where: {
@@ -47,13 +47,16 @@ module.exports = class extends require('../../plugin') {
           'parameters.service': 'cloud-logging'
         }
       }
+      const additions = [cloudLogging], relationships = []
       const srv = srv4(srvPath)
-      const additions = [srv, cloudLogging]
-      const relationships = [{
-        insert: [cloudLogging, 'name'],
-        into: [srv, 'requires', 'name']
-      }]
-      if (hasMultitenancy) {
+      if (addMta) {
+        additions.push(srv)
+        relationships.push({
+          insert: [cloudLogging, 'name'],
+          into: [srv, 'requires', 'name']
+        })
+      }
+      if (addMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
         additions.push(mtxSidecar)
         relationships.push({
@@ -61,7 +64,7 @@ module.exports = class extends require('../../plugin') {
           into: [mtxSidecar, 'requires', 'name']
         })
       }
-      if (hasApprouter) {
+      if (addApprouter) {
         additions.push(approuter)
         relationships.push({
           insert: [cloudLogging, 'name'],
@@ -74,7 +77,7 @@ module.exports = class extends require('../../plugin') {
         with: project, additions, relationships
       })
     }
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml')
     }
   }

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

@@ -20,9 +20,9 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { srvPath, hasHelm, hasHelmUnifiedRuntime, hasMta } = project
+        const { srvPath, addHelm, addHelmUnifiedRuntime, addMta } = project
 
-        if (hasMta) {
+        if (addMta) {
             const srv = srv4(srvPath)
             const additions = [srv, 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 (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', {
                 project,
                 additions: [{

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

@@ -24,26 +24,26 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasHelm, hasApprouter, hasMultitenancy, hasHelmUnifiedRuntime, hasMta, srvPath, isJava } = project
+        const { addHelm, addApprouter, addMultitenancy, addHelmUnifiedRuntime, addMta, hasMta, srvPath, isJava } = project
 
-        if (hasMultitenancy) {
+        if (addMultitenancy) {
             await merge({ cds: { requires: { destinations:true } } }).into('mtx/sidecar/package.json')
         }
 
-        if (hasMta) {
+        if (addMta || (addApprouter || addMultitenancy) && hasMta) {
             const srv = srv4(srvPath)
             const additions = [srv, destination]
             const relationships = [{
                 insert: [destination, 'name'],
                 into: [srv, 'requires', 'name']
             }]
-            if (hasApprouter) {
+            if (addApprouter) {
                 relationships.push({
                     insert: [destination, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
-            if (hasMultitenancy) {
+            if (addMultitenancy) {
                 relationships.push({
                     insert: [destination, 'name'],
                     into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
@@ -52,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 (hasHelm || hasHelmUnifiedRuntime) {
+        if (addHelm || addHelmUnifiedRuntime) {
             await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
         }
     }

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

@@ -24,9 +24,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { appName, hasMta, hasHelm, hasHelmUnifiedRuntime, isJava, hasMultitenancy, srvPath } = project
+    const { appName, addMta, addHelm, addHelmUnifiedRuntime, isJava, addMultitenancy, srvPath } = project
 
-    if (hasMta) {
+    if (addMta || addMultitenancy) {
       const dynatrace = {
         in: 'resources',
         where: {
@@ -34,13 +34,16 @@ module.exports = class extends require('../../plugin') {
           'parameters.service': 'dynatrace'
         }
       }
-      const srv = srv4(srvPath)
-      const additions = [srv, dynatrace]
-      const relationships = [{
-        insert: [dynatrace, 'name'],
-        into: [srv, 'requires', 'name']
-      }]
-      if (hasMultitenancy) {
+      const additions = [dynatrace], relationships = []
+      if (addMta) {
+        const srv = srv4(srvPath)
+        additions.push(srv)
+        relationships.push({
+          insert: [dynatrace, 'name'],
+          into: [srv, 'requires', 'name']
+        })
+      }
+      if (addMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
         additions.push(mtxSidecar)
         relationships.push({
@@ -54,7 +57,7 @@ module.exports = class extends require('../../plugin') {
       })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
     }
   }

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

@@ -41,9 +41,9 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
 
   async combine() {
     const project = readProject()
-    const { hasXsuaa, hasHelm, hasHelmUnifiedRuntime, hasMta, srvPath, appName } = project
+    const { addXsuaa, addHelm, addHelmUnifiedRuntime, addMta, srvPath, appName } = project
 
-    if (hasMta) {
+    if (addMta) {
       const srv = srv4(srvPath)
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
           project,
@@ -55,8 +55,8 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
       })
     }
 
-    if (hasXsuaa) {
-      if (hasMta) {
+    if (addXsuaa || addMta) {
+      if (addMta) {
         await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
           project,
           additions: [xsuaa]
@@ -72,7 +72,7 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
       })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
     }
 

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

@@ -34,7 +34,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
     const project = readProject()
     const { configFile, isNodejs } = project
     if (isNodejs) {
-      project.shortcut = typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
+      project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.messaging !== 'object'
       project.cloudevents = cds.cli.options.cloudevents
       await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
     }
@@ -42,9 +42,9 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
 
   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)
       await merge(__dirname, 'files', 'mta.yaml.hbs').into('mta.yaml', {
         project,
@@ -56,7 +56,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../../
       })
     }
 
-    if (hasHelm || hasHelmUnifiedRuntime) {
+    if (addHelm || addHelmUnifiedRuntime) {
       await merge(__dirname, 'files/values.yaml').into('chart/values.yaml')
     }