@sap/cds-dk 10.0.7 → 10.1.1

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

@@ -63,11 +63,16 @@ modules:
     type: html5
     path: {{& appPath}}{{app}}
     build-parameters:
+      {{#isStatic}}
+      build-result: .
+      {{/isStatic}}
+      {{^isStatic}}
       build-result: dist
       builder: custom
       commands:
         - npm ci
         - npm run build
+      {{/isStatic}}
       supported-platforms: []
   {{/apps}}
 

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

@@ -2,7 +2,7 @@ const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, html5RepoHost, html5Runtime, xsuaa, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
-const { odataApi, html5RepoApi } = require('../../registries/xs-app')
+const { srvApi, html5RepoApi } = require('../../registries/xs-app')
 const { exists, read } = require('../../../cds').utils
 
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
@@ -22,18 +22,18 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
     async run() {
         const project = readProject()
-        const { appUIPaths, appPath, configFile } = project
+        const { apps, appPath, configFile } = project
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
 
-        // app deployer requires a manifest.json
-        await Promise.all(appUIPaths.map(p =>
+        // Fiori/UI5 apps deploy a manifest.json; static apps (plain index.html) don't
+        await Promise.all(apps.filter(a => !a.isStatic).map(({ app }) =>
             merge(__dirname, 'files/manifest.json')
-                .into(join(appPath, p, 'webapp/manifest.json'), { project })
+                .into(join(appPath, app, 'webapp/manifest.json'), { project })
         ))
     }
 
-    async combine() {
-        const project = readProject()
+    async combine(facet) {
+        const project = readProject(facet)
         const {
             isJava, srv, appPath, apps,
             hasApprouter, hasMta, addMta, hasKyma, hasXsuaa, hasMultitenancy, hasUI5,
@@ -43,7 +43,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         await Promise.all(apps.map(async ({ app }) => {
             project.app = app
             project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
-            const additions = [odataApi, html5RepoApi]
+            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) : {}
@@ -73,10 +73,14 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         if (addMta || affected && hasMta) {
             const srvModule = srv4(srv.path)
             project.apps = apps
-            const relationships = [{
-                insert: [html5RepoHost, 'name'],
-                into: [appDeployer, 'requires', 'name'],
-            }]
+            const hasApps = apps.length > 0
+            const relationships = []
+            if (hasApps) {
+                relationships.push({
+                    insert: [html5RepoHost, 'name'],
+                    into: [appDeployer, 'requires', 'name'],
+                })
+            }
             const appModules = []
             for (const { app } of project.apps) {
                 const html5App = { in: 'modules', where: { type: 'html5', path: `${appPath}${app}` } }
@@ -101,7 +105,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                     into: [isJava ? srvModule : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
                 })
             }
-            if (hasXsuaa) {
+            if (hasXsuaa && hasApps) {
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [appDeployer, 'requires']
@@ -109,7 +113,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project,
-                additions: [srvModule, appDeployer, html5RepoHost, ...appModules],
+                additions: [srvModule, ...(hasApps ? [appDeployer] : []), html5RepoHost, ...appModules],
                 relationships
             })
         }

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

@@ -101,13 +101,21 @@ module.exports = class HttpTemplate extends require('../../plugin') {
             const autoexposed = c['@cds.autoexposed'] || c['@cds.autoexpose']
             const valuelist = c['@cds.odata.valuelist'] === true
             if (!exposed.size && autoexposed && !valuelist) continue
+            const singleton = c['@odata.singleton'] || Object.keys(c).some(k => k.startsWith('@odata.singleton.')) // object form flattens to @odata.singleton.<sub>
             entities.push({
               name: c.name,
-              readOnly: (c["@readonly"] || autoexposed || c['@odata.singleton']) ?? false,
+              readOnly: (c["@readonly"] || autoexposed || singleton) ?? false,
+              insertOnly: c['@insertonly'] ?? false,
+              noInsert: c['@Capabilities.InsertRestrictions.Insertable'] === false,
+              noUpdate: c['@Capabilities.UpdateRestrictions.Updatable'] === false,
+              noDelete: c['@Capabilities.DeleteRestrictions.Deletable'] === false,
               isDraft: c['@odata.draft.enabled'] ?? false,
-              keys: c.keys
+              keys: c.keys,
+              params: c.params,
+              boundOps: c.actions,
+              elements: c.elements
             })
-          } else if (c.kind === 'action') {
+          } else if (c.kind === 'action' || c.kind === 'function') {
             actions.push(c)
           }
         }
@@ -163,47 +171,77 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       const headerAuth = username ? `Authorization: Basic {{username}}:{{password}}` : ''
       const headers = headerAuth ? `Content-Type: application/json\n${headerAuth}` : `Content-Type: application/json`
 
-      service.urlPaths.forEach((urlPath) => {
+      const usedNames = new Set()
+      const uniqueName = base => {
+        let name = base, i = 2
+        while (usedNames.has(name)) name = `${base}_${i++}`
+        usedNames.add(name)
+        return name
+      }
+
+      service.urlPaths.forEach((rawUrlPath) => {
+        const urlPath = rawUrlPath.replace(/^\//, '') // avoid a double slash when the service path is '/'
         if (service.urlPaths.length > 1) {
           requests.push(`\n# Service endpoint: ${urlPath}`)
         }
 
         service.entities.forEach((e) => {
           const entityNameSimple = e.name.slice(serviceName.length + 1)
-          const nameSlug = slug(entityNameSimple)
-          const url = `{{server}}/${urlPath}${entityNameSimple}`
+          const entitySet = entityNameSimple.replace(/\./g, '_') // OData flattens nested names, e.g. E.addr -> E_addr
+          const nameSlug = uniqueName(slug(entitySet))
           const requestTitle = `\n### ${entityNameSimple}`
-          requests.push(`${requestTitle}\n# @name ${nameSlug}_GET\nGET ${url}\n${headerAuth}\n`)
+
+          // parameterized entities are addressed as E(p=…)/Set and are read-only
+          if (e.params && Object.keys(e.params).length) {
+            const args = Object.entries(e.params).map(([n, p]) => `${n}=${sampleParam(p)}`).join(',')
+            const url = `{{server}}/${urlPath}${entitySet}(${args})/Set`
+            requests.push(`${requestTitle}\n# @name ${nameSlug}_GET\nGET ${url}\n${headerAuth}\n`)
+            return
+          }
+
+          const url = `{{server}}/${urlPath}${entitySet}`
+          if (!e.insertOnly) requests.push(`${requestTitle}\n# @name ${nameSlug}_GET\nGET ${url}\n${headerAuth}\n`) // insert-only entities cannot be read
           if (e.readOnly) return
 
           const entityData = payload[`${e.name}`] ? payload[`${e.name}`][0] : null
           if (!entityData) return
 
+          stripNonWritable(entityData, e.keys, e.elements)
+
           if (e.isDraft) {
-            const key = Object.keys(e.keys)[0] // draft keys are always single
-            delete entityData[key] // draft keys should always by auto generated (either UUID or through custom logic), so remove them from the payload
+            const keyNames = Object.keys(e.keys)
+            const activeId = keyPredicate(e.keys, entityData, true)
+            keyNames.forEach(k => delete entityData[k]) // draft keys are auto-generated, so drop them from the payload
             const postBody = JSON.stringify(entityData, null, 2)
-            generateDraftRequests(requests, requestTitle, url, headers, headerAuth, postBody, key, service)
+            generateDraftRequests(requests, requestTitle, url, headers, headerAuth, postBody, keyNames, service)
+            if (activeId) {
+              const instance = `${url}${activeId.replace(/\)$/, ',IsActiveEntity=true)')}`
+              generateBoundOps(requests, requestTitle, instance, headers, headerAuth, nameSlug, e.boundOps, serviceName)
+            }
           }
           else {
             const postBody = JSON.stringify(entityData, null, 2)
-            let id
-            const compositeKey = Object.keys(e.keys||{}).length > 1
-            if (compositeKey) {
-              id = [...e.keys].map(k => k.type === 'cds.String' ? `${k.name}='${entityData[k.name]}'` : `${k.name}=${entityData[k.name]}`).join(',')
-            } else {
-              id = entityData[Object.keys(e.keys||{})[0]]
+            if (!e.noInsert) requests.push(`${requestTitle}\n# @name ${nameSlug}_POST\nPOST ${url}\n${headers}\n\n${postBody}\n`)
+            const id = e.insertOnly ? undefined : keyPredicate(e.keys, entityData)
+            if (id) {
+              if (!e.noUpdate) requests.push(`${requestTitle}\n# @name ${nameSlug}_PATCH\nPATCH ${url}${id}\n${headers}\n\n${postBody}\n`)
+              if (!e.noDelete) requests.push(`${requestTitle}\n# @name ${nameSlug}_DELETE\nDELETE ${url}${id}\n${headers}\n`)
+              const parenId = keyPredicate(e.keys, entityData, true)
+              generateBoundOps(requests, requestTitle, `${url}${parenId}`, headers, headerAuth, nameSlug, e.boundOps, serviceName)
             }
-            compositeKey ? id = `(${id})` : id = `/${id}`
-            requests.push(`${requestTitle}\n# @name ${nameSlug}_POST\nPOST ${url}\n${headers}\n\n${postBody}\n`)
-            requests.push(`${requestTitle}\n# @name ${nameSlug}_PATCH\nPATCH ${url}${id}\n${headers}\n\n${postBody}\n`)
-            requests.push(`${requestTitle}\n# @name ${nameSlug}_DELETE\nDELETE ${url}${id}\n${headers}\n`)
           }
         })
 
         service.actions.forEach((a) => {
           const simpleNameAction = a.name.slice(serviceName.length + 1)
           const url = `{{server}}/${urlPath}${simpleNameAction}`
+          const actionSlug = uniqueName(slug(simpleNameAction))
+
+          if (a.kind === 'function') {
+            const args = Object.entries(a.params || {}).map(([n, p]) => `${n}=${literal(p.type, payload[a.name]?.[0]?.[n])}`).join(',')
+            requests.push(`\n### ${simpleNameAction}\n# @name ${actionSlug}_GET\nGET ${url}(${args})\n${headerAuth}\n`)
+            return
+          }
 
           let actionPayload = {}
           if (a.params) {
@@ -211,26 +249,85 @@ module.exports = class HttpTemplate extends require('../../plugin') {
               actionPayload[pName] = payload[a.name]?.[0]?.[pName] ?? null
             }
           }
-          requests.push(`\n### ${simpleNameAction}\n# @name ${simpleNameAction}_POST\nPOST ${url}\n${headers}\n\n${JSON.stringify(actionPayload, null, 2)}\n`)
+          requests.push(`\n### ${simpleNameAction}\n# @name ${actionSlug}_POST\nPOST ${url}\n${headers}\n\n${JSON.stringify(actionPayload, null, 2)}\n`)
         })
 
       })
       this.#write(requests, serviceName)
     }
 
-    function generateDraftRequests(requests, title, url, headers, headerAuth, postBody, key, service) {
+    function generateDraftRequests(requests, title, url, headers, headerAuth, postBody, keys, service) {
       const nameDraftsCreate = slug(title+'_Draft_POST')
+      const draftVar = k => keys.length > 1 ? `draftID_${k}` : 'draftID'
+      const predicate = keys.map(k => `${k}={{${draftVar(k)}}}`).join(',') + ',IsActiveEntity=false'
+      const bindings = keys.map(k => `@${draftVar(k)}={{${nameDraftsCreate}.response.body.$.${k}}}`).join('\n')
       requests.push(`${title} Drafts GET\n# @name ${slug(title+'_Drafts_GET')}\nGET ${url}?$filter=(IsActiveEntity eq false)\n${headerAuth}\n`) // unencoded URL for better readability (client can handle this)
       requests.push(`${title} Draft POST\n# @name ${nameDraftsCreate}\nPOST ${url}\n${headers}\n\n${postBody}\n`)
-      requests.push(`\n### Result from POST request above\n@draftID={{${nameDraftsCreate}.response.body.$.${key}}}\n`)
-      requests.push(`${title} Draft PATCH\n# @name ${slug(title+'_Draft_Patch')}\nPATCH ${url}(${key}={{draftID}},IsActiveEntity=false)\n${headers}\n\n${postBody}\n`)
-      requests.push(`${title} Draft Prepare\n# @name ${slug(title+'_Draft_Prepare')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/${service.name}.draftPrepare\n${headers}\n\n{}\n`)
-      requests.push(`${title} Draft Activate\n# @name ${slug(title+'_Draft_Activate')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/${service.name}.draftActivate\n${headers}\n\n{}\n`)
+      requests.push(`\n### Result from POST request above\n${bindings}\n`)
+      requests.push(`${title} Draft PATCH\n# @name ${slug(title+'_Draft_Patch')}\nPATCH ${url}(${predicate})\n${headers}\n\n${postBody}\n`)
+      requests.push(`${title} Draft Prepare\n# @name ${slug(title+'_Draft_Prepare')}\nPOST ${url}(${predicate})/${service.name}.draftPrepare\n${headers}\n\n{}\n`)
+      requests.push(`${title} Draft Activate\n# @name ${slug(title+'_Draft_Activate')}\nPOST ${url}(${predicate})/${service.name}.draftActivate\n${headers}\n\n{}\n`)
     }
 
     function slug(str) {
       return str.trim().replace(/[#\\. ]/g, '')
     }
+
+    // drop non-writable fields (readonly/computed/managed) from a request body, keeping keys for addressing
+    function stripNonWritable(data, keys, elements) {
+      const keyNames = new Set(Object.keys(keys || {}))
+      for (const name of Object.keys(data)) {
+        if (keyNames.has(name)) continue
+        const el = elements?.[name]
+        if (el && (el['@readonly'] || el['@Core.Computed'] || el['@cds.on.insert'] || el['@cds.on.update'])) delete data[name]
+      }
+    }
+
+    // placeholder value for a parameterized-entity argument
+    function sampleParam(p) {
+      const t = p.type
+      if (t === 'cds.String' || t === 'cds.UUID' || t === 'cds.Date' || t === 'cds.DateTime' || t === 'cds.Timestamp') return `''`
+      if (t === 'cds.Boolean') return 'true'
+      return '0'
+    }
+
+    // OData URL literal for a value of the given type
+    function literal(type, value) {
+      if (value === undefined || value === null) return 'null'
+      return type === 'cds.String' ? `'${value}'` : `${value}`
+    }
+
+    // key predicate from scalar keys with a sample value; associations, structs, binary types and unseeded keys aren't addressable
+    function keyPredicate(keys, data, paren) {
+      const notAddressable = new Set(['cds.Association', 'cds.Composition', 'cds.Binary', 'cds.LargeBinary', 'cds.Vector'])
+      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(',')})`
+      return `/${val(scalar[0])}`
+    }
+
+    // sample value for a bound-operation parameter
+    function sampleValue(type) {
+      if (type === 'cds.Boolean') return true
+      if (type === 'cds.Integer' || type === 'cds.Int16' || type === 'cds.Int32' || type === 'cds.Int64' || type === 'cds.Decimal' || type === 'cds.Double') return 0
+      return ''
+    }
+
+    // bound actions (POST body) and functions (GET with inline args) on a single instance
+    function generateBoundOps(requests, title, instanceUrl, headers, headerAuth, nameSlug, boundOps, serviceName) {
+      for (const [name, op] of Object.entries(boundOps || {})) {
+        const params = op.params || {}
+        if (op.kind === 'function') {
+          const args = Object.entries(params).map(([n, p]) => `${n}=${literal(p.type, sampleValue(p.type))}`).join(',')
+          requests.push(`${title} ${name}\n# @name ${nameSlug}_${slug(name)}_GET\nGET ${instanceUrl}/${serviceName}.${name}(${args})\n${headerAuth}\n`)
+        } else {
+          const body = {}
+          for (const [n, p] of Object.entries(params)) body[n] = sampleValue(p.type)
+          requests.push(`${title} ${name}\n# @name ${nameSlug}_${slug(name)}_POST\nPOST ${instanceUrl}/${serviceName}.${name}\n${headers}\n\n${JSON.stringify(body, null, 2)}\n`)
+        }
+      }
+    }
   }
 
   async #getHostnameAndAuth(service, csn) {

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

@@ -22,8 +22,8 @@ module.exports = class IasTemplate extends require('../../plugin') {
         if (isNodejs) await sort('package.json', 'dependencies')
     }
 
-    async combine() {
-        const project = readProject()
+    async combine(facet) {
+        const project = readProject(facet)
         const { isJava, addMta, hasMta, addCfManifest, addKyma, addMultitenancy, hasApprouter, hasMultitenancy, srv } = project
 
         if (addMultitenancy) {

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

@@ -27,8 +27,8 @@ module.exports = class KafkaTemplate extends require('../../plugin') {
     if (isJava) await mvn.add('kafka')
   }
 
-  async combine() {
-    const project = readProject()
+  async combine(facet) {
+    const project = readProject(facet)
     const { addMta, srv, addKyma } = project
 
     if (addMta) {

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

@@ -73,13 +73,13 @@ module.exports = class KymaTemplate extends require('../../plugin') {
 
   }
 
-  async combine() {
+  async combine(facet) {
     // REVISIT: This must be moved to the respective plugins
     const {
-      addHana, addMultitenancy, addXsuaa, hasApprouter,
+      addHana, addHanaServerless, hasHanaServerless, addMultitenancy, addXsuaa, hasApprouter,
       addApprouter, addIas, addAms, hasXsuaa, hasMultitenancy, addWorkzoneStandard,
       addHtml5Repo, hasHtml5Repo, addAppFrontend
-    } = readProject()
+    } = readProject(facet)
 
     if (addHtml5Repo || addWorkzoneStandard || addApprouter && hasHtml5Repo) {
       if (addHtml5Repo) {
@@ -106,8 +106,10 @@ module.exports = class KymaTemplate extends require('../../plugin') {
         await KymaTemplate.mergeDependency('service-instance', 'subscription-manager')
       }
     }
-    if (addHana || addMultitenancy) {
-      if (hasMultitenancy) {
+    if (addHana || addHanaServerless || addMultitenancy) {
+      if (hasHanaServerless) {
+        await KymaTemplate.mergeDependency('service-instance', 'db')
+      } else if (hasMultitenancy) {
         await KymaTemplate.mergeDependency('service-instance', 'service-manager')
         await KymaTemplate.mergeDependency('content-deployment', 'mtx-upgrade')
       } else {

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

@@ -21,8 +21,8 @@ module.exports = class MalwareScannerTemplate extends require('../../plugin') {
         }
     }
 
-    async combine() {
-        const project = readProject()
+    async combine(facet) {
+        const project = readProject(facet)
         const { addMta, addKyma, srv } = project
 
         if (addMta) {

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

@@ -11,7 +11,7 @@ build-parameters:
     - builder: custom
       commands:
         - npm ci
-        - npx cds build --production{{#isMonorepoMicroservice}} --ws-pack{{/isMonorepoMicroservice}}
+        - npx cds build --production
 {{/isNodejs}}
 modules:
   - name: {{appName}}-srv

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

@@ -40,11 +40,11 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     await copyRenderedJSON(join(__dirname, 'files', 'package.sidecar.json.hbs'), join('mtx', 'sidecar/package.json'), project)
   }
 
-  async combine() {
-    const project = readProject()
+  async combine(facet) {
+    const project = readProject(facet)
     const {
       isNodejs, isJava, addMta, hasMta,
-      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, addKyma, hasApprouter,
+      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, hasHanaServerless, addKyma, hasApprouter,
       srv, appName
     } = project
 
@@ -98,6 +98,21 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
             `https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.{{ .Values.global.domain }}`
         }}}
       }).into('chart/values.yaml',{ forceOverwrite: true })
+
+      if (hasHanaServerless) {
+        await merge('chart/values.yaml').remove([
+          'service-manager',
+          'srv.bindings.service-manager',
+          'sidecar.bindings.service-manager',
+          'mtx-upgrade.bindings.service-manager'
+        ])
+        await merge({
+          srv: { bindings: { db: { serviceInstanceName: 'db' } } },
+          sidecar: { bindings: { db: { serviceInstanceName: 'db' } } },
+          'mtx-upgrade': { bindings: { db: { serviceInstanceName: 'db' } } }
+        }).into('chart/values.yaml')
+        await merge('chart/Chart.yaml').remove([{ dependencies: { alias: 'service-manager' } }])
+      }
     }
 
     // cds10 move to if above

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

@@ -33,8 +33,8 @@ module.exports = class NotificationsTemplate extends require('../../plugin') {
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
   }
 
-  async combine() {
-    const project = readProject()
+  async combine(facet) {
+    const project = readProject(facet)
     const { addMta } = project
 
     if (addMta) {

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

@@ -17,9 +17,11 @@ modules:
     requires:
       - name: {{appName}}-portal
 
+  {{#withApps}}
   - name: {{appName}}-app-deployer
     type: com.sap.application.content
     path: {{#isNodejs}}gen{{/isNodejs}}{{#isJava}}.{{/isJava}}
+  {{/withApps}}
 
   - name: {{appName}}-portal-deployer
     type: com.sap.application.content
@@ -50,9 +52,11 @@ modules:
              name: {{appName}}-portal-deployer-ias-key
       {{/hasIas}}
       - name: {{appName}}-html5-repo-host
+      {{#withApps}}
       - name: {{appName}}-app-deployer
     deployed-after:
       - {{appName}}-app-deployer
+      {{/withApps}}
 
 resources:
   - name: {{appName}}-portal

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

@@ -27,9 +27,9 @@ module.exports = class PortalTemplate extends require('../../plugin') {
     await renderAndCopy(path.join(__dirname, 'files/portal-site'), 'app/portal/portal-site', project)
   }
 
-  async combine() {
-    const project = readProject()
-    const { isJava, addMta, hasMta, srv, addHtml5Repo, addXsuaa, addApprouter, addMultitenancy, addKyma, hasApprouter, hasHtml5Repo, hasMultitenancy, hasXsuaa } = project
+  async combine(facet) {
+    const project = readProject(facet)
+    const { isJava, addMta, hasMta, srv, apps, addHtml5Repo, addXsuaa, addApprouter, addMultitenancy, addKyma, hasApprouter, hasHtml5Repo, hasMultitenancy, hasXsuaa } = project
 
     if (addMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
@@ -37,14 +37,19 @@ module.exports = class PortalTemplate extends require('../../plugin') {
 
     if (addMta || (addXsuaa || addHtml5Repo || addApprouter || addMultitenancy) && hasMta) {
       const srvModule = srv4(srv.path)
-      const additions = [srvModule, portal, appDeployer, portalDeployer]
+      const hasApps = apps.length > 0
+      project.withApps = hasApps
+      const additions = [srvModule, portal, ...(hasApps ? [appDeployer] : []), portalDeployer]
       const relationships = [{
         insert: [portal, 'name'],
         into: [portalDeployer, 'requires', 'name']
-      }, {
-        insert: [appDeployer, 'name'],
-        into: [portalDeployer, 'requires', 'name']
       }]
+      if (hasApps) {
+        relationships.push({
+          insert: [appDeployer, 'name'],
+          into: [portalDeployer, 'requires', 'name']
+        })
+      }
 
       if (hasXsuaa) {
         relationships.push({
@@ -81,7 +86,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
     if (addKyma) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
       await KymaTemplate.mergeDependency('service-instance', 'portal')
-      await renderAndCopy(path.join(__dirname, 'files/portal-site'), 'app/html5-deployer/portal/portal-site', project)
+      await renderAndCopy(path.join(__dirname, 'files/portal-site'), path.join(project.html5DeployerPath, 'portal/portal-site'), project)
     }
   }
 }

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

@@ -27,8 +27,8 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
     await sort('package.json', 'dependencies')
   }
 
-  async combine() {
-    const project = readProject()
+  async combine(facet) {
+    const project = readProject(facet)
     const { addMta, srv, hasMultitenancy, addKyma, hasKyma, addMultitenancy } = project
 
     if (addMta) {

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

@@ -24,8 +24,8 @@ module.exports = class extends require('../../plugin') {
     await merge(__dirname, 'files/package.json.hbs').into('package.json')
   }
 
-  async combine() {
-    const project = readProject()
+  async combine(facet) {
+    const project = readProject(facet)
     const { addMta, srv } = project
 
     if (addMta) {

package/lib/init/template/sample/files/db/currencies.cds

@@ -1,5 +1,7 @@
 using { sap } from '@sap/cds/common';
 
+namespace sap.capire.bookshop;
+
 extend sap.common.Currencies with {
   // Currencies.code = ISO 4217 alphabetic three-letter code
   // with the first two letters being equal to ISO 3166 alphabetic country codes

package/lib/init/template/sample/files/db/data/sap.capire.bookshop-Authors.csv

@@ -1,5 +1,5 @@
 ID,name,dateOfBirth,placeOfBirth,dateOfDeath,placeOfDeath
 101,Emily Brontë,1818-07-30,"Thornton, Yorkshire",1848-12-19,"Haworth, Yorkshire"
 107,Charlotte Brontë,1818-04-21,"Thornton, Yorkshire",1855-03-31,"Haworth, Yorkshire"
-150,Edgar Allen Poe,1809-01-19,"Boston, Massachusetts",1849-10-07,"Baltimore, Maryland"
+150,Edgar Allan Poe,1809-01-19,"Boston, Massachusetts",1849-10-07,"Baltimore, Maryland"
 170,Richard Carpenter,1929-08-14,"King’s Lynn, Norfolk",2012-02-26,"Hertfordshire, England"

package/lib/init/template/tiny-sample/files/nodejs/db/data/CatalogService.Books.csv

@@ -1,6 +1,6 @@
 ID,title,author
 1,Wuthering Heights,Emily Brontë
 2,Jane Eyre,Charlotte Brontë
-3,The Raven,Edgar Allen Poe
-4,Eleonora,Edgar Allen Poe
+3,The Raven,Edgar Allan Poe
+4,Eleonora,Edgar Allan Poe
 5,Catweazle,Richard Carpenter

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

@@ -4,7 +4,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { join } = require('path')
 const { destination, destinations, xsuaa, srv4, html5RepoHost, mtxSidecar4 } = require('../../registries/mta')
-const { odataApi } = require('../../registries/xs-app')
+const { srvApi } = require('../../registries/xs-app')
 
 module.exports = class extends require('../../plugin') {
 
@@ -39,8 +39,8 @@ module.exports = class extends require('../../plugin') {
     }
   }
 
-  async combine() {
-    const project = readProject()
+  async combine(facet) {
+    const project = readProject(facet)
     const { isJava, addMta, hasMta, srv, apps, appPath, appUIPaths, addMultitenancy, addXsuaa, strippedAppName } = project
 
     await Promise.all(appUIPaths.map(async p => {
@@ -58,9 +58,9 @@ module.exports = class extends require('../../plugin') {
     }))
 
     await Promise.all(apps.map(async ({ app }) => {
-      const additions = [odataApi]
+      const additions = [srvApi]
       const overwrites = [{
-        item: [odataApi, 'destination'],
+        item: [srvApi, 'destination'],
         withValue: `srv-api`
       }]
       project.app = app

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

@@ -32,8 +32,8 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project, forceOverwrite: true })
     }
 
-    async combine() {
-        const project = readProject()
+    async combine(facet) {
+        const project = readProject(facet)
         const { addMultitenancy, hasMultitenancy, addMta, hasMta, addKyma, isJava, srv, hasKyma } = project
 
         const cds = require('../../../../lib')
@@ -81,6 +81,16 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
                 }
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites, relationships })
+            if (project.hasExtensibility) {
+                const extTemplate = require('path').join(__dirname, '../extensibility')
+                await merge(extTemplate, 'files', 'mta.yaml.hbs').into('mta.yaml', {
+                    project,
+                    additions: [
+                        xsuaa,
+                        { in: [xsuaa, 'parameters.config.role-collections'], where: { name: `ExtensionDeveloper (${project.appName} \${org}-\${space})` } }
+                    ]
+                })
+            }
         }
 
         if (addKyma || addMultitenancy && hasKyma) {
@@ -96,6 +106,14 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
                     'role-template-references': [`$XSAPPNAME.${role.name}`],
                 }))
             }
+            if (project.hasExtensibility) {
+                parameters['role-collections'] ??= []
+                parameters['role-collections'].push({
+                    name: `ExtensionDeveloper (${project.appName} {{ .Release.Namespace }})`,
+                    description: 'generated',
+                    'role-template-references': ['$XSAPPNAME.ExtensionDeveloper'],
+                })
+            }
             await merge({ xsuaa: { parameters } }).into('chart/values.yaml')
             await KymaTemplate.mergeDependency('service-instance', 'xsuaa')