@sap/cds-dk 6.3.1 → 6.4.0

package/CHANGELOG.md

@@ -7,6 +7,41 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 6.4.0 - 2022-12-15
+
+### Added
+
+- `cds add helm` now supports approuter.
+- `cds subscribe --local` starts @sap/cds-mtxs locally instead of contacting a running instance via URL.
+- `cds unsubscribe` removes the subscription of a tenant from a SaaS app.
+
+### Changed
+
+- `cds add multitenancy` will not compile internal roles into the `xs-security.json` any more.
+- `cds add hana` does not create a `hdi-service-name: ${service-name}` for the database resource properties any more.
+- MTX-related commands now print usage help in case of known errors.
+- `cds import` now adds the annotation `@open` for all the Entities and ComplexTypes with attribute `Abstract` or `OpenType` and adds the same for those referred by the attribute `BaseType`.
+- `cds import` now adds default value in the CSN for the optional parameters in action/function for OData V4 files.
+- `cds init` uses latest Maven Java archetype version 1.30.0 for creating Java projects.
+
+### Fixed
+
+- `cds init` no longer creates `engines` entry in package.json to avoid `unsupported engine` warnings.
+- `cds subscribe` correctly exits the process after deploying to a HANA database.
+- `cds add multitenancy` doesn't create a duplicate `saas-registry` resource if there's one with `service-plan: service` any more.
+- `cds bind` now correctly maps the `hana-mt` and `sql-mt` shortcuts to the `cds.requires.db` entry.
+- `cds add mtx` no longer fails if the `mtx/sidecar` folder doesn't exist.
+- `cds compile --to xsuaa` now rejects expressions leading to invalid XSUAA attributes like `$user.foo-bar`, `$user.foo/bar`, `$user.foo.bar`
+- `cds compile --to xsuaa -o <file>` now sets `.json` as file ending instead of `.xsuaa`
+
+## Version 6.3.2 - 2022-11-28
+
+### Changed
+
+- Include `@sap/cds` 6.3.2
+- Include `@sap/cds-compiler` 3.4.4
+- Include `@sap/cds-mtxs` 1.3.2
+
 ## Version 6.3.1 - 2022-11-04
 
 ### Changed
@@ -15,10 +50,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Use `@sap/cds` 6.3.1
 - Use `@sap/cds-mtxs` 1.3.1
 
-### Fixed
-
-- MTX Client no longer reports 'Request failed with status code 401' when sending a passcode to old MTX server.
-
 ## Version 6.3.0 - 2022-11-02
 
 ### Added
@@ -37,7 +68,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 - MTX Client now ignores a username potentially saved for the current project, if a passcode is given
 - MTX Client now treats keytar as optional unless explicitly running `cds login`
-- `cds import` now caputres the documentation properly for all the EntitySet referring to same EntityType.
+- `cds import` now captures the documentation properly for all the EntitySet referring to same EntityType.
 - `cds deploy --to sql` now produces 'plain' SQL again, suitable for e.g. H2.  In 6.2 it produced 'sqlite' dialect, erroneously.
 - `cds compile --to openapi` now fixes the duplication of fields in `required` section.
 - `cds lint` now recognizes ESLint configurations from _package.json_.
@@ -247,6 +278,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Fixed
 
+- `cds add html5-repo` and `cds add destinations` throw an error if applied for MTA deployments, for which they are currently unsupported.
 - `cds compile --to openapi` fixes annotations on bound action overloads.
 - `cds add cf-manifest` now uses the correct `application` plan for the `xsuaa` service
 - A combination of `cds add approuter`, `cds add mtx`, and `cds add mta` will now use a safer approach to determine the subscription URL.

package/bin/cds.js

@@ -94,7 +94,9 @@ function _dieForUnknownCommand(cmd) {
 
   const excludeList = ['cds.js', 'cds-ts.js', 'fix-redirects.js'];
   const { readdirSync } = require('fs');
+  const { resolve } = require('path');
   const commands = readdirSync(__dirname, { withFileTypes: true })
+    .concat(readdirSync(resolve(_local('@sap/cds'), '..', '..', 'bin'), { withFileTypes: true }))
     .filter((f) => f.isFile() && !excludeList.includes(f.name))
     .map((f) => f.name.split('.')[0]).sort();
 

package/bin/compile/index.js

@@ -273,7 +273,8 @@ function compile (models, options={}) {
     cdl: '.cds',
     ddl: '.sql',
     sql: '.sql',
-    edm: '.json'
+    edm: '.json',
+    xsuaa: '.json'
   }[x] || '.'+x) }
 
 }

package/bin/deploy/index.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(deploy, {
   options: ['--to', '--tunnel-address', '--vcap-file'],
-  flags: [ '--no-save', '--auto-undeploy', '--dry', '--with-mocks', '--store-credentials', '--bind' ],
+  flags: [ '--no-save', '--auto-undeploy', '--dry', '--xdry', '--with-mocks', '--store-credentials', '--bind' ],
   shortcuts: ['-2'],
   help: `
 # SYNOPSIS
@@ -79,7 +79,7 @@ async function deploy (_model, options) { // NOSONAR
 
     cds deploy --to sql
     cds deploy --to sqlite
-    cds deploy --to sqlite:db/my.db
+    cds deploy --to sqlite:db/my-db.sqlite
     `)
 
   const conf = cds.env.requires.db || {}

package/bin/deploy/to-sqlite.js

@@ -1,27 +1,29 @@
 exports.deploy = function deploy_to_sqlite (_model, _db, options) {
-    const cds = require('../../lib/cds')
-    const {to:_dbrl} = options
-    const conf = cds.env.requires.db || {}
-    const fts = cds.env.features.folders
-    const model = _model || conf.model || cds.resolve(!fts ? '*' : ['*',fts], false)
-    const file = _database4 (_db, _dbrl, conf)
 
-    // current 'sqlite' default is bad, as we want to default to 'plain', so ignore it
-    const env_dialect = cds.env.sql.dialect !== 'sqlite' ? cds.env.sql.dialect : 'plain'
-    const to_dialect = _dbrl && _dbrl.match(/^(\w+)/) && RegExp.$1
-    if (to_dialect)  options.dialect = (to_dialect === 'sql')
-        ? conf.dialect || env_dialect
-        : to_dialect
     if (options.dialect === 'postgres' && !options.dry)  console.error('\nDeploying to PostgreSQL is not yet supported\n')
 
-    return cds.deploy(model) .to ('sqlite:'+file, options)
-    .then (db => db && db.disconnect()) // REVISIT: we should NOT require to disconnect explicitly
+    const cds = require('../../lib/cds')
+    const conf = cds.env.requires.db ?? {}
+    const fts = cds.env.features.folders
+    const model = _model || conf.model || cds.resolve(!fts ? '*' : ['*',fts], false)
+    let file = 'db'
+    if (options.to) {
+        file = 'sqlite:'+ _database4 (_db, options.to, conf)
+        // current 'sqlite' default is bad, as we want to default to 'plain', so ignore it
+        const env_dialect = cds.env.sql.dialect !== 'sqlite' ? cds.env.sql.dialect : 'plain'
+        const to_dialect = options.to && options.to.match(/^(\w+)/) && RegExp.$1
+        if (to_dialect)  options.dialect = (to_dialect === 'sql')
+            ? conf.dialect ?? env_dialect
+            : to_dialect
+    }
+    return cds.deploy(model) .to (file, options)
 }
 
 function _database4 (_db,_dbrl,conf) {
     if (_db)  return _db
+    if (_dbrl === 'sqlite')  return 'db.sqlite'
     if (conf.credentials?.database) return conf.credentials.database
     if (conf.credentials?.url) return conf.credentials.url
-    if (_dbrl === 'sqlite')  return 'db.sqlite'
     if (_dbrl === 'sql')  return ':memory:'
+    else return conf.credentials?.database ?? conf.credentials?.url
 }

package/bin/help.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-module.exports = exports = Object.assign (help, {help:`
+module.exports = exports = Object.assign (help, {formatHelp, help:`
 # USAGE
 
     *cds* <command> [<args>]
@@ -39,10 +39,13 @@ module.exports = exports = Object.assign (help, {help:`
 function help (topic) {
   if (Array.isArray(topic))  topic = topic[0]
   const task = !topic ? help : this.load && this.load (this.Shortcuts[topic] || topic)
-  if (task && task.help) console.log (task.help
+  if (task && task.help) console.log (formatHelp (task.help))
+  else throw new Error(`Didn't find a help topic for '${ topic.name || topic }'.`)
+}
+
+function formatHelp (text) {
+  return text
     .replace(/\n# ([^\n]*)\n/g, `\n\x1b[1m$1\x1b[0m\n`)
     .replace(/ \*([^*]+)\*/g,   ` \x1b[1m$1\x1b[0m`)
     .replace(/ _([^_]+)_/g,     ` \x1b[4m$1\x1b[0m`)
-  )
-  else throw new Error(`Didn't find a help topic for '${ topic.name || topic }'.`)
 }

package/bin/init.js

@@ -29,7 +29,7 @@ module.exports = Object.assign(init, {
                       This feature uses the 'Java Maven archetype' to create a project
                       using the *Java* programming language.
 
-        *mtx*         - prepares a multi-tenant project
+        *mtx*         - prepares a multitenant project
 
                       This version only supports Node.js projects.
 

package/bin/login.js

@@ -74,8 +74,6 @@ module.exports = Object.assign(login, {
     *-u* | *--user* <name>[:[<password>]]
 
         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.
         When omitting both, password will be queried interactively.
@@ -117,8 +115,9 @@ module.exports = Object.assign(login, {
 # SEE ALSO
 
     *cds logout* to remove any authentication data
-`
-}});
+    https://cap.cloud.sap/docs/guides/extensibility/customization?q=mock#mock-users for information on suitable mock users.
+
+`}});
 
 
 async function login ([url], options = {}) {

package/bin/migrate.js

@@ -0,0 +1,33 @@
+module.exports = Object.assign(migrate, {
+    options: ['--directory'],
+    shortcuts: ['-d'],
+    flags: ['--dry'],
+    help: `
+# SYNOPSIS
+
+    *cds migrate* <tenant1|"*">[,<tenant2>] -d <directory> --dry
+
+    Migrate extensions created with @sap/cds-mtx to extensions for @sap/cds-mtxs
+
+    This command only runs on the root directory of an application.
+
+# OPTIONS
+
+    *-d* | *--directory* <extension-projects-directory>
+
+        Specify the target directory of your migrated extension projects. By default, the migrated extension projects will not be stored.
+
+    *--dry*
+
+        Do a dry-run only. Only run a verification of the extension migration.
+
+# SEE ALSO
+`})
+
+
+async function migrate (param, options = {}) {
+    // eslint-disable-next-line cds-dk/no-missing-dependencies
+    await require('@sap/cds-mtxs/bin/cds-mtx-migrate').run(param[0], options)
+}
+
+/* eslint no-console: off */

package/bin/pull.js

@@ -39,7 +39,7 @@ module.exports = Object.assign(pull, {
 
     *cds push* to push an extension to the SaaS app.
     *cds login* for more information on authentication options.
-    *cds login* to save authentication data, simplifying multiple runs of *cds pull* and *cds push* against the same app.
+    *cds login* to save project settings and authentication data, simplifying multiple runs of this command.
 
 `});
 
@@ -49,8 +49,8 @@ async function pull([url], options = {}) {
     delete options.user;
     const [clientid, clientsecret] = options.client?.split(':') ?? [];
     delete options.client;
-    if (options.from) url = options.from
-    delete options.from
+    if (options.from) url = options.from;
+    delete options.from;
 
     await require('../lib/client/pull').run({
         ...options,
@@ -59,5 +59,5 @@ async function pull([url], options = {}) {
         password,
         clientid,
         clientsecret
-    })
+    });
 }

package/bin/push.js

@@ -46,7 +46,7 @@ module.exports = Object.assign(push, {
 
     *cds pull* to get the CDS model of the SaaS app.
     *cds login* for more information on authentication options.
-    *cds login* to save authentication data, simplifying multiple runs of *cds pull* and *cds push* against the same app.
+    *cds login* to save project settings and authentication data, simplifying multiple runs of this command.
 
 `});
 

package/bin/subscribe.js

@@ -1,75 +1,67 @@
 module.exports = Object.assign(subscribe, {
-  options: ['--to', '--user'],
-  flags: [],
-  shortcuts: ['-2', '-u'],
-  help: `
+    init: on => new (require('../lib/client/subscription'))(on),
+    options: ['--to', '--user'],
+    flags: ['--local'],
+    shortcuts: ['-2', '-u', '-l'],
+    help: `
 # SYNOPSIS
 
-  *cds subscribe* <tenant>
+    *cds subscribe* <tenant>
 
-  Subscribe a tenant to a multi-tenant SaaS app.
+    Subscribe a tenant to a multitenant SaaS app.
 
-  *cds subscribe* only supports Basic Authentication and is intended for non-productive use,
-  including SaaS apps running on localhost with mock authentication.
+    Running *cds subscribe* with a URL is intended for non-productive use only, including against
+    SaaS apps running on localhost with mock authentication.
 
 # OPTIONS
 
-  *-2* | *--to* <url>
-
-    Specify the URL of the extensible SaaS app. Required setting.
-
-  *-u* | *--user* <name>[:<password>]
-
-    Username and optionally password for authentication. Required setting.
-    See https://cap.cloud.sap/docs/guides/multitenancy/#send-subscribe-events for information on suitable mock users.
-
-    If password is omitted, it is assumed empty.
-    Note: productive passwords should not be specified on the command line.
-
-`})
-
-
-
-async function subscribe([tenant], { to: url, user } = {}) {
-
-  const cds = require('../lib/cds')
-
-  // check for application environment
-  // fails for edge cases (ignored for now):
-  // @sap/cds-mtx application with missing modules (no npm install)
-  // dev scenario with both @sap/cds-mtx and @sap/cds-mtxs installed
-  function _hasMtEnv() {
-    return cds.requires.multitenancy && !cds.mtx
-  }
-
-
-  if (!tenant) {
-    console.error('Must provide a tenant')
-    return this.help('subscribe')
-  }
-  if (!url) {
-    // check whether we are in a mt(xs) environment
-    if (!_hasMtEnv()) throw new Error('Local cds subscribe operation can only be run inside a multitenant application environment using @sap/cds-mtxs. Please specify application url (--to <url>) if you want to subscribe from remote')
-    console.log ('\nSubscribing', {tenant})
-    const { 'cds.xt.DeploymentService':ds } = await cds.serve ([
-      '@sap/cds-mtxs/srv/deployment-service',
-      '@sap/cds-mtxs/srv/model-provider'
-    ])
-    cds.emit('served')
-    // await cds.connect.to('db')
-    await ds.subscribe(tenant)
-  } else {
-    // Connecting to a deployment service in a subscribed application
-    if (typeof user !== 'string')  throw new Error('Must provide a username')
-    const [username, password = ''] = user.split(':');
-    console.log ('\nSubscribing', {tenant}, 'to', {url})
-    await require('axios').post (url+'/-/cds/deployment/subscribe', {
-      tenant
-    }, {
-      auth: { username, password }
-    });
-  }
-  console.log('Subscription succeeded.\n')
-}
+    *-2* | *--to* <url>
+
+        Specify the URL of the SaaS app. Determined from the current user's active CDS or
+        Cloud Foundry login by default.
+
+    *-u* | *--user* <name>[:[<password>]]
+
+        Username and optionally password for authentication with Basic Auth in test scenarios.
+        Required setting if URL is given. (Tokens saved with *cds login* are not used because they
+        are unsuitable for this command.)
+
+    *-l* | *--local*
+
+        Run a locally-installed @sap/cds-mtxs and connect to it instead of a URL. Ignore settings
+        saved with *cds login*.
+
 
-// cds subscribe t1 --to http://localhost:4004 -u yves
+# SEE ALSO
+
+    *cds login* for more information on authentication options.
+    *cds login* to save project settings, simplifying multiple runs of this command.
+
+`});
+
+
+async function subscribe([tenant], options = {}) {
+    const { CliError } = require('../lib/client/helper/errors');
+    if (!tenant) {
+        throw new CliError('Tenant not given.', { command: 'subscribe' });
+    }
+    const libOptions = { tenant };
+    if (options.local) {
+        libOptions.local = true;
+        delete options.local;
+        if (options.user) {
+            throw new CliError('Username cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
+        }
+        if (options.to) {
+            throw new CliError('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
+        }
+    }
+    const [username, password] = options.user?.split(':') ?? [];
+    delete options.user;
+
+    await subscribe.init(true).run({
+        ...options,
+        username,
+        password
+    }, libOptions);
+}

package/bin/unsubscribe.js

@@ -0,0 +1,67 @@
+module.exports = Object.assign(unsubscribe, {
+    init: on => new (require('../lib/client/subscription'))(on),
+    options: ['--from', '--user'],
+    flags: ['--local'],
+    shortcuts: ['-f', '-u', '-l'],
+    help: `
+# SYNOPSIS
+
+    *cds unsubscribe* <tenant>
+
+    Unsubscribe a tenant from a multitenant SaaS app.
+
+    Running *cds unsubscribe* with a URL is intended for non-productive use only, including against
+    SaaS apps running on localhost with mock authentication.
+
+# OPTIONS
+
+    *-f* | *--from* <url>
+
+        Specify the URL of the SaaS app. Determined from the current user's active CDS or
+        Cloud Foundry login by default.
+
+    *-u* | *--user* <name>[:[<password>]]
+
+        Username and optionally password for authentication with Basic Auth in test scenarios.
+        Required setting if URL is given. (Tokens saved with *cds login* are not used because they
+        are unsuitable for this command.)
+
+    *-l* | *--local*
+
+        Run a locally-installed @sap/cds-mtxs and connect to it instead of a URL. Ignore settings
+        saved with *cds login*.
+
+
+# SEE ALSO
+
+    *cds login* for more information on authentication options.
+    *cds login* to save project settings, simplifying multiple runs of this command.
+
+`});
+
+
+async function unsubscribe([tenant], options = {}) {
+    const { CliError } = require('../lib/client/helper/errors');
+    if (!tenant) {
+        throw new CliError('Tenant not given.', { command: 'unsubscribe' });
+    }
+    const libOptions = { tenant };
+    if (options.local) {
+        libOptions.local = true;
+        delete options.local;
+        if (options.user) {
+            throw new CliError('Username cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
+        }
+        if (options.from) {
+            throw new CliError('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'unsubscribe' });
+        }
+    }
+    const [username, password] = options.user?.split(':') ?? [];
+    delete options.user;
+
+    await unsubscribe.init(false).run({
+        ...options,
+        username,
+        password
+    }, libOptions);
+}

package/bin/watch.js

@@ -11,6 +11,9 @@ module.exports = Object.assign ( watch, {
   project or the current work directory. Compiles and (re-)runs the server
   on every change detected.
 
+  Actually, cds watch is just a convenient shortcut for:
+  *cds serve all --with-mocks --in-memory?*
+
 # OPTIONS
 
   *--port* <number>
@@ -36,9 +39,7 @@ module.exports = Object.assign ( watch, {
 
 # SEE ALSO
 
-  Actually, *cds watch* is just a convenient shortcut for:
-  *cds serve* all --with-mocks --in-memory? ...
-  Check out *cds serve ?* to learn more.
+  *cds serve --help* for the different start options
 
 `})
 

package/lib/bind/bindingUtil.js

@@ -6,6 +6,8 @@ const KindToRequiresNameMap = {
     xsuaa: 'auth',
     'hana-cloud': 'db',
     hana: 'db',
+    'hana-mt': 'db',
+    'sql-mt': 'db',
     destinations: 'destinations',
     connectivity: 'connectivity',
     'audit-log': 'audit-log',

package/lib/bind/cfKeyProvider.js

@@ -6,6 +6,7 @@ const util = require('util');
 const axios = require('axios');
 const { URL } = require('url');
 const path = require('path');
+const term = require('../util/term');
 
 const execAsync = util.promisify(cp.exec);
 const IS_WIN = os.platform() === 'win32';
@@ -150,7 +151,10 @@ class CFKeyProvider {
         name = name || `${instance}:${key}`;
 
         if (apiEndpoint && apiEndpoint !== target.apiEndpoint) {
-            throw new Error(`Current Cloud Foundry api endpoint "${target.apiEndpoint}" different than api endpoint "${apiEndpoint}" for service binding "${name}".`);
+            let message = `Current Cloud Foundry API endpoint "${target.apiEndpoint}" differs from API endpoint "${apiEndpoint}" for service binding "${name}".\n`;
+            message += `Use ${term.bold(`cf login -a ${apiEndpoint}`)} to log in to the target API endpoint.`;
+            console.log(message);
+            process.exit(1);
         }
 
         let spaceGuid;

package/lib/client/activate.js

@@ -29,7 +29,7 @@ async function checkFinished(jobId, statusUrl, params, finisher) {
         finisher.finished = true;
         clearInterval(finisher.timer);
         if (status === JOB_STATUS.FAILED) {
-            return finisher.reject(new CliError(`Job ${jobId} failed`, error));
+            return finisher.reject(new CliError(`Job ${jobId} failed`, { error }));
         }
         console.log('Extension active');
         finisher.resolve();
@@ -66,7 +66,7 @@ module.exports = class Activate extends BaseCommand {
                 await this.runCustomFileUpload(params);
             }
         } catch (error) {
-            this.handleHttpError(error, params);
+            this.handleHttpError(error, params, { command: 'activate' });
         }
     }
 
@@ -132,7 +132,7 @@ module.exports = class Activate extends BaseCommand {
         try {
             pkgJson = await fs.readFile(path.join(absoluteFolder, 'package.json'), 'utf-8');
         } catch (error) {
-            throw new CliError('No package.json file found', error);
+            throw new CliError('No package.json file found', { error });
         }
         allFiles.set('package.json', pkgJson);
 

package/lib/client/auth_manager.js

@@ -60,7 +60,7 @@ async function retrieveTokenOrPasscodeUrl(params) {
         try {
             response = await axios.get(tokenUrl);
         } catch (error) {
-            throw new CliError('Failed to get authentication token', error);
+            throw new CliError('Failed to get authentication token', { error });
         }
         authData = response.data;
 
@@ -83,7 +83,7 @@ module.exports = class AuthManager {
         await SettingsManager.loadAndMergeSettings(params);
         if (params.has('username')) {
             params.set('reqAuth', { auth: { username: params.get('username'), password: params.get('password') } });
-        } else {
+        } else if (!params.get('skipToken')) {
             await retrieveTokenOrPasscodeUrl(params);
             if (!params.has('token')) {
                 if (params.get('saveData')) {

package/lib/client/base_command.js

@@ -15,20 +15,21 @@ module.exports = class BaseCommand {
         return exists;
     }
 
-    static handleHttpError(error, params, url) {
+    static handleHttpError(error, params, { url, command } = {}) {
         url = url ?? params.get('appUrl');
         const prefix = `Request to ${url} failed`;
         switch (error.response?.status) {
             case 401:
-                throw new CliError(prefix + ': invalid authentication. Retry with valid passcode' +
-                    params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : '', error);
+                throw new CliError(`${prefix}: invalid authentication. Retry with valid passcode${
+                    params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''
+                }.`, { error, command });
             case 403:
-                throw new CliError(prefix + ': insufficient authorization. Ensure client has all necessary roles', error);
+                throw new CliError(prefix + ': insufficient authorization. Ensure client has all necessary roles.', { error, command });
             case 404:
-                throw new CliError(prefix + ': resource not found.');
+                throw new CliError(prefix + ': resource not found.', { command });
             case 422:
                 // Compilation or native-extension error.
-                throw new CliError(prefix, error);
+                throw new CliError(prefix + '.', { error, command });
             default:
                 // Unexpected error should be transparent to user.
                 throw error;

package/lib/client/extend.js

@@ -87,13 +87,13 @@ module.exports = class Extend extends BaseCommand {
 
         const runOnExistingProject = await Extend.checkProject(params.get('projectFolder'));
         if (runOnExistingProject && !(params.get('force') || params.get('templates'))) {
-            throw new CliError(folderExists(params.get('projectFolder')));
+            throw new CliError(folderExists(params.get('projectFolder')), { command: 'extend' });
         }
 
         try {
             await Extend.runExtend(params);
         } catch (error) {
-            await Extend.handleHttpError(error, params);
+            await Extend.handleHttpError(error, params, { command: 'extend' });
         }
     }
 

package/lib/client/helper/errors.js

@@ -2,11 +2,17 @@ const { getMessage } = require('./logging');
 
 class CliError extends Error {
     // noinspection JSAnnotator
-    constructor(message, error) {
-        throw getMessage(message, error);
+    constructor(message, { error, command } = {}) {
+        const help = command && getCommandHelp(command);
+        throw getMessage(message, { error, help });
     }
 }
 
+function getCommandHelp(command) {
+    const cli = require('../../../bin/cds');
+    return cli?.load(command, () => ({ help: '' }))?.help ?? '';
+}
+
 module.exports = {
     CliError
 };