@sap/cds-dk 6.8.2 → 7.0.0

package/lib/init/template/cf-manifest/files/manifest.yml.hbs

@@ -1,56 +1,56 @@
 # Generated manifest.yml based on template version 0.1.0
-# appName = {{cap.appName}}
-# language={{cap.language}}
-# multitenancy={{cap.isMultitenant}}
+# appName = {{appName}}
+# language={{language}}
+# multitenancy={{isMultitenant}}
 ---
 applications:
 # -----------------------------------------------------------------------------------
 # Backend Service
 # -----------------------------------------------------------------------------------
-- name: {{cap.appName}}-{{cap.srvName}}
+- name: {{appName}}-{{srvName}}
   random-route: true  # for development only
-{{#cap.isNodejs}}
-  path: {{& cap.srvPath}}
+{{#isNodejs}}
+  path: {{& srvPath}}
   memory: 256M
   buildpack: nodejs_buildpack
-{{/cap.isNodejs}}
-{{#cap.isJava}}
-  path: {{& cap.srvPath}}/target/{{cap.srvExt.archiveName}}
+{{/isNodejs}}
+{{#isJava}}
+  path: {{& srvPath}}/target/{{srvExt.archiveName}}
   memory: 1G
   disk_quota: 512M
   env:
     SPRING_PROFILES_ACTIVE: cloud
   buildpack: java_buildpack
-{{/cap.isJava}}
-{{#cap.hasRequires}}
+{{/isJava}}
+{{#hasRequires}}
   services:
-{{#cap.requires}}
+{{#requires}}
 {{#resource.isHana}}
   - {{resource.name}}
 {{/resource.isHana}}
 {{#resource.isXsuaa}}
   - {{resource.name}}
 {{/resource.isXsuaa}}
-{{/cap.requires}}
-{{/cap.hasRequires}}
+{{/requires}}
+{{/hasRequires}}
 
-{{#cap.needsSidecar}}
+{{#needsSidecar}}
 # -----------------------------------------------------------------------------------
 # HANA Database Content Deployer App
 # -----------------------------------------------------------------------------------
-- name: {{cap.appName}}-{{cap.db.0.name}}-deployer
-  path: {{& cap.db.0.path}}
+- name: {{appName}}-{{db.0.name}}-deployer
+  path: {{& db.0.path}}
   no-route: true
   health-check-type: process
   memory: 256M
   instances: 1
   buildpack: nodejs_buildpack
-{{#cap.hasRequires}}
+{{#hasRequires}}
   services:
-{{#cap.requires}}
+{{#requires}}
 {{#resource.isHana}}
   - {{resource.name}}
 {{/resource.isHana}}
-{{/cap.requires}}
-{{/cap.hasRequires}}
-{{/cap.needsSidecar}}
+{{/requires}}
+{{/hasRequires}}
+{{/needsSidecar}}

package/lib/init/template/cf-manifest/files/services-manifest.yml.hbs

@@ -1,8 +1,8 @@
 # Generated services-manifest.yml based on template version 0.1.0
-# appName = {{cap.appName}}
+# appName = {{appName}}
 ---
 create-services:
-{{#cap.requires}}
+{{#requires}}
 # ------------------------------------------------------------
   - name:   {{resource.name}}
 {{#resource.isHana}}
@@ -19,4 +19,4 @@ create-services:
     broker: {{resource.service}}
     plan: {{resource.vcap.name}}
 {{/resource.vcap.name}}
-{{/cap.requires}}
+{{/requires}}

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

@@ -0,0 +1,14 @@
+---
+modules:
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
+    requires:
+      - name: {{appName}}-connectivity
+
+resources:
+  - name: {{appName}}-connectivity
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: connectivity
+      service-plan: lite

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

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

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

@@ -1,17 +1,35 @@
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
-const { mergeYAML } = require('../../util/merge')
+const { mergeJSON, mergeYAML } = require('../../util/merge')
 const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5')
+const { srvJava4, srvNode4, connectivity } = require('../_merging/registry-mta')
 
 module.exports = class ConnectivityTemplate extends require('../templateBase') {
 
+    static hasFacet(env) {
+        return env.requires.connectivity
+    }
+
     async run() {
+        const projectDescriptor = await readProject(this.options)
+        const { configFile } = projectDescriptor
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
         await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
         const projectDescriptor = await readProject(this.options)
-        const { hasHelm } = projectDescriptor.cap
+        const { isJava, srvPath, hasHelm, hasMta } = projectDescriptor
+
+        if (hasMta) {
+            const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
+            const additions = [srv, connectivity]
+            const relationships = [{
+                insert: [connectivity, 'name'],
+                into: [srv, 'requires', 'name']
+            }]
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), projectDescriptor, { additions, relationships })
+        }
 
         if (hasHelm) {
             //in case facet is being added to the already exisiting charts folder
@@ -20,13 +38,12 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
                 isIndependentCommand = true
                 context.oldTrackingData = context.newTrackingData = await parseMd5File(join('chart', '.cds-add-helm-files.md5'))
             }
-
             await mergeYAML(
                 join('chart', 'values.yaml'),
                 join(__dirname, 'files', 'values.yaml.hbs'),
                 projectDescriptor,
                 { additions: [{
-                    in: `srv.additionalVolumes`,
+                    in: 'srv.additionalVolumes',
                     where: [{
                         property: 'name',
                         isEqualTo: 'connectivity-secret'

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

@@ -8,6 +8,10 @@ const DEBUG = cds.debug('cli')
 module.exports = class DataTemplate extends require('../templateBase') {
 
   async run() {
+    if (this.options['for']) {
+      throw `\nError: Did you mean \`... --data:for\` ?`
+    }
+
     const env = await this.getEnv();
 
     let dest = (typeof this.options.out === 'string') // target folder
@@ -15,7 +19,7 @@ module.exports = class DataTemplate extends require('../templateBase') {
       : getDefaultTargetFolder(env);
     dest = resolve(cds.root, dest);
 
-    const nameFilter = asRegex(this.options['data:for'] || this.options.for)
+    const nameFilter = asRegex(this.options['data:for'])
     const force = this.options.force;
 
     let csn = await cds.compile.to.csn(cds.env.roots) // normal CSN

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

@@ -0,0 +1,14 @@
+---
+modules:
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
+    requires:
+      - name: {{appName}}-destination
+
+resources:
+  - name: {{appName}}-destination
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: destination
+      service-plan: lite

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

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

package/lib/init/template/{destinations → destination}/index.js

@@ -1,33 +1,39 @@
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
-const { mergeYAML } = require('../../util/merge')
+const { mergeJSON, mergeYAML } = require('../../util/merge')
+const { srvJava4, srvNode4, destination } = require('../_merging/registry-mta')
 const { parseMd5File, writeMd5File } = require('../../util/md5')
 
-module.exports = class DestinationsTemplate extends require('../templateBase') {
-
-    async canRun() {
-        const projectDescriptor = await readProject(this.options)
-        const { hasMta, hasHelm } = projectDescriptor.cap
-        if (!hasHelm && hasMta) {
-            throw `'cds add destinations' is not available for Cloud Foundry yet`
-        }
-        return true
-    }
+module.exports = class DestinationTemplate extends require('../templateBase') {
 
     static hasFacet(env) {
         const kinds = { odata: 1, 'odata-v2': 1, 'odata-v4': 1, rest: 1 }
         const mtxServices = { 'cds.xt.SaasProvisioningService': 1, 'cds.xt.DeploymentService': 1, 'cds.xt.ModelProviderService': 1, 'cds.xt.ExtensibilityService': 1 }
         const _fromMtx = service => service in mtxServices
-        return Object.entries(env.requires).some(([service, require]) => !_fromMtx(service) && !kinds[service] && kinds[require.kind])
+        const hasDestination = Object.entries(env.requires).some(([service, require]) => !_fromMtx(service) && !kinds[service] && kinds[require.kind])
+        return hasDestination || env.requires.destinations
     }
 
     async run() {
+        const projectDescriptor = await readProject(this.options)
+        const { configFile } = projectDescriptor
+        await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), projectDescriptor)
         await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
         const projectDescriptor = await readProject(this.options)
-        const { hasHelm, hasDestination, hasHtml5Repo } = projectDescriptor.cap
+        const { isJava, hasHelm, hasDestination, hasMta, srvPath, hasHtml5Repo } = projectDescriptor
+
+        if (hasMta) {
+            const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
+            const additions = [srv, destination]
+            const relationships = [{
+                insert: [destination, 'name'],
+                into: [srv, 'requires', 'name']
+            }]
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), projectDescriptor, { additions, relationships })
+        }
 
         if (hasHelm) {
             //const env = await this.getEnv()

package/lib/init/template/enterprise-messaging/files/event-mesh.json.hbs

@@ -1,7 +1,7 @@
 {
-  "emname": "{{cap.appName}}-emname",
+  "emname": "{{appName}}-emname",
   "version": "1.1.0",
-  "namespace": "default/sap.myapp/1",
+  "namespace": "default/{{appName}}/1",
   "options": {
     "management": true,
     "messagingrest": true,
@@ -10,7 +10,7 @@
   "rules": {
     "topicRules": {
       "publishFilter": [
-        "${namespace}/sample"
+        "${namespace}/*"
       ],
       "subscribeFilter": [
         "*"

package/lib/init/template/enterprise-messaging/files/mta.yaml.hbs

@@ -1,13 +1,13 @@
 ---
 modules:
- - name: {{cap.appName}}-srv
-   type: {{cap.language}}
-   path: {{& cap.srvPath}}
+ - name: {{appName}}-srv
+   type: {{language}}
+   path: {{& srvPath}}
    requires:
-    - name: {{cap.appName}}-messaging
+    - name: {{appName}}-messaging
 
 resources:
-  - name: {{cap.appName}}-messaging
+  - name: {{appName}}-messaging
     type: org.cloudfoundry.managed-service
     parameters:
       service: enterprise-messaging

package/lib/init/template/enterprise-messaging/files/package.json.hbs

@@ -1,19 +1,19 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "cds": {
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
     "requires": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-      {{/cap.for}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
         "messaging": {
           "kind": "enterprise-messaging"
         }
-      {{#cap.for}}
+      {{#profile}}
       }
-      {{/cap.for}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }

package/lib/init/template/enterprise-messaging/files/xs-security.json.hbs

@@ -0,0 +1,19 @@
+{
+  "scopes": [
+    {
+      "name": "$XSAPPNAME.emmanagement",
+      "description": "Enterprise-Messaging Management Access"
+    },
+    {
+      "name": "$XSAPPNAME.emcallback",
+      "description": "Enterprise-Messaging Callback Access",
+      "grant-as-authority-to-apps": [
+        "$XSSERVICENAME({{em-service-name}})"
+      ]
+    }
+  ],
+  "authorities": [
+    "$XSAPPNAME.emmanagement",
+    "$XSAPPNAME.mtcallback"
+  ]
+}

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

@@ -1,3 +1,4 @@
+const YAML = require('@sap/cds-foss')('yaml')
 const { join } = require('path')
 const cds = require('../../../cds')
 const { read } = cds.utils
@@ -9,8 +10,7 @@ const { srvNode4, srvJava4, enterpriseMessaging } = require('../_merging/registr
 module.exports = class EnterpriseMessagingTemplate extends require('../templateBase') {
 
   async canRun() {
-    const projectDescriptor = await readProject(this.options)
-    const { isJava } = projectDescriptor.cap
+    const { isJava } = await readProject(this.options)
     if (isJava) throw `'cds add enterprise-messaging' is not available for Java yet`
     return true
   }
@@ -21,18 +21,17 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
 
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { configFile } = projectDescriptor.cap
-    projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    const { configFile } = projectDescriptor
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
-    await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging(context = {}) {
     const projectDescriptor = await readProject(this.options)
-    const { hasHelm, hasMta, isNodejs, srvPath } = projectDescriptor.cap
+    const { hasXsuaa, hasHelm, hasMta, isNodejs, srvPath, appName } = projectDescriptor
 
     if (hasMta) {
+      await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), projectDescriptor)
       const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
       await mergeYAML(
           'mta.yaml',
@@ -48,6 +47,28 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
       )
     }
 
+    if (hasXsuaa) {
+      if (hasMta) {
+        projectDescriptor['em-service-name'] = YAML.parse(await read('mta.yaml'))?.resources?.find(r => r?.parameters?.service === 'enterprise-messaging')?.name
+      } else {
+        projectDescriptor['em-service-name'] = `${appName}-messaging`
+      }
+      await mergeJSON(
+        'xs-security.json',
+        join(__dirname, 'files', 'xs-security.json.hbs'),
+        projectDescriptor,
+        {
+          additions: [{
+            in: 'scopes',
+            where: [{ property: 'name', isEqualTo: '$XSAPPNAME.emcallback' }],
+          }, {
+            in: 'scopes',
+            where: [{ property: 'name', isEqualTo: '$XSAPPNAME.emmanagement' }],
+          }]
+        }
+      )
+    }
+
     if (hasHelm) {
       //in case facet is being added to the already exisiting charts folder
       let isIndependentCommand = false

package/lib/init/template/enterprise-messaging-shared/files/event-mesh.json.hbs

@@ -1,7 +1,7 @@
 {
-  "emname": "{{cap.appName}}-emname",
+  "emname": "{{appName}}-emname",
   "version": "1.1.0",
-  "namespace": "default/sap.myapp/1",
+  "namespace": "default/{{appName}}/1",
   "options": {
     "management": true,
     "messagingrest": true,
@@ -10,7 +10,7 @@
   "rules": {
     "topicRules": {
       "publishFilter": [
-        "${namespace}/sample"
+        "${namespace}/*"
       ],
       "subscribeFilter": [
         "*"

package/lib/init/template/enterprise-messaging-shared/files/mta.yaml.hbs

@@ -1,13 +1,13 @@
 ---
 modules:
- - name: {{cap.appName}}-srv
-   type: {{cap.language}}
-   path: {{& cap.srvPath}}
+ - name: {{appName}}-srv
+   type: {{language}}
+   path: {{& srvPath}}
    requires:
-    - name: {{cap.appName}}-messaging
+    - name: {{appName}}-messaging
 
 resources:
-  - name: {{cap.appName}}-messaging
+  - name: {{appName}}-messaging
     type: org.cloudfoundry.managed-service
     parameters:
       service: enterprise-messaging

package/lib/init/template/enterprise-messaging-shared/files/package.json.hbs

@@ -1,22 +1,22 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "dependencies": {
     "@sap/xb-msg-amqp-v100": "^0"
   },
   "cds": {
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
     "requires": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-      {{/cap.for}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
         "messaging": {
           "kind": "enterprise-messaging-shared"
         }
-      {{#cap.for}}
+      {{#profile}}
       }
-      {{/cap.for}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }

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

@@ -8,8 +8,7 @@ const { srvNode4, srvJava4, enterpriseMessaging } = require('../_merging/registr
 module.exports = class EnterpriseMessagingSharedTemplate extends require('../templateBase') {
 
   async canRun() {
-    const projectDescriptor = await readProject(this.options)
-    const { hasMta, hasHelm, isJava } = projectDescriptor.cap
+    const { hasMta, hasHelm, isJava }  = await readProject(this.options)
     if (isJava)             throw `'cds add enterprise-messaging-shared' is not available for Java yet`
     if (hasHelm && !hasMta) throw `'cds add enterprise-messaging-shared' is not available for Kyma yet`
     return true
@@ -21,8 +20,8 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../tem
 
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { configFile } = projectDescriptor.cap
-    projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    const { configFile } = projectDescriptor
+    projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
     await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), projectDescriptor)
     await this.runDependentMerging()
@@ -30,7 +29,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../tem
 
   async runDependentMerging() {
     const projectDescriptor = await readProject(this.options)
-    const { hasMta, isNodejs, srvPath } = projectDescriptor.cap
+    const { hasMta, isNodejs, srvPath } = projectDescriptor
 
     if (hasMta) {
       const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)

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

@@ -1,20 +1,20 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "dependencies": {
-    "@sap/cds-mtxs": "^1"
+    "@sap/cds-mtxs": "^1.9"
   },
   "cds": {
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
     "requires": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-      {{/cap.for}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
         "extensibility": true
-      {{#cap.for}}
+      {{#profile}}
       }
-      {{/cap.for}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }

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

@@ -3,13 +3,17 @@ const { exists } = cds.utils
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON } = require('../../util/merge')
-const { OPTION_MULTITENANCY } = require('../../constants')
+const { MULTITENANCY } = require('../../constants').OPTIONS
 
 module.exports = class ExtensibilityTemplate extends require('../templateBase') {
 
 
   getDependencies() {
-    return exists('pom.xml') ? [OPTION_MULTITENANCY] : [] // REVISIT: Remove this dependency
+    return exists('pom.xml') ? [MULTITENANCY] : [] // REVISIT: Remove this dependency
+  }
+
+  getRelatedFacets() {
+    return ['approuter']
   }
 
   static hasFacet(env) {
@@ -18,14 +22,14 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
 
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { configFile } = projectDescriptor.cap
+    const { configFile } = projectDescriptor
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging() {
     const projectDescriptor = await readProject(this.options)
-    const { hasXsuaa, hasApprouter } = projectDescriptor.cap
+    const { hasXsuaa } = projectDescriptor
     if (hasXsuaa) {
       await mergeJSON(
         'xs-security.json',
@@ -45,10 +49,5 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
         }
       )
     }
-    if (hasApprouter) {
-      const ApprouterTemplate = require(`../approuter`)
-      const approuterTemplate = new ApprouterTemplate(this.generator)
-      await approuterTemplate.runDependentMerging()
-    }
   }
 }

package/lib/init/template/file-based-messaging/files/package.json.hbs

@@ -1,19 +1,19 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "cds": {
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
     "requires": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-      {{/cap.for}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
         "messaging": {
           "kind": "file-based-messaging"
         }
-      {{#cap.for}}
+      {{#profile}}
       }
-      {{/cap.for}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }