@sap/cds-dk 7.3.1 → 7.3.2

package/bin/add.js

@@ -27,6 +27,8 @@ module.exports = Object.assign(add, {
 
     *approuter*             - add support for application routing
 
+    *local-messaging*       - add support for local messaging
+
     *file-based-messaging*  - add support for file-based messaging
 
     *enterprise-messaging*  - add support for SAP Event Mesh

package/bin/build.js

@@ -88,8 +88,9 @@ module.exports = Object.assign(build, {
 
 async function build([project], options = {}) {
     const path = require('path')
+
     const cds = require('../lib/cds')
-    
+
     // plugins are loaded based on cds.root path
     cds.root = path.resolve(process.cwd(), project || options.project || '.')
 

package/bin/cds.js

@@ -30,7 +30,7 @@ const cli = { //NOSONAR
     if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
     if (argv.some(a => this.Shortcuts[a]==='help'))  return this.help (cmd)
 
-    const cds = require('../lib/cds')
+    const cds = require('../lib') // make sure to load cds-dk API for plugins
     DEBUG?.(`[cds] - @sap/cds ${cds.version} loaded: ${cds.home}`)
 
     try {

package/bin/compile/index.js

@@ -53,6 +53,17 @@ module.exports = Object.assign ( compile, {
 
     - odata
     - sql
+    
+  *--dialect* <dialect>
+    
+    Needs option *--to*.
+    Specify the dialect in combination with *--to sql*.
+    Currently supported:
+    
+    - sqlite
+    - h2
+    - postgres
+    - hana
 
   *-s* | *--service* <name> | all
 

package/bin/init.js

@@ -40,7 +40,7 @@ module.exports = Object.assign(init, {
 
         *approuter*             - add support for application routing
 
-        *file-based-messaging*  - add support for file-based messaging
+        *local-messaging*       - add support for local messaging
 
         *enterprise-messaging*  - add support for SAP Event Mesh
 

package/lib/build/provider/edmxBuildPlugin.js

@@ -51,9 +51,13 @@ class EdmxBuildPlugin extends FeatureToggleBuildPlugin {
     }
 
     _isOdataProtocol(srv) {
-        let protocols = cds.service.protocols.protocol4(srv)
-        if (typeof protocols === "string") {
-            protocols = [protocols]
+        let protocols = cds.service.protocols4?.(srv)
+        if (!protocols) {
+            // compatibility with @sap/cds < 7.3.0
+            protocols = cds.service.protocols.protocol4(srv)
+            if (typeof protocols === "string") {
+                protocols = [protocols]
+            }
         }
         return protocols.some(p => p && p.startsWith('odata'))
     }

package/lib/build/provider/featureToggleBuildPlugin.js

@@ -124,9 +124,8 @@ class FeatureToggleBuildPlugin extends InternalBuildPlugin {
 
     _validateFeature(ftCsn, baseCsn) {
         // features must not have other dependencies than base model dependencies - cross feature dependencies are not supported
-        // do not pass options.messages in order to avoid duplicate compiler messages
-        // version 2.13.9 of compileSources does not read the 'requires' definition of parsed CSNs
-        cds.compiler.compileSources({ [ftCsn.requires[0]]: baseCsn, 'feature.csn': ftCsn }, this.options())
+        // assuming only core compiler options are relevant for validation scenario
+        cds.compiler.compileSources({ [ftCsn.requires[0]]: baseCsn, 'feature.csn': ftCsn }, { ...super.options(), ...cds.env.cdsc ?? {}})
     }
 }
 

package/lib/build/provider/nodejs/index.js

@@ -44,9 +44,10 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         await this.collectAllLanguageBundles(dictionary, sources, destSrv, destRoot)
 
         if (!this.hasBuildOption(CONTENT_EDMX, false)) {
-            //REVISIT: inferred model expected by cds.compile.to.edmx()
             const compileOptions = { [FLAVOR_LOCALIZED_EDMX]: this.hasBuildOption(FLAVOR_LOCALIZED_EDMX, true) }
-            const baseModel = cds.compiler.compileSources({ 'base.json': dictionary.base }, { messages: this.messages })
+            // inferred flavor is required by edmx compiler backend
+            // using cds.compile instead of cds.compiler.compileSources ensures that cds.env options are correctly read
+            const baseModel = dictionary.base.meta.flavor !== 'inferred' ? await cds.compile(sources.base, super.options(), 'inferred') : dictionary.base
             await this.compileToEdmx(baseModel, path.join(this.destSrv, 'odata', cds.env.odata.version), compileOptions)
         }
 

package/lib/client/base_command.js

@@ -38,27 +38,17 @@ module.exports = class BaseCommand {
         }
     }
 
-    static concatUrls(base, ...paths) {
-        function trimBeginSlash(str) {
-            return str.replace(/^\//, '');
-        }
-        function trimEndSlash(str) {
-            return str.replace(/\/$/, '');
-        }
-        function trimSlashes(str) {
-            return trimBeginSlash(trimEndSlash(str));
-        }
-        const concatenated = new URL(base);
-        concatenated.pathname = trimEndSlash(concatenated.pathname) + '/' +
-            paths.map((p, i) => i < paths.length - 1 ? trimSlashes(p) : trimBeginSlash(p)).join('/');
-        return concatenated.toString();
+    static concatUrls(...parts) {
+        return parts
+            .map((p, i) => i === 0
+                ? p.replace(/\/$/ /*end slash*/, '')
+                : i === parts.length - 1
+                    ? p.replace(/^\// /*begin slash*/, '')
+                    : p.replace(/^\/|\/$/g /*both*/, ''))
+            .join('/');
     }
 
     static getMtxApiUrl(url, action) {
         return BaseCommand.concatUrls(url, MTX_URL_PATH_PREFIX, action);
     }
-
-    static getMtxApiUrlSync(url, action) {
-        return BaseCommand.concatUrls(url, MTX_URL_PATH_PREFIX, action);
-    }
 }

package/lib/client/download_legacy.js

@@ -1,6 +1,3 @@
-const cds = require ('../cds')
-const { tar } = cds.utils;
-
 const fs = require('fs');
 const { join } = require('path');
 const axios = require('axios');

package/lib/client/params.js

@@ -170,7 +170,7 @@ class BasicParams {
         this.clearOtherTokenStorage = new Param('clearOtherTokenStorage', false, { internal: true });
 
         // - persisted
-        this.appUrl                 = new Param('appUrl',                 '', { persist: Persistence.setting });
+        this.appUrl                 = new Param('appUrl',                 '', { persist: Persistence.setting }); // any trailing slash (/) is removed
         this.url                    = this.appUrl.newAlias('url');
         this.from                   = this.appUrl.newAlias('from');
         this.to                     = this.appUrl.newAlias('to');
@@ -276,6 +276,7 @@ class ParamCollection {
 
     /**
      * Get the name of a main param (as opposed to an alias).
+     * Throws an error if the param is not part of this collection.
      * @param name the param in question
      */
     static mainName(name) {
@@ -287,7 +288,7 @@ class ParamCollection {
     }
 
     /**
-     * Whether this includes the given param.
+     * Return whether the given param is included in this collection.
      * @param name the param in question
      */
     has(name) {
@@ -295,7 +296,7 @@ class ParamCollection {
     }
 
     /**
-     * Return the value of the given param.
+     * Return the value of the given param or `undefined` if not part of this collection.
      * @param name the param in question
      */
     get(name) {
@@ -304,7 +305,7 @@ class ParamCollection {
     }
 
     /**
-     * Return the `Param` object for the given param.
+     * Return the `Param` object for the given param or `undefined` if not part of this collection.
      * @param name the param in question
      */
     getParam(name) {

package/lib/client/settings_manager.js

@@ -96,19 +96,17 @@ async function getTokenBaseUrl(params, renewUrl) {
     if (!params.has('appUrl')) {
         throw 'Failed to determine token URL: app URL not given';
     }
-    const baseUrl = new URL(params.get('appUrl'));
-    const cleanPathname = pathname => baseUrl.pathname.replace(/\/?$/, pathname);
-    const getBaseUrl = pathname => {
-        const url = new URL(baseUrl.toString());
-        url.pathname = cleanPathname(pathname);
-        return url;
+    const appUrlWith = pathname => {
+        const url = new URL(params.get('appUrl'));
+        url.pathname = url.pathname.replace(/\/*$/, pathname);
+        return url.toString();
     };
 
     let existingPath;
     const oauthPaths = [OAUTH_PATH_STREAMLINED_MTX];
     for (const path of oauthPaths) {
         try {
-            await axios.head(getBaseUrl(path).toString());
+            await axios.head(appUrlWith(path));
             existingPath = path;
             break;
         } catch (error) {
@@ -119,7 +117,7 @@ async function getTokenBaseUrl(params, renewUrl) {
         }
     }
     existingPath = existingPath ?? OAUTH_PATH_OLD_MTX; // REVISIT can this just be included in the array?
-    return getBaseUrl(existingPath).toString();
+    return appUrlWith(existingPath);
 }
 
 function getKeyringAccountName(params) {
@@ -194,7 +192,6 @@ class SettingsManager {
 
         const loadedSettings = await this._loadFromFile(projectFolder);
         DEBUG?.(`Loaded project settings for ${params.get('projectFolder')}: ${loadedSettings.format()}`);
-        const loadedAppUrl = loadedSettings.get('appUrl');
 
         if (params.has('passcode') && loadedSettings.has('username')) {
             console.log(`Unsetting username${(loadedSettings.has('isEmptyPassword') ? ' and empty-password hint' : '')}`);
@@ -207,14 +204,14 @@ class SettingsManager {
         if (params.has('username')) {
             params.set('skipToken', true);
         }
-        await this.updateUrls(params, logout, loadedAppUrl);
+        await this.updateUrls(params, logout, loadedSettings);
         await this.setKeytar(params, logout);
         await this.addAuth(params, logout);
         DEBUG?.(`Effective project settings: ${params.format()}`);
     }
 
-    static async updateUrls(params, logout, loadedAppUrl) {
-        async function addAppUrl() {
+    static async updateUrls(params, logout, loadedSettings) {
+        async function updateAppUrl() {
             if (!logout && !params.has('appUrl')) {
                 // Get appUrl from CF
                 DEBUG?.('App URL not given');
@@ -240,19 +237,23 @@ class SettingsManager {
                 DEBUG?.(`Added schema to app URL: ${appUrl}`);
             }
             params.set('appUrl', appUrl);
+            if (params.get('appUrl') !== loadedSettings.get('appUrl')) {
+                DEBUG?.(`Updated app URL from '${loadedSettings.get('appUrl')}' (loaded) to '${appUrl}'`);
+            }
         }
-        async function renewTokenUrl() {
-            const renewUrl = params.get('appUrl') !== loadedAppUrl;
-            if (!params.get('tokenUrl') || renewUrl) {
-                params.set('tokenUrl', await getTokenBaseUrl(params, renewUrl));
+        async function updateTokenUrl() {
+            const tokenUrl = params.get('tokenUrl');
+            const renewUrl = !logout && !params.get('skipToken')
+                && (!tokenUrl || tokenUrl.includes('//-/cds') || params.get('appUrl') !== loadedSettings.get('appUrl'));
+            if (renewUrl) {
+                const tokenUrl = await getTokenBaseUrl(params, renewUrl);
+                params.set('tokenUrl', tokenUrl);
+                DEBUG?.(`Updated token URL from '${loadedSettings.get('tokenUrl')}' (loaded) to '${tokenUrl}'`);
             }
         }
 
-        await addAppUrl();
-
-        if (!logout && !params.get('skipToken')) {
-            await renewTokenUrl();
-        }
+        await updateAppUrl();
+        await updateTokenUrl();
     }
 
     static async setKeytar(params, logout = false) {

package/lib/deploy/to-hana/hana.js

@@ -45,13 +45,16 @@ class HanaDeployer {
   // arg object
   // async deploy(model, serviceName, tunnelAddress, buildTaskOptions, vcapFile, undeployWhitelist, hdiOptions, bindCallback) { // NOSONAR
   async deploy(options = {}) { // NOSONAR
-    let { model, serviceName, tunnelAddress, vcapFile, undeployWhitelist, hdiOptions } = options;
+    let { model, serviceName, tunnelAddress, vcapFile, undeployWhitelist, hdiOptions, dry } = options;
 
     if (model) {
       throw 'Specifying a model for hana deployment is not supported.';
     }
 
-    console.log(`${bold('Starting deploy to SAP HANA ...')}`);
+    if (dry) {
+      console.log('-- running in dry mode ---');
+    }
+
     if (vcapFile) {
       console.log(`Using VCAP_SERVICES from file ${vcapFile} (beta feature).`);
     }
@@ -66,51 +69,66 @@ class HanaDeployer {
       globalVcapEnv.TARGET_CONTAINER = process.env.TARGET_CONTAINER;
     }
 
-    for (const buildResult of buildResults) {
-      let vcapEnv = globalVcapEnv;
-      let serviceKeyName;
-      const currentModelFolder = buildResult.task.dest;
-
-      if (undeployWhitelist) {
-        console.log('Writing undeploy.json');
-        await fs.write(path.join(currentModelFolder, 'undeploy.json'), JSON.stringify(undeployWhitelist, null, 2));
+    if (dry) {
+      for (const buildResult of buildResults) {
+        const model = await cds.load(buildResult.task.src);
+        const data = cds.compile.to.hdbtable(model);
+        for (const [src, { file }] of data) {
+          console.log(`-- ${file}`);
+          console.log(src);
+          console.log();
+        }
       }
+    } else {
+      for (const buildResult of buildResults) {
+        let vcapEnv = globalVcapEnv;
+        let serviceKeyName;
+        const currentModelFolder = buildResult.task.dest;
+
+        if (undeployWhitelist) {
+          console.log('Writing undeploy.json');
+          await fs.write(path.join(currentModelFolder, 'undeploy.json'), JSON.stringify(undeployWhitelist, null, 2));
+        }
 
-      const hasVCAPEnv = Object.keys(vcapEnv).length > 0;
-      if (!serviceName && hasVCAPEnv) {
-        await fs.mkdir(currentModelFolder, { recursive: true });
-      } else {
-        const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =
-          await this._getOrCreateCFService(projectPath, currentModelFolder, serviceName, tunnelAddress);
-        serviceKeyName = cfServiceInstanceKeyName;
-        serviceName = serviceName || cfServiceInstanceName;
+        const hasVCAPEnv = Object.keys(vcapEnv).length > 0;
+        if (!serviceName && hasVCAPEnv) {
+          await fs.mkdir(currentModelFolder, { recursive: true });
+        } else {
+          const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =
+            await this._getOrCreateCFService(projectPath, currentModelFolder, serviceName, tunnelAddress);
+          serviceKeyName = cfServiceInstanceKeyName;
+          serviceName = serviceName || cfServiceInstanceName;
 
-        vcapEnv = this._getVCAPServicesEntry(cfServiceInstanceName, serviceKey);
+          vcapEnv = this._getVCAPServicesEntry(cfServiceInstanceName, serviceKey);
 
-        if (options.storeCredentials) {
-          await this._addInstanceToDefaultEnvJson([currentModelFolder, projectPath], cfServiceInstanceName, serviceKey);
+          if (options.storeCredentials) {
+            await this._addInstanceToDefaultEnvJson([currentModelFolder, projectPath], cfServiceInstanceName, serviceKey);
+          }
         }
-      }
 
-      hdiOptions = hdiOptions || {}
-      await hdiDeployUtil.deploy(currentModelFolder, vcapEnv, hdiOptions);
+        console.log(`${bold('Starting deployment to SAP HANA ...')}`);
+
+        hdiOptions = hdiOptions || {}
+        await hdiDeployUtil.deploy(currentModelFolder, vcapEnv, hdiOptions);
 
-      if (!hasVCAPEnv) {
-        const bindOptions = {
-          ...options,
-          to: `${serviceName}:${serviceKeyName}`,
-          for: options.for,
-          kind: buildResult.task.for
+        if (!hasVCAPEnv) {
+          const bindOptions = {
+            ...options,
+            to: `${serviceName}:${serviceKeyName}`,
+            for: options.for,
+            kind: buildResult.task.for
+          }
+          await bind(bindOptions);
         }
-        await bind(bindOptions);
       }
-    }
 
-    if (options.storeCredentials) {
-      await gitUtil.ensureFileIsGitignored('default-env.json', projectPath);
+      if (options.storeCredentials) {
+        await gitUtil.ensureFileIsGitignored('default-env.json', projectPath);
+      }
+
+      console.log(`If not already done, use ${info('cds add hana')} to configure the project for SAP HANA.\n`);
     }
 
-    console.log(`If not already done, use ${info('cds add hana')} to configure the project for SAP HANA.\n`);
     console.log(`Done.`);
 
     return { buildResults };

package/lib/index.js

@@ -21,7 +21,7 @@ if (cds.compile.to.constructor.name === 'Object') { // not a class as in cds 7
 
 cds.schema = cds.schema || {} // backward compatibility
 cds.extend (cds.schema) .with ( {
-  overlay4: require('./env/schema')
+  get overlay4() { return super.overlay4 = require('./env/schema') }
 })
 
 // set build API, potentially removing the old API facade from sap/cds 7

package/lib/init/constants.js

@@ -27,9 +27,10 @@ module.exports = {
         POSTGRES: 'postgres',
         SQLITE: 'sqlite',
         H2: 'h2',
+        LOCAL_MESSAGING: 'local-messaging',
+        FILE_BASED_MESSAGING: 'file-based-messaging',
         ENTERPRISE_MESSAGING: 'enterprise-messaging',
         ENTERPRISE_MESSAGING_SHARED: 'enterprise-messaging-shared',
-        FILE_BASED_MESSAGING: 'file-based-messaging',
         REDIS_MESSAGING: 'redis-messaging',
         APPROUTER: 'approuter',
         DESTINATION: 'destination',

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/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/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/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 },
         }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.3.1",
+  "version": "7.3.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.3.1",
+      "version": "7.3.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -28,20 +28,6 @@
         "cds": "bin/cds.js",
         "cds-ts": "bin/cds-ts.js"
       },
-      "devDependencies": {
-        "@cap-js/sqlite": "^1",
-        "@types/jest": "^29",
-        "chai": "^4.3.7",
-        "chai-as-promised": "^7.1.1",
-        "chai-subset": "^1.6.0",
-        "eslint-plugin-cds-dk": "file:.eslint",
-        "jest": "^29",
-        "nock": "^13.3.1",
-        "semver": "^7",
-        "tar": "^6.2.0",
-        "ts-node": "^10.9.1",
-        "typescript": "^5.0.4"
-      },
       "optionalDependencies": {
         "sqlite3": "^5.0.4"
       }
@@ -67,7 +53,7 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.9.1",
+      "version": "4.10.0",
       "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -95,7 +81,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.51.0",
+      "version": "8.52.0",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -107,10 +93,10 @@
       "optional": true
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.11",
+      "version": "0.11.13",
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
+        "@humanwhocodes/object-schema": "^2.0.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.5"
       },
@@ -130,7 +116,7 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
+      "version": "2.0.1",
       "license": "BSD-3-Clause"
     },
     "node_modules/@mapbox/node-pre-gyp": {
@@ -225,7 +211,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.3.0",
+      "version": "7.3.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": "^4",
@@ -241,7 +227,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.3.0",
+      "version": "4.3.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -608,6 +594,10 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
+      "license": "ISC"
+    },
     "node_modules/abbrev": {
       "version": "1.1.1",
       "license": "ISC",
@@ -873,11 +863,12 @@
       "optional": true
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
+      "version": "1.0.5",
       "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1020,6 +1011,18 @@
       "version": "0.1.4",
       "license": "MIT"
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "license": "MIT",
@@ -1128,16 +1131,17 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.51.0",
+      "version": "8.52.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.51.0",
-        "@humanwhocodes/config-array": "^0.11.11",
+        "@eslint/js": "8.52.0",
+        "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -1500,13 +1504,13 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
+      "version": "1.2.2",
       "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1553,6 +1557,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "license": "ISC",
@@ -1562,13 +1576,6 @@
       "version": "1.4.0",
       "license": "MIT"
     },
-    "node_modules/has": {
-      "version": "1.0.4",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "license": "MIT",
@@ -1576,6 +1583,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-proto": {
       "version": "1.0.1",
       "license": "MIT",
@@ -1601,6 +1618,16 @@
       "license": "ISC",
       "optional": true
     },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/http-cache-semantics": {
       "version": "4.1.1",
       "license": "BSD-2-Clause",
@@ -1818,7 +1845,7 @@
       }
     },
     "node_modules/livereload-js": {
-      "version": "4.0.1",
+      "version": "4.0.2",
       "license": "MIT"
     },
     "node_modules/locate-path": {
@@ -2205,7 +2232,7 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.0",
+      "version": "1.13.1",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2618,6 +2645,19 @@
       "license": "ISC",
       "optional": true
     },
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "license": "ISC"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.3.1",
+  "version": "7.3.2",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [

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

@@ -1,16 +0,0 @@
-[
-  {
-    "NotificationTypeKey": "{{ appName }}-notification",
-    "NotificationTypeVersion": "1",
-    "Templates": [
-      {
-        "Language": "en",
-        "TemplatePublic": "Hello world!",
-        "TemplateSensitive": "Hello SAP!",
-        "TemplateGrouped": "Hello universe!",
-        "TemplateLanguage": "mustache",
-        "Subtitle": "Hello {{ appName }}!"
-      }
-    ]
-  }
-]