@sap/cds-dk 7.8.2 → 7.9.1

package/lib/mtx/util/logging.js

@@ -3,9 +3,12 @@
 function getMessage(errorText, { error, command, help = command && getCommandHelp(command) } = {}) {
     let message = errorText ? errorText.trim() : '';
     if (error) {
-        const includeStack = error.stack && require('../../cds').debug('cli');
-        message = message.replace(/(?<!\p{P})$/u, ':'); // Append colon if no punctuation at the end
-        message += includeStack ? '\n' : ' ';
+        const debug = require('../../cds').debug('cli');
+        const includeStack = debug && error.stack?.includes('\n');
+        if (message.length) {
+            message = message.replace(/(?<!\p{P})$/u, ':'); // Append colon if no punctuation at the end
+            message += includeStack ? '\n' : ' ';
+        }
         const oriMsg = error.response?.data?.message // case: response body == error
             || error.response?.data?.error?.message  // case: response body == { error }
             || (includeStack ? '' : error.message);
@@ -13,9 +16,12 @@ function getMessage(errorText, { error, command, help = command && getCommandHel
         if (includeStack) {
             message += (oriMsg ? '\n' : '') + error.stack;
         }
+        if (debug && error.cause) {
+            message += '\nCaused by: ' + getMessage('', { error: error.cause }).replace(/^(?= *at)/gm, '  ');
+        }
     }
     if (typeof help === 'string') {
-        message += require('../../../bin/help').formatHelp(help);
+        message += '\n' + require('../../../bin/help').formatHelp(help);
     }
     return message;
 }

package/lib/util/axios.js

@@ -15,7 +15,8 @@ function pruneErrors() {
         response => response,
         axError => {
             const { inspect } = require('util');
-            const { url, method } = axError.config ?? {};
+            let { url, method } = axError.config ?? {};
+            url = url?.replace(/(passcode|refreshToken|clientsecret|key)=[^&]+/g, '$1=...');
             const { errno, code, response = {}, message: axMessage } = axError;
             const prefix = (url && method ? `${method.toUpperCase()} ${url}` : 'Request') + ' failed';
 

package/lib/util/cf.js

@@ -28,12 +28,8 @@ const OPERATION_STATE_SUCCEEDED = 'succeeded';
 
 const CF_CLIENT_MINIMUM_VERSION = 8;
 
-
-class CfUtil {
-
-    _clear() {
-        this.spaceInfo = null;
-    }
+module.exports = new class CfUtil {
+    spaceInfo;
 
     async _sleep(ms) {
         return new Promise((resolve) => {
@@ -41,7 +37,7 @@ class CfUtil {
         });
     }
 
-    async _cfRun(...args) {
+    async cfRun(...args) {
         args = args.map(arg => arg.replace(/"/g, '\\"'));
         const cmdLine = `${CF_COMMAND} "${args.join('" "')}"`;
         DEBUG && console.time(cmdLine);
@@ -65,12 +61,15 @@ class CfUtil {
         }
     }
 
-    async _cfRequest(urlPath, queryObj, bodyObj) {
+    async cfRequest(urlPath, queryObj, bodyObj) {
         if (queryObj) {
             const entries = Object.entries(queryObj);
             const queryStr = entries.map(([key, value]) => {
+                if (Array.isArray(value)) {
+                    value = value.join(',');
+                }
                 // commas cause problems in cf curl when not double encoded
-                value = value.replace(/,/g, encodeURIComponent(','));
+                // value = value.replace(/,/g, encodeURIComponent(','));
                 return `${key}=${encodeURIComponent(value)}`;
             }).join('&');
 
@@ -84,7 +83,7 @@ class CfUtil {
             args.push(JSON.stringify(bodyObj)); // cfRun uses spawn so no special handling for quotes on cli required
         }
 
-        const result = await this._cfRun(...args);
+        const result = await this.cfRun(...args);
         let response = {};
         if (result.stdout) {
             response = JSON.parse(result.stdout);
@@ -108,7 +107,7 @@ class CfUtil {
         throw new Error(errorMsg);
     }
 
-    async getCfTargetFromConfigFile() {
+    async _getCfTargetFromConfigFile() {
         const cfHome = process.env.CF_HOME || process.env.cf_home || path.join(os.homedir(), '.cf');
         try {
             const fileContent = await fsp.readFile(path.join(cfHome, 'config.json'));
@@ -125,8 +124,8 @@ class CfUtil {
         }
     }
 
-    async getCfTargetFromCli() {
-        const result = await this._cfRun('target');
+    async _getCfTargetFromCli() {
+        const result = await this.cfRun('target');
         if (result?.stdout) {
             return {
                 apiEndpoint: this._extract(result.stdout, /api endpoint\s*:\s*([^\s]+)/i, `CF API endpoint is missing. Use 'cf login' to login.`),
@@ -137,23 +136,23 @@ class CfUtil {
         }
     }
 
-    async getCfAuthorization() {
+    async _getCfAuthorization() {
         DEBUG?.('getting authorization');
         try {
-            return (await this._cfRun('oauth-token')).stdout;
+            return (await this.cfRun('oauth-token')).stdout;
         } catch (err) {
             throw err.message;
         }
     }
 
     async getCfTarget() {
-        await this.checkCliVersion();
-        await this.getCfAuthorization();
-        return await this.getCfTargetFromConfigFile() || await this.getCfTargetFromCli();
+        await this._checkCliVersion();
+        await this._getCfAuthorization();
+        return await this._getCfTargetFromConfigFile() || await this._getCfTargetFromCli();
     }
 
-    async checkCliVersion() {
-        const result = await this._cfRun('-v');
+    async _checkCliVersion() {
+        const result = await this.cfRun('-v');
         const version = result?.stdout?.match(/version.*(\d+\.\d+\.\d+)/i)
         if (parseInt(version?.[1]) < CF_CLIENT_MINIMUM_VERSION) {
             console.log(warn(`
@@ -170,13 +169,13 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
             const target = await this.getCfTarget();
 
             const { org, space } = target;
-            const orgs = await this._cfRequest(`/v3/organizations`, { names: org });
+            const orgs = await this.cfRequest(`/v3/organizations`, { names: org });
             if (!orgs?.resources?.length) {
                 throw new Error(`CF org ${bold(org)} not found!`);
             }
 
             const orgGuid = orgs.resources[0].guid;
-            const spaces = await this._cfRequest(`/v3/spaces`, { names: space, organization_guids: orgGuid });
+            const spaces = await this.cfRequest(`/v3/spaces`, { names: space, organization_guids: orgGuid });
             if (!spaces?.resources?.length) {
                 throw new Error(`CF space ${bold(space)} not found in org ${bold(org)}!`);
             }
@@ -196,10 +195,10 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
 
     async getEnv(app) {
         const { spaceGuid: space_guids, orgGuid: organization_guids } = await this.getCfSpaceInfo();
-        const apps = await this._cfRequest('/v3/apps', { space_guids, organization_guids, names: app });
+        const apps = await this.cfRequest('/v3/apps', { space_guids, organization_guids, names: app });
         if (apps.resources.length < 1) throw `Cannot find app with name '${app}'`
         const guid = apps.resources[0].guid;
-        return await this._cfRequest('/v3/apps/' + guid + '/env', { space_guids, organization_guids, names: app });
+        return await this.cfRequest('/v3/apps/' + guid + '/env', { space_guids, organization_guids, names: app });
     }
 
     async getService(serviceName, showMessage = true) {
@@ -209,7 +208,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
         let counter = POLL_COUNTER;
         while (counter > 0) {
             counter--;
-            const serviceInstances = await this._cfRequest('/v3/service_instances', {
+            const serviceInstances = await this.cfRequest('/v3/service_instances', {
                 names: serviceName,
                 space_guids: spaceInfo.spaceGuid,
                 organization_guids: spaceInfo.orgGuid
@@ -253,7 +252,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
 
         const spaceInfo = await this.getCfSpaceInfo();
 
-        const servicePlan = await this._cfRequest(`/v3/service_plans`, {
+        const servicePlan = await this.cfRequest(`/v3/service_plans`, {
             names: planName,
             space_guids: spaceInfo.spaceGuid,
             organization_guids: spaceInfo.orgGuid,
@@ -286,7 +285,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
             body.parameters = { ...options };
         }
 
-        const postResult = await this._cfRequest('/v3/service_instances', undefined, body);
+        const postResult = await this.cfRequest('/v3/service_instances', undefined, body);
         if (postResult?.errors) {
             throw new Error(postResult.errors[0].detail);
         }
@@ -299,14 +298,13 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
         throw new Error(`Could not create service ${bold(serviceName)}`);
     }
 
-
-    async getServiceKey(serviceInstance, serviceKeyName, showMessage = true) {
+    async _getServiceKey(serviceInstance, serviceKeyName, showMessage = true) {
         showMessage && console.log(`Getting service key ${bold(serviceKeyName)}`);
 
         let counter = POLL_COUNTER;
         while (counter > 0) {
             counter--;
-            const bindings = await this._cfRequest(`/v3/service_credential_bindings`, { names: serviceKeyName, service_instance_guids: serviceInstance.guid });
+            const bindings = await this.cfRequest(`/v3/service_credential_bindings`, { names: serviceKeyName, service_instance_guids: serviceInstance.guid });
             if (!bindings?.resources?.length) {
                 return null;
             }
@@ -319,7 +317,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
                     break;
 
                 case OPERATION_STATE_SUCCEEDED: {
-                    const keyDetails = await this._cfRequest(`/v3/service_credential_bindings/${encodeURIComponent(binding.guid)}/details`);
+                    const keyDetails = await this.cfRequest(`/v3/service_credential_bindings/${encodeURIComponent(binding.guid)}/details`);
                     return keyDetails.credentials;
                 }
 
@@ -335,9 +333,8 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
         throw new Error(`Timeout occurred while getting service key ${bold(serviceKeyName)}`);
     }
 
-
     async getOrCreateServiceKey(serviceInstance, serviceKeyName, parameters, { silent = false, create = true } = {}) {
-        const serviceKey = await this.getServiceKey(serviceInstance, serviceKeyName, false);
+        const serviceKey = await this._getServiceKey(serviceInstance, serviceKeyName, false);
         if (serviceKey || !create) {
             if (serviceKey && !silent) console.log(`Getting service key ${bold(serviceKeyName)}`);
             return serviceKey;
@@ -358,12 +355,12 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
             parameters
         }
 
-        const postResult = await this._cfRequest('/v3/service_credential_bindings', undefined, body);
+        const postResult = await this.cfRequest('/v3/service_credential_bindings', undefined, body);
         if (postResult?.errors) {
             throw new Error(postResult.errors[0].detail);
         }
 
-        const newServiceKey = await this.getServiceKey(serviceInstance, serviceKeyName, false);
+        const newServiceKey = await this._getServiceKey(serviceInstance, serviceKeyName, false);
         if (newServiceKey) {
             return newServiceKey;
         }
@@ -371,5 +368,3 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
         throw new Error(`Could not create service key ${bold(serviceKeyName)}`);
     }
 }
-
-module.exports = new CfUtil();

package/lib/util/git.js

@@ -35,7 +35,7 @@ class GitUtil {
             }
         }
 
-        console.log(`adding entry '${file}' to ${GIT_IGNORE_FILE}.`);
+        console.log(`Adding entry '${file}' to ${GIT_IGNORE_FILE}.`);
         let gitignore = await this.readFileSafely(gitIgnorePath);
         gitignore = gitignore + `${os.EOL}# added by cds${os.EOL}${file}${os.EOL}`;
 

package/lib/util/term.js

@@ -26,7 +26,7 @@ module.exports.info  = o => as(t.green, o)
 module.exports.link  = o => as(t.link, o)
 module.exports.bold  = o => as(t.bold, o)
 module.exports.highlight  = o => as(t.blue,as(t.bold, o))
-module.exports.secondary  = o => as(t.grey, o)
+module.exports.dim  = o => as(t.grey, o)
 
 const format = module.exports.format = (o, severity='Error', asInternalError=false, withStack=false) => {
   switch (severity) {

package/{bin → lib/watch}/watched.js

@@ -7,8 +7,8 @@
 
   // run through cli in order to use its error handling
   const args = JSON.parse(process.env._args)
-  const cds = require('../lib/cds'); cds.watched = true
-  const bootstrap = require('./cds')(...args)
+  const cds = require('../cds'); cds.watched = true
+  const bootstrap = require('../../bin/cds')(...args)
 
   cds.once('listening', ({server}) => {
     process.send ({ code:'listening', port: server.address().port })

package/npm-shrinkwrap.json

@@ -1,18 +1,18 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.8.2",
+  "version": "7.9.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.8.2",
+      "version": "7.9.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
         "@sap/cds-foss": "^5.0.0",
         "@sap/cds-mtxs": "^1.9.0",
-        "@sap/eslint-plugin-cds": "^2.6.0",
+        "@sap/eslint-plugin-cds": "^3.0.1",
         "@sap/hdi-deploy": "^4.8.0",
         "axios": "^1",
         "eslint": "^8",
@@ -32,13 +32,6 @@
         "sqlite3": "^5.0.4"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@cap-js/cds-types": {
       "version": "0.2.0",
       "license": "SEE LICENSE IN LICENSE",
@@ -215,7 +208,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.8.1",
+      "version": "7.9.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/cds-types": "<1",
@@ -232,7 +225,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.8.0",
+      "version": "4.9.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -268,7 +261,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.17.0",
+      "version": "1.18.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -280,7 +273,7 @@
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "2.7.0",
+      "version": "3.0.2",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/cds": ">=5.6.0",
@@ -290,7 +283,7 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "eslint": ">=7"
+        "eslint": ">=8"
       }
     },
     "node_modules/@sap/hana-client": {
@@ -777,8 +770,8 @@
     },
     "node_modules/chownr": {
       "version": "2.0.0",
-      "devOptional": true,
       "license": "ISC",
+      "optional": true,
       "engines": {
         "node": ">=10"
       }
@@ -1432,8 +1425,8 @@
     },
     "node_modules/fs-minipass": {
       "version": "2.1.0",
-      "devOptional": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "minipass": "^3.0.0"
       },
@@ -2082,8 +2075,8 @@
     },
     "node_modules/minipass": {
       "version": "3.3.6",
-      "devOptional": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -2153,13 +2146,13 @@
     },
     "node_modules/minipass/node_modules/yallist": {
       "version": "4.0.0",
-      "devOptional": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/minizlib": {
       "version": "2.1.2",
-      "devOptional": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
@@ -2170,13 +2163,13 @@
     },
     "node_modules/minizlib/node_modules/yallist": {
       "version": "4.0.0",
-      "devOptional": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/mkdirp": {
       "version": "1.0.4",
-      "devOptional": true,
       "license": "MIT",
+      "optional": true,
       "bin": {
         "mkdirp": "bin/cmd.js"
       },
@@ -2221,7 +2214,7 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.57.0",
+      "version": "3.62.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2332,15 +2325,15 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
+      "version": "0.9.4",
       "license": "MIT",
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -3038,8 +3031,8 @@
     },
     "node_modules/tar": {
       "version": "6.2.1",
-      "devOptional": true,
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -3085,16 +3078,16 @@
     },
     "node_modules/tar/node_modules/minipass": {
       "version": "5.0.0",
-      "devOptional": true,
       "license": "ISC",
+      "optional": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/tar/node_modules/yallist": {
       "version": "4.0.0",
-      "devOptional": true,
-      "license": "ISC"
+      "license": "ISC",
+      "optional": true
     },
     "node_modules/text-table": {
       "version": "0.2.0",
@@ -3252,6 +3245,13 @@
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/wordwrap": {
       "version": "1.0.0",
       "license": "MIT"
@@ -3261,7 +3261,7 @@
       "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.16.0",
+      "version": "8.17.0",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -3297,7 +3297,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.4.1",
+      "version": "2.4.2",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.8.2",
+  "version": "7.9.1",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -19,7 +19,7 @@
     "@sap/cds": "^7",
     "@sap/cds-foss": "^5.0.0",
     "@sap/cds-mtxs": "^1.9.0",
-    "@sap/eslint-plugin-cds": "^2.6.0",
+    "@sap/eslint-plugin-cds": "^3.0.1",
     "@sap/hdi-deploy": "^4.8.0",
     "axios": "^1",
     "eslint": "^8",

package/lib/init/template/nodejs/files/.eslintrc

@@ -1,26 +0,0 @@
-{
-  "extends": "eslint:recommended",
-  "env": {
-    "es2022": true,
-    "node": true,
-    "jest": true,
-    "mocha": true
-  },
-  "globals": {
-    "SELECT": true,
-    "INSERT": true,
-    "UPSERT": true,
-    "UPDATE": true,
-    "DELETE": true,
-    "CREATE": true,
-    "DROP": true,
-    "CDL": true,
-    "CQL": true,
-    "CXL": true,
-    "cds": true
-  },
-  "rules": {
-    "no-console": "off",
-    "require-atomic-updates": "off"
-  }
-}