@sap/cds-dk 7.3.1 → 7.4.0

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

@@ -1,8 +1,9 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
+const cmd = require('../../../util/command');
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
-const { BuildError } = require('../../util')
+const { BuildError, pathExists } = require('../../util')
 const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX, CONTENT_PACKAGELOCK_JSON,
     CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
 const { WARNING } = EdmxBuildPlugin
@@ -44,9 +45,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)
         }
 
@@ -60,59 +62,6 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         return this._result
     }
 
-    // REVISIT: fix for simple mono repos using npm workspaces
-    // Support for HANA native artifacts defined in sub-modules required
-    async _addWorkspaceDependencies(dest) {
-        try {
-            const workspaceRoot = path.resolve(cds.root, this.getBuildOption("workspaceRoot") ?? '.')
-            if (workspaceRoot !== cds.root && !fs.existsSync(workspaceRoot)) {
-                throw new BuildError(`The given workspaceRoot path ${workspaceRoot} does not exist`)
-            }
-            const packageJson = require(path.join(dest, 'package.json'))
-            const workspaces = workspaceRoot === cds.root ? packageJson.workspaces : require(path.join(workspaceRoot, 'package.json')).workspaces
-            if (workspaces?.length) {
-                this.logger._debug && this.logger.debug(`Existing npm workspace configuration '${JSON.stringify(workspaces, ' ')}'`)
-                const { tar } = require('../../../../lib').utils
-                const { dependencies } = packageJson
-                const folders = fs.readdirSync(workspaceRoot).filter(res => {
-                    try {
-                        return fs.lstatSync(path.join(workspaceRoot, res)).isDirectory()
-                    } catch (e) {
-                        return false
-                    }
-                })
-                this.logger._debug && this.logger.debug(`Existing workspace subfolders '${JSON.stringify(folders, ' ')}'`)
-
-                const workspaceNames = new Set()
-                let changed
-                for (const workspace of workspaces) {
-                    //REVISIT: workspaces must only use simple glob like 'foo*', nested folders are not supported
-                    const regex = new RegExp('^' + workspace.split('/').pop().replace(/\*/g, '.*') + '$')
-                    for (const folder of folders) {
-                        if (!workspaceNames.has(folder) && folder.match(regex)) {
-                            workspaceNames.add(folder)
-                            const plugin = require(require.resolve(path.join(workspaceRoot, folder, 'package.json')))
-                            const tarFile = `${plugin.name.replace(/\//g, '-').replace(/@/, '')}-${plugin.version}.tgz`
-                            if (dependencies[plugin.name] === '*') {
-                                const tarFilePath = path.join(dest, tarFile)
-                                dependencies[plugin.name] = `file:${tarFile}`
-                                await tar.czfd(tarFilePath, path.join(workspaceRoot, folder))
-                                this.pushFile(tarFilePath)
-                                changed = true
-                            }
-                        }
-                    }
-                }
-                if (changed) {
-                    return this.write(JSON.stringify(packageJson, null, '  ')).to(path.join(dest, 'package.json'))
-                }
-            }
-        } catch (e) {
-            this.pushMessage(`Failed to add npm workspace dependencies: ${e.message}`)
-            this.logger.debug(e)
-        }
-    }
-
     async clean() {
         // staging build content is deleted by BuildTaskEngine
         if (cds.env.build.target === '.') {
@@ -208,6 +157,78 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
             return srvAllowList.test(entry) && (!filter || filter.call(this, entry))
         })
     }
+
+    async _addWorkspaceDependencies(dest) {
+        let packageDescriptors
+        try {
+             packageDescriptors = await this._execNpmPack(dest)
+        } catch (e) {
+            this.logger.debug(e)
+            throw new BuildError(`Failed to package npm workspace dependencies\n${e.message}`)
+        }
+        if (packageDescriptors?.length) {
+            const packageJson = require(path.join(dest, 'package.json'))
+            const dependencies = packageJson.dependencies
+            const devDependencies = packageJson.devDependencies
+            let changed
+            const promises = []
+            for (const packageDescriptor of packageDescriptors) {
+                const {name, filename: fileName} = packageDescriptor
+                const filePath = path.join(dest, fileName)                        
+                if (dependencies?.[name] === '*' || devDependencies?.[name] === '*') {
+                    if (dependencies?.[name] === '*') {
+                        dependencies[name] = `file:${fileName}`
+                    } else {
+                        devDependencies[name] = `file:${fileName}`
+                    }
+                    this.pushFile(filePath)
+                    changed |= true
+                } else {
+                    if (await pathExists(filePath)) {
+                        promises.push(fs.promises.rm(filePath))
+                    }
+                }
+            }
+            if (changed) {
+                promises.push(this.write(JSON.stringify(packageJson, 0, 2)).to(path.join(dest, 'package.json')))
+            } else {
+                throw new BuildError('No matching workspaces found!')
+            }
+            await Promise.all(promises)
+        }
+    }
+    
+    async _execNpmPack(dest) {
+        function findWorkspaceRoot(dir) {
+            if(fs.existsSync(path.join(dir, 'package.json'))) {
+                if(require(path.join(dir, 'package.json')).workspaces) {
+                    return dir
+                }
+            }
+            if(fs.existsSync(path.join(dir, '.gitmodules')) || fs.existsSync(path.join(dir, 'node_modules'))) {
+                return // project root reached
+            }
+            if (path.dirname(dir) !== dir) {
+                return findWorkspaceRoot(path.dirname(dir))
+            }
+        }
+        const wsRoot = findWorkspaceRoot(cds.root)
+        if (!wsRoot) {
+            throw new BuildError('No workspace configuration found!')
+        }
+        const args = ['pack', '-ws', '--json', `--pack-destination=${dest}`]
+        if (this.task.options?.workspaces) {
+            let {workspaces} = this.task.options
+            workspaces = Array.isArray(workspaces) ? workspaces : [workspaces]
+            workspaces.forEach(w => args.push(`-w=${w}`))
+        }
+        this.logger._debug && this.logger.debug(`execute command: npm ${args}`)
+
+        const result = await cmd.spawnCommand( 'npm', args, { cwd: wsRoot || cds.root }, true, !!this.logger._debug)
+
+        this.logger._debug && this.logger.debug(result)
+        return JSON.parse(result)
+    }
 }
 
 module.exports = NodejsBuildPlugin

package/lib/client/auth_manager.js

@@ -66,7 +66,7 @@ async function retrieveTokenOrPasscodeUrl(params) {
         let response;
         for (const { method, url, data } of reqParams(params)) {
             try {
-                DEBUG?.(`Getting authentication token or passcode URL from ${method.toUpperCase()} ${(params.obfuscateQueryParams(url))}`);
+                DEBUG?.(`Getting authentication token or passcode URL from ${method.toUpperCase()} ${params.obfuscateQueryParams(url)}`);
                 response = await axios[method](url, data);
             } catch (error) {
                 if (error.status === 404) { // may represent 405 in case of wrong method

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/pull.js

@@ -49,6 +49,14 @@ module.exports = class Pull extends BaseCommand {
             .catch(error => this.handleHttpError(error, params, { url: pullUrl }));
     }
 
+    static getPackageJsonIndentation(packageContents) {
+        return /^ +/m.exec(packageContents)?.[0].length ?? 2;
+    }
+
+    static formatPackageJson(newObj, oldContents) {
+        return JSON.stringify(newObj, undefined, this.getPackageJsonIndentation(oldContents));
+    }
+
     static amendPackageJson(projectFolder, env) {
         if ('extends' in env) {
             return;
@@ -61,7 +69,7 @@ module.exports = class Pull extends BaseCommand {
         } catch (error) {
             throw getMessage('package.json missing or unreadable', { error });
         }
-        fs.writeFileSync(packageJson, JSON.stringify({
+        fs.writeFileSync(packageJson, this.formatPackageJson({
             ...packageContents,
             cds: {
                 ...(packageContents.cds ?? {}),

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/compile/asyncapi/components/schemas/annotations.js

@@ -1,3 +1,17 @@
+
+const odmAnnotationsMapping = Object.freeze({
+    '@ODM.entityName': 'x-sap-odm-entity-name',
+    '@ODM.oid': 'x-sap-odm-oid'
+});
+
+function addOdmExtensions(definition, object) {
+    for (const [annotation, asyncApiExtension] of Object.entries(odmAnnotationsMapping)) {
+        if (definition[annotation]) {
+            object[asyncApiExtension] = definition[annotation];
+        }
+    }
+}
+
 module.exports = function addAnnotations(definition, object) {
     if (typeof (definition['@title']) === 'string') {
         object.title = definition['@title'];
@@ -9,5 +23,11 @@ module.exports = function addAnnotations(definition, object) {
         object.description = definition.doc.replace(/\n/g, ' ');
     }
 
+    if (definition['@ODM.root']) {
+        object['x-sap-root-entity'] = definition['@ODM.root']
+    }
+
+    addOdmExtensions(definition, object);
+
     return object;
 }

package/lib/compile/openapi/csdl2openapi.js

@@ -479,7 +479,7 @@ module.exports.csdl2openapi = function (
             if (description) tag.description = description;
             tags.push(tag);
         })
-        return tags.sort(function(pre, next){return pre.name.localeCompare(next.name)});
+        return tags.sort(function (pre, next) { return pre.name.localeCompare(next.name) });
     }
 
     /**
@@ -655,7 +655,7 @@ module.exports.csdl2openapi = function (
                             schema: ref(element.$Type, SUFFIX.create),
                         }
                     }
-                },              
+                },
                 responses: response(201, 'Created ' + lname, { $Type: element.$Type }, insertRestrictions.ErrorResponses, !countRestrictions),
             };
             if (insertRestrictions.LongDescription) pathItem.post.description = insertRestrictions.LongDescription;
@@ -1620,7 +1620,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         r[code] = {
             description: description
         };
-        let CountPropertyObj = {[csdl.$Version > '4.0' ? '@count' : '@odata.count'] : ref('count')} ;
+        let CountPropertyObj = { [csdl.$Version > '4.0' ? '@count' : '@odata.count']: ref('count') };
         if (code != 204) {
             const s = getSchema(type);
             r[code].content = {

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

@@ -19,13 +19,15 @@ if (cds.compile.to.constructor.name === 'Object') { // not a class as in cds 7
   cds.compile.to.xsuaa = require('./compile/to-xsuaa')
 }
 
-cds.schema = cds.schema || {} // backward compatibility
-cds.extend (cds.schema) .with ( {
-  overlay4: require('./env/schema')
+// add overlay4 method to cds.schema to retrieve schema with cds-dk features
+// schema is cds version specific; add cds-dk parts not present in cds, e.g. build
+// failsafe for legacy cds without schema.constructor
+cds.extend(cds.schema?.constructor || {}).with(class {
+  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
+// delete cds.__proto__?.build //> not required, as its overriden below anyways
 cds.extend (cds.constructor) .with (class {
   get build() { return super.build = require('./build') }
 })

package/lib/init/constants.js

@@ -4,7 +4,7 @@ module.exports = {
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION: '2.3.0',
+    MAVEN_ARCHETYPE_VERSION: '2.4.0',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -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',
@@ -44,8 +45,6 @@ module.exports = {
         NOTIFICATIONS: 'notifications'
     }),
 
-    PROJECT_TYPE: Object.freeze({ nodejs: 1, java: 2, unknown: 3 }),
-
     REGEX_JAVA_PACKAGE: /^[a-z_][a-z0-9_]*(\.[a-z_][a-z0-9_]*)*$/g,
     // copied from mbt error message
     REGEX_JAVA_VERSION: /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/,

package/lib/init/index.js

@@ -6,7 +6,7 @@ const { OPTIONS, COMMAND_INIT, PROJECT_FILES, REGEX_PROJECT_NAME } = require('./
 const {
     NODEJS, JAVA,
     HANA, APPROUTER, XSUAA, KIBANA, ENTERPRISE_MESSAGING,
-    MTA, HELM, MULTITENANCY, PIPELINE,
+    MTA, MULTITENANCY, PIPELINE,
     TINY_SAMPLE, SAMPLE
  } = OPTIONS
 
@@ -23,7 +23,7 @@ module.exports = class CDSGenerator {
             default: '',
             target: 'projectName',
             validate: async (value) => {
-                try {    
+                try {
                     cds.root = path.resolve(this.cwd, value || '.');
 
                     await this._validateProjectName(value);
@@ -74,7 +74,7 @@ module.exports = class CDSGenerator {
             default: '',
             choices: [
                 { name: 'Cloud Foundry: MTA Deployment', value: MTA },
-                { name: 'Kyma: Helm Deployment', value: HELM },
+                // { name: 'Kyma: Helm Deployment', value: HELM },
                 { name: 'Multitenancy', value: MULTITENANCY },
                 { name: 'CI/CD Pipeline Integration', value: PIPELINE },
             ],
@@ -182,7 +182,11 @@ module.exports = class CDSGenerator {
 
         if (cds.cli.command === COMMAND_INIT) {
             const relativeProjectPath = path.relative(this.cwd, cds.root)
-            console.log(`\nSuccessfully created project. Continue with '${term.bold('cd '+relativeProjectPath)}'.\n`)
+            let message = 'Successfully created project.'
+            if (relativeProjectPath) {
+                message = message + ` Continue with '${term.bold('cd ' + relativeProjectPath)}'.`
+            }
+            console.log('\n' + message)
         } else {
             console.log(`\nSuccessfully added features to your project.`)
         }
@@ -219,6 +223,7 @@ module.exports = class CDSGenerator {
             // Compat
             if (facet === 'sample-tiny') facet = 'tiny-sample'
             if (facet === 'kibana-logging') facet = 'kibana'
+            if (facet === 'postgresql') facet = 'postgres'
 
             if (!templates.has(facet)) {
                 const template = await this._createTemplate(facet)