@sap/cds-dk 7.3.1 → 7.4.0

package/lib/init/template/approuter/files/package.json

@@ -4,7 +4,7 @@
     "@sap/approuter": "^14.0.0"
   },
   "engines": {
-    "node": "^18.0.0"
+    "node": "^20.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/approuter/approuter.js"

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

@@ -1,7 +1,7 @@
 {
   "emname": "{{appName}}-emname",
   "version": "1.1.0",
-  "namespace": "default/{{appName}}/1",
+  "namespace": "default/{{cleanedAppName}}/1",
   "options": {
     "management": true,
     "messagingrest": true,

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

@@ -23,6 +23,7 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
     const project = await readProject()
     const { configFile } = project
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), project)
   }
 
   async runDependentMerging(context = {}) {
@@ -30,7 +31,6 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
     const { hasXsuaa, hasHelm, hasMta, isNodejs, srvPath, appName } = project
 
     if (hasMta) {
-      await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), project)
       const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
       await mergeYAML(
           'mta.yaml',

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

@@ -1,7 +1,7 @@
 {
   "emname": "{{appName}}-emname",
   "version": "1.1.0",
-  "namespace": "default/{{appName}}/1",
+  "namespace": "default/{{cleanedAppName}}/1",
   "options": {
     "management": true,
     "messagingrest": true,

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

@@ -3,14 +3,14 @@ const cds = require('../../../cds')
 const { read } = cds.utils
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
+const { parseMd5File, writeMd5File } = require('../../util/md5')
 const { srvNode4, srvJava4, enterpriseMessaging } = require('../_merging/registry-mta')
 
 module.exports = class EnterpriseMessagingSharedTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { hasMta, hasHelm, isJava }  = await readProject()
-    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`
+    const { isJava } = await readProject()
+    if (isJava) throw `'cds add enterprise-messaging-shared' is not available for Java yet`
     return true
   }
 
@@ -26,9 +26,9 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../tem
     await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), project)
   }
 
-  async runDependentMerging() {
+  async runDependentMerging(context = {}) {
     const project = await readProject()
-    const { hasMta, isNodejs, srvPath } = project
+    const { hasMta, hasHelm, isNodejs, srvPath } = project
 
     if (hasMta) {
       const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
@@ -45,5 +45,19 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../tem
           }
       )
     }
+
+    if (hasHelm) {
+      let isIndependentCommand = false
+      if (Object.keys(context).length == 0){
+          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'))
+      const HelmTemplate = require(`../helm`);
+      const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
+      isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
+      await helmTemplate.addDependency('service-instance', 'event-mesh');
+      if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData)
+    }
   }
 }

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

@@ -4,7 +4,7 @@
     "@sap/hdi-deploy": "^4"
   },
   "engines": {
-    "node": "^16 || ^18"
+    "node": "^20.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js",

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

@@ -14,7 +14,7 @@ module.exports = class HelmTemplate extends require('../templateBase') {
     }
 
     getRelatedFacets() {
-        return ['hana', 'xsuaa', 'enterprise-messaging', 'destination' , 'multitenancy', 'extensibility', 'approuter', 'connectivity']
+        return ['hana', 'xsuaa', 'enterprise-messaging', 'enterprise-messaging-shared', 'destination' , 'multitenancy', 'extensibility', 'approuter', 'connectivity']
     }
 
     static hasFacet() {

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

@@ -0,0 +1,15 @@
+{
+  "cds": {
+    "requires": {
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
+        "messaging": {
+          "kind": "local-messaging"
+        }
+      {{#profile}}
+      }
+      {{/profile}}
+    }
+  }
+}

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

@@ -0,0 +1,25 @@
+const { join } = require('path')
+const cds = require('../../../cds')
+const { read } = cds.utils
+const { readProject } = require('../../util/projectReader')
+const { mergeJSON } = require('../../util/merge')
+
+module.exports = class LocalMessagingTemplate extends require('../templateBase') {
+
+  async canRun() {
+    const { isJava } = await readProject()
+    if (isJava) throw `'cds add local-messaging' is not available for Java yet`
+    return true
+  }
+
+  static hasFacet(env) {
+    return env.requires?.messaging?.kind === 'local-messaging'
+  }
+
+  async run() {
+    const project = await readProject()
+    const { configFile } = project
+    project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+  }
+}

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

@@ -1,6 +1,6 @@
 const { join } = require('path')
 const cds = require('../../../cds')
-const { exists, read, write } = cds.utils
+const { read, write } = cds.utils
 const { APPROUTER, HANA, KIBANA } = require('../../constants').OPTIONS
 const mvn = require('../../util/mvn')
 const { readProject } = require('../../util/projectReader')
@@ -17,11 +17,9 @@ const {
 module.exports = class MultitenancyTemplate extends require('../templateBase') {
 
   static hasFacet(env) {
-    // REVISIT: Check if this can be simplified
     const { options } = cds.cli.options
-    return options?.add?.has('mtx') || options?.add?.has('multitenancy') ||
-           !!env.requires?.multitenancy || !!env.requires?.db?.multiTenant ||
-           exists(join('mtx', 'sidecar')) || false
+    // REVISIT: Check if this can be simplified
+    return options?.add?.has('mtx') || options?.add?.has('multitenancy') || !!env.requires?.multitenancy || false
   }
 
   getRelatedFacets() {

package/lib/init/template/nodejs/files/.gitignore.hbs

@@ -29,3 +29,6 @@ mta_archives/
 # IDEs
 # .vscode
 # .idea
+
+# @cap-js/cds-typer
+@cds-models

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

@@ -1,14 +1,5 @@
 {
   "dependencies": {
     "@cap-js/notifications": "*"
-  },
-  "cds":{
-    "requires":{
-       "notifications":{
-           "types" : "notificationtypes.json",
-           "destination" : "SAP_Notifications",
-           "prefix": "{{ appName }}"
-         }
-     }
   }
-}
+}

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

@@ -1,6 +1,4 @@
 const { join } = require('path')
-const cds = require('../../../cds')
-const { exists } = cds.utils
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
 const { DESTINATION } = require('../../constants').OPTIONS
@@ -17,7 +15,7 @@ module.exports = class NotificationsTemplate extends require('../templateBase')
     const project = await readProject()
     const { isJava } = project
     if (isJava) {
-      throw `'cds add notifications' is not available for JAVA yet`
+      throw `'cds add notifications' is not available for Java yet`
     }
     return true
   }
@@ -27,26 +25,19 @@ module.exports = class NotificationsTemplate extends require('../templateBase')
   }
 
   async run() {
-    const project = await readProject();
-    const { configFile } = project;
-
-    // create notificationtypes if it doesn't exist
-    if (!exists('notificationtypes.json')) {
-      await mergeJSON('notificationtypes.json', join(__dirname, 'files', 'notificationtypes.json.hbs'), project);
-    }
-
-    //update package.json
-    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project);
+    const project = await readProject()
+    const { configFile } = project
+    await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
   }
 
   async runDependentMerging() {
-    const project = await readProject();
-    const { hasMta } = project;
+    const project = await readProject()
+    const { hasMta } = project
 
     if (hasMta) {
       await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), project, {
         additions: [notificationTypesDeployer]
-      });
+      })
     }
   }
 }

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

@@ -3,13 +3,13 @@ const cds = require('../../../cds')
 const { read } = cds.utils
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
+const mvn = require('../../util/mvn')
 const { srvNode4, srvJava4, postgres, postgresDeployer } = require('../_merging/registry-mta')
 
 module.exports = class PostgresTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { hasMta, hasHelm, isJava } = await readProject(this.options)
-    if (isJava)             throw `'cds add postgres' is not available for Java yet`
+    const { hasMta, hasHelm } = await readProject(this.options)
     if (hasHelm && !hasMta) throw `'cds add postgres' is not available for Kyma yet`
     return true
   }
@@ -20,9 +20,10 @@ module.exports = class PostgresTemplate extends require('../templateBase') {
 
   async run() {
     const project = await readProject(this.options)
-    const { configFile } = project
+    const { configFile, isJava } = project
     project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    if (isJava) await mvn.add('postgresql')
     await this.runDependentMerging()
   }
 

package/lib/init/template/templateBase.js

@@ -1,6 +1,4 @@
 const cds = require('../../cds')
-const { exists } = require('../../cds').utils
-const { PROJECT_TYPE } = require('../constants')
 
 module.exports = class TemplateBase {
 
@@ -99,15 +97,4 @@ module.exports = class TemplateBase {
      */
     async finalize() {
     }
-
-    /**
-     * Returns the project type
-     * @see PROJECT_TYPE
-     * @returns PROJECT_TYPE for current project
-     */
-    getProjectType() {
-        if (exists('pom.xml')) return PROJECT_TYPE.java;
-        if (exists('package.json')) return PROJECT_TYPE.nodejs;
-        return PROJECT_TYPE.unknown;
-    }
 }

package/lib/init/template/typer/files/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-typer": "^0"
+    "@cap-js/cds-typer": ">=0.1"
   },
   "imports": {
     "#cds-models/*": "./@cds-models/*/index.js"

package/lib/init/util/projectReader.js

@@ -83,6 +83,7 @@ module.exports = new class ProjectReader {
             get appPath()        { return env.folders.app ?? 'app' },
             get appVersion()     { return appVersion },
             get appName()        { return appName },
+            get cleanedAppName() { return appName.replace('_', '-') }, // Required when _ isn't allowed in the namespace
             get appId()          { return appId },
             get appDescription() { return appDescription },
         }