@sap/cds-dk 7.0.2 → 7.1.0

package/bin/add.js

@@ -91,8 +91,8 @@ module.exports = Object.assign(add, {
 
 `});
 
-async function add(args, options = {}) {
+async function add(args) {
   const CDSGenerator = require('../lib/init');
   const generator = new CDSGenerator();
-  await generator.addCmd(args[0], options);
+  await generator.addCmd(args[0]);
 }

package/bin/bind.js

@@ -54,7 +54,6 @@ module.exports = Object.assign(cds_bind, {
 const os = require('os');
 const IS_WIN = os.platform() === 'win32';
 
-const { CliError } = require('../lib/client/helper/errors');
 const { bind, parseProfile } = require('../lib/bind');
 
 
@@ -70,27 +69,26 @@ async function cds_bind(args, options) {
 
     // Check if cds command was bind. Don't abort in case of deploy
     if (process.env.CDS_ENV && process.argv[2] === 'bind') {
-        throw new CliError('Option --profile is no longer supported. Use --for instead to specify the profile to use when storing connection settings.');
+        throw 'Option --profile is no longer supported. Use --for instead to specify the profile to use when storing connection settings.';
     }
-    options.for = options.for ?? 'hybrid';
 
     if (!options.to) {
-        throw new CliError(`Use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`);
+        throw `Use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`;
     }
 
     if (args.length > 1) {
-        throw new CliError(`Too many arguments: Please specify only one or no service.`);
+        throw `Too many arguments: Please specify only one or no service.`;
     }
 
     options.serviceArg = args[0]
     options.targets = options.to.split(/,/g);
 
     if (options.targets.length >= 2 && options.serviceArg) {
-        throw new CliError(`Service argument cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the service argument.`);
+        throw `Service argument cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the service argument.`;
     }
 
     if (options.targets.length >= 2 && options.kind) {
-        throw new CliError(`The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`);
+        throw `The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`;
     }
 
     await bind({

package/bin/build.js

@@ -96,19 +96,14 @@ async function build([project], options = {}) {
     cds.env = cds.env.for('cds', cds.root);
     delete options.project // avoid that relative project paths are resolved twice
 
-    options.cli = true // avoid that errors are logged twice
-
-    const { CliError } = require('../lib/client/helper/errors')
     const { build } = require('../lib/build')
-
     const [major] = cds.version.split('.')
     if (Number(major) < 6) {
-        throw new CliError("This application uses @sap/cds version < 6, which is not compatible with the installed @sap/cds-dk version >= 7. Update @sap/cds to version >= 6.")
+        throw "This application uses @sap/cds version < 6, which is not compatible with the installed @sap/cds-dk version >= 7. Update @sap/cds to version >= 6."
     }
     if (options.clean === "false") {
-        throw new CliError("cds build option '--clean' is deprecated - build output folders are always cleaned before build")
+        throw "cds build option '--clean' is deprecated - build output folders are always cleaned before build"
     }
-
     if (typeof options["options-model"] === "string") {
         options.opts = "model=[" + options["options-model"].split(",").map((entry) => entry.trim()) + "]"
         delete options["options-model"]

package/bin/cds.js

@@ -54,11 +54,7 @@ const cli = { //NOSONAR
         return await task.apply(this, args)
       }
     } catch (e) {
-      const { BuildError } = require('../lib/build')
-      const { CliError } = require('../lib/client/helper/errors')
       process.exitCode ??= 1
-      if (e.messages?.length) return cds._log(e.messages, { 'log-level': cds.env.log.levels.cli })
-      else if (e instanceof CliError || e instanceof BuildError) return console.error(e.message)
       if (cds.watched)  throw e  // bin/watched.js handles errors
       else return console.error(e)
     }
@@ -152,13 +148,15 @@ function _dieForUnknownCommand(cmd) {
 
   let bestMatchText = '';
 
-  const excludeList = ['cds.js', 'cds-ts.js', 'fix-redirects.js'];
+  const excludeList = ['cds.js', 'cds-ts.js', 'fix-redirects.js', 'util'];
   const { readdirSync } = require('fs');
   const { resolve } = require('path');
-  const commands = readdirSync(__dirname, { withFileTypes: true })
+  let 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();
+    .filter((f) => !excludeList.includes(f.name))
+    .map((f) => f.name.split('.')[0])
+  commands = [...new Set(commands)] // make unique
+    .sort();
 
   const bestMatches = fuzzySearch(cmd, commands, DEBUG);
 

package/bin/deploy/to-hana.js

@@ -8,6 +8,6 @@ exports.deploy = (model, serviceName, options) => {
     tunnelAddress: options['tunnel-address'],
     vcapFile: options['vcap-file'],
     hdiOptions: { autoUndeploy: options['auto-undeploy'] },
-    storeCredentials: options['store-credentials']
+    storeCredentials: options['store-credentials'] // TODO: Remove with cds-dk 8
   });
 }

package/bin/init.js

@@ -98,11 +98,11 @@ module.exports = Object.assign(init, {
 
 `})
 
-async function init (args, options = {}) {
+async function init (args) {
     if (process.argv.some(a => legacyOptions.includes(a))) return _showWarningMessage()
     const CDSGenerator = require('../lib/init')
     const generator = new CDSGenerator()
-    await generator.initCmd(args[0], options)
+    await generator.initCmd(args[0])
 }
 
 

package/bin/subscribe.js

@@ -46,19 +46,19 @@ module.exports = Object.assign(subscribe, {
 
 
 async function subscribe([tenant], options = {}) {
-    const { CliError } = require('../lib/client/helper/errors');
+    const { getMessage } = require('../lib/client/helper/logging');
     if (!tenant) {
-        throw new CliError('Tenant not given.', { command: 'subscribe' });
+        throw getMessage('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' });
+            throw getMessage('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' });
+            throw getMessage('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'subscribe' });
         }
     }
     const [username, password] = options.user?.split(':') ?? [];

package/bin/unsubscribe.js

@@ -47,19 +47,19 @@ module.exports = Object.assign(unsubscribe, {
 
 
 async function unsubscribe([tenant], options = {}) {
-    const { CliError } = require('../lib/client/helper/errors');
+    const { getMessage } = require('../lib/client/helper/logging');
     if (!tenant) {
-        throw new CliError('Tenant not given.', { command: 'unsubscribe' });
+        throw getMessage('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' });
+            throw getMessage('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' });
+            throw getMessage('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'unsubscribe' });
         }
     }
     const [username, password] = options.user?.split(':') ?? [];

package/bin/upgrade.js

@@ -47,19 +47,19 @@ module.exports = Object.assign(upgrade, {
 
 
 async function upgrade([tenant], options = {}) {
-    const { CliError } = require('../lib/client/helper/errors');
+    const { getMessage } = require('../lib/client/helper/logging');
     if (!tenant) {
-        throw new CliError('Tenant not given.', { command: 'upgrade' });
+        throw getMessage('Tenant not given.', { command: 'upgrade' });
     }
     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: 'upgrade' });
+            throw getMessage('Username cannot be specified when running @sap/cds-mtxs locally.', { command: 'upgrade' });
         }
         if (options.at) {
-            throw new CliError('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'upgrade' });
+            throw getMessage('URL cannot be specified when running @sap/cds-mtxs locally.', { command: 'upgrade' });
         }
     }
     const [username, password] = options.user?.split(':') ?? [];

package/lib/bind/cfKeyProvider.js

@@ -4,9 +4,9 @@ const DEBUG = cds.debug('cli')
 const cfUtil = require('../util/cfUtil');
 
 const axios = require('axios');
+require('../util/pruneAxiosErrors');
 const { URL } = require('url');
 const { bold, highlight } = require('../util/term');
-const { CliError } = require('../client/helper/errors');
 
 class CFKeyProvider {
     async getCfSpaceInfo() {
@@ -20,13 +20,13 @@ class CFKeyProvider {
         const { org, space } = target;
         const orgs = await BatchRequest.req(targetWithAuth, `/v3/organizations?names=${encodeURIComponent(encodeURIComponent(org))}`);
         if (!(orgs && orgs.resources.length === 1)) {
-            throw new CliError(`CF org ${org} not found!`);
+            throw `CF org ${org} not found!`;
         }
 
         const orgGuid = orgs.resources[0].guid;
         const spaces = await BatchRequest.req(targetWithAuth, `/v3/spaces?names=${encodeURIComponent(encodeURIComponent(space))}&organization_guids=${encodeURIComponent(encodeURIComponent(orgGuid))}`)
         if (!(spaces && spaces.resources.length === 1)) {
-            throw new CliError(`CF space ${space} not found in org ${org}!`);
+            throw `CF space ${space} not found in org ${org}!`;
         }
 
         const spaceGuid = spaces.resources[0].guid;
@@ -80,7 +80,7 @@ class CFKeyProvider {
         try {
             instanceObj = await this.getInstance({ names: instance, space_guids: spaceGuid });
         } catch (error) {
-            throw new CliError(`Service instance "${instance}" not found.`);
+            throw `Service instance "${instance}" not found.`;
         }
         switch (instanceObj.type) {
             case 'managed':
@@ -88,7 +88,7 @@ class CFKeyProvider {
             case 'user-provided':
                 return this._resolveUserProvidedService(instanceObj, instance, org, space);
             default:
-                throw new CliError(`Service type ${instanceObj.type} not supported`)
+                throw `Service type ${instanceObj.type} not supported`;
         }
     }
 
@@ -99,7 +99,7 @@ class CFKeyProvider {
         } catch (error) {
             let message = `No service key ${highlight(key)} found for service instance ${highlight(instance)}.\n\n`;
             message += `Use ${bold(`cf create-service-key ${instanceObj.name} ${key} [-c ...]`)} to create the required service key.`;
-            throw new CliError(message);
+            throw message;
         }
         const planObj = await this.getPlans({ guids: instanceObj.relationships.service_plan.data.guid });
         const offeringObj = await this.getOfferings({ guids: planObj.relationships.service_offering.data.guid });
@@ -150,10 +150,10 @@ class CFKeyProvider {
 
         // if no api endpoint is configured the currently logged in endpoint will be used
         if (apiEndpoint && apiEndpoint !== this.target.apiEndpoint) {
-            name = `${name || instance}:${key || instance + '-key'}`
+            name = `${name || instance}:${key || instance + '-key'}`;
             let message = `Current Cloud Foundry API endpoint ${highlight(this.target.apiEndpoint)} differs from API endpoint ${highlight(apiEndpoint)} for service binding ${highlight(name)}.\n\n`;
             message += `Use ${bold(`cf login -a ${apiEndpoint}`)} to log in to the target API endpoint.`;
-            throw new CliError(message)
+            throw message;
         }
     }
 }
@@ -223,9 +223,9 @@ class BatchRequest {
             if (filteredResources.length === 1) {
                 filter.resolve(filteredResources[0]);
             } else if (filteredResources.length === 0) {
-                filter.reject(new CliError(`Couldn't find resource for url "${this.url}" with filter "${fmt(filter.filter)}"`));
+                filter.reject(`Couldn't find resource for url "${this.url}" with filter "${fmt(filter.filter)}"`);
             } else {
-                filter.reject(new CliError(`Found more than one resources for url "${this.url}" with filter "${fmt(filter.filter)}"`));
+                filter.reject(`Found more than one resources for url "${this.url}" with filter "${fmt(filter.filter)}"`);
             }
         }
     }

package/lib/bind/index.js

@@ -1,7 +1,5 @@
 const cds = require('../cds');
 
-const { CliError } = require('../client/helper/errors');
-
 const BindingResolver = require('./bindingResolver');
 const { determineKinds, getRequiresNameFromKind, checkIsJavaProject, platformText, bindingText, logger } = require('./bindingUtil');
 const { highlight, bold, info } = require('../util/term');
@@ -15,6 +13,9 @@ module.exports = { bind, parseProfile }
  * @param {object} options - command options as defined by build command.
  */
 async function bind(options) {
+
+    options.for = options.for || 'hybrid';
+
     let on;
     switch(options.on) {
         case 'k8s':
@@ -28,7 +29,7 @@ async function bind(options) {
             on = 'cf';
             break;
         default:
-            throw new CliError(`Invalid value '${options.on}' for option --on.`);
+            throw `Invalid value '${options.on}' for option --on.`;
     }
 
     const onText = { 'cf': 'Cloud Foundry', 'k8s': 'Kubernetes' }[on];

package/lib/bind/userCdsrcJsonStorageProvider.js

@@ -58,11 +58,7 @@ class UserCdsrcJsonStorageProvider {
 
         cdsRoot.requires = cdsRoot.requires || {};
         let section;
-        if (options.for) {
-            section = cdsRoot.requires[profileKey] = cdsRoot.requires[profileKey] || {};
-        } else {
-            section = cdsRoot.requires;
-        }
+        section = cdsRoot.requires[profileKey] = cdsRoot.requires[profileKey] || {};
 
         for (const service of services) {
             const { name, kind, binding, credentials } = service;
@@ -72,11 +68,7 @@ class UserCdsrcJsonStorageProvider {
         }
 
         await this.writeJsonFile(jsonPath, jsonObject);
-        if (options.for) {
-            logger.log(`Saving bindings to ${highlight(jsonPath)} in profile ${highlight(options.for)}`);
-        } else {
-            logger.log(`Saving bindings to ${highlight(jsonPath)}`);
-        }
+        logger.log(`Saving bindings to ${highlight(jsonPath)} in profile ${highlight(options.for)}`);
     }
 
     async readJsonSafely(filePath) {

package/lib/build/buildTaskEngine.js

@@ -27,7 +27,6 @@ class BuildTaskEngine {
 
     async processTasks(tasks) {
         const startTime = Date.now()
-        const messages = []
 
         this.logger.log(`building project [${cds.root}], clean [${this.buildOptions.clean}]`)
         this.logger.log(`cds-dk [${require('../../package.json').version}], cds [${cds.version}], compiler [${cds.compiler.version()}], home [${cds.home}]\n`)
@@ -64,18 +63,12 @@ class BuildTaskEngine {
 
             await this._writeGenerationLog(handlers)
             this._logBuildOutput(handlers)
-            this._logMessages([...BuildTaskEngine._getHandlerMessages(handlers), ...messages])
+            this._logMessages(BuildTaskEngine._getHandlerMessages(handlers))
             this._logTimer(startTime, Date.now())
 
             return buildResult
         } catch (error) {
             this._logBuildOutput(handlers)
-
-            // cds CLI layer logs in case of an exception if invoked from CLI
-            if (!this.buildOptions.cli) {
-                this._logMessages([...BuildTaskEngine._getErrorMessages([error]), ...messages])
-            }
-
             throw error
         }
     }
@@ -215,22 +208,16 @@ class BuildTaskEngine {
     }
 
     _createHandler(task) {
-        try {
-            const handler = this.providerFactory.createHandler(task)
-            handler.init()
+        const handler = this.providerFactory.createHandler(task)
+        handler.init()
 
-            if (!(handler instanceof BuildTaskHandlerInternal) && handler.priority !== 1) {
-                // Custom build handlers are executed before internal handlers to ensure
-                // that generated content cannot be overwritten by mistake
-                throw new Error(`Illegal priority for ${handler.constructor.name} encountered for custom handler - in this version only priority value '1' is allowed`)
-            }
-            this._logTaskHandler(handler)
-
-            return handler
-        } catch (error) {
-            log(error, { log: this.logger.log })
-            throw error
+        if (!(handler instanceof BuildTaskHandlerInternal) && handler.priority !== 1) {
+            // Custom build handlers are executed before internal handlers to ensure
+            // that generated content cannot be overwritten by mistake
+            throw new Error(`Illegal priority for ${handler.constructor.name} encountered for custom handler - in this version only priority value '1' is allowed`)
         }
+        this._logTaskHandler(handler)
+        return handler
     }
 
     _logBuildOutput(handlers) {

package/lib/build/buildTaskFactory.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const path = require('path')
-const cds = require('../cds'), { _log:log } = cds
+const cds = require('../cds')
 const BuildTaskProviderFactory = require('./buildTaskProviderFactory')
 const { hasJavaNature, getProperty, redactCredentials, flatten, getDefaultModelOptions } = require('./util')
 const { FILE_EXT_CDS, BUILD_TASK_JAVA_CF, BUILD_TASK_JAVA } = require("./constants")
@@ -24,36 +24,27 @@ class BuildTaskFactory {
     // 2. read using cds.env.build.tasks
     // 3. create from cds.env.folders config data
     async getTasks() {
-        try {
-            const tasks = await this._createTasks()
+        const tasks = await this._createTasks()
 
-            // log build tasks
-            this.logger.log(`the following build tasks will be executed`)
-            let tasksOutput = "   {\n     \"build\": {\n       \"target\": \"" + cds.env.build.target + "\",\n       \"tasks\": ["
-            for (let i = 0; i < tasks.length; i++) {
-                tasksOutput += "\n         " + BuildTaskFactory._stringifyTask(tasks[i]) + (i + 1 < tasks.length ? "," : "")
-            }
-            tasksOutput += "\n       ]\n     }\n   }\n"
-            this.logger.log(tasksOutput)
+        // log build tasks
+        this.logger.log(`the following build tasks will be executed`)
+        let tasksOutput = "   {\n     \"build\": {\n       \"target\": \"" + cds.env.build.target + "\",\n       \"tasks\": ["
+        for (let i = 0; i < tasks.length; i++) {
+            tasksOutput += "\n         " + BuildTaskFactory._stringifyTask(tasks[i]) + (i + 1 < tasks.length ? "," : "")
+        }
+        tasksOutput += "\n       ]\n     }\n   }\n"
+        this.logger.log(tasksOutput)
 
-            // for testing purposes
-            this.logger.debug("cds.env used for build:")
-            this.logger._debug && this.logger.debug(redactCredentials(cds.env))
+        // for testing purposes
+        this.logger.debug("cds.env used for build:")
+        this.logger._debug && this.logger.debug(redactCredentials(cds.env))
 
-            // always resolve tasks for input validation
-            const resolvedTasks = this.providerFactory.resolveTasks(tasks)
-            if (this.buildOptions.resolve) {
-                return resolvedTasks
-            }
-            return tasks
-        } catch (e) {
-            this.logger.log('')
-            // cds CLI layer is doing the logging if invoked using CLI
-            if (!this.buildOptions.cli) {
-                log(e, { withStack: true, log: (message) => this.logger.log(message) })
-            }
-            throw e
+        // always resolve tasks for input validation
+        const resolvedTasks = this.providerFactory.resolveTasks(tasks)
+        if (this.buildOptions.resolve) {
+            return resolvedTasks
         }
+        return tasks
     }
 
     async _createTasks() {

package/lib/build/constants.js

@@ -19,20 +19,22 @@ exports.BUILD_TASKS = [this.BUILD_TASK_JAVA, this.BUILD_TASK_JAVA_CF, this.BUILD
 exports.ODATA_VERSION_V2 = "v2"
 exports.ODATA_VERSION_V4 = "v4"
 
-exports.CONTENT_LANGUAGE_BUNDLES = "contentLanguageBundles" // create i18n.json language bundles
-exports.CONTENT_DEFAULT_CSN = "contentDefaultCsn"           // create default CSN format flavor: "inferred"
-exports.CONTENT_EDMX = "contentEdmx"                        // create EDMX for required languages
-exports.CONTENT_PACKAGE_JSON = "contentPackageJson"         // create package.json file if not existing, or modify existing package.json
-exports.CONTENT_PACKAGELOCK_JSON = "contentPackageLockJson" // copy package-lock.json file if existing into deployment folder
-exports.CONTENT_HDBTABLEDATA = "contentHdbtabledata"        // create .hdbtabledata files for .csv files if not existing
-exports.CONTENT_NPMRC = "contentNpmrc"                      // copy .npmrc file if existing into deployment folder
-exports.CONTENT_CDSRC_JSON = "contentCdsrcJson"             // copy .cdsrc.json file if existing into deployment folder
-exports.CONTENT_NODE_MODULES = "contentNodeModules"         // copy node_modules folder if existing into deployment folder
-exports.CONTENT_ENV = "contentEnv"                          // copy .env file if existing into deployment folder
-exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"  // copy default-env.json file if existing into deployment folder
-exports.CSV_FILE_DETECTION = "csvFileDetection"             // detect CSV files based on CDS model location
-exports.EXTENSION_POINT_VALIDATION = "extensionPointValidation" // validate extension point restrictions defined by the extended SaaS app
-exports.DEFAULT_BUILT_IN_MODELS = "defaultBuiltInModels"    // add @sap/cds* built-in models to build tasks
+exports.CONTENT_LANGUAGE_BUNDLES = "contentLanguageBundles"     // create i18n.json language bundles - build task specific
+exports.CONTENT_DEFAULT_CSN = "contentDefaultCsn"               // create default CSN format flavor: "inferred" - build task specific
+exports.CONTENT_EDMX = "contentEdmx"                            // create EDMX for required languages - build task specific
+exports.CONTENT_PACKAGE_JSON = "contentPackageJson"             // create package.json file if not existing, or modify existing package.json - ENABLED by default
+exports.CONTENT_PACKAGELOCK_JSON = "contentPackageLockJson"     // copy package-lock.json file if existing into deployment folder - ENABLED by default
+exports.CONTENT_HDBTABLEDATA = "contentHdbtabledata"            // create .hdbtabledata files for .csv files if not existing - ENABLED by default
+exports.CONTENT_NPMRC = "contentNpmrc"                          // copy .npmrc file if existing into deployment folder - ENABLED by default
+exports.CONTENT_CDSRC_JSON = "contentCdsrcJson"                 // copy .cdsrc.json file if existing into deployment folder - ENABLED by default
+exports.CONTENT_NODE_MODULES = "contentNodeModules"             // copy node_modules folder if existing into deployment folder - DISABLED by default
+exports.CONTENT_ENV = "contentEnv"                              // copy .env file if existing into deployment folder - DISABLED by default
+exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-env.json file if existing into deployment folder - DISABLED by default
+
+exports.CSV_FILE_DETECTION = "csvFileDetection"                 // detect CSV files based on CDS model location - ENABLED by default
+exports.EXTENSION_POINT_VALIDATION = "extensionPointValidation" // validate extension point restrictions defined by the extended SaaS app - ENABLED by default
+exports.DEFAULT_BUILT_IN_MODELS = "defaultBuiltInModels"        // add @sap/cds* built-in models to build tasks - ENABLED by default
+exports.MTX_SIDECAR_DB_VALIDATION = "mtxSidecarDbValidation"    // validate consistency of app and sidecar db configuration - ENABLED by default
 
 exports.FOLDER_GEN = "gen"
 exports.FILE_EXT_CDS = ".cds"

package/lib/build/index.js

@@ -14,8 +14,17 @@ module.exports = { build, BuildTaskFactory, BuildTaskEngine, BuildTaskHandler, B
  */
 async function build(options = {}) {
     if (!fs.existsSync(cds.root) || !fs.lstatSync(cds.root).isDirectory()) {
-        const { CliError } = require('../client/helper/errors')
-        throw new CliError(`Project folder '${cds.root}' does not exist`)
+        throw `Project folder '${cds.root}' does not exist`
+    }
+    try {
+        return await new BuildTaskEngine(options).processTasks()
+    } catch (e) {
+        if (e instanceof BuildError || e.constructor.name === 'CompilationError') {
+            cds._log(e.messages.length ? [...e.messages, ''] : e.message + '\n', { 'log-level': options['log-level'] || cds.env['log-level'] })
+            // CompilationError.message also includes the detail messages - do not log twice
+            const message = e.constructor.name === 'CompilationError' ? 'CDS compilation failed' : e.messages.length ? e.message : 'CDS build failed'
+            throw message
+        }
+        throw e
     }
-    return await new BuildTaskEngine(options).processTasks()
 }