@sap/cds-dk 7.0.1 → 7.0.3

package/bin/add.js

@@ -1,3 +1,4 @@
+const term = require('../lib/util/term')
 
 module.exports = Object.assign(add, {
   options: ['--for', '--out', '--data:for'],
@@ -8,72 +9,68 @@ module.exports = Object.assign(add, {
 
     *cds add* <feature | comma-separated list of features>
 
-    Adds one or more features to an existing project in the current working
-    folder - Grow-as-you-go scenario.
+    Adds one or more features to an existing project - grow as you go.
 
-    The following <features> are supported so far:
+    The following features are supported so far:
 
-    *hana*          - adds configuration for SAP HANA databases
+    *hana*                  - add support for SAP HANA
 
-    *sqlite*        - adds configuration for SQLite databases
+    *sqlite*                - add support for SQLite databases
 
-    *xsuaa*         - adds configuration for authentication via XSUAA
+    *xsuaa*                 - add support for authentication via XSUAA
 
-    *multitenancy*  - adds configuration for multitenancy
+    *multitenancy*          - add support for multitenancy
 
-    *toggles*       - adds configuration for feature toggles
+    *toggles*               - add support for feature toggles
 
-    *extensibility* - adds configuration for extensibility
+    *extensibility*         - add support for extensibility
 
-    *mtx*           - adds configuration for multitenancy, feature toggles and
-                      extensibility
+    *approuter*             - add support for application routing
 
-    *approuter*     - adds configuration for the Cloud Foundry approuter
+    *file-based-messaging*  - add support for file-based messaging
 
-    *mta*           - adds an _mta.yaml_ file for MTA-based SAP Business
-                      Technology Platform deployment
+    *enterprise-messaging*  - add support for SAP Event Mesh
 
-    *cf-manifest*   - adds _manifest.yml_ and _services-manifest.yml_ files for
-                      Cloud Foundry native deployment
+    *redis-messaging*       - add support for Redis messaging
 
-                      This approach makes use of the 'Create-Service-Push
-                      Plugin' that has to be installed separately using
-                      _cf install-plugin Create-Service-Push_.
-                      _cf create-service-push_ creates the service(s) and pushes
-                      the application(s) to the SAP Business Technology
-                      Platform.
+    *kibana-logging*        - add support for Kibana formatting
 
-    *pipeline*      - adds files for CI/CD pipeline integration
+    *mta*                   - add support for MTA-based deployment
 
-    *sample*        - adds sample files including Fiori UI
+    *cf-manifest*           - add support for CF-native deployment
 
-    *tiny-sample*   - adds minimal sample files
+    *helm*                  - add support for Helm-based Kyma deployment
 
-    *data*          - adds data content for CSN model entities (as csv files)
+    *html5-repo*            - add support for the HTML5 repository
 
-    *helm*          - adds helm chart folder that contains the files needed to
-                      deploy the application using Kyma.
+    *pipeline*              - add files for CI/CD pipeline integration
 
-    *html5-repo*    - adds configuration for HTML5 Application Deployer to Helm
-                      Chart (Kyma Only).
+    *tiny-sample*           - add minimal sample files
+
+    *sample*                - add sample files including Fiori UI
+
+    *data*                  - add CSV headers for modeled entities
+
+    *typer*                 - add type generation for CDS models
+
+    *lint*                  - add support for CDS Lint
 
 
 # OPTIONS
 
     *--for* <profile>
 
-      Writes configuration data, if any, under the given profile, like
-      \`"[production]": { "db": "hana" }\`
+      Write configuration data for the given profile.
 
     *--data:for* <entity name or prefix>
 
-      Adds data content for entities matching the given pattern.  If it contains
+      Add data content for entities matching the given pattern.  If it contains
       meta characters like '^' or '*', it is treated like a regular expression,
       otherwise as a prefix.
 
     *-o* | *--out* <target folder>
 
-      Specifies output target folder (applicable to data feature only)
+      Specify output target folder (applicable to ${term.bold('data')} feature only).
 
     *--force*
 
@@ -81,11 +78,10 @@ module.exports = Object.assign(add, {
 
 # EXAMPLES
 
-    *cds add* mta,pipeline
-    *cds add* multitenancy
-    *cds add* hana,xsuaa --for production
-    *cds add* cf-manifest
+    *cds add* sample
+    *cds add* multitenancy,hana,xsuaa --for production
     *cds add* data --data:for my.namespace.MyEntity
+    *cds add* mta
     *cds add* helm
 
 
@@ -95,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

@@ -72,7 +72,6 @@ async function cds_bind(args, options) {
     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.');
     }
-    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`);

package/bin/build.js

@@ -101,6 +101,10 @@ async function build([project], options = {}) {
     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.")
+    }
     if (options.clean === "false") {
         throw new CliError("cds build option '--clean' is deprecated - build output folders are always cleaned before build")
     }

package/bin/cds.js

@@ -54,9 +54,13 @@ const cli = { //NOSONAR
         return await task.apply(this, args)
       }
     } catch (e) {
-      process.exitCode = 1
-      if (process.argv[1].endsWith('watched'))  throw e // bin/watched.js handles errors
-      cds._log(e.messages?.length ? e.messages : e.message ?? e, { 'log-level': cds.env.log.levels.cli })
+      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)
     }
   },
 
@@ -148,13 +152,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);
 
@@ -180,7 +186,7 @@ function _dieForUnknownCommand(cmd) {
 `
   console.error(msg)
 
-  process.exitCode = 1
+  process.exit(1)
 }
 
 function _require (id,o) {

package/bin/compile/index.js

@@ -175,7 +175,7 @@ function compile (models, options={}) {
     model = readModelFromStdin()
     src = 'stdin'
   } else { // no args, no stdin
-    throw new Error (`You must specify a model to compile.\nRun 'cds c -?' to learn more.`)
+    throw `You must specify a model to compile.\nRun 'cds c -?' to learn more.`
   }
 
   let chain = model.then (m => model=m)
@@ -189,7 +189,7 @@ function compile (models, options={}) {
   if (typeof options.to === 'string')  for (let each of options.to.split(',')) {
     chain = chain.then (next (processor ('to', _suffix=each)))
   } else if (options.to) {
-    cds.error (`Specify a model processor`)
+    throw `Specify a model processor`
   }
 
   // add processor for i18n
@@ -235,7 +235,7 @@ function compile (models, options={}) {
     let p = cds.compile[kind]
     for (let each of tail.split('.')) {
       p = p[each]
-      if (!p) throw new Error (`Unknown model processor: cds.compile.${kind}.${tail}`)
+      if (!p) throw `Unknown model processor: cds.compile.${kind}.${tail}`
     }
     return p
   }

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/help.js

@@ -39,9 +39,8 @@ module.exports = exports = Object.assign (help, {formatHelp, 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 (formatHelp (task.help))
-  else throw new Error(`Didn't find a help topic for '${ topic.name || topic }'.`)
+  const task = !topic ? help : this.load?.(this.Shortcuts[topic] || topic)
+  if (task?.help) console.log (formatHelp (task.help))
 }
 
 function formatHelp (text) {

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/lib/bind/cfKeyProvider.js

@@ -4,6 +4,7 @@ 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');

package/lib/bind/index.js

@@ -15,6 +15,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':

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

@@ -30,7 +30,7 @@ class BuildTaskEngine {
         const messages = []
 
         this.logger.log(`building project [${cds.root}], clean [${this.buildOptions.clean}]`)
-        this.logger.log(`cds [${cds.version}], compiler [${cds.compiler.version()}], home [${cds.home}]\n`)
+        this.logger.log(`cds-dk [${require('../../package.json').version}], cds [${cds.version}], compiler [${cds.compiler.version()}], home [${cds.home}]\n`)
 
         if (!tasks) {
             const buildTaskFactory = new BuildTaskFactory(this.buildOptions)

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/provider/buildTaskHandlerFeatureToggles.js

@@ -3,6 +3,7 @@ const path = require('path')
 const cds = require('../../cds')
 const { DEFAULT_CSN_FILE_NAME, OUTPUT_MODE, OUTPUT_MODE_RESULT } = require('../constants')
 const BuildTaskHandlerInternal = require('./buildTaskHandlerInternal')
+const { getI18nDefaultFolder } = require('../util')
 
 class FeatureToggleBuilder extends BuildTaskHandlerInternal {
     init() {
@@ -46,7 +47,7 @@ class FeatureToggleBuilder extends BuildTaskHandlerInternal {
     }
 
     async collectAllLanguageBundles(dictionary, paths, destBase, destFts) {
-        const i18nFolder = cds.env.i18n.folders?.[0] || 'i18n'
+        const i18nFolder = getI18nDefaultFolder()
         // create language bundle for base model
         const i18n = await this.collectLanguageBundles(dictionary.base, path.join(destBase, i18nFolder))
         if (i18n && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {

package/lib/build/provider/java/index.js

@@ -3,6 +3,7 @@ const path = require('path')
 const cds = require('../../../cds')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
+const { getI18nDefaultFolder } = require('../../util')
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize('src/main/resources/edmx')
 
 class JavaModuleBuilder extends BuildTaskHandlerEdmx {
@@ -28,8 +29,7 @@ class JavaModuleBuilder extends BuildTaskHandlerEdmx {
 
         if (this.hasBuildOption(CONTENT_LANGUAGE_BUNDLES, true)) {
             // collect and write language bundles into single i18n.json file
-            const i18nFolder = cds.env.i18n.folders?.[0] || 'i18n'
-            const i18n = await this.collectLanguageBundles(model, path.join(this.task.dest, i18nFolder))
+            const i18n = await this.collectLanguageBundles(model, path.join(this.task.dest, getI18nDefaultFolder()))
             if (i18n && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
                 this._result.languageBundles = i18n.bundles
             }

package/lib/build/provider/mtx/resourcesTarBuilder.js

@@ -83,12 +83,8 @@ class ResourcesTarBuilder {
     }
 
     async _getHanaTenantDbDest() {
-        let hanaTask = this.handler.context.tasks.find(task => task.for === BUILD_TASK_HANA)
-        if (!hanaTask) {
-            this.handler.pushMessage(`Found SQLite database configuration. Ensure that productive cloud deployments requiring SAP HANA database are built with 'production' profile.`, WARNING)
-            return null
-        }
-        return hanaTask.dest
+        const hanaTask = this.handler.context.tasks.find(task => task.for === BUILD_TASK_HANA)
+        return hanaTask?.dest
     }
 }
 module.exports = ResourcesTarBuilder

package/lib/build/provider/mtx-sidecar/index.js

@@ -1,11 +1,11 @@
 const path = require('path')
 const cds = require('../../../cds')
 const fs = require('fs')
-const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
+const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME, MTX_SIDECAR_DB_VALIDATION } = require('../../constants')
 const NodeCfModuleBuilder = require('../nodejs')
 const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
-const { WARNING, ERROR } = NodeCfModuleBuilder
-const { relativePaths, BuildError, resolveRequiredSapModels } = require('../../util')
+const { ERROR } = NodeCfModuleBuilder
+const { relativePaths, BuildError, resolveRequiredSapModels, getI18nDefaultFolder } = require('../../util')
 
 const DEFAULT_MAIN_FOLDER = "_main"
 
@@ -45,11 +45,10 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
     async _buildNodeApp(sidecarEnv) {
         const destSidecar = this.task.dest
         const destSidecarSrc = path.join(destSidecar, cds.env.folders.srv)
-        const i18nFolder = cds.env.i18n.folders?.[0] || 'i18n'
         const model = this._compileSidecarSync(sidecarEnv)
         await this.compileToJson(model, path.join(destSidecarSrc, DEFAULT_CSN_FILE_NAME))
 
-        await this.collectLanguageBundles(model, path.join(destSidecarSrc, i18nFolder))
+        await this.collectLanguageBundles(model, path.join(destSidecarSrc, getI18nDefaultFolder()))
         await this.copySrvContent(this.task.src, destSidecar, destSidecar)
     }
 
@@ -62,13 +61,18 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         if (!main) {
             throw new BuildError(`Invalid MTX sidecar configuration. Make sure that the profile 'mtx-sidecar' is configured and an up-to-date version of @sap/cds-mtxs is installed.`)
         }
-        const profiles = cds.env.profiles || []
+        if (!this.hasBuildOption(MTX_SIDECAR_DB_VALIDATION, false)
+            && !cds.env.build.tasks?.length                     // disable if custom build tasks exist
+            && sidecarEnv.requires.db && cds.env.requires.db    // ensure database is configured
+            && sidecarEnv.requires.db.kind !== cds.env.requires.db.kind) {
+            throw new BuildError(`Inconsistent database configuration found - application db '${cds.env.requires.db?.kind}', sidecar db '${sidecarEnv.requires.db?.kind}'`)
+        }
+        const profiles = cds.env.profiles ?? []
+        if (!profiles.includes("production") && !profiles.includes("prod")) {
+            // need to overwrite 'development' profile setting '../..' with '_main', although it is questionable why cds build is executed with development profile
+            main = DEFAULT_MAIN_FOLDER
+        }
 
-            if (!profiles.includes("production") && !profiles.includes("prod")) {
-                main = DEFAULT_MAIN_FOLDER
-                // root should represent the production use case and not development
-                this.pushMessage(`MTX sidecar build results are created in folder '${main}'. Enable 'production' or 'prod' profile if the folder is configured differently.`, WARNING)
-            }
         const destRoot = this.task.dest
         const destMain = path.join(destRoot, main)
         const destMainSrv = path.join(destMain, cds.env.folders.srv)

package/lib/build/util.js

@@ -170,6 +170,13 @@ async function copy(src, dest) {
     }
 }
 
+function getI18nDefaultFolder() {
+    // keep '_i18n' as preferred folder for compatibility reasons
+    if (cds.env.i18n.folders.includes('_i18n')) return '_i18n'
+    if (cds.env.i18n.folders.includes('i18n')) return 'i18n'
+    return cds.env.i18n.folders[0] ?? 'i18n'
+}
+
 /**
  * Return gnu-style error string for location `loc`:
  *  - 'File:Line:Col' without `loc.end`
@@ -258,6 +265,7 @@ module.exports = {
     getDefaultModelOptions,
     flatten,
     copy,
+    getI18nDefaultFolder,
     BuildMessage,
     BuildError
 }

package/lib/cds.js

@@ -3,8 +3,8 @@ const cds = _local ('@sap/cds')
 
 module.exports = Object.defineProperties (cds, {
   // for internal use in cds-dk only
-  _log: { value: _local ('../bin/util/log') },
-  _local: { value: _local },
+  _log: { value: _local ('../bin/util/log'), configurable: true },
+  _local: { value: _local, configurable: true },
 })
 
 function _local (id) {

package/lib/client/base_command.js

@@ -1,6 +1,8 @@
 const path = require('path');
 const fs = require('fs').promises;
 
+require('../util/pruneAxiosErrors');
+
 const { CliError } = require('./helper/errors');
 
 const MTX_URL_PATH_PREFIX = 'mtx/v1/model/';
@@ -26,17 +28,12 @@ module.exports = class BaseCommand {
             case 403:
                 throw new CliError(prefix + ': insufficient authorization. Ensure client has all necessary roles.', { error, command });
             case 404:
-                throw new CliError(prefix + ': resource not found.', { command });
+                throw new CliError(prefix + ': resource not found.', { error, command });
             case 422:
                 // Compilation or native-extension error.
                 throw new CliError(prefix + '.', { error, command });
             default:
                 // Unexpected error should be transparent to user.
-                if (!require('..').debug('axios')) {
-                    error.config?.auth && (error.config.auth = '...'); // TODO use &&= with Node > 14
-                    delete error.request;
-                    delete error.response;
-                }
                 throw error;
         }
     }

package/lib/compile/asyncapi/components/messages/index.js

@@ -16,11 +16,31 @@ function getHeaderProperties(name) {
     return { type: { const: name } };
 }
 
+function nestedAnnotation(resObj, asyncapiProperty, keys, value) {
+    if (resObj[asyncapiProperty] === undefined) {
+        resObj[asyncapiProperty] = {};
+    }
+
+    let node = resObj[asyncapiProperty];
+
+    // traverse the annotation property and define the objects if they're not defined
+    for (let nestedIndex = 1; nestedIndex < keys.length - 1; nestedIndex++) {
+        const nestedElement = keys[nestedIndex];
+        if (node[nestedElement] === undefined) {
+            node[nestedElement] = {};
+        }
+        node = node[nestedElement];
+    }
+
+    // set value annotation property
+    node[keys[keys.length - 1]] = value;
+}
+
 function readAnnotations(definition, presets) {
     let resObj = {};
 
     for (const [key, value] of Object.entries(definition)) {
-        if (key.startsWith('@AsyncAPI')) {
+        if (key.startsWith('@AsyncAPI') && !key.startsWith('@AsyncAPI.Extensions')) {
             // get annotation value after @AsyncAPI
             const annotationProperties = key.split('@AsyncAPI.')[1];
             const keys = annotationProperties.split('.');
@@ -35,23 +55,22 @@ function readAnnotations(definition, presets) {
             if (keys.length === 1) {
                 resObj[asyncapiProperty] = value;
             } else {
-                if (resObj[asyncapiProperty] === undefined) {
-                    resObj[asyncapiProperty] = {};
-                }
-
-                let node = resObj[asyncapiProperty];
+                nestedAnnotation(resObj, asyncapiProperty, keys, value)
+            }
+        }
 
-                // traverse the annotation property and define the objects if they're not defined
-                for (let nestedIndex = 1; nestedIndex < keys.length-1; nestedIndex++) {
-                    const nestedElement = keys[nestedIndex];
-                    if (node[nestedElement] === undefined) {
-                        node[nestedElement] = {};
-                    }
-                    node = node[nestedElement];
-                }
+        else if (key.startsWith('@AsyncAPI.Extensions')) {
+            const annotationProperties = key.split('@AsyncAPI.Extensions.')[1];
+            const keys = annotationProperties.split('.');
+            keys[0] = "x-" + keys[0];
 
-                // set value annotation property
-                node[keys[keys.length-1]] = value;
+            if (keys.length === 1) {
+                // if the key is already present, that means, Annotations have already been considered
+                if (resObj[keys[0]]) continue;
+                // else we populate
+                resObj[keys[0]] = value;
+            } else {
+                nestedAnnotation(resObj, keys[0], keys, value);
             }
         }
     }
@@ -142,9 +161,13 @@ function entriesToMessages(definitions, events, presets) {
 /**
  * Combining the definition objects from CSN into one schema
  */
-module.exports = function definitionsToMessages(definitions, events, presets) {
+function definitionsToMessages(definitions, events, presets) {
     const messages = {};
-
     Object.assign(messages, entriesToMessages(definitions, events, presets));
     return messages;
 }
+
+module.exports = {
+    definitionsToMessages,
+    nestedAnnotation
+}