@sap/cds-dk 7.1.1 → 7.2.0

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

@@ -52,31 +52,64 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
         if (this.isStagingBuild() && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
             const srcSrv = this.task.src === cds.root ? path.resolve(this.task.src, cds.env.folders.srv) : this.task.src
             await this._copyNativeContent(cds.root, srcSrv, destRoot, destSrv)
-            await this._fixCapireSamplesDeps(destRoot)
+            if (this.context.options.workspaces) {
+                await this._addWorkspaceDependencies(destRoot)
+            }
         }
         return this._result
     }
 
-    // REVISIT: fix for capire samples - needs to be reworked
-    // Instead of adding relative paths we may better delete the entire entry as relative paths
-    // cannot be resolved in cloud deployments anyway.
+    // REVISIT: fix for simple mono repos using npm workspaces
     // Support for HANA native artifacts defined in sub-modules required
-    async _fixCapireSamplesDeps(dest) {
-        const packageJson = path.join(dest, 'package.json')
+    async _addWorkspaceDependencies(dest) {
         try {
-            const content = require(packageJson)
-            const { dependencies } = content
-            let changed
-            for (let dependency in dependencies) {
-                if (dependency.startsWith('@capire/')) {
-                    dependencies[dependency] = path.relative(dest, path.dirname(require.resolve(dependency + '/package.json')))
-                    changed = true
-                }
+            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`)
             }
-            if (changed) {
-                return this.write(JSON.stringify(content, null, '  ')).to(packageJson)
+            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) {/*ignore*/ }
+        } catch (e) {
+            this.pushMessage(`Failed to add npm workspace dependencies: ${e.message}`)
+            this.logger.debug(e)
+        }
     }
 
     async clean() {
@@ -91,7 +124,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
 
     async _copyNativeContent(srcRoot, srcSrv, destRoot, destSrv) {
         // project/srv/** -> 'gen/srv/srv/**'
-        const filesFilter = await this.copySrvContent(srcSrv, destRoot, this.hasBuildOption('flatDeployLayout', true)? destRoot : destSrv)
+        const filesFilter = await this.copySrvContent(srcSrv, destRoot, this.hasBuildOption('flatDeployLayout', true) ? destRoot : destSrv)
 
         // project/* -> 'gen/srv/*'
         await this.copyProjectRootContent(srcRoot, destRoot, (entry) => !filesFilter.includes(path.basename(entry)))

package/lib/build/util.js

@@ -119,6 +119,14 @@ function getDefaultModelOptions() {
     return _pushModelPaths(modelPaths)
 }
 
+/**
+ * For valid paths replace '\\' with '/' and remove trailing '/'. Otherwise return as is
+ * @param {*} dir
+ */
+function normalizePath(dir) {
+    return typeof dir === "string" ? dir.replace(/\\/g, '/').replace(/\/$/, '') : dir
+}
+
 function _pushModelPaths(...modelPaths) {
     const model = new Set()
     // may contain nested arrays
@@ -131,7 +139,7 @@ function _pushModelPaths(...modelPaths) {
             if (roots.includes(m)) {
                 const dir = path.resolve(cds.root, m)
                 if (fs.existsSync(dir)) {
-                    model.add(m.replace(/\/$/, ''))
+                    model.add(m)
                 } else if (fs.existsSync(dir + FILE_EXT_CDS)) { //might be cds file name, compatibility to old build configs
                     model.add(m)
                 }
@@ -140,7 +148,7 @@ function _pushModelPaths(...modelPaths) {
             }
         }
     })
-    return [...model]
+    return [...model].map(m => normalizePath(m))
 }
 
 function flatten(modelPaths) {
@@ -154,22 +162,6 @@ function flatten(modelPaths) {
     }, [])
 }
 
-/**
- * Copy a file or directory. The directory can have contents.
- * REVISIT: 'fs.promises.cp' replacement for nodejs 14
- * @param src <String> Note that if src is a directory it will copy everything inside of this directory, not the entire directory itself.
- * @param dest <String> Note that if src is a file, dest cannot be a directory.
- */
-async function copy(src, dest) {
-    if ((await fs.promises.stat(src)).isDirectory()) {
-        const entries = await fs.promises.readdir(src)
-        return Promise.all(entries.map(async each => copy(path.join(src, each), path.join(dest, each))))
-    } else {
-        await fs.promises.mkdir(path.dirname(dest), { recursive: true })
-        return fs.promises.copyFile(src, dest)
-    }
-}
-
 function getI18nDefaultFolder() {
     // keep '_i18n' as preferred folder for compatibility reasons
     if (cds.env.i18n.folders.includes('_i18n')) return '_i18n'
@@ -276,9 +268,9 @@ module.exports = {
     resolveRequiredSapModels,
     getDefaultModelOptions,
     flatten,
-    copy,
     getI18nDefaultFolder,
     isClassicMtx,
+    normalizePath,
     BuildMessage,
     BuildError
 }

package/lib/compile/openapi/csdl2openapi.js

@@ -52,6 +52,7 @@ module.exports.csdl2openapi = function (
     {
         url: serviceRoot,
         servers: serversObject,
+        odataVersion: odataVersion,
         scheme: scheme = 'https',
         host: host = 'localhost',
         basePath: basePath = '/service-root',
@@ -61,6 +62,7 @@ module.exports.csdl2openapi = function (
 ) {
     // as preProcess below mutates the csdl, copy it before, to avoid side-effects on the caller side
     csdl = JSON.parse(JSON.stringify(csdl))
+    csdl.$Version = odataVersion ? odataVersion : '4.01'
     serviceRoot = serviceRoot || (scheme + '://' + host + basePath);
     const queryOptionPrefix = csdl.$Version <= '4.0' ? '$' : '';
     const typesToInline = {}; // filled in schema() and used in inlineTypes()
@@ -82,7 +84,7 @@ module.exports.csdl2openapi = function (
         openapi: '3.0.2',
         info: getInfo(csdl, entityContainer),
         'x-sap-api-type': 'ODATAV4',
-        'x-odata-version': '4.0',
+        'x-odata-version': csdl.$Version,
         'x-sap-shortText': getShortText(csdl, entityContainer),
         servers: getServers(serviceRoot, serversObject),
         tags: entityContainer ? getTags(entityContainer) : {},
@@ -638,12 +640,12 @@ module.exports.csdl2openapi = function (
      */
     function operationCreate(pathItem, element, name, sourceName, targetName, target, level, restrictions) {
         const insertRestrictions = restrictions.InsertRestrictions || target && target[voc.Capabilities.InsertRestrictions] || {};
-
+        let countRestrictions = target && (target[voc.Capabilities.CountRestrictions]?.Countable === false); // count property will be added if CountRestrictions is false
         if (insertRestrictions.Insertable !== false) {
             const lname = pluralize.singular(splitName(name));
             const type = modelElement(element.$Type);
             pathItem.post = {
-                summary: insertRestrictions.Description || operationSummary('Create', name, sourceName, level, true, true),
+                summary: insertRestrictions.Description || operationSummary('Creates', name, sourceName, level, true, true),
                 tags: [sourceName],
                 requestBody: {
                     description: type && type[voc.Core.Description] || 'New ' + lname,
@@ -653,8 +655,8 @@ module.exports.csdl2openapi = function (
                             schema: ref(element.$Type, SUFFIX.create),
                         }
                     }
-                },
-                responses: response(201, 'Created ' + lname, { $Type: element.$Type }, insertRestrictions.ErrorResponses),
+                },              
+                responses: response(201, 'Created ' + lname, { $Type: element.$Type }, insertRestrictions.ErrorResponses, !countRestrictions),
             };
             if (insertRestrictions.LongDescription) pathItem.post.description = insertRestrictions.LongDescription;
             if (targetName && sourceName != targetName) pathItem.post.tags.push(targetName);
@@ -711,6 +713,7 @@ module.exports.csdl2openapi = function (
         const readRestrictions = restrictions.ReadRestrictions || targetRestrictions || {};
         const readByKeyRestrictions = readRestrictions.ReadByKeyRestrictions;
         let readable = true;
+        let countRestrictions = target && (target[voc.Capabilities.CountRestrictions]?.Countable === false);
         if (byKey && readByKeyRestrictions && readByKeyRestrictions.Readable !== undefined)
             readable = readByKeyRestrictions.Readable;
         else if (readRestrictions.Readable !== undefined)
@@ -722,11 +725,11 @@ module.exports.csdl2openapi = function (
             const lname = splitName(name);
             const collection = !byKey && element.$Collection;
             const operation = {
-                summary: descriptions.Description || operationSummary('Retrieve', name, sourceName, level, element.$Collection, byKey),
+                summary: descriptions.Description || operationSummary('Retrieves', name, sourceName, level, element.$Collection, byKey),
                 tags: [sourceName],
                 parameters: [],
                 responses: response(200, 'Retrieved ' + (byKey ? pluralize.singular(lname) : lname), { $Type: element.$Type, $Collection: collection },
-                    byKey ? readByKeyRestrictions?.ErrorResponses : readRestrictions?.ErrorResponses)
+                    byKey ? readByKeyRestrictions?.ErrorResponses : readRestrictions?.ErrorResponses, !countRestrictions)
             };
             const deltaSupported = element[voc.Capabilities.ChangeTracking] && element[voc.Capabilities.ChangeTracking].Supported;
             if (!byKey && deltaSupported) {
@@ -1165,11 +1168,11 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
      */
     function operationUpdate(pathItem, element, name, sourceName, target, level, restrictions, byKey) {
         const updateRestrictions = restrictions.UpdateRestrictions || target && target[voc.Capabilities.UpdateRestrictions] || {};
-
+        let countRestrictions = target && (target[voc.Capabilities.CountRestrictions]?.Countable === false);
         if (updateRestrictions.Updatable !== false) {
             const type = modelElement(element.$Type);
             const operation = {
-                summary: updateRestrictions.Description || operationSummary('Change', name, sourceName, level, element.$Collection, byKey),
+                summary: updateRestrictions.Description || operationSummary('Changes', name, sourceName, level, element.$Collection, byKey),
                 tags: [sourceName],
                 requestBody: {
                     description: type && type[voc.Core.Description] || 'New property values',
@@ -1180,7 +1183,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
                         }
                     }
                 },
-                responses: response(204, "Success", undefined, updateRestrictions.ErrorResponses),
+                responses: response(204, "Success", undefined, updateRestrictions.ErrorResponses, !countRestrictions),
             };
             if (updateRestrictions.LongDescription) operation.description = updateRestrictions.LongDescription;
             customParameters(operation, updateRestrictions);
@@ -1202,12 +1205,12 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
      */
     function operationDelete(pathItem, element, name, sourceName, target, level, restrictions, byKey) {
         const deleteRestrictions = restrictions.DeleteRestrictions || target && target[voc.Capabilities.DeleteRestrictions] || {};
-
+        let countRestrictions = target && (target[voc.Capabilities.CountRestrictions]?.Countable === false);
         if (deleteRestrictions.Deletable !== false) {
             pathItem.delete = {
-                summary: deleteRestrictions.Description || operationSummary('Delete', name, sourceName, level, element.$Collection, byKey),
+                summary: deleteRestrictions.Description || operationSummary('Deletes', name, sourceName, level, element.$Collection, byKey),
                 tags: [sourceName],
-                responses: response(204, "Success", undefined, deleteRestrictions.ErrorResponses),
+                responses: response(204, "Success", undefined, deleteRestrictions.ErrorResponses, !countRestrictions),
             };
             if (deleteRestrictions.LongDescription) pathItem.delete.description = deleteRestrictions.LongDescription;
             customParameters(pathItem.delete, deleteRestrictions);
@@ -1423,7 +1426,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         const name = actionName.indexOf('.') === -1 ? actionName : nameParts(actionName).name;
         const pathItem = {
             post: {
-                summary: actionImport[voc.Core.Description] || overload[voc.Core.Description] || 'Invoke action ' + name,
+                summary: actionImport[voc.Core.Description] || overload[voc.Core.Description] || 'Invokes action ' + name,
                 tags: [overload[voc.Common.Label] || sourceName || 'Service Operations'],
                 responses: overload.$ReturnType ? response(200, "Success", overload.$ReturnType, overload[voc.Capabilities.OperationRestrictions]?.ErrorResponses)
                     : response(204, "Success", undefined, overload[voc.Capabilities.OperationRestrictions]?.ErrorResponses),
@@ -1479,7 +1482,6 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         const name = functionName.indexOf('.') === -1 ? functionName : nameParts(functionName).name;
         let parameters = overload.$Parameter || [];
         if (overload.$IsBound) parameters = parameters.slice(1);
-
         const pathSegments = [];
         const params = [];
 
@@ -1534,7 +1536,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         const pathParameters = implicitAliases ? '' : '(' + pathSegments.join(',') + ')';
         const pathItem = {
             get: {
-                summary: functionImport[voc.Core.Description] || overload[voc.Core.Description] || 'Invoke function ' + name,
+                summary: functionImport[voc.Core.Description] || overload[voc.Core.Description] || 'Invokes function ' + name,
                 tags: [overload[voc.Common.Label] || sourceName || 'Service Operations'],
                 parameters: prefixParameters.concat(params),
                 responses: response(200, "Success", overload.$ReturnType, overload[voc.Capabilities.OperationRestrictions]?.ErrorResponses),
@@ -1558,7 +1560,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
             const firstEntitySet = Object.keys(container).filter(child => isIdentifier(child) && container[child].$Collection)[0];
             paths['/$batch'] = {
                 post: {
-                    summary: batchSupport[voc.Core.Description] || 'Send a group of requests',
+                    summary: batchSupport[voc.Core.Description] || 'Sends a group of requests',
                     description: (batchSupport[voc.Core.LongDescription] || 'Group multiple requests into a single request payload, see '
                         + '[Batch Requests](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_BatchRequests).')
                         + '\n\n*Please note that "Try it out" is not supported for this request.*',
@@ -1613,11 +1615,12 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
      * @param {object} type Response type object
      * @param {array} errors Array of operation-specific status codes with descriptions
      */
-    function response(code, description, type, errors) {
+    function response(code, description, type, errors, isCount = true) {
         const r = {};
         r[code] = {
             description: description
         };
+        let CountPropertyObj = {[csdl.$Version > '4.0' ? '@count' : '@odata.count'] : ref('count')} ;
         if (code != 204) {
             const s = getSchema(type);
             r[code].content = {
@@ -1627,7 +1630,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
                             type: 'object',
                             title: 'Collection of ' + nameParts(type.$Type || 'Edm.String').name,
                             properties: {
-                                [csdl.$Version > '4.0' ? '@count' : '@odata.count']: ref('count'),
+                                ...(isCount && CountPropertyObj),
                                 value: s
                             }
                         }
@@ -1806,14 +1809,20 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         const isKey = keyMap(type);
         const required = Object.keys(isKey);
         const schemaProperties = {};
-
+        let isCount = true;
+        if (csdl[qualifier]?.$Annotations) {
+            const annotations = csdl[qualifier].$Annotations[`${qualifier}.EntityContainer/${name}`];
+            if (annotations && annotations[voc.Capabilities.CountRestrictions] && annotations[voc.Capabilities.CountRestrictions]?.Countable === false) {
+                isCount = false;
+            }
+        }
         const properties = propertiesOfStructuredType(type);
         Object.keys(properties).forEach(iName => {
             const property = properties[iName];
             if (suffix === SUFFIX.read) schemaProperties[iName] = getSchema(property);
             if ((Object.prototype.hasOwnProperty.call(property, '@Common.FieldControl')) && property['@Common.FieldControl'] === 'Mandatory') { required.push(iName) }
             if (property.$Kind == 'NavigationProperty') {
-                if (property.$Collection && suffix === "") {
+                if (property.$Collection && suffix === "" && isCount === true) {
                     schemaProperties[`${iName}@${csdl.$Version === '4.0' ? 'odata.' : ''}count`] = ref('count');
                 }
                 if (property[voc.Core.Permissions] != "Read" && !property[voc.Core.Computed] && property.$ContainsTarget) {

package/lib/compile/openapi/index.js

@@ -34,11 +34,15 @@ function _getOpenApi(csdl, options) {
     return openapi;
 }
 
-function toOpenApiOptions(csdl, csn, options={}) {
+function toOpenApiOptions(csdl, csn, options = {}) {
     const result = {}
     for (const key in options) {
-        if (/^openapi:(.*)/.test(key) && RegExp.$1)
-            result[RegExp.$1] = options[key]
+        if (/^openapi:(.*)/.test(key) && RegExp.$1) {
+            result[RegExp.$1] = options[key];
+        }
+        else if (key === 'odata-version') {
+            result['odataVersion'] = options[key];
+        }
     }
     if (result.url) {
         result.url = result.url.replace(/\/*\$\{service-path\}/g, servicePath(csdl, csn))

package/lib/import/common.js

@@ -7,7 +7,7 @@ const messages = require("./message").getMessages();
 const cds = require('../cds');
 const { fs, path, write, mkdirp, exists, read } = cds.utils;
 const cdsCompiler = require('..').compile.to;
-const md5 = require('md5');
+const md5 = data => require('crypto').createHash('md5').update(data).digest('hex');
 
 let optionsMapping = {
     'keep-namespace': 'keepNamespace',

package/lib/init/constants.js

@@ -1,14 +1,10 @@
-const os = require('os');
-
-const MAVEN_ARCHETYPE_VERSION = '2.1.0';
-
-const constants = {
-    IS_WIN: (os.platform() === 'win32'),
+module.exports = {
+    IS_WIN: require('os').platform() === 'win32',
 
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION,
+    MAVEN_ARCHETYPE_VERSION: '2.2.0',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -29,7 +25,7 @@ const constants = {
         XSUAA: 'xsuaa',
         HANA: 'hana',
         SQLITE: 'sqlite',
-        AUDITLOG: 'auditlog',
+        H2: 'h2',
         ENTERPRISE_MESSAGING: 'enterprise-messaging',
         ENTERPRISE_MESSAGING_SHARED: 'enterprise-messaging-shared',
         FILE_BASED_MESSAGING: 'file-based-messaging',
@@ -48,6 +44,8 @@ const constants = {
     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-]+)*)?$/,
     REGEX_PROJECT_NAME: /[^0-9a-zA-Z_-]/g,
 
     URLS: Object.freeze({
@@ -57,11 +55,8 @@ const constants = {
         MAVEN_ARCHETYPE_HELP: `https://cap.cloud.sap/docs/java/development/#the-maven-archetype`,
         MAVEN_INSTALL_HELP: `https://maven.apache.org/install.html`,
         VSCODE: 'https://code.visualstudio.com/',
-        VSCODE_NBVIEWER: 'https://marketplace.visualstudio.com/items?itemName=ms-python.python',
         VSCODE_ESLINT: 'https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint'
     }),
 
     PROJECT_FILES: ['package.json', 'pom.xml', '.cdsrc.json']
 }
-
-module.exports = constants;

package/lib/init/index.js

@@ -3,7 +3,12 @@ const path = require('path');
 const term = require('../util/term');
 
 const { OPTIONS, COMMAND_INIT, PROJECT_FILES, REGEX_PROJECT_NAME } = require('./constants')
-const { NODEJS, JAVA, HANA, MTA,PIPELINE, TINY_SAMPLE, CF_MANIFEST } = OPTIONS
+const {
+    NODEJS, JAVA,
+    HANA, APPROUTER, XSUAA, KIBANA, ENTERPRISE_MESSAGING,
+    MTA, HELM, MULTITENANCY, PIPELINE,
+    TINY_SAMPLE, SAMPLE
+ } = OPTIONS
 
 const cds = require('../cds'), { exists, readdir } = cds.utils
 const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) ? console.debug : undefined
@@ -12,77 +17,86 @@ module.exports = class CDSGenerator {
     constructor() {
         this.cwd = process.cwd();
 
-        this.uiConfig = [
-            {
-                title: `Project Name`,
-                description: `Enter your project name.`,
-                default: '',
-                target: 'projectName',
-                validate: async (value) => {
-                    try {
-                        cds.root = path.resolve(this.cwd, value || '.');
-
-                        await this._validateProjectName(value);
-                        await this._validateProjectFolder(path.join(this.cwd, value), this.cwd);
-
-                        return true;
-                    } catch (err) {
-                        return err;
-                    }
-                },
-                guiOptions: {
-                    hint: 'This name is restricted to certain characters. A valid project name is compatible across platforms.',
-                    mandatory: true
-                }
-            },
-            {
-                title: `Type`,
-                description: `Select your runtime.`,
-                default: NODEJS,
-                choices: [
-                    { name: 'Node.js', value: NODEJS },
-                    { name: 'Java', value: JAVA }
-                ],
-                multiple: false,
-                target: 'add',
-                guiOptions: {
-                    hint: `The preferred runtime can't be changed afterwards. To use a different runtime, create a new project.`,
-                    mandatory: true
-                }
-            },
-            {
-                title: `Features`,
-                description: `Add features to your project.`,
-                default: '',
-                choices: [
-                    { name: 'CI/CD Pipeline Integration', value: PIPELINE },
-                    { name: 'Configuration for SAP HANA Deployment', value: HANA },
-                    { name: 'MTA based SAP Business Technology Platform Deployment', value: MTA },
-                    // { name: 'Multitenancy', value: mtx },
-                    { name: `Cloud Foundry native Deployment`, value: CF_MANIFEST }
-                    // { name: `CDS Linter for custom rules`, value: lint },
-                    // { name: `CDS Linter for custom rules with sample`, value: lintDev }
-                ],
-                multiple: true,
-                target: 'add',
-                guiOptions: {
-                    hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${term.bold('cds add')}`
+        this.uiConfig = [{
+            title: 'Project Name',
+            description: 'Enter your project name.',
+            default: '',
+            target: 'projectName',
+            validate: async (value) => {
+                try {    
+                    cds.root = path.resolve(this.cwd, value || '.');
+
+                    await this._validateProjectName(value);
+                    await this._validateProjectFolder(path.join(this.cwd, value), this.cwd);
+                } catch (e) {
+                    return e
                 }
+
+                return true;
             },
-            {
-                title: `Samples`,
-                description: `Add sample content to your project.`,
-                default: '',
-                choices: [
-                    { name: 'Basic Sample Files', value: TINY_SAMPLE }
-                ],
-                multiple: true,
-                target: 'add',
-                guiOptions: {
-                    hint: 'Speed up your ramp-up phase with some sample files in your project.'
-                }
+            guiOptions: {
+                hint: 'This name is restricted to certain characters. A valid project name is compatible across platforms.',
+                mandatory: true
+            }
+        }, {
+            title: 'Type',
+            description: `Select your runtime.`,
+            default: NODEJS,
+            choices: [
+                { name: 'Node.js', value: NODEJS },
+                { name: 'Java', value: JAVA }
+            ],
+            multiple: false,
+            target: 'add',
+            guiOptions: {
+                hint: `The preferred runtime can't be changed afterwards. To use a different runtime, create a new project.`,
+                mandatory: true
+            }
+        }, {
+            title: 'Features',
+            description: 'Choose productive runtime capabilities for your application.',
+            default: '',
+            choices: [
+                { name: 'SAP HANA Cloud', value: HANA },
+                { name: 'SAP Application Router', value: APPROUTER },
+                { name: 'User Authentication via XSUAA', value: XSUAA },
+                { name: 'Kibana Logging Dashboard', value: KIBANA },
+                { name: 'SAP BTP Event Mesh', value: ENTERPRISE_MESSAGING }
+            ],
+            multiple: true,
+            target: 'add',
+            guiOptions: {
+                hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${term.bold('cds add')}`
+            }
+        }, {
+            title: 'Deployment',
+            description: 'Choose which way to deploy your project.',
+            default: '',
+            choices: [
+                { name: 'Cloud Foundry: MTA Deployment', value: MTA },
+                { name: 'Kyma: Helm Deployment', value: HELM },
+                { name: 'Multitenancy', value: MULTITENANCY },
+                { name: 'CI/CD Pipeline Integration', value: PIPELINE },
+            ],
+            multiple: true,
+            target: 'add',
+            guiOptions: {
+                hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${term.bold('cds add')}`
+            }
+        }, {
+            title: 'Samples',
+            description: `Add sample content to your project.`,
+            default: '',
+            choices: [
+                { name: 'Minimal Sample', value: TINY_SAMPLE },
+                { name: 'Extended Sample with UI', value: SAMPLE }
+            ],
+            multiple: true,
+            target: 'add',
+            guiOptions: {
+                hint: 'Speed up your ramp-up phase with sample files in your project.'
             }
-        ]
+        }]
     }
 
     /**
@@ -190,8 +204,7 @@ module.exports = class CDSGenerator {
                     );
                 const fuzzySearch = require('../../bin/util/fuzzySearch');
                 const [bestMatch] = fuzzySearch(filename, entries);
-                console.log(`Unknown facet '${term.bold(filename)}'. Did you mean ${term.bold(`cds add ${bestMatch}`)}?\n\nHaven't found the proper facet yet? Here are all supported facets:\n\n  ${term.bold(entries.join('\n  '))}\n`);
-                process.exit(1);
+                throw `Unknown facet '${term.bold(filename)}'. Did you mean ${term.bold(`cds add ${bestMatch}`)}?\n\nHaven't found the proper facet yet? Here are all supported facets:\n\n  ${term.bold(entries.join('\n  '))}\n`
             }
             throw err;
         }

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

@@ -60,17 +60,6 @@ const connectivity = {
     }]
 }
 
-const auditlog = {
-    in: 'resources',
-    where: [{
-        property: 'type',
-        isEqualTo: 'org.cloudfoundry.managed-service',
-    }, {
-        property: 'parameters.service',
-        isEqualTo: 'auditlog-api',
-    }]
-}
-
 const redis = {
     in: 'resources',
     where: [{
@@ -260,7 +249,6 @@ module.exports = {
     srvJava4,
     approuter,
     xsuaa,
-    auditlog,
     destination,
     connectivity,
     enterpriseMessaging,

package/lib/init/template/approuter/files/mta.yaml.hbs

@@ -19,7 +19,7 @@ modules:
 
   - name: {{appName}}
     type: approuter.nodejs
-    path: {{& appPath}} # from cds.env.folders. Consider also cds.env.build.target -> gen/app
+    path: {{& approuterPath }}
     parameters:
       keep-existing-routes: true
       disk-quota: 256M