@sap/cds-dk 6.1.1 → 6.1.2

package/CHANGELOG.md

@@ -7,6 +7,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 6.1.2 - 2022-08-25
+
+### Changed
+- `cds init` uses latest Maven Java archetype version 1.27.1 for creating Java projects.
+
+### Fixed
+- `cds add helm` fixed JSON Schema for `srv` property in values.yaml
+- `cds add helm` fixed env property errors for `hana_deployer` and `html5_apps_deployer`
+- `cds add data` now creates proper data file names for entites in a `context`, i.e. `sap.common-Countries.csv` instead of `sap-common-Countries.csv`
+- `cds import` now captures the parameter/property of collection type differently and the associated annotations are pulled out of the `items` object of the parameter/property entry in the csn.
+- Remove redundant `console.log()` statement in `cds lint`
+- `cds push` now shows complete error messages from extension validation
+- `cds push` and related commands now show properly formatted error messages and also fail with a non-zero exit code in error situations
+
 ## Version 6.1.1 - 2022-08-11
 
 ### Added

package/bin/compile/index.js

@@ -283,7 +283,7 @@ function _log (messages, options) {
   const { sortMessagesSeverityAware, deduplicateMessages } = cds.compiler
   deduplicateMessages(messages)
   messages = sortMessagesSeverityAware (messages)
-  cds.utils._log (messages, options)
+  cds._log (messages, options)
 }
 
 /* eslint no-console:0 */

package/bin/login.js

@@ -1,8 +1,8 @@
 const { bold } = require('../lib/util/term');
 
 module.exports = Object.assign(login, {
-    options: ['--subdomain', '--directory', '--passcode', '--clientid'],
-    shortcuts: ['-s', '-d', '-p', '-c'],
+    options: ['--subdomain', '--directory', '--passcode', '--user', '--clientid'],
+    shortcuts: ['-s', '-d', '-p', '-u', '-c'],
     flags: ['--plain'],
     get help() {
         const config = require('../lib/client/settings_manager').SettingsManager.config
@@ -71,10 +71,16 @@ module.exports = Object.assign(login, {
 
         Tenant-specific passcode for authentication.
 
-    *-u* | *--username* <name>
+    *-u* | *--user* <name>[:[<password>]]
 
-        Username for authentication with Basic Auth in test scenarios. For security reasons,
-        username will only be saved for app URLs that look like localhost.
+        Username and optionally password for authentication with Basic Auth in test scenarios.        
+        See https://cap.cloud.sap/docs/guides/multitenancy/#send-subscribe-events for information
+        on suitable mock users.
+
+        When typing the colon but omitting <password>, the password is assumed empty. 
+
+        For security reasons, username will only be saved for app URLs that look like localhost.
+        The same is true for an empty password. Non-empty passwords will never be saved.
 
     *-c* | *--clientid* <clientid>
 
@@ -105,8 +111,12 @@ module.exports = Object.assign(login, {
 
 
 async function login ([url], options = {}) {
+    const [username, password] = options.user?.split(':') ?? [];
+    delete options.user;
     Object.assign(options, {
         url,
+        username,
+        password,
         tokenStorage: options.plain ? 'plain' : 'keyring',
         renewLogin: true,
         saveData: true

package/bin/subscribe.js

@@ -36,7 +36,7 @@ async function subscribe([tenant], { to: url, user } = {}) {
   if (!tenant)  throw new Error('Must provide a tenant')
   if (!url)  throw new Error('Must provide an app URL via `--to`')  // for now, if we don't infer it from the project
   if (typeof user !== 'string')  throw new Error('Must provide a username')
-  const [, username, , password = ''] = /([^:]+)(:(.*))?/.exec(user);
+  const [username, password = ''] = user.split(':');
   Logger.log(`Subscribing to ${url} for tenant '${tenant}' with user '${username}'${password === '' ? ' and empty password' : ''}`);
   const options = { auth: { username, password } };
   return require('axios').post (url+'/-/cds/deployment/subscribe', { tenant }, options);

package/lib/cds.js

@@ -1,9 +1,8 @@
-/** @type { import('@sap/cds/apis/cds') } */
+/** @type { import('@sap/cds/lib') } */
 const cds = module.exports = require(_local ('@sap/cds'))
 
 // for internal use in cds-dk only
-cds.utils._log = require(_local ('@sap/cds/bin/utils/log'))
-
+cds._log = require(_local ('@sap/cds/bin/utils/log'))
 
 function _local (id) {
   return require.resolve (id, {paths:[

package/lib/client/activate.js

@@ -6,6 +6,7 @@ const AuthManager = require('./auth_manager');
 const BaseCommand = require('./base_command');
 const { collectFileContent, collectFiles, toUnixPath } = require('./helper/fs_helper');
 const Logger = require('./helper/logging');
+const { CliError } = require('./helper/errors');
 
 const COMMAND_URL_SUFFIX = 'asyncActivate';
 const COMMAND_URL_SUFFIX_SYNC = 'activate';
@@ -27,7 +28,7 @@ async function checkFinished(jobId, statusUrl, params, finisher) {
         finisher.finished = true;
         clearInterval(finisher.timer);
         if (status === JOB_STATUS.FAILED) {
-            return finisher.reject(new Error(`Job ${jobId} failed: ${error.message || JSON.stringify(error)}`));
+            return finisher.reject(new CliError(`Job ${jobId} failed: ${error.message || JSON.stringify(error)}`));
         }
         Logger.log('Extension active');
         finisher.resolve();
@@ -55,17 +56,17 @@ module.exports = class Activate extends BaseCommand {
                 Logger.log(`Activating extension located at ${params.get('projectFolder')} to URL ${params.get('appUrl')}`);
             }
 
-            if (!await Activate.checkProject(params.get('projectFolder'))) {
-                throw new Error(params.get('projectFolder') + ' is not a valid extension project');
+            if (!await this.checkProject(params.get('projectFolder'))) {
+                throw new CliError(params.get('projectFolder') + ' is not a valid extension project');
             }
 
             try {
-                await Activate.runActivate(injection.cds, params);
+                await this.runActivate(injection.cds, params);
                 if (params.get('wsdl')) {
-                    await Activate.runCustomFileUpload(params);
+                    await this.runCustomFileUpload(params);
                 }
             } catch (error) {
-                Activate.handleHttpError(error, params);
+                await this.handleHttpError(error, params);
             }
         } catch (error) {
             Logger.error(undefined, error);
@@ -153,7 +154,7 @@ module.exports = class Activate extends BaseCommand {
             return wsdlFiles;
         } catch (error) {
             Logger.error(undefined, error);
-            throw new Error('No custom files found');
+            throw new CliError('No custom files found');
         }
     }
 
@@ -161,7 +162,7 @@ module.exports = class Activate extends BaseCommand {
         let activationUrl;
         const isSync = params.get('sync');
 
-        return Activate.collectExtensionFiles(cds, params.get('projectFolder'))
+        return this.collectExtensionFiles(cds, params.get('projectFolder'))
         .then(allFiles => {
             if (allFiles.size === 0) {
                 return null;
@@ -169,8 +170,8 @@ module.exports = class Activate extends BaseCommand {
 
             Logger.log('Activating extension...');
 
-            const urlSuffix = isSync ? Activate.COMMAND_URL_SUFFIX_SYNC : Activate.COMMAND_URL_SUFFIX;
-            activationUrl = Activate.getMtxApiUrl(params.get('appUrl'), urlSuffix);
+            const urlSuffix = isSync ? this.COMMAND_URL_SUFFIX_SYNC : this.COMMAND_URL_SUFFIX;
+            activationUrl = this.getMtxApiUrl(params.get('appUrl'), urlSuffix);
             const requestOptions = Object.assign({
                 headers: {}
             }, params.get('reqAuth'));
@@ -189,17 +190,17 @@ module.exports = class Activate extends BaseCommand {
             const { jobID: jobId, statusPath } = response.data;
 
             if (jobId === undefined) {
-                throw new Error('Activation failed: did not receive job ID');
+                throw new CliError('Activation failed: did not receive job ID');
             }
 
             if (!statusPath) {
-                throw new Error(`Job ${jobId} failed: did not receive job-status path`);
+                throw new CliError(`Job ${jobId} failed: did not receive job-status path`);
             }
 
             Logger.debug(`Job ID: ${jobId}`);
 
             return new Promise((resolve, reject) => {
-                const statusUrl = Activate.concatUrls(params.get('appUrl'), statusPath);
+                const statusUrl = this.concatUrls(params.get('appUrl'), statusPath);
                 const finisher = {
                     resolve,
                     reject,
@@ -214,7 +215,7 @@ module.exports = class Activate extends BaseCommand {
     static async runCustomFileUpload(params) {
         Logger.log(`Uploading custom files to ${params.get('appUrl')}...`);
 
-        const customFiles = Activate.collectCustomFiles(params.get('projectFolder'));
+        const customFiles = this.collectCustomFiles(params.get('projectFolder'));
 
         const customFilesSerialized = [];
         customFiles.forEach((value, key) => {
@@ -225,7 +226,7 @@ module.exports = class Activate extends BaseCommand {
             });
         });
 
-        const customFileUrl = Activate.getMtxApiUrl(params.get('appUrl'), Activate.UPDATE_CUSTOM_FILE_URL_SUFFIX);
+        const customFileUrl = this.getMtxApiUrl(params.get('appUrl'), this.UPDATE_CUSTOM_FILE_URL_SUFFIX);
         const requestOptions = Object.assign({
             headers: {},
         }, params.get('reqAuth'));

package/lib/client/auth_manager.js

@@ -4,6 +4,7 @@ const axios = require('axios');
 const Logger = require('./helper/logging');
 const { SettingsManager } = require('./settings_manager');
 const { ParamCollection } = require('./params');
+const { CliError } = require('./helper/errors');
 
 function addTokenInfo(params, authData) {
     params.set('token', authData.access_token);
@@ -60,7 +61,7 @@ async function retrieveTokenOrPasscodeUrl(params) {
         try {
             response = await axios.get(tokenUrl);
         } catch (error) {
-            throw new Error(`Failed to get authentication token: ${error}.\nResponse body: ${util.inspect(error.response && error.response.data)}`);
+            throw new CliError(`Failed to get authentication token: ${error}.\nResponse body: ${util.inspect(error.response && error.response.data)}`);
         }
         authData = response.data;
 
@@ -89,7 +90,7 @@ module.exports = class AuthManager {
                 if (params.get('saveData')) {
                     await SettingsManager.saveSettings(params);
                 }
-                throw new Error('Failed to login: no valid token or passcode provided. ' +
+                throw new CliError('Failed to login: no valid token or passcode provided. ' +
                     'Get a passcode' + (params.get('passcodeUrl') ? ' from ' + params.get('passcodeUrl') : '') +
                     ' and supply the code when re-running the command');
             }

package/lib/client/base_command.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs').promises;
 
-const Logger = require('./helper/logging');
+const { CliError } = require('./helper/errors');
 
 const MTX_URL_PATH_PREFIX = 'mtx/v1/model/';
 const CUSTOM_FILE_URL_SUFFIX = 'customTenantContent';
@@ -22,15 +22,13 @@ module.exports = class BaseCommand {
 
         switch (error.response && error.response.status) {
             case 401:
-                Logger.error('Request failed: authorization might have expired. Please retry with valid passcode' +
+                throw new CliError('Request failed: authorization might have expired. Please retry with valid passcode' +
                     (params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''), error);
-                break;
             case 404:
-                Logger.error(`Request failed. Please check application URL ${params.get('appUrl')}`, error);
-                break;
+                throw new CliError(`Request failed. Please check application URL ${params.get('appUrl')}`, error);
             default:
                 // Including 422 (compilation or native-extension error).
-                Logger.error(undefined, error);
+                throw new CliError(undefined, error);
         }
     }
 

package/lib/client/extend.js

@@ -7,6 +7,7 @@ const BaseCommand = require('./base_command');
 const { normalizePath, isParent } = require('./helper/fs_helper');
 const Logger = require('./helper/logging');
 const Question = require('./helper/question');
+const { CliError } = require('./helper/errors');
 
 const COMMAND_URL_SUFFIX = 'content';
 const CUSTOM_FILE_FOLDERS = ['wsdl'];
@@ -88,7 +89,7 @@ module.exports = class Extend extends BaseCommand {
 
             const runOnExistingProject = await Extend.checkProject(params.get('projectFolder'));
             if (runOnExistingProject && !(params.get('force') || params.get('templates'))) {
-                throw new Error(folderExists(params.get('projectFolder')));
+                throw new CliError(folderExists(params.get('projectFolder')));
             }
 
             try {

package/lib/client/helper/errors.js

@@ -0,0 +1,11 @@
+const Logger = require('./logging');
+class CliError extends Error {
+    stack = '';
+    constructor(message, error) {
+        super(Logger.getMessage(message, error));
+    }
+}
+
+module.exports = {
+    CliError
+};

package/lib/client/helper/logging.js

@@ -17,20 +17,13 @@ module.exports = class Logger {
     }
 
     static getMessage(errorText, error) {
-        let message = errorText && errorText + '\n' || '';
+        let message = errorText ? errorText + '\n' : '';
         if (!error) {
             return message;
         }
-        if (process.env.DEBUG) {
-            if ('response' in error && error.response.data) {
-                const body = error.response.data;
-                if (body.error && body.error.message) {
-                    message += body.error.message + '\n';
-                }
-            }
+        message += error.response?.data?.error?.message || error.message;
+        if (process.env.DEBUG && error.stack) {
             message += '\n' + error.stack;
-        } else {
-            message += error.message;
         }
         return message;
     }

package/lib/client/params.js

@@ -1,5 +1,6 @@
 const Logger = require('./helper/logging');
 const { escapeRegex } = require('./helper/string_helper');
+const { CliError } = require('./helper/errors');
 
 
 // PARAM BASE TYPES
@@ -104,10 +105,10 @@ class Param {
             expectedType = typeof this.allowedValues[0];
         }
         if (typeof val !== expectedType) {
-            throw new Error(`Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected value of type ${expectedType}`);
+            throw new CliError(`Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected value of type ${expectedType}`);
         }
         if (this.allowedValues && !(this.allowedValues).includes(val)) {
-            throw new Error(`Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected one of ${JSON.stringify(this.allowedValues)}`);
+            throw new CliError(`Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected one of ${JSON.stringify(this.allowedValues)}`);
         }
     }
 
@@ -246,7 +247,7 @@ class ParamCollection {
      */
     checkFrozen() {
         if (this.isFrozen) {
-            throw new Error('cannot modify read-only parameter collection');
+            throw new CliError('cannot modify read-only parameter collection');
         }
     }
 
@@ -267,7 +268,7 @@ class ParamCollection {
     static mainName(name) {
         const paramDef = ParamDefs[name];
         if (!paramDef) {
-            throw new Error(`Unknown parameter: '${name}'`);
+            throw new CliError(`Unknown parameter: '${name}'`);
         }
         return paramDef.mainName;
     }

package/lib/client/pull.js

@@ -7,13 +7,13 @@ const { unpackTarArchive } = require('@sap/cds/lib/utils/resources');
 const { login } = require('./auth_manager');
 const BaseCommand = require('./base_command');
 const Logger = require('./helper/logging');
+const { CliError } = require('./helper/errors');
 
 module.exports = class Pull extends BaseCommand {
 
     static async run(paramValues) {
         try {
             const params = await login(paramValues);
-
             Logger.log(`Pulling base model from ${params.get('appUrl')}, for subdomain '${params.get('subdomain')}', to project folder '${params.get('projectFolder')}'`);
 
             const projectFolder = params.get('projectFolder');
@@ -24,8 +24,8 @@ module.exports = class Pull extends BaseCommand {
             const tgzBuffer = Buffer.from(await this.getTgz(params));
             return unpackTarArchive(tgzBuffer, targetDir, false);
 
-        } catch (mainError) {
-            Logger.error(undefined, mainError);
+        } catch (error) {
+            throw new CliError(undefined, error);
         }
     }
 
@@ -41,11 +41,8 @@ module.exports = class Pull extends BaseCommand {
         const pullUrl = `${(params.get('appUrl'))}/-/cds/extensibility/pull`;
         const options = { ...params.get('reqAuth'), responseType: 'arraybuffer' };
 
-        try {
-            const response = await axios.post(pullUrl, {}, options);
-            return response.data;
-        } catch (error) {
-            return this.handleHttpError(error, params);
-        }
+        return axios.post(pullUrl, {}, options)
+            .then(response => response.data)
+            .catch(error => this.handleHttpError(error, params));
     }
 }

package/lib/client/push.js

@@ -5,23 +5,22 @@ const axios = require('axios');
 const { login } = require('./auth_manager');
 const BaseCommand = require('./base_command');
 const Logger = require('./helper/logging');
+const { CliError } = require('./helper/errors');
 
 module.exports = class Push extends BaseCommand {
 
     static async run(paramValues) {
         try {
             const params = await login(paramValues);
-
             const projectFolder = params.get('projectFolder');
             Logger.log(`Pushing extension from project folder '${projectFolder}', for subdomain '${params.get('subdomain')}', to app URL ${params.get('appUrl')}`);
 
-            const tgzPath = join(projectFolder, 'gen', 'extension.tgz');
-            const tgz = fs.readFileSync(tgzPath, { encoding: 'base64' });
+            const tgz = fs.readFileSync(join(projectFolder, 'gen', 'extension.tgz'), { encoding: 'base64' });
             const extensionName = this.getExtensionName(projectFolder);
             return this.pushTgz(params, tgz, extensionName);
 
-        } catch (mainError) {
-            Logger.error(undefined, mainError);
+        } catch (error) {
+            throw new CliError(undefined, error);
         }
     }
 
@@ -29,7 +28,7 @@ module.exports = class Push extends BaseCommand {
         try {
             return require(join(projectFolder, 'package.json')).name;
         } catch (error) {
-            throw new Error(`Extension project at ${projectFolder} is missing package.json`);
+            throw new CliError(`Extension project at ${projectFolder} is missing package.json`);
         }
     }
 
@@ -37,13 +36,10 @@ module.exports = class Push extends BaseCommand {
         const pushUrl = `${params.get('appUrl')}/-/cds/extensibility/push`;
         const options = { ...params.get('reqAuth') };
 
-        try {
-            return axios.post(pushUrl, {
-                extension: tgz,
-                tag: extensionName
-            }, options);
-        } catch (error) {
-            return this.handleHttpError(error, params);
-        }
+        return axios.post(pushUrl, {
+            extension: tgz,
+            tag: extensionName
+        }, options)
+            .catch(error => this.handleHttpError(error, params));
     }
 }

package/lib/client/settings_manager.js

@@ -9,6 +9,7 @@ const { getAppFromSuggestions, getAppName, getSubdomain } = require('./helper/cf
 const isBas = require('./helper/env_helper');
 const Logger = require('./helper/logging');
 const Question = require('./helper/question');
+const { CliError } = require('./helper/errors');
 const { httpSchema, httpsSchema, extractSubdomain, schemaRegex, localhostRegex } = require('./helper/url_helper');
 const { ParamCollection, Persistence } = require('./params');
 const { capitalize } = require('./helper/string_helper');
@@ -95,7 +96,7 @@ async function getTokenBaseUrl(params, renewUrl) {
         return params.get('tokenUrl');
     }
     if (!params.has('appUrl')) {
-        throw new Error('Failed to determine token URL: app URL not given');
+        throw new CliError('Failed to determine token URL: app URL not given');
     }
     const baseUrl = new URL(params.get('appUrl'));
     const cleanPathname = pathname => baseUrl.pathname.replace(/\/?$/, pathname);
@@ -116,7 +117,7 @@ async function getTokenBaseUrl(params, renewUrl) {
             if (e.response?.status === 404) {
                 continue;
             } else {
-                throw Error(`Failed with root cause ${e.message}`);
+                throw CliError(`Failed with root cause ${e.message}`);
             }
         }
     }
@@ -230,12 +231,12 @@ class SettingsManager {
                 }
             }
             if (!params.has('appUrl')) {
-                throw new Error('App URL not given. Please specify it or log in to Cloud Foundry and repeat this command.');
+                throw new CliError('App URL not given. Please specify it or log in to Cloud Foundry and repeat this command.');
             }
             if (!params.has('subdomain')) {
                 const subdomain = extractSubdomain(params.get('appUrl'));
                 if (!subdomain) {
-                    throw new Error('Subdomain not given');
+                    throw new CliError('Subdomain not given');
                 }
                 params.set('subdomain', subdomain);
                 Logger.log(`Subdomain determined from app URL: ${subdomain}`);
@@ -267,7 +268,7 @@ class SettingsManager {
             return;
         }
         if (params.get('tokenStorage') === 'keyring') {
-            throw new Error(`${capitalize(TOKEN_STORAGE_DESC.keyring)} requested but keytar not installed. Run 'npm install -g keytar' or ` +
+            throw new CliError(`${capitalize(TOKEN_STORAGE_DESC.keyring)} requested but keytar not installed. Run 'npm install -g keytar' or ` +
                 `switch to ${TOKEN_STORAGE_DESC.plain} by adding '--plain' (discouraged).`);
         }
         if (params.get('renewLogin') || logout) {
@@ -288,7 +289,7 @@ class SettingsManager {
             params.set('clientsecret', await Question.askQuestion('clientsecret: ', undefined, true));
             console.log();
             if (params.get('clientsecret') === '') {
-                throw new Error('clientsecret cannot be empty');
+                throw new CliError('clientsecret cannot be empty');
             }
         }
         async function addPasscode() {
@@ -296,7 +297,7 @@ class SettingsManager {
             params.set('passcode', await Question.askQuestion(prompt, undefined, true));
             console.log();
             if (params.get('passcode') === '') {
-                throw new Error('Passcode cannot be empty');
+                throw new CliError('Passcode cannot be empty');
             }
         }
         function setRelevantAuth(auth) {
@@ -338,7 +339,7 @@ class SettingsManager {
             if (params.get('password') === '') {
                 params.set('isEmptyPassword', true);
                 // TODO check password only in production env
-                // throw new Error('Password cannot be empty');
+                // throw new CliError('Password cannot be empty');
             } else {
                 params.delete('isEmptyPassword');
             }

package/lib/import/odata/v2parser.js

@@ -448,38 +448,63 @@ function _getServiceEntityProperty(
 		propertyJson = propertyJson + '"key": true,\n';
 	}
 	if (isCollection === 1) {
-		propertyJson = propertyJson + '"items": { \n'
-	}
-	propertyJson = propertyJson + '"type":"' + cdsDataType + '"';
+		//if annotations to be added
+		if (edmxncdsdatatype[dataType + "_a"] && cdsDataType != "cds.Date") {
+			if (dataType === 'Edm.Stream') 
+				propertyJson = propertyJson + '"@Core.MediaType": "application/octet-stream",\n';
+			else 
+				propertyJson = propertyJson + '"@odata.Type": "' + dataType + '",\n';
+		}
 
-	//if annotations to be added
-	if (edmxncdsdatatype[dataType + "_a"] && cdsDataType != "cds.Date") {
-		if (dataType === 'Edm.Stream') 
-			propertyJson = propertyJson + ',\n"@Core.MediaType": "application/octet-stream"';
-		else 
-			propertyJson = propertyJson + ',\n"@odata.Type": "' + dataType + '"';
-	}
+		//adding precision in case of DateTime datatypes
+		if ((dataType === "Edm.DateTimeOffset" || dataType === "Edm.DateTime") && cdsDataType != "cds.Date") {
+			if (!precision || precision === -1) precision = 0;
+			propertyJson = propertyJson + '"@odata.Precision": ' + precision + ',\n';
+		}
 
-	if (length && length > 0) {
-		propertyJson = propertyJson + ',\n"length":' + length;
-	} else if (precision && precision > 0 && hasInvalidPrecision === false) {
-		propertyJson = propertyJson + ',\n"precision":' + precision;
-		if (scale && scale > 0) {
-			propertyJson = propertyJson + ',\n"scale":' + scale;
-		} else {
-			propertyJson = propertyJson + ',\n"scale":' + 0;
+		propertyJson = propertyJson + '"items": { \n'
+		propertyJson = propertyJson + '"type":"' + cdsDataType + '"';
+		
+		if (length && length > 0) {
+			propertyJson = propertyJson + ',\n"length":' + length;
+		} else if (precision && precision > 0 && hasInvalidPrecision === false) {
+			propertyJson = propertyJson + ',\n"precision":' + precision;
+			if (scale && scale > 0) {
+				propertyJson = propertyJson + ',\n"scale":' + scale;
+			} else {
+				propertyJson = propertyJson + ',\n"scale":' + 0;
+			}
 		}
+		propertyJson = propertyJson + '\n}'
 	}
+	else{
+		propertyJson = propertyJson + '"type":"' + cdsDataType + '"';
+			//if annotations to be added
+		if (edmxncdsdatatype[dataType + "_a"] && cdsDataType != "cds.Date") {
+			if (dataType === 'Edm.Stream') 
+				propertyJson = propertyJson + ',\n"@Core.MediaType": "application/octet-stream"';
+			else 
+				propertyJson = propertyJson + ',\n"@odata.Type": "' + dataType + '"';
+		}
 
-	//adding precision in case of DateTime datatypes
-	if ((dataType === "Edm.DateTimeOffset" || dataType === "Edm.DateTime") && cdsDataType != "cds.Date") {
-		if (!precision || precision === -1) precision = 0;
-		propertyJson = propertyJson + ',\n"@odata.Precision": ' + precision;
-	}
+		if (length && length > 0) {
+			propertyJson = propertyJson + ',\n"length":' + length;
+		} else if (precision && precision > 0 && hasInvalidPrecision === false) {
+			propertyJson = propertyJson + ',\n"precision":' + precision;
+			if (scale && scale > 0) {
+				propertyJson = propertyJson + ',\n"scale":' + scale;
+			} else {
+				propertyJson = propertyJson + ',\n"scale":' + 0;
+			}
+		}
 
-	if (isCollection === 1) {
-		propertyJson = propertyJson + '\n}'
+		//adding precision in case of DateTime datatypes
+		if ((dataType === "Edm.DateTimeOffset" || dataType === "Edm.DateTime") && cdsDataType != "cds.Date") {
+			if (!precision || precision === -1) precision = 0;
+			propertyJson = propertyJson + ',\n"@odata.Precision": ' + precision;
+		}
 	}
+
 	if (documentation != -1 && documentation) {
 		propertyJson = propertyJson + ',\n"doc":"' + documentation + '"';
 	}

package/lib/import/odata/v4parser.js

@@ -138,6 +138,13 @@ function _includeExternalNamespaceAnnotation(source, target) {
 
 function _typeWithCollections(property, type, isCollection) {
     if (isCollection === true) {
+        let typeKeys = Object.keys(type);
+        for (let i = 0; i < typeKeys.length; i++) {
+            if(typeKeys[i].startsWith("@")){
+                property[typeKeys[i]] = type[typeKeys[i]];
+                delete type[typeKeys[i]];
+            }
+        }
         property.items = type;
     } else {
         Object.assign(property, type);

package/lib/init/constants.js

@@ -1,6 +1,6 @@
 const os = require('os');
 
-const MAVEN_ARCHETYPE_VERSION = '1.27.0';
+const MAVEN_ARCHETYPE_VERSION = '1.27.1';
 
 const constants = {
     IS_WIN: (os.platform() === 'win32'),

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

@@ -233,13 +233,10 @@ const approuterExtensibility = {
     in: 'routes',
     where: [{
         property: 'source',
-        isEqualTo: '^/extend/(.*)'
+        isEqualTo: '^/-/cds/.*'
     }, {
         property: 'destination',
         isEqualTo: 'mtx-api',
-    }, {
-        property: 'target',
-        isEqualTo: '$1',
     }, {
         property: 'authenticationType',
         isEqualTo: 'none',
@@ -251,13 +248,10 @@ const approuterExtensibilityJava = {
     in: 'routes',
     where: [{
         property: 'source',
-        isEqualTo: '^/extend/(.*)'
+        isEqualTo: '^/-/cds/.*'
     }, {
         property: 'destination',
         isEqualTo: 'mtx-api',
-    }, {
-        property: 'target',
-        isEqualTo: '$1',
     }, {
         property: 'authenticationType',
         isEqualTo: 'none',

package/lib/init/template/approuter/files/xs-app.json.hbs

@@ -1,6 +1,13 @@
 {
   "authenticationMethod": "route",
   "routes": [
+    {{#cap.isMultitenant}}
+    {
+      "source": "^/-/cds/.*",
+      "destination": "mtx-api",
+      "authenticationType": "none"
+    },
+    {{/cap.isMultitenant}}
     {
       "source": "^/app/(.*)$",
       "target": "$1",
@@ -14,13 +21,6 @@
       "destination": "srv-api",
       "authenticationType": "xsuaa",
       "csrfProtection": true
-    }{{#cap.isMultitenant}},
-    {
-      "source": "^/extend/(.*)",
-      "destination": "mtx-api",
-      "target": "$1",
-      "authenticationType": "none"
     }
-    {{/cap.isMultitenant}}
   ]
 }

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

@@ -45,8 +45,8 @@ module.exports = class ApprouterTemplate extends TemplateBase {
         }
 
         const appPath = join(this.projectPath, projectDescriptor.ui.appPath || 'app')
-        const additions = isExtensible && isJava ? [approuterExtensibilityJava] :
-                          isExtensible && isNodejs ? [approuterExtensibility] : []
+        const additions = isExtensible && isJava ? [{ ...approuterExtensibilityJava, at: 0 }] :
+                          isExtensible && isNodejs ? [{ ...approuterExtensibility, at: 0 }] : []
         await this.templateUtil.mergeJSON(
             `${appPath}/xs-app.json`,
             `${__dirname}/files/xs-app.json.hbs`,

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

@@ -148,9 +148,8 @@ function getNamespace(csn, artifactName) {
 
   // First step is not a namespace (we faked those in the CSN)
   // No subsequent step can be a namespace then
-  if (art && art.kind !== 'namespace') {
+  if (art && art.kind !== 'namespace' && art.kind !== 'context')
     return null;
-  }
 
 
   for (let i = 1; i < parts.length; i++) {
@@ -159,9 +158,8 @@ function getNamespace(csn, artifactName) {
     seen = `${seen}.${parts[i]}`;
     // This might not be - if it isn't, return the result.
     const currentArtifact = csn.definitions[seen];
-    if (currentArtifact && currentArtifact.kind !== 'namespace') {
+    if (currentArtifact && currentArtifact.kind !== 'namespace' && currentArtifact.kind !== 'context')
       return previousArtifactName;
-    }
   }
   // We came till here - so the full artifactName is a namespace
   return artifactName;

package/lib/init/util/templateUtil.js

@@ -174,7 +174,7 @@ module.exports = class TemplateUtil {
             } else if (YAML.isPair(node) && node.value?.items) {
                 collectionStack.unshift(node.value)
             } else if (YAML.isScalar(node) && semantics.forceOverwrite && templateNode) {
-                node.value = templateNode.value
+                node.value = templateNode.value ?? templateNode.items?.[0]?.value?.value
             }
 
             if (node.items) {
@@ -293,13 +293,13 @@ module.exports = class TemplateUtil {
             mergeCollection: (targetNode, templateNode) => {
                 if (YAML.isSeq(templateNode)) {
                     let [,parent] = collectionStack
-                    additions?.filter(existence => {
-                            if (typeof existence.in === 'string' || Array.isArray(existence.in) && typeof existence.in[0] === 'string') return true
-                            const inExistence = Array.isArray(existence.in) ? existenceMap.get(existence.in[0].ref) : existenceMap.get(existence.in.ref)
+                    additions?.filter(addition => {
+                            if (typeof addition.in === 'string' || Array.isArray(addition.in) && typeof addition.in[0] === 'string') return true
+                            const inExistence = Array.isArray(addition.in) ? existenceMap.get(addition.in[0].ref) : existenceMap.get(addition.in.ref)
                             return inExistence?.node === parent
                         })
-                        .filter(existence => {
-                            const keyPath = typeof existence.in === 'string' ? existence.in : Array.isArray(existence.in) && typeof existence.in[0] === 'string' ? existence.in[0] : existence.in[1]
+                        .filter(addition => {
+                            const keyPath = typeof addition.in === 'string' ? addition.in : Array.isArray(addition.in) && typeof addition.in[0] === 'string' ? addition.in[0] : addition.in[1]
                             const keys = keyPath.split('.')
                             if (keys.length > collectionStack.length + 1) return
                             if (keys.length > 1) parent = collectionStack[keys.length]
@@ -308,9 +308,9 @@ module.exports = class TemplateUtil {
                         .filter(({ ref }) => {
                             return !existenceMap.get(ref)
                         })
-                        .forEach(({ ref }) => {
+                        .forEach(({ ref, at }) => {
                             const templateNode = templateExistenceMap.get(ref).node
-                            targetNode.add(templateNode)
+                            at !== undefined ? targetNode.items.splice(at, 0, templateNode) : targetNode.add(templateNode)
                         })
                 }
             },

package/lib/k8s/ChartAdder.js

@@ -33,9 +33,11 @@ class ChartAdder {
     }
 
     async copySchema() {
-        let schema = JSON.parse(await fs.readFile(path.join(this.resources, 'values.schema.json'), { encoding: 'utf8' }))
+        let valuesSchema = JSON.parse(await fs.readFile(path.join(this.resources, 'schemas', 'values.schema.json'), { encoding: 'utf8' }))
+        let valuesRootSchema = JSON.parse(await fs.readFile(path.join(this.resources, 'schemas', 'values.root.schema.json'), { encoding: 'utf8' }))
 
-        await this.builder.writeChartFile('values.schema.json', JSON.stringify(schema, null, 4));
+        await this.builder.writeChartFile('values.schema.json', JSON.stringify(valuesSchema, null, 4));
+        await this.builder.writeChartFile('values.root.schema.json', JSON.stringify(valuesRootSchema, null, 4));
     }
 
     async addChartValues() {

package/lib/k8s/ChartBuilder.js

@@ -53,7 +53,7 @@ class ChartBuilder {
         } else {
 
             const header = `
-# yaml-language-server: $schema=./values.schema.json
+# yaml-language-server: $schema=./values.root.schema.json
 
 `
             data = header + data;

package/lib/k8s/resources/helm/chart/schemas/values.root.schema.json

@@ -0,0 +1,11 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "allOf": [{ "$ref": "./values.schema.json" }],
+    "properties": {
+        "srv": {
+            "$id": "#/properties/srv",
+            "description": "Deployment",
+            "$ref": "./charts/web-application/values.schema.json"
+        }
+    }
+}

package/lib/k8s/resources/helm/chart/{values.schema.json → schemas/values.schema.json}

@@ -124,6 +124,21 @@
                 "resources": {
                     "$id": "#/properties/hana_deployer/resources",
                     "$ref": "#/definitions/Resources"
+                },
+                "env": {
+                    "$id": "#/properties/hana_deployer/env",
+                    "description": "Key-value map of environment variables, which should be added to the Pod spec.",
+                    "type": "object",
+                    "patternProperties": {
+                        "^[-._a-zA-Z][-._a-zA-Z0-9]*$": {
+                            "$comment": "regex above copied from https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L402",
+                            "not": {
+                                "type": ["null", "object", "array"]
+                            }
+                        }
+                    },
+                    "additionalProperties": false,
+                    "default": {}
                 }
             }
         },
@@ -150,6 +165,21 @@
                     "$id": "#/properties/html5_apps_deployer/resources",
                     "$ref": "#/definitions/Resources"
                 },
+                "env": {
+                    "$id": "#/properties/html5_apps_deployer/env",
+                    "description": "Key-value map of environment variables, which should be added to the Pod spec.",
+                    "type": "object",
+                    "patternProperties": {
+                        "^[-._a-zA-Z][-._a-zA-Z0-9]*$": {
+                            "$comment": "regex above copied from https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go#L402",
+                            "not": {
+                                "type": ["null", "object", "array"]
+                            }
+                        }
+                    },
+                    "additionalProperties": false,
+                    "default": {}
+                },
                 "backendDestinations": {
                     "$id": "#/properties/html5_apps_deployer/backendDestinations",
                     "title": "Backend Destinations for HTML5 Application",

package/lib/lint/io.js

@@ -63,7 +63,6 @@ module.exports = {
     const isFilePath = typeof configIn === "string";
     if (isFilePath) {
       if (await fsUtil.pathExists(configIn)) {
-        console.log('+++', configIn)
         configContents = (await this.readEslintConfig(configIn)) || {};
       }
     } else {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "6.1.1",
+      "version": "6.1.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^6.1.0",
@@ -162,8 +162,8 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "6.1.0",
-      "integrity": "sha512-H+Gb2uBZ0qM8pKCGYkT7+yCZ3psbuUGtGFZbev9CMgTSf5XI4e7mfw7ledC2XDHb2iBGHC/G/6LSppIpyustVw==",
+      "version": "6.1.1",
+      "integrity": "sha512-oOdwHpzPnpt10bJ94E8Umq8Y9uuA+1mpEH9zjQNB/jynNqSMuvM1/68ZAsndhL1pSgw49o8W6b83cKJNUVyzfw==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": "^3.0.0",
@@ -177,8 +177,8 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "3.1.0",
-      "integrity": "sha512-utabOEdAr2EYie82yWzlztgd7T99J/xGrt3VX8AJ87ieN3EsUU/M94l52hyp6rDxCWiz470IEa2EZgBUNgg8fw==",
+      "version": "3.1.2",
+      "integrity": "sha512-csH3aEs4aPCzAtc75Jx/Ayym2A06JgAeaDUFLXI867/Vsp2F0g7MJxuCkNhpa+zVZsXcyB0Kxzzv4xU7zuJXsQ==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -931,8 +931,8 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.21.0",
-      "integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==",
+      "version": "8.22.0",
+      "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
       "license": "MIT",
       "dependencies": {
         "@eslint/eslintrc": "^1.3.0",
@@ -1275,8 +1275,8 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.6",
-      "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==",
+      "version": "3.2.7",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
@@ -3252,16 +3252,16 @@
       }
     },
     "@sap/cds": {
-      "version": "6.1.0",
-      "integrity": "sha512-H+Gb2uBZ0qM8pKCGYkT7+yCZ3psbuUGtGFZbev9CMgTSf5XI4e7mfw7ledC2XDHb2iBGHC/G/6LSppIpyustVw==",
+      "version": "6.1.1",
+      "integrity": "sha512-oOdwHpzPnpt10bJ94E8Umq8Y9uuA+1mpEH9zjQNB/jynNqSMuvM1/68ZAsndhL1pSgw49o8W6b83cKJNUVyzfw==",
       "requires": {
         "@sap/cds-compiler": "^3.0.0",
         "@sap/cds-foss": "^4"
       }
     },
     "@sap/cds-compiler": {
-      "version": "3.1.0",
-      "integrity": "sha512-utabOEdAr2EYie82yWzlztgd7T99J/xGrt3VX8AJ87ieN3EsUU/M94l52hyp6rDxCWiz470IEa2EZgBUNgg8fw==",
+      "version": "3.1.2",
+      "integrity": "sha512-csH3aEs4aPCzAtc75Jx/Ayym2A06JgAeaDUFLXI867/Vsp2F0g7MJxuCkNhpa+zVZsXcyB0Kxzzv4xU7zuJXsQ==",
       "requires": {
         "antlr4": "4.9.3"
       }
@@ -3744,8 +3744,8 @@
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
     },
     "eslint": {
-      "version": "8.21.0",
-      "integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==",
+      "version": "8.22.0",
+      "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
       "requires": {
         "@eslint/eslintrc": "^1.3.0",
         "@humanwhocodes/config-array": "^0.10.4",
@@ -3994,8 +3994,8 @@
       }
     },
     "flatted": {
-      "version": "3.2.6",
-      "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="
+      "version": "3.2.7",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
     },
     "follow-redirects": {
       "version": "1.15.1",

package/package.json

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