@sap/cds-dk 4.6.2 → 4.6.3

package/CHANGELOG.md

@@ -6,6 +6,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 4.6.3 - 2021-11-16
+
+### Fixed
+
+- `cds watch` recovers again from compilation errors and properly prints these
+- `cds import` fix for omitting empty `doc` components.
+- `cds add lint` no longer duplicates initial contents in `package.json`
+- `cds add data` no longer ignores imported services for which credentials are stored in the project
+
 ## Version 4.6.2 - 2021-11-09
 
 ### Fixed

package/bin/watch.js

@@ -206,7 +206,7 @@ if (!module.parent) (async()=>{ // launched by nodemon
     case 'NO_SERVICES_FOUND': return _no_services_found(e)
     case 'MODEL_NOT_FOUND': return _no_models_found(e)
     case 'EADDRINUSE': return process.send(e)  //> tell cds watch
-    default: console.error(e)
+    default: { throw e } // cli error handling will catch and format
   }}
   function _no_models_found(e) { console.log (`
     No models found in ${cds.resolve(e.model||'*',false)}.

package/lib/client/activate.js

@@ -20,11 +20,7 @@ const JOB_STATUS = {
 };
 
 async function checkFinished(jobId, statusUrl, params, finisher) {
-    const requestOptions = Object.assign({
-        method: 'GET'
-    }, params.get('reqAuth'));
-
-    const { status, error } = (await axios(statusUrl, requestOptions)).data;
+    const { status, error } = (await axios.get(statusUrl, params.get('reqAuth'))).data;
 
     if ((status === JOB_STATUS.FINISHED || status === JOB_STATUS.FAILED) && !finisher.finished) {
         finisher.finished = true;
@@ -170,7 +166,6 @@ module.exports = class Activate extends BaseCommand {
 
             activationUrl = Activate.getMtxApiUrl(params.get('appUrl'), COMMAND_URL_SUFFIX);
             const requestOptions = Object.assign({
-                method: 'POST',
                 headers: {},
                 data: {
                     extension: [...allFiles],
@@ -179,7 +174,7 @@ module.exports = class Activate extends BaseCommand {
             }, params.get('reqAuth'));
             requestOptions.headers['Content-Type'] = 'application/json';
 
-            return axios(activationUrl, requestOptions);
+            return axios.post(activationUrl, requestOptions);
         })
         .then(response => {
             if (response === null) {
@@ -227,7 +222,6 @@ module.exports = class Activate extends BaseCommand {
 
         const customFileUrl = Activate.getMtxApiUrl(params.get('appUrl'), Activate.UPDATE_CUSTOM_FILE_URL_SUFFIX);
         const requestOptions = Object.assign({
-            method: 'POST',
             headers: {},
             data: {
                 content: customFilesSerialized
@@ -235,7 +229,7 @@ module.exports = class Activate extends BaseCommand {
         }, params.get('reqAuth'));
         requestOptions.headers['Content-Type'] = 'application/json';
 
-        await axios(customFileUrl, requestOptions);
+        await axios.post(customFileUrl, requestOptions);
 
         Logger.log('Custom file upload finished');
     }

package/lib/client/auth_manager.js

@@ -58,7 +58,7 @@ async function retrieveTokenOrPasscodeUrl(params) {
 
         let response;
         try {
-            response = await axios(tokenUrl, { method: 'GET' });
+            response = await axios.get(tokenUrl);
         } catch (error) {
             throw new Error(`Failed to get authentication token: ${error}.\nResponse body: ${util.inspect(response && response.data)}`);
         }

package/lib/client/extend.js

@@ -104,15 +104,12 @@ module.exports = class Extend extends BaseCommand {
     }
 
     static async runExtend(params) {
-        const extendUrl = Extend.getMtxApiUrl(params.get('appUrl'), COMMAND_URL_SUFFIX);
-        const requestOptions = Object.assign({
-            method: 'GET',
-            retry: 0
-        }, params.get('reqAuth'));
+        const contentUrl = Extend.getMtxApiUrl(params.get('appUrl'), COMMAND_URL_SUFFIX);
+        const requestOptions = Object.assign({ retry: 0 }, params.get('reqAuth'));
 
         Logger.log('Retrieving files...');
 
-        const [ response ] = (await axios(extendUrl, requestOptions)).data;
+        const [ response ] = (await axios.get(contentUrl, requestOptions)).data;
 
         Logger.log('\nWriting files to: ' + params.get('projectFolder'));
 
@@ -142,11 +139,9 @@ module.exports = class Extend extends BaseCommand {
         }
 
         if (params.get('wsdl')) {
-
             Logger.log('Writing custom files');
-
             const customFileUrl = Extend.getMtxApiUrl(params.get('appUrl'), Extend.CUSTOM_FILE_URL_SUFFIX);
-            const customFiles = (await axios(customFileUrl, params)).data;
+            const customFiles = (await axios.get(customFileUrl, requestOptions)).data;
             await Extend.storeCustomFiles(params.get('projectFolder'), customFiles);
         }
     }

package/lib/import/v2parser.js

@@ -472,7 +472,7 @@ function _getServiceEntityProperty(
 	{
 		propertyJson = propertyJson + '\n}'
 	}
-	if(documentation != -1 && documentation != undefined){
+	if(documentation != -1 && documentation){
 		propertyJson = propertyJson + ',\n"doc":"' + documentation + '"';
 	}
 
@@ -674,7 +674,7 @@ function _getFunctionImport(functionImport,isBounded) {
 		csn = csn + _getServiceEntityProperty(noValue,functionImport[2],noValue,noValue,noValue,noValue,noValue,noValue,isCollection);
 		csn = csn + '\n }';
 	}
-	if(functionImport[4] !== -1)
+	if(functionImport[4] !== -1 && functionImport[4])
 	{
 		csn = csn + ',\n "doc": "' + _replaceSpecialCharacters(functionImport[4]) + '"';
 	}
@@ -1503,8 +1503,10 @@ function _generateEDMXJSON2CSN(
 		
 		let serviceDoc = jsonObj["edmx:Edmx"]["edmx:DataServices"]["Schema"].EntityContainer.Documentation;
 		// if documentation exists for service
-		if(serviceDoc)
-			def += ',\n' + `"doc": "${_parseDocumentationTag(serviceDoc)}"`;
+		if (serviceDoc) {
+			let doc = _parseDocumentationTag(serviceDoc);
+			if (doc) def += ',\n' + `"doc": "${doc}"`;
+		}
 		def += "}";
 		definitions.push(def);
 	}

package/lib/import/v4parser.js

@@ -786,13 +786,13 @@ function _replaceSpecialCharacters(text) {
 
 function _checkAnnotatationTerm(annotation, path, no_of_terms, targetString){
    if(path){
-        if(targetString === "@Core.Description"){
+        if(targetString === "@Core.Description" && annotation[1]["@Core.Description"]){
             if(path.doc === undefined)
                 path.doc = _replaceSpecialCharacters(annotation[1]["@Core.Description"]);
             else
                 path.doc += _replaceSpecialCharacters(annotation[1]["@Core.Description"]);
         }
-        else if(targetString === "@Core.LongDescription"){
+        else if(targetString === "@Core.LongDescription" && annotation[1]["@Core.LongDescription"]){
             _generateLongDescription(annotation,path,no_of_terms);
         }
     }

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

@@ -29,7 +29,7 @@ module.exports = class DataTemplate extends TemplateBase {
 
     // Also include 'external' entities w/ cds.persistence.skip (similar to 'mocked' option of serve).
     // Could be too much sometimes, but don't want to bother users w/ a separate option for this.
-    cds.deploy.include_external_entities_in(csn)
+    includeExternalEntities(csn, logger)
 
     csn = cds.compile.for.sql(csn, { names:env.sql.names, messages:[] })  // CSN w/ persistence information
     csn = cds.reflect(csn); // reflected model (adds additional helper functions)
@@ -40,7 +40,17 @@ module.exports = class DataTemplate extends TemplateBase {
       .filter (e => e.name !== 'DRAFT.DraftAdministrativeData' && !e.name.endsWith('.drafts')) // exclude draft stuff
       .forEach(e => processEntity(e, dest, this.projectPath, csn, force, logger));
   }
+}
 
+function includeExternalEntities(model, logger) {
+  for (let each in model.definitions) {
+    const def = model.definitions[each]
+    if (def['@cds.persistence.skip'] === true) {
+      logger.debug ('Including skipped entity '+each)
+      delete def['@cds.persistence.skip']
+    }
+  }
+  return model
 }
 
 function processEntity (entity, dest, projectPath, csn, force, logger) {

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

@@ -13,8 +13,6 @@ const { nullLogger } = require('../../util/logger');
 module.exports = class HanaTemplate extends TemplateBase {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
-
-        this.env = null;
     }
 
     async checkEnabled() {
@@ -22,11 +20,11 @@ module.exports = class HanaTemplate extends TemplateBase {
             return true;
         }
 
-        this.env = await this.getEnv(true);
+        const env = await this.getEnv();
 
-        const hdiConfigPath = path.join(this.projectPath, this.env.folders.db, 'src/.hdiconfig');
+        const hdiConfigPath = path.join(this.projectPath, env.folders.db, 'src/.hdiconfig');
         if (await this.fsUtil.pathExists(hdiConfigPath)) {
-            const configFilePath = path.join(this.env.folders.db, 'src/.hdiconfig');
+            const configFilePath = path.join(env.folders.db, 'src/.hdiconfig');
             throw new Error(`Database config file ${configFilePath} already exists. Use --force to overwrite.`);
         }
 
@@ -34,22 +32,20 @@ module.exports = class HanaTemplate extends TemplateBase {
     }
 
     // read env from project
-    async getEnv(force) {
+    async getEnv() {
         const cdsEnvVar = process.env.CDS_ENV;
         process.env.CDS_ENV = 'production'
-        let env
         try {
-            env = await super.getEnv(force);
+            return await super.getEnv();
         } finally {
             cdsEnvVar ? process.env.CDS_ENV = cdsEnvVar : delete process.env.CDS_ENV
         }
-        return env
     }
 
     async run() {
-        this.env = await this.getEnv(true);
+        const env = await this.getEnv();
 
-        await this.templateUtil.copyFiles('common', path.join(this.projectPath, this.env.folders.db), {
+        await this.templateUtil.copyFiles('common', path.join(this.projectPath, env.folders.db), {
             projectName: this.projectName
         }, this.options.force);
 
@@ -57,13 +53,13 @@ module.exports = class HanaTemplate extends TemplateBase {
         const projectType = await this.getProjectType();
         switch (projectType) {
             case PROJECT_TYPE.java:
-                await this.templateUtil.copyFiles('java', path.join(this.projectPath, this.env.folders.db), {}, this.options.force);
+                await this.templateUtil.copyFiles('java', path.join(this.projectPath, env.folders.db), {}, this.options.force);
                 await this._updatePomXml();
-                await this._updateCdsrcJson(cdsrcJsonPath, this.env.folders.db);
+                await this._updateCdsrcJson(cdsrcJsonPath, env.folders.db, env);
                 break;
 
             case PROJECT_TYPE.nodejs:
-                await this._updatePackageJson(path.join(this.projectPath, 'package.json'), this.env.folders.db);
+                await this._updatePackageJson(path.join(this.projectPath, 'package.json'), env.folders.db, env);
                 break;
 
             default: break;
@@ -87,7 +83,7 @@ module.exports = class HanaTemplate extends TemplateBase {
         }
     }
 
-    async _updatePackageJson(packageJsonPath, modelName) { //NOSONAR
+    async _updatePackageJson(packageJsonPath, modelName, env) { //NOSONAR
         modelName = path.basename(modelName);
 
         if (!await this.fsUtil.pathExists(packageJsonPath)) {
@@ -109,7 +105,7 @@ module.exports = class HanaTemplate extends TemplateBase {
             changed = true
         }
 
-        if (!this._isUsingHana(modelName)) {
+        if (!this._isUsingHana(modelName, env)) {
             packageJson.cds = packageJson.cds || {};
             packageJson.cds.requires = packageJson.cds.requires || {};
             packageJson.cds.requires[modelName] = packageJson.cds.requires[modelName] || {};
@@ -130,7 +126,7 @@ module.exports = class HanaTemplate extends TemplateBase {
         }
     }
 
-    async _updateCdsrcJson(cdsrcJsonPath, modelName) {
+    async _updateCdsrcJson(cdsrcJsonPath, modelName, env) {
         modelName = path.basename(modelName);
 
         let changed;
@@ -143,7 +139,7 @@ module.exports = class HanaTemplate extends TemplateBase {
 
         this.logger.isDebug && this.logger.debug(`_updateCdsrcJson before: ${JSON.stringify(cdsrcJson, null, 2)}`);
 
-        if (!this._isUsingHana(modelName)) {
+        if (!this._isUsingHana(modelName, env)) {
             cdsrcJson.requires = cdsrcJson.requires || {};
             cdsrcJson.requires[modelName] = cdsrcJson.requires[modelName] || {};
             cdsrcJson.requires[modelName].kind = KIND_SQL;
@@ -161,7 +157,7 @@ module.exports = class HanaTemplate extends TemplateBase {
         }
     }
 
-    _isUsingHana(db) {
-        return this.env.get(`requires.${db}.kind`) === KIND_HANA || this.env.get(`requires.${db}.dialect`) === KIND_HANA || this.env.get(`requires.${db}.use`) === KIND_HANA;
+    _isUsingHana(db, env) {
+        return env.get(`requires.${db}.kind`) === KIND_HANA || env.get(`requires.${db}.dialect`) === KIND_HANA || env.get(`requires.${db}.use`) === KIND_HANA;
     }
 }

package/lib/init/template/mta/projectReader.js

@@ -22,13 +22,11 @@ module.exports = class ProjectReader {
     async getEnv(profile = 'production') {
         const cdsEnvVar = process.env.CDS_ENV
         process.env.CDS_ENV = profile
-        let env
         try {
-            env = await this.template.getEnv(true);
+            return await this.template.getEnv();
         } finally {
             cdsEnvVar ? process.env.CDS_ENV = cdsEnvVar : delete process.env.CDS_ENV
         }
-        return env
     }
 
     get fsUtil() {

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

@@ -58,7 +58,7 @@ module.exports = class SamplesTemplate extends TemplateBase {
     }
 
     async _addNodejsSamples() {
-        const folders = (await this.getEnv(true)).folders;
+        const folders = (await this.getEnv()).folders;
         const dbFolder = path.join(this.projectPath, folders.db);
         await this.templateUtil.copyFiles('nodejs/db', dbFolder, {}, this.options.force);
 

package/lib/init/template/templateBase.js

@@ -1,11 +1,9 @@
 const path = require('path');
-const cds = require('@sap/cds/lib');
+const Config = require('@sap/cds/lib/env');
 
 const TemplateUtil = require('../util/templateUtil');
-const commandUtil = require('../util/commandUtil');
-const { nullLogger } = require('../util/logger');
 
-const { IS_WIN, PROJECT_TYPE } = require('../constants');
+const { PROJECT_TYPE } = require('../constants');
 
 
 module.exports = class TemplateBase {
@@ -43,49 +41,20 @@ module.exports = class TemplateBase {
         return true;
     }
 
-    getCdsModulePath() {
-        return path.join(__dirname, '../../../bin/cds.js');
-    }
-
     /**
      * calls cds env and caches result
      * @param {boolean} force, ignore cached value
      * @returns {object} the current cds env
      */
-    async getEnv(force = false) {
-        if (!this.env || force) {
-            let projectPath;
-            if (await this.fsUtil.pathExists(this.projectPath)) {
-                projectPath = this.projectPath;
-            } else {
-                projectPath = this.cwd;
-            }
-
-            const logger = (this.logger.isDebug ? this.logger : nullLogger);
-
-            let modPath = this.getCdsModulePath();
-            if (IS_WIN) {
-                modPath = `"${modPath}"`;
-            }
-
-            let envJsonOutput = await commandUtil.spawnCommand('node', [modPath, 'env', 'json'], {
-                cwd: projectPath,
-                env: process.env
-            }, logger, true);
-
-            if (envJsonOutput) {
-                // cheap check to see if json is valid
-                if (envJsonOutput.indexOf('":') < 0) {
-                    // eslint-disable-next-line no-control-regex
-                    envJsonOutput = envJsonOutput.replace(/'/g, '"').replace(/\s(\w+):\s/g, ' "$1": ').replace(/\x1b\[\w+m/g, '');
-                }
-
-                this.env = JSON.parse(envJsonOutput);
-                // env has additional getters and setters
-                Object.setPrototypeOf(this.env, cds.env.__proto__);
-            }
+    async getEnv() {
+        let projectPath;
+        if (await this.fsUtil.pathExists(this.projectPath)) {
+            projectPath = this.projectPath;
+        } else {
+            projectPath = this.cwd;
         }
-        return this.env;
+
+        return Config.for('cds', projectPath);
     }
 
     /**

package/lib/lint/Linter.js

@@ -148,9 +148,7 @@ class Linter {
       extensions.join(',')
     );
     // Enable colored output
-    if (process.stdout.isTTY) {
-      this.eslintCmdOpts = io.mergeWithUserOpts(this.eslintCmdOpts, "color");
-    }
+    this.eslintCmdOpts = io.mergeWithUserOpts(this.eslintCmdOpts, "color");
     return;
   }
 
@@ -205,22 +203,18 @@ class Linter {
       } else {
         input = `'${this.eslintCmdFileExpr.join("' '")}'`;
       }
-      const eslintCmdSplit = this.eslintCmd.split(" ");
-      this.eslintCmd = eslintCmdSplit[0];
-      eslintCmdOpts.unshift(eslintCmdSplit[1]);
-      eslintCmdOpts.push(input);
       // Run ESLint with given cmd line options
-      // - Show 'eslint' instead of 'node ...eslint.js' cmd
-      // - Remove debug flag for printed cmd
+      // - Show 'eslint' instead of actual eslint cmd ('node .../.eslint.js')
+      // - Remove debug flag for printed cmd line
       if (this.eslintCmdOpts.debug) {
         eslintCmdOpts.splice(eslintCmdOpts.indexOf('--debug'), 1);
         console.log(
-          `Linting:\n ${term.info(`eslint ${eslintCmdOpts.slice(1).join(' ')}`)}\n`
+          `Linting:\n ${term.info(`eslint ${eslintCmdOpts.concat(input).join(' ')}`)}\n`
         );
         eslintCmdOpts.push('--debug');
       }
       if (!dryRun) {
-        return commandUtil.spawnCommand(this.eslintCmd, eslintCmdOpts, {
+        return commandUtil.spawnCommand(this.eslintCmd, eslintCmdOpts.concat(input), {
           cwd: process.cwd(),
           shell: true,
           stdio: process.env.NODE_ENV === 'test' ? 'pipe' : 'inherit',

package/lib/lint/io.js

@@ -33,14 +33,14 @@ module.exports = {
         break;
       case ".eslintrc.json":
       case ".eslintrc":
+        config = JSON.parse(await fsp.readFile(configPath, "utf8"));
+        break;
       case "package.json":
-        try {
-          config = JSON.parse(await fsp.readFile(configPath, "utf8"));
-          if (configFile === "package.json" && "eslintConfig" in config) {
-            config = config["eslintConfig"];
-          }
-        } catch (err) {
-          // Do nothing
+        config = JSON.parse(await fsp.readFile(configPath, "utf8"));
+        if ("eslintConfig" in config) {
+          config = config["eslintConfig"];
+        } else {
+          config = {}
         }
         break;
       default:
@@ -138,21 +138,20 @@ module.exports = {
         break;
       case ".eslintrc.json":
       case ".eslintrc":
+        await fsUtil.writeFile(configPath, `${JSON.stringify(configContents, null, 2)}`);
+        break;
       case "package.json":
-        if (configFile === "package.json") {
-          if (await fsUtil.pathExists(configPath)) {
-            contents = JSON.parse(await fsp.readFile(configPath, "utf8"));
-          } else {
-            contents = {};
-          }
-          if (!("eslintConfig" in configContents)) {
-            contents["eslintConfig"] = configContents;
-          } else {
-            contents["eslintConfig"] = [...configContents, ...contents["eslintConfig"]];
-          }
-          configContents = contents;
+        if (await fsUtil.pathExists(configPath)) {
+          contents = JSON.parse(await fsp.readFile(configPath, "utf8"));
+        } else {
+          contents = {};
         }
-        await fsUtil.writeFile(configPath, `${JSON.stringify(configContents, null, 2)}`);
+        if (!("eslintConfig" in configContents)) {
+          contents["eslintConfig"] = configContents;
+        } else {
+          contents["eslintConfig"] = [...configContents, ...contents["eslintConfig"]];
+        }
+        await fsUtil.writeFile(configPath, `${JSON.stringify(contents, null, 2)}`);
         break;
       default:
         break;

package/lib/watch/node-watch.js

@@ -73,7 +73,7 @@ const isWindows = (process.platform === 'win32')
 const waitTime = parseInt(process.env.CDS_WATCH_KILL_DELAY) || (isWindows ? 500 : 0)
 function gracefullyKill (proc, fn=()=>{}) {
   if (proc)  {
-    proc.send({ exit: true })
+    proc.send({ exit: true }, () => { /* ignore */ })
     setTimeout(()=> { proc.kill(); fn()}, waitTime)
   }
   else fn()

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "4.6.2",
+      "version": "4.6.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^5.6.2",
@@ -127,13 +127,13 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.16.0",
-      "integrity": "sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==",
+      "version": "7.16.3",
+      "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.16.0",
         "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.17.5",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -297,12 +297,12 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.16.0",
-      "integrity": "sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==",
+      "version": "7.16.3",
+      "integrity": "sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.16.0",
-        "@babel/traverse": "^7.16.0",
+        "@babel/traverse": "^7.16.3",
         "@babel/types": "^7.16.0"
       },
       "engines": {
@@ -379,8 +379,8 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.16.2",
-      "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==",
+      "version": "7.16.3",
+      "integrity": "sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -563,8 +563,8 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.16.0",
-      "integrity": "sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==",
+      "version": "7.16.3",
+      "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.16.0",
@@ -572,7 +572,7 @@
         "@babel/helper-function-name": "^7.16.0",
         "@babel/helper-hoist-variables": "^7.16.0",
         "@babel/helper-split-export-declaration": "^7.16.0",
-        "@babel/parser": "^7.16.0",
+        "@babel/parser": "^7.16.3",
         "@babel/types": "^7.16.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
@@ -962,8 +962,8 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "5.6.2",
-      "integrity": "sha512-Y4i0vdyJ5klpksIAN+9gZ3yDHskHbhSWPMAuRA6vMP2zZSniDLyKBOiZsgLT3DpMF8ly186P14iN18ztBMp7+g==",
+      "version": "5.6.3",
+      "integrity": "sha512-k48JsHQuDoZEFgppBPBPAK7ANKpG3Iuh3j9kPAdOT0Lo8Tl7PL3ovhIZm41MhxWZ1CVcGAZ1JLcbIZi3jWunZA==",
       "dependencies": {
         "@sap-cloud-sdk/core": "^1.41",
         "@sap-cloud-sdk/util": "^1.41",
@@ -1241,19 +1241,19 @@
       }
     },
     "node_modules/@types/jsonwebtoken": {
-      "version": "8.5.5",
-      "integrity": "sha512-OGqtHQ7N5/Ap/TUwO6IgHDuLiAoTmHhGpNvgkCm/F4N6pKzx/RBSfr2OXZSwC6vkfnsEdb6+7DNZVtiXiwdwFw==",
+      "version": "8.5.6",
+      "integrity": "sha512-+P3O/xC7nzVizIi5VbF34YtqSonFsdnbXBnWUCYRiKOi1f9gA4sEFvXkrGr/QVV23IbMYvcoerI7nnhDUiWXRQ==",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "16.11.6",
-      "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="
+      "version": "16.11.7",
+      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
     },
     "node_modules/@types/prettier": {
-      "version": "2.4.1",
-      "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==",
+      "version": "2.4.2",
+      "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
       "dev": true
     },
     "node_modules/@types/stack-utils": {
@@ -1754,12 +1754,12 @@
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.17.6",
-      "integrity": "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==",
+      "version": "4.18.1",
+      "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
       "dev": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001274",
-        "electron-to-chromium": "^1.3.886",
+        "caniuse-lite": "^1.0.30001280",
+        "electron-to-chromium": "^1.3.896",
         "escalade": "^3.1.1",
         "node-releases": "^2.0.1",
         "picocolors": "^1.0.0"
@@ -1834,8 +1834,8 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001278",
-      "integrity": "sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==",
+      "version": "1.0.30001280",
+      "integrity": "sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -2371,8 +2371,8 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.890",
-      "integrity": "sha512-VWlVXSkv0cA/OOehrEyqjUTHwV8YXCPTfPvbtoeU2aHR21vI4Ejh5aC4AxUwOmbLbBgb6Gd3URZahoCxtBqCYQ==",
+      "version": "1.3.899",
+      "integrity": "sha512-w16Dtd2zl7VZ4N4Db+FIa7n36sgPGCKjrKvUUmp5ialsikvcQLjcJR9RWnlYNxIyEHLdHaoIZEqKsPxU9MdyBg==",
       "dev": true
     },
     "node_modules/emittery": {
@@ -2978,8 +2978,8 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.2",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA=="
+      "version": "3.2.4",
+      "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="
     },
     "node_modules/fn.name": {
       "version": "1.1.0",
@@ -4384,8 +4384,8 @@
       }
     },
     "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.2.0",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "version": "6.2.1",
+      "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -4841,17 +4841,17 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.50.0",
-      "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
+      "version": "1.51.0",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.33",
-      "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
+      "version": "2.1.34",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "dependencies": {
-        "mime-db": "1.50.0"
+        "mime-db": "1.51.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -6288,8 +6288,8 @@
       }
     },
     "node_modules/table/node_modules/ajv": {
-      "version": "8.6.3",
-      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+      "version": "8.8.0",
+      "integrity": "sha512-L+cJ/+pkdICMueKR6wIx3VP2fjIx3yAhuvadUv/osv9yFD7OVZy442xFF+Oeu3ZvmhBGQzoF6mTSt+LUWBmGQg==",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -7018,13 +7018,13 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.16.0",
-      "integrity": "sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==",
+      "version": "7.16.3",
+      "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.16.0",
         "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.17.5",
         "semver": "^6.3.0"
       },
       "dependencies": {
@@ -7142,12 +7142,12 @@
       "dev": true
     },
     "@babel/helpers": {
-      "version": "7.16.0",
-      "integrity": "sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==",
+      "version": "7.16.3",
+      "integrity": "sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.16.0",
-        "@babel/traverse": "^7.16.0",
+        "@babel/traverse": "^7.16.3",
         "@babel/types": "^7.16.0"
       }
     },
@@ -7205,8 +7205,8 @@
       }
     },
     "@babel/parser": {
-      "version": "7.16.2",
-      "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==",
+      "version": "7.16.3",
+      "integrity": "sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw==",
       "dev": true
     },
     "@babel/plugin-syntax-async-generators": {
@@ -7334,8 +7334,8 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.16.0",
-      "integrity": "sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==",
+      "version": "7.16.3",
+      "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.16.0",
@@ -7343,7 +7343,7 @@
         "@babel/helper-function-name": "^7.16.0",
         "@babel/helper-hoist-variables": "^7.16.0",
         "@babel/helper-split-export-declaration": "^7.16.0",
-        "@babel/parser": "^7.16.0",
+        "@babel/parser": "^7.16.3",
         "@babel/types": "^7.16.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
@@ -7660,8 +7660,8 @@
       }
     },
     "@sap/cds": {
-      "version": "5.6.2",
-      "integrity": "sha512-Y4i0vdyJ5klpksIAN+9gZ3yDHskHbhSWPMAuRA6vMP2zZSniDLyKBOiZsgLT3DpMF8ly186P14iN18ztBMp7+g==",
+      "version": "5.6.3",
+      "integrity": "sha512-k48JsHQuDoZEFgppBPBPAK7ANKpG3Iuh3j9kPAdOT0Lo8Tl7PL3ovhIZm41MhxWZ1CVcGAZ1JLcbIZi3jWunZA==",
       "requires": {
         "@sap-cloud-sdk/core": "^1.41",
         "@sap-cloud-sdk/util": "^1.41",
@@ -7878,19 +7878,19 @@
       }
     },
     "@types/jsonwebtoken": {
-      "version": "8.5.5",
-      "integrity": "sha512-OGqtHQ7N5/Ap/TUwO6IgHDuLiAoTmHhGpNvgkCm/F4N6pKzx/RBSfr2OXZSwC6vkfnsEdb6+7DNZVtiXiwdwFw==",
+      "version": "8.5.6",
+      "integrity": "sha512-+P3O/xC7nzVizIi5VbF34YtqSonFsdnbXBnWUCYRiKOi1f9gA4sEFvXkrGr/QVV23IbMYvcoerI7nnhDUiWXRQ==",
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/node": {
-      "version": "16.11.6",
-      "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="
+      "version": "16.11.7",
+      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
     },
     "@types/prettier": {
-      "version": "2.4.1",
-      "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==",
+      "version": "2.4.2",
+      "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==",
       "dev": true
     },
     "@types/stack-utils": {
@@ -8283,12 +8283,12 @@
       "dev": true
     },
     "browserslist": {
-      "version": "4.17.6",
-      "integrity": "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==",
+      "version": "4.18.1",
+      "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001274",
-        "electron-to-chromium": "^1.3.886",
+        "caniuse-lite": "^1.0.30001280",
+        "electron-to-chromium": "^1.3.896",
         "escalade": "^3.1.1",
         "node-releases": "^2.0.1",
         "picocolors": "^1.0.0"
@@ -8338,8 +8338,8 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001278",
-      "integrity": "sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==",
+      "version": "1.0.30001280",
+      "integrity": "sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA==",
       "dev": true
     },
     "caseless": {
@@ -8745,8 +8745,8 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.3.890",
-      "integrity": "sha512-VWlVXSkv0cA/OOehrEyqjUTHwV8YXCPTfPvbtoeU2aHR21vI4Ejh5aC4AxUwOmbLbBgb6Gd3URZahoCxtBqCYQ==",
+      "version": "1.3.899",
+      "integrity": "sha512-w16Dtd2zl7VZ4N4Db+FIa7n36sgPGCKjrKvUUmp5ialsikvcQLjcJR9RWnlYNxIyEHLdHaoIZEqKsPxU9MdyBg==",
       "dev": true
     },
     "emittery": {
@@ -9208,8 +9208,8 @@
       }
     },
     "flatted": {
-      "version": "3.2.2",
-      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA=="
+      "version": "3.2.4",
+      "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="
     },
     "fn.name": {
       "version": "1.1.0",
@@ -10221,8 +10221,8 @@
       },
       "dependencies": {
         "camelcase": {
-          "version": "6.2.0",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "version": "6.2.1",
+          "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==",
           "dev": true
         }
       }
@@ -10579,14 +10579,14 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.50.0",
-      "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="
+      "version": "1.51.0",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
     },
     "mime-types": {
-      "version": "2.1.33",
-      "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
+      "version": "2.1.34",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "requires": {
-        "mime-db": "1.50.0"
+        "mime-db": "1.51.0"
       }
     },
     "mimic-fn": {
@@ -11666,8 +11666,8 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.6.3",
-          "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
+          "version": "8.8.0",
+          "integrity": "sha512-L+cJ/+pkdICMueKR6wIx3VP2fjIx3yAhuvadUv/osv9yFD7OVZy442xFF+Oeu3ZvmhBGQzoF6mTSt+LUWBmGQg==",
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",

package/package.json

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