@sap/cds-dk 7.9.6 → 8.0.3

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

@@ -1,9 +1,13 @@
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
-const { srv4, destination } = require('../../registries/mta')
+const { srv4, approuter, destination, mtxSidecar4 } = require('../../registries/mta')
 
 module.exports = class DestinationTemplate extends require('../../plugin') {
 
+    static help() {
+        return 'SAP BTP Destination Service'
+    }
+
     static hasInProduction(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 }
@@ -20,7 +24,11 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasHelm, hasHelmUnifiedRuntime, hasMta, srvPath } = project
+        const { hasHelm, hasApprouter, hasMultitenancy, hasHelmUnifiedRuntime, hasMta, srvPath, isJava } = project
+
+        if (hasMultitenancy) {
+            await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
+        }
 
         if (hasMta) {
             const srv = srv4(srvPath)
@@ -29,6 +37,18 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
                 insert: [destination, 'name'],
                 into: [srv, 'requires', 'name']
             }]
+            if (hasApprouter) {
+                relationships.push({
+                    insert: [destination, 'name'],
+                    into: [approuter, 'requires', 'name']
+                })
+            }
+            if (hasMultitenancy) {
+                relationships.push({
+                    insert: [destination, 'name'],
+                    into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
+                })
+            }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions, relationships })
         }
 

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

@@ -1,18 +1,21 @@
-const YAML = require('@sap/cds-foss')('yaml')
 const cds = require('../../../cds')
-const { read } = cds.utils
+const { read, yaml: YAML } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, enterpriseMessaging } = require('../../registries/mta')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../../plugin') {
 
+  static help() {
+    return 'messaging via SAP Enterprise Messaging'
+  }
+
   options() {
     return {
       'cloudevents': {
         type: 'boolean',
         short: 'c',
-        help: 'Use CloudEvents formatting',
+        help: 'Use CloudEvents formatting.',
       }
     }
   }

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

@@ -6,12 +6,16 @@ const { srv4, enterpriseMessaging } = require('../../registries/mta')
 
 module.exports = class EnterpriseMessagingSharedTemplate extends require('../../plugin') {
 
+  static help() {
+    return 'messaging via shared SAP Enterprise Messaging'
+  }
+
   options() {
     return {
       'cloudevents': {
         type: 'boolean',
         short: 'c',
-        help: 'Use CloudEvents formatting',
+        help: 'Use CloudEvents formatting.',
       }
     }
   }

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

@@ -1,7 +1,7 @@
 {
   {{#isNodejs}}
   "dependencies": {
-    "@sap/cds-mtxs": "^1.9"
+    "@sap/cds-mtxs": "^2"
   },
   "cds": {
   {{/isNodejs}}

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

@@ -3,10 +3,6 @@
     {
       "name": "$XSAPPNAME.cds.ExtensionDeveloper",
       "description": "Extend CAP applications via extension projects"
-    },
-    {
-      "name": "$XSAPPNAME.cds.UIFlexDeveloper",
-      "description": "Extend CAP applications via UIFlex extensibility"
     }
   ],
   "role-templates": [
@@ -14,13 +10,11 @@
       "name": "ExtensionDeveloper",
       "description": "Extension development including UIFlex extensibility",
       "scope-references": [
-        "$XSAPPNAME.cds.ExtensionDeveloper",
-        "$XSAPPNAME.cds.UIFlexDeveloper"
+        "$XSAPPNAME.cds.ExtensionDeveloper"
       ]
     }
   ],
   "authorities": [
-    "$XSAPPNAME.cds.ExtensionDeveloper",
-    "$XSAPPNAME.cds.UIFlexDeveloper"
+    "$XSAPPNAME.cds.ExtensionDeveloper"
   ]
 }

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

@@ -6,6 +6,9 @@ const { MULTITENANCY } = require('../../constants').OPTIONS
 
 module.exports = class ExtensibilityTemplate extends require('../../plugin') {
 
+  static help() {
+    return 'tenant-specific model extensibility'
+  }
 
   requires() {
     return exists('pom.xml') ? [MULTITENANCY] : [] // REVISIT: Remove this dependency
@@ -29,7 +32,6 @@ module.exports = class ExtensibilityTemplate extends require('../../plugin') {
         project,
         additions: [
           { in: 'scopes', where: { name: '$XSAPPNAME.cds.ExtensionDeveloper' }},
-          { in: 'scopes', where: { name: '$XSAPPNAME.cds.UIFlexDeveloper' }},
           { in: 'role-templates', where: { name: 'ExtensionDeveloper' }}
         ]
       })

package/lib/init/template/file-based-messaging/index.js

@@ -4,6 +4,10 @@ const { merge } = require('../../merge')
 
 module.exports = class FileBasedMessagingTemplate extends require('../../plugin') {
 
+  static help() {
+    return 'messaging via file system'
+  }
+
   async canRun() {
     const { isJava } = readProject()
     if (isJava) throw `'cds add file-based-messaging' is not available for Java yet`

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

@@ -4,6 +4,10 @@ const { H2 } = require('../../constants').OPTIONS
 
 module.exports = class H2Template extends require('../../plugin') {
 
+  static help() {
+    return 'database support for H2'
+  }
+
   async canRun() {
     const { isNodejs } = readProject()
     if (isNodejs) throw `'cds add ${H2}' is not available for Node.js`

package/lib/init/template/hana/files/containerize.yaml.hbs

@@ -0,0 +1,10 @@
+---
+modules:
+  - name: {{appName}}-hana-deployer
+    build-parameters:
+      buildpack:
+        type: nodejs
+        builder: builder-jammy-base
+        path: {{& db.path}}
+        env:
+          BP_NODE_RUN_SCRIPTS: ""

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

@@ -1,13 +1,14 @@
 {
   "name": "deploy",
   "dependencies": {
-    "@sap/hdi-deploy": "^4"
+    "hdb": "^0",
+    "@sap/hdi-deploy": "^5"
   },
   "engines": {
     "node": "^20.0.0"
   },
   "scripts": {
-    "start": "node node_modules/@sap/hdi-deploy/deploy.js",
+    "start": "node node_modules/@sap/hdi-deploy/deploy.js --use-hdb",
     "build": "npm i && npx cds build .. --for hana --production"
   }
 }

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

@@ -1,14 +1,12 @@
 {
-  {{#isNodejs}}
   "dependencies": {
-    "@sap/cds-hana": "^2"
-  },
+    "@cap-js/hana": "^1"
+  }{{#profile}},
+  {{#isNodejs}}
   "cds": {
   {{/isNodejs}}
     "requires": {
-      {{#profile}}
       "[{{profile}}]": {
-      {{/profile}}
       {{#shortcut}}
         "db": "hana"
       {{/shortcut}}
@@ -17,11 +15,10 @@
           "kind": "hana"
         }
       {{/shortcut}}
-      {{#profile}}
       }
-      {{/profile}}
     }
   {{#isNodejs}}
   }
   {{/isNodejs}}
+  {{/profile}}
 }

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

@@ -5,8 +5,7 @@ srv:
       serviceInstanceName: hana
 hana-deployer:
   image:
-    repository: <your-container-registry>/{{appName}}-hana-deployer
-    tag: latest
+    repository: {{appName}}-hana-deployer
   bindings:
     hana:
       serviceInstanceName: hana

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

@@ -5,14 +5,16 @@ const { readProject } = require('../../projectReader')
 const { merge, removeFromYAML, removeFromYAMLArray } = require('../../merge')
 const mvn = require('../../mvn')
 
-const { OPTIONS: { JAVA } } = require('../../constants')
-
 const { srv4, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../../registries/mta')
 
 module.exports = class HanaTemplate extends require('../../plugin') {
 
+    static help() {
+        return 'database support for SAP HANA'
+    }
+
     static hasInProduction(env) {
-        return env.requires?.db?.kind === 'hana'
+        return env.requires?.db?.kind === 'hana' || env.dependencies?.['@cap-js/hana']
     }
 
     async run() {
@@ -26,9 +28,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
         if (isJava) {
             await copy(join(__dirname, 'files', 'db')).to(db.folder)
-            // REVISIT: shouldn't behave differently during cds init
-            // if called during cds init the project generation call to AT will add settings
-            if (!cds.cli.options.add.has(JAVA)) await mvn.execMvn(mvn.getAddHanaCmdArgs())
+            await mvn.add('hana')
         }
 
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project, forceOverwrite: true }) // REVISIT: forceOverwrite: true as default?
@@ -42,7 +42,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasMta, hasHelm, hasHelmUnifiedRuntime, hasHtml5Repo, isJava, hasMultitenancy, srvPath } = project
+        const { hasMta, hasHelm, hasHelmUnifiedRuntime, hasHtml5Repo, hasContainerize, isJava, hasMultitenancy, srvPath } = project
 
         if (hasMta) {
             const srv = srv4(srvPath)
@@ -98,5 +98,13 @@ module.exports = class HanaTemplate extends require('../../plugin') {
                 await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
             }
         }
+
+        if (hasContainerize && !hasMultitenancy) {
+            const additions = [{
+                in: 'modules',
+                where: { name: `${project.appName}-hana-deployer` }
+            }]
+            await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
+        }
     }
 }

package/lib/init/template/helm/files/Chart.yaml.hbs

@@ -1,10 +1,9 @@
 ---
-#
-# This file is generated by "cds add helm"
 apiVersion: v2
 name: {{appName}}
 description: {{appDescription}}
 type: application
 version: {{appVersion}}
 appVersion: {{appVersion}}
-
+annotations:
+  app.kubernetes.io/managed-by: cds-dk/helm