@sap/cds-dk 7.3.0 → 7.3.2

package/lib/build/index.js

@@ -1,11 +1,10 @@
 const fs = require('fs')
 const cds = require('../cds')
 const BuildTaskEngine = require('./buildTaskEngine')
-const BuildTaskFactory = require('./buildTaskFactory')
 const BuildPlugin = require('./buildPlugin')
 const { BuildError } = require('./util')
 
-module.exports = { build, BuildTaskFactory, BuildTaskEngine, BuildPlugin, BuildError }
+module.exports = { build, register, BuildPlugin }
 
 /**
  * Executes cds build in the directory defined by cds.root.
@@ -28,4 +27,8 @@ async function build(options = {}) {
         }
         throw e
     }
+}
+
+function register(id, options) {
+    return require('./plugins').register(id, options)
 }

package/lib/build/plugins.js

@@ -0,0 +1,35 @@
+const cds = require('../cds')
+
+module.exports = new (class BuildPlugins {
+    constructor() {
+        this._plugins = new Map()
+    }
+    getPlugins() {
+        return this._plugins
+    }
+    getPlugin(id) {
+        return this._plugins.get(id)
+    }
+    register(id, options) {
+        if (!id || !options?.impl) {
+            throw Error("Invalid build plugin parameter")
+        }
+        if (this._plugins.has(id)) {
+            throw Error(`Build plugin ${id} already registered`)
+        }
+        this._plugins.set(id, {
+            id,
+            class: this._loadPlugin(id, options.impl),
+            description: options.description,
+            taskDefaults: options.taskDefaults ?? {}
+        })
+    }
+    _loadPlugin(id, impl) {
+        try {
+            // project-local module is preferred - otherwise from our own dependencies
+            return require(require.resolve(impl, { paths: [cds.root, __dirname] })) 
+        } catch (e) {
+            throw new Error(`Custom build plugin implementation '${impl}' for '${id}' cannot be loaded:\n` + e)
+        }
+    }
+})

package/lib/build/provider/edmxBuildPlugin.js

@@ -51,7 +51,15 @@ class EdmxBuildPlugin extends FeatureToggleBuildPlugin {
     }
 
     _isOdataProtocol(srv) {
-        return cds.service.protocols.protocol4(srv).startsWith('odata')
+        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'))
     }
 
     _options4odata() {

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({ '../..csn.json': 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/internalBuildPlugin.js

@@ -22,6 +22,10 @@ class InternalBuildPlugin extends BuildPlugin {
         return InternalBuildPlugin.PRIORITY_MAX_VALUE
     }
 
+    init() { 
+        // REVISIT: no default gen folder for now
+    }
+
     async clean() {
         // build results are deleted by the BuildTaskEngine if the build.target !== '.'
         // make sure that src is not a subfolder of dest

package/lib/build/provider/internalBuildTaskProvider.js

@@ -43,7 +43,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         InternalBuildTaskProvider._setDefaultModel(task)
     }
 
-    loadPlugin(task) {
+    getPluginClass(task) {
         return require(`./${InternalBuildTaskProvider._getForValueFromTask(task)}`)
     }
 

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

@@ -2,8 +2,8 @@ const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
-const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME, 
-    OUTPUT_MODE_FILESYSTEM, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
+const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME,
+    OUTPUT_MODE_FILESYSTEM, FLAVOR_LOCALIZED_EDMX, CONTENT_EDMX, CONTENT_LOCALIZED_EDMX } = require('../../constants')
 const { getI18nDefaultFolder } = require('../../util')
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize('src/main/resources/edmx')
 
@@ -20,11 +20,17 @@ class JavaBuildPlugin extends EdmxBuildPlugin {
         if (!model) {
             return
         }
-
-        // generate edmx files containing all features
         const odata = await this._compileForOdata(model, compileDest)
-        await this.compileToEdmx(odata, compileDest) // localized edmx for backward compatibility
-        await this.compileToEdmx(odata, path.join(compileDest, 'odata', cds.env.odata.version), { [FLAVOR_LOCALIZED_EDMX]: false }) // non-localized edmx
+
+        if (!this.hasBuildOption(CONTENT_EDMX, false)) {
+            // generate edmx files containing all features
+            // localized edmx for backward compatibility
+            if (!this.hasBuildOption(CONTENT_LOCALIZED_EDMX, false)) {
+                await this.compileToEdmx(odata, compileDest, { [FLAVOR_LOCALIZED_EDMX]: true })
+            }
+            // non-localized edmx
+            await this.compileToEdmx(odata, path.join(compileDest, 'odata', cds.env.odata.version), { [FLAVOR_LOCALIZED_EDMX]: false })
+        }
 
         if (!this.hasBuildOption(CONTENT_LANGUAGE_BUNDLES, false)) {
             // collect and write language bundles containing all features

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/build/util.js

@@ -208,6 +208,10 @@ function _locationString(loc) {
         : `${loc.file}:${loc.line}.${loc.col}-${loc.endLine}.${loc.endCol}`;
 }
 
+async function pathExists(path) {
+    return fs.promises.access(path).then(() => true).catch(() => false);
+}
+
 /**
  * Class for individual build message.
  *
@@ -271,6 +275,7 @@ module.exports = {
     getI18nDefaultFolder,
     isClassicMtx,
     normalizePath,
+    pathExists,
     BuildMessage,
     BuildError
 }

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');
@@ -13,10 +10,6 @@ const DOWNLOAD_FILE_NAME = 'migrated_projects.tgz'; // TODO try to add tenant la
 module.exports = class Download extends BaseCommand {
 
     static async run(paramValues) {
-        if (!tar) {
-            throw `cds pull requires @sap/cds version >= 6.2. Current version is ${cds.version}\n`;
-        }
-
         const params = await login(paramValues);
 
         const projectFolder = params.get('projectFolder');
@@ -31,17 +24,16 @@ module.exports = class Download extends BaseCommand {
         const downloadedTgz = await this.getTgz(params);
         await fs.promises.writeFile(downloadPath, downloadedTgz);
 
-        //await tar.xz(baseModelTgz).to(target); // expand if feature is requested later
-
         console.log(`Finished.`);
     }
 
     static async getTgz(params) {
         const tagRule = params.get('tagRule');
+        const defaultTag = params.get('defaultTag');
         const downloadUrl = `${(params.get('appUrl'))}/-/cds/extensibility/getMigratedProjects`;
         const options = { ...params.get('reqAuth'), responseType: 'arraybuffer' };
 
-        return axios.post(downloadUrl, { tagRule }, options)
+        return axios.post(downloadUrl, { tagRule, defaultTag }, options)
             .then(response => Buffer.from(response.data))
             .catch(error => this.handleHttpError(error, params, { url: downloadUrl }));
     }

package/lib/client/params.js

@@ -163,13 +163,14 @@ class BasicParams {
         this.directory              = this.projectFolder.newAlias('directory');
 
         this.tagRule                = new Param('tagRule', '');
+        this.defaultTag             = new Param('defaultTag', '');
 
         // - non-persisted, internal
         this.reqAuth                = new Param('reqAuth',                null, { obfuscate: ObfuscationLevel.full, internal: true });
         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');
@@ -275,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) {
@@ -286,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) {
@@ -294,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) {
@@ -303,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,50 +204,56 @@ 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() {
-            // Prefix URL schema
-            if (params.has('appUrl')) {
-                const appUrl = params.get('appUrl');
-                if (!schemaRegex.test(appUrl)) {
-                    if (localhostRegex.test(appUrl)) {
-                        params.set('appUrl', httpSchema + appUrl);
-                    } else {
-                        params.set('appUrl', httpsSchema + appUrl);
-                    }
-                    DEBUG?.(`Added schema to app URL: ${params.get('appUrl')}`);
-                }
-            }
-
+    static async updateUrls(params, logout, loadedSettings) {
+        async function updateAppUrl() {
             if (!logout && !params.has('appUrl')) {
                 // Get appUrl from CF
                 DEBUG?.('App URL not given');
                 await getAppUrlAndSubdomainFromSuggestions(params);
             }
 
-            // Check required param: appUrl
             if (!params.has('appUrl')) {
                 throw 'App URL not given. Please specify it or log in to Cloud Foundry and repeat this command.';
             }
+
+            // Prefix URL schema
+            let appUrl = params.get('appUrl');
+            if (appUrl.endsWith('/')) {
+                appUrl = appUrl.replace(/\/+$/, '');
+                DEBUG?.(`Removed trailing slash from app URL: ${appUrl}`);
+            }
+            if (!schemaRegex.test(appUrl)) {
+                if (localhostRegex.test(appUrl)) {
+                    appUrl = httpSchema + appUrl;
+                } else {
+                    appUrl = httpsSchema + appUrl;
+                }
+                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/compile/openapi/csdl2openapi.js

@@ -64,7 +64,7 @@ module.exports.csdl2openapi = function (
     csdl = JSON.parse(JSON.stringify(csdl))
     csdl.$Version = odataVersion ? odataVersion : '4.01'
     serviceRoot = serviceRoot || (scheme + '://' + host + basePath);
-    const queryOptionPrefix = csdl.$Version <= '4.0' ? '$' : '';
+    const queryOptionPrefix = csdl.$Version <= '4.01' ? '$' : '';
     const typesToInline = {}; // filled in schema() and used in inlineTypes()
     const boundOverloads = {};
     const derivedTypes = {};

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,5 +21,11 @@ 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
+delete cds.__proto__?.build
+cds.extend (cds.constructor) .with (class {
+  get build() { return super.build = require('./build') }
 })

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',
@@ -40,7 +41,8 @@ module.exports = {
         LINT_DEV: 'lint:dev',
         HELM: 'helm',
         TYPER: 'typer',
-        HTML5_REPO: 'html5-repo'
+        HTML5_REPO: 'html5-repo',
+        NOTIFICATIONS: 'notifications'
     }),
 
     PROJECT_TYPE: Object.freeze({ nodejs: 1, java: 2, unknown: 3 }),

package/lib/init/template/_merging/registry-mta.js

@@ -112,6 +112,17 @@ const hdiContainer = {
     }]
 }
 
+const notificationTypesDeployer = {
+    in: 'modules',
+    where: [{
+        property: 'name',
+        isEqualTo: 'notification-content-deployment'
+    }, {
+        property: 'type',
+        isEqualTo: 'nodejs'
+    }]
+}
+
 const serviceManager = {
     in: 'resources',
     where: [{
@@ -273,6 +284,7 @@ module.exports = {
     enterpriseMessaging,
     hdbDeployer,
     hdiContainer,
+    notificationTypesDeployer,
     serviceManager,
     postgres,
     postgresDeployer,

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',