@sap/cds-dk 8.0.2 → 8.1.0

package/CHANGELOG.md

@@ -7,6 +7,50 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 8.1.0 - 2024-07-26
+
+### Added
+
+- `cds compile --to mermaid` can be configured with a layout direction like `LR`.
+- `cds deploy --to hana` now shows the `hdi-deploy` version when running.
+
+### Changed
+
+- Better generation of http files with `cds add http`, especially for draft requests.
+
+### Fixed
+
+- `cds add` recognizes `hasCfManifest` as inactive unless a `manifest.yml` file exists.
+- `cds add` help and suggestions are only shown when the `help` method is implemented.
+- `cds add sample` does not include the deprecated `synchronizationMode` property in `manifest.json` files any more.
+- `cds compile --to mermaid` no longer produces empty `namespace` blocks that would lead to rendering errors.
+- `cds compile --to mermaid` no longer fails for complex queries like joins.
+- `cds build --for mtx-sidecar` now correctly supports different `srv` folder name.
+- `cds add audit-log` in combination with `cds add multitenancy` correctly adds the audit-log dependency to the MTX sidecar.
+- `cds build` adds the correct hdbtabledata file paths to the hana result set.
+- `cds add` plugins can now correctly interpret `cds.cli` properties.
+- `cds deploy --to hana --dry` now shows correct files with their content.
+- `cds version` now reports the correct version of `@sap/cds` if this one is installed locally along with a local `@sap/cds-dk` installation.
+- Shell completion now works correctly for `cds init --add`.
+- `cds build --for mtx-sidecar` no longer fails if the severity of a compilation error has been downgraded from `Error` to `Warning`.
+
+## Version 8.0.3 - 2024-07-20
+
+### Fixed
+
+- `cds build --ws` no longer creates migration tables in shared db if already existing in a workspace.
+- `cds add destination` adds the destination service as an MTX SaaS dependency.
+- `cds add html5-repo` adds the HTML5 repo runtime as an MTX SaaS dependency.
+- `cds add html5-repo` does not add a destination service any more if not required by other services.
+- `cds add workzone` runs `cds add destination` as a dependent facet.
+- `cds add` plugins don't fail if custom options are provided via the `options` API.
+- `cds add data` can now correctly handle circular associations. The maximum depth of associations is increased to 5.
+- `cds add redis` is separated from `cds add redis-messaging` to allow for separate consumption.
+- `cds add redis` uses the `standard` service plan by default.
+- `cds watch` no longer leads to a warning `'@sap/cds' was loaded from different installations` when local project dependencies are installed.
+- `cds init` uses latest Maven Java archetype version 3.0.0 for creating Java projects.
+
+
 ## Version 8.0.2 - 2024-07-12
 
 ### Added
@@ -20,9 +64,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds init` no longer creates a `.cdsrc.json` for Node.js projects.
 - `cds build` configuration cleanup for `data.model` and `service.model` to only support configuration of a single model folder.
 
-### Fixed
-
-
 ## Version 8.0.1 - 2024-07-09
 
 ### Added
@@ -128,6 +169,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 - `cds add notebook` is removed.  CAP Jupyter Notebooks have been replaced by custom CAP Notebooks for VS Code which are now part of the CDS Editor.  See https://cap.cloud.sap/docs/tools/#add-cds-editor for more.
 
+## Version 7.9.6 - 2024-07-19
+
+### Fixed
+
+- `cds add data` can now correctly handle circular associations. The maximum depth of associations is increased to 5.
 
 ## Version 7.9.5 - 2024-07-12
 

package/bin/bind.js

@@ -46,7 +46,7 @@ module.exports = Object.assign(cds_bind, {
 
     *-a | --to-app-services* <app>
 
-        Bind to a given application (Cloud Foundry only).
+        Bind services of a given application (Cloud Foundry only).
 
     *--no-create-service-key*
 
@@ -164,11 +164,11 @@ async function cds_bind(args, options) {
         options.targets = options.to.split(/,/g);
 
         if (options.targets.length >= 2 && options.serviceArg) {
-            throw `Service argument cannot be specified together with multiple targets (${term.bold('--to')}) services. Use one service per call or omit the service argument.`;
+            throw `Service argument cannot be specified together with multiple target (${term.bold('--to')}) services. Use one service per call or omit the service argument.`;
         }
 
         if (options.targets.length >= 2 && options.kind) {
-            throw `The option '--kind' cannot be specified together with multiple targets (${term.bold('--to')}) services. Use one service per call or omit the ${term.bold('--kind')} option.`;
+            throw `The option '--kind' cannot be specified together with multiple target (${term.bold('--to')}) services. Use one service per call or omit the ${term.bold('--kind')} option.`;
         }
 
         const services = await bind({ ...options, out });

package/bin/cds.js

@@ -55,6 +55,14 @@ const cli = {
           argv = argv.slice(0, endOfOptions)
         }
 
+        // REVISIT: Have to load plugins to allow for plugin-contributed flags!
+        if (cmd === 'add') {
+          cds.cli = { command: 'add' }
+          await cds.plugins
+          for (const [, Plugin] of cds.add.registered) {
+            task.options.push(...Object.keys((new Plugin).options()).map(key => '--'+key))
+          }
+        }
         const args = this.args(task, argv)
         args[0].push(...appendArgs)
         cds.cli = {
@@ -63,13 +71,6 @@ const cli = {
           options: args[1],
         }
 
-        // REVISIT: Have to do it here to allow custom flags for plugins!
-        if (cmd === 'add') {
-          await cds.plugins
-          for (const [, Plugin] of cds.add.registered) {
-            task.options.push(...Object.keys((new Plugin).options()).map(key => '--'+key))
-          }
-        }
         if (args[1]?.['resolve-bindings']) await _resolveBindings({ silent: cmd === 'env' })
 
         // cds.root may for some subcommands not point to the correct directory (e.g. cds w where users can pass a project directory)

package/bin/init.js

@@ -61,18 +61,15 @@ async function handleCompletion(currentWord, previousWord, argv, util) {
         return allOptionsFlags;
     }
 
-    if (previousWord === '--add') {
-        return util.completionFs.readTemplates(argv);
-    }
-
     if (previousWord === '--java:package') {
         const excludes = ['_merging'];
         return (await util.completionFs.readdir(currentWord, { files: false }))
             .filter(e => !excludes.includes(e));
     }
 
-    if (!currentWord && init.options?.includes(previousWord)) {
-        return [];
+    const templates = await util.completionFs.readTemplates(argv);
+    if (previousWord === '--add' || argv.includes('--add') && previousWord.endsWith(',')) {
+        return templates;
     }
 
     return allOptionsFlags;

package/bin/version.js

@@ -61,7 +61,8 @@ function list_versions(args, options) {
 }
 
 function info({ root:cwd=process.cwd() }) {
-  const env = require('../lib').env.for('cds', cwd)
+  const cds = require('../lib')
+  const env = cds.env.for('cds', cwd)
   env.cli ??= {}; env.cli.version ??= {}
   const javaInfo = !env.cli.version.skipjava && env['project-nature'] === 'java'
   if (javaInfo && process.stderr.isTTY) {
@@ -74,10 +75,11 @@ function info({ root:cwd=process.cwd() }) {
     ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // ... or installed globally
     ..._versions_from(_pkg_path('@sap/cds-dk', cwd)), // local dk, important for Java projects
     ..._versions_from(_pkg_path('@sap/cds', __dirname)), // @sap/cds from here
-    ..._versions_from(cwd), // ... or from local app dependencies
+    ..._versions_from(_pkg_path('@sap/cds', cds.home)),  // ... or local @sap/cds
+    ..._versions_from(cwd), // ... more from local app dependencies
     ..._versions_from(_pkg_path('@sap/cds-compiler', cwd, __dirname)), // compiler is no direct dependency, so list it explicitly
     'Node.js': process.version,
-    'home': require('../lib/cds').home, // effective (local) cds
+    'home': cds.home, // effective cds home
   }
   // sort Node entries
   versions = Object.keys(versions).sort().reduce((all, key) => { all[key] = versions[key]; return all }, {})

package/bin/watch.js

@@ -76,6 +76,7 @@ async function watch ([cwd], {
   } catch (err) {
     throw `Error: No such folder or package: '${cwd}'`
   }
+  const _cwd = cwd || process.cwd()
 
   if (!Object.keys(options).includes('with-mocks'))               args.push ('--with-mocks')
   if (!Object.keys(options).find(a => /^in-memory\??$/.test(a)))  args.push ('--in-memory?')
@@ -91,18 +92,20 @@ async function watch ([cwd], {
   })
   if (process.env.CDS_TYPESCRIPT) {
     // Needed by ts-node/tsc to find the tsconfig.json. Same as `--project`.
-    env.TS_NODE_PROJECT = env.TS_NODE_PROJECT ?? cwd ?? process.cwd()
+    env.TS_NODE_PROJECT = env.TS_NODE_PROJECT ?? _cwd
   }
 
-  // allow running w/o or partial local node_modules, also add cds-dk for its sqlite
-  env.NODE_PATH = [...paths(cwd||process.cwd()), ...paths(__dirname)].join(delimiter)
+  // if sap/cds is not installed locally, run with cds-dk's deps. (sap/cds, sqlite etc)
+  if (!installed('@sap/cds', _cwd)) {
+    env.NODE_PATH = [...paths(_cwd), ...paths(__dirname)].join(delimiter)
+  }
 
   if (typeof ext !== 'string')  ext = extDefaults
   const delay = parseInt(process.env.CDS_WATCH_DELAY) || 200
 
   let liveReload //= ...
   let firstTime = true
-  if (!/false|no/.test(options['livereload']) && cds.env.for('cds', cwd||process.cwd()).livereload !== false) {
+  if (!/false|no/.test(options['livereload']) && cds.env.for('cds', _cwd).livereload !== false) {
     liveReload = new (require ('../lib/watch/livereload-server'))
     env.CDS_LIVERELOAD_PATH = require.resolve ('../lib/watch/livereload-connect')
     env.CDS_LIVERELOAD_URL = await liveReload.start (options['livereload'], cwd, delay)
@@ -199,3 +202,8 @@ function paths (dir) {
   const parts = resolve(dir).split(sep), n = parts.length, nm = sep+'node_modules'
   return parts.map ((_,i,a)=> a.slice(0,n-i).join(sep)+nm).filter(p => fs.existsSync(p))
 }
+
+function installed(id, ...paths) {
+  try { return require.resolve (id, { paths }) }
+  catch(e) { if (e.code !== 'MODULE_NOT_FOUND')  throw e }
+}

package/lib/build/constants.js

@@ -35,6 +35,7 @@ exports.CONTENT_ENV = "contentEnv"                              // copy .env fil
 exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-env.json file into deployment folder - DISABLED by default
 
 exports.OPTION_WS = "ws"                                        // run a workspace build, e.g. including model folders of configured npm workspaces
+exports.OPTION_WS_PACK = "ws-pack"                              // enable tarball based packaging of workspace dependencies
 exports.CSV_FILE_TARGET = "csvFileTarget"                       // target folder when copying CSV files to the deployment target folder ./db/src/gen/*, default is 'data'
 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

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

@@ -6,7 +6,7 @@ const InternalBuildPlugin = require('../internalBuildPlugin')
 const { BuildError, relativePaths, BuildMessage, getWorkspaces, hasOptionValue, getFiles } = require('../../util')
 const { OUTPUT_MODE_NONE, OUTPUT_MODE, CONTENT_PACKAGE_JSON, CONTENT_HDBTABLEDATA, CSV_FILE_DETECTION,
     CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, CONTENT_NODE_MODULES, OUTPUT_MODE_RESULT, CONTINUE_UNRESOLVED_SCHEMA_CHANGES,
-    CSV_FILE_TARGET, OPTION_WS} = require('../../constants')
+    CSV_FILE_TARGET, OPTION_WS } = require('../../constants')
 const { WARNING } = InternalBuildPlugin
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize("src/gen")
 const FILE_EXT_CSV = ".csv"
@@ -26,7 +26,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
             this._result = {
                 dest: this.task.dest,
-                hana: []
+                hana: new Set()
             }
         }
         this.task.options.compileDest = path.resolve(this.task.dest, this.task.options.compileDest || DEFAULT_COMPILE_DEST_FOLDER)
@@ -38,9 +38,14 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         if (!model) {
             return
         }
+        let workspaceFiles
+        if (cds.cli.options?.[OPTION_WS] || hasOptionValue(this.task.options[OPTION_WS], true)) {
+            workspaceFiles = await this._getWorkspaceFiles()
+        }
+
         // the order of 1 and 2 is important
         // 1. compile
-        const hdiPlugins = await this._compileToHana(model)
+        const hdiPlugins = await this._compileToHana(model, workspaceFiles)
 
         if (!this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_NONE)) {
             // 2. copy resources
@@ -49,9 +54,15 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             } else {
                 await this._copyResourcesExt(src, dest, model)
             }
-            // copy native hana artifacts from workspace dependencies
-            if (cds.cli.options?.[OPTION_WS] || hasOptionValue(this.task.options?.[OPTION_WS], true)) {
-                await this._addWorkspaceContent()
+            // copy native hana artifacts from workspaces
+            if (workspaceFiles) {
+                const dest = path.join(this.task.dest, 'src/gen')
+                await Promise.all(
+                    workspaceFiles.map((src) => {
+                        const { dir, filePath } = src
+                        return this.copy(path.join(dir, filePath)).to(path.join(dest, filePath))
+                    })
+                )
             }
 
             // create additional stuff in dest
@@ -217,7 +228,6 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             }
 
             const promises = []
-            const relDest = path.relative(this.task.dest, this.task.options.compileDest)
             const options = { ...this.options(), messages: this.messages, dirs: csvDirs, baseDir: this.task.options.compileDest }
 
             const toHdbtabledata = cds.compile.to.hdbtabledata ?? require(path.join(cds.home, 'bin/build/provider/hana/2tabledata')) // cds@6 compatibility
@@ -229,7 +239,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                 let tableDataPath = csvFolder.startsWith(this.task.options.compileDest) ? csvFolder : this.task.options.compileDest
                 tableDataPath = path.join(tableDataPath, file)
                 if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                    this._result.hana.push(path.join(relDest, file))
+                    this._result.hana.add(path.relative(this.task.dest, tableDataPath))
                 }
                 promises.push(this.write(tableData).to(tableDataPath))
             }
@@ -254,7 +264,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
      *
      * @param {object} model The compiled csn model
      */
-    async _compileToHana(model) {
+    async _compileToHana(model, workspaceFiles) {
         // compile to old format (.hdbcds) or new format (.hdbtable / .hdbview)
         const format = this.getBuildOption(DEPLOY_FORMAT) || cds.env.requires.db?.[DEPLOY_FORMAT] || cds.env.hana?.[DEPLOY_FORMAT]
         if (!cds.compile.to[format]) {
@@ -267,7 +277,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             // compatibility with existing cds.compile.to.hdbtable plugins cds < 8.0.0
             return await this._compileToHdb(model, format)
         } else {
-            return await this._compileToHdbmigration(model, format)
+            return await this._compileToHdbmigration(model, format, workspaceFiles)
         }
     }
 
@@ -285,7 +295,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
 
             hdiPlugins.add(suffix)
             if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                this._result.hana.push(path.join(relDest, file))
+                this._result.hana.add(path.join(relDest, file))
             }
             promises.push(this.write(content).to(path.join(this.task.options.compileDest, file)))
             if (suffix === FILE_EXT_HDBTABLE) {
@@ -303,7 +313,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         return hdiPlugins
     }
 
-    async _compileToHdbmigration(model, format) {
+    async _compileToHdbmigration(model, format, workspaceFiles) {
         const hdiPlugins = new Set()
         const relDestDir = path.relative(this.task.dest, this.task.options.compileDest)
         const relDbDestDir = path.relative(cds.root, this.task.options.compileDest)
@@ -326,33 +336,37 @@ class HanaBuildPlugin extends InternalBuildPlugin {
 
         for (const { name, suffix, content, changed } of definitions) {
             hdiPlugins.add(suffix)
-            const file = name + suffix
+            const fileName = name + suffix
             if (suffix === FILE_EXT_HDBMIGRATIONTABLE) {
-                migrationTableFiles.push(path.join(relDbSrcDir, file))
-                if (changed) {
-                    if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                        this._result.hana.push(path.join("src", file))
+                // Skip the .hdbmigrationtable file if its origin is a different workspace.
+                // The workspace build copies artifacts located in 'db/src/**' workspace folders.
+                if (!workspaceFiles?.find(wsFile => wsFile.fileName === fileName)) {
+                    migrationTableFiles.push(path.join(relDbSrcDir, fileName))
+                    if (changed) {
+                        if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
+                            this._result.hana.add(path.join("src", fileName))
+                        }
+                        promises.push(this.write(content).to(path.join(dbSrcDir, fileName)))
+                    } else {
+                        DEBUG?.(`no change, keep existing ${fileName}`)
                     }
-                    promises.push(this.write(content).to(path.join(dbSrcDir, file)))
-                } else {
-                    DEBUG?.(`no change, keep existing ${file}`)
                 }
             } else {
                 if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                    this._result.hana.push(path.join(relDestDir, file))
+                    this._result.hana.add(path.join(relDestDir, fileName))
                 }
-                promises.push(this.write(content).to(path.join(this.task.options.compileDest, file)))
+                promises.push(this.write(content).to(path.join(this.task.options.compileDest, fileName)))
                 if (suffix === FILE_EXT_HDBTABLE) {
                     // issue an error in case a .hdbmigrationtable file already exists
                     if (fs.existsSync(path.join(dbSrcDir, name + FILE_EXT_HDBMIGRATIONTABLE))) {
-                        validationError = new BuildError(`Multiple files exist defining the same HANA artifact - [${path.join(relDbSrcDir, name + FILE_EXT_HDBMIGRATIONTABLE)}, ${path.join(relDbDestDir, file)}].\nEither annotate the model entity using @cds.persistence.journal or undeploy the file [${path.join('src', name + FILE_EXT_HDBMIGRATIONTABLE)}] using an undeploy.json file.`)
+                        validationError = new BuildError(`Multiple files exist defining the same HANA artifact - [${path.join(relDbSrcDir, name + FILE_EXT_HDBMIGRATIONTABLE)}, ${path.join(relDbDestDir, fileName)}].\nEither annotate the model entity using @cds.persistence.journal or undeploy the file [${path.join('src', name + FILE_EXT_HDBMIGRATIONTABLE)}] using an undeploy.json file.`)
                     }
                 }
             }
         }
-        // the last-dev CSN shall only be updated, if all .hdbmigrationtable files could be successfully updated
-        // of course, .hdbmigrationtable files already written would need to be manually reverted before the 
-        // cds build command is again executed
+        // The last-dev CSN shall only be updated, if all .hdbmigrationtable files could be successfully updated.
+        // Of course, .hdbmigrationtable files already written would need to be manually reverted before the 
+        // cds build command is again executed.
         await Promise.all(promises)
 
         try {
@@ -531,35 +545,38 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         }
     }
 
-
     /**
-     * Copy native hana content from workspaces.
+     * Returns all hana native artifacts located in db/src/** workspace folders.
+     * @returns {Array} Array of workspace files, each entry contains the db src directory, 
+     * the relative file path and the file name.
      */
-    async _addWorkspaceContent() {
-        const srcPaths = new Set()
+    async _getWorkspaceFiles() {
+        const dbPaths = new Set()
         const workspaces = await getWorkspaces()
 
         workspaces.forEach(workspace => {
             const dbSrc = path.join(cds.root, workspace, 'db/src')
             const dbCfg = path.join(cds.root, workspace, 'db/cfg')
             if (fs.existsSync(dbSrc)) {
-                srcPaths.add(dbSrc)
+                dbPaths.add(dbSrc)
             }
             if (fs.existsSync(dbCfg)) {
-                srcPaths.add(dbCfg)
+                dbPaths.add(dbCfg)
             }
         })
-        DEBUG?.(`Copying hana native artifacts from folders '${[...srcPaths].map(f => path.relative(cds.root, f)).join(', ')}'`)
-        const dest = path.join(this.task.dest, 'src/gen')
-        for (const src of srcPaths) {
-            await this.copyNativeContent(src, dest, (entry) => {
+        const workspaceFiles = [...dbPaths].reduce((acc, src) => {
+            const files = getFiles(src, (entry) => {
                 if (entry.match(/(\/|\\)gen(\/|\\)?$/)) {
                     // skip gen folder content
                     return false
                 }
                 return true
             })
-        }
+            files.forEach(file => acc.add({ dir: src, filePath: path.relative(src, file), fileName: path.basename(file) }))
+            return acc
+        }, new Set())
+
+        return [...workspaceFiles]
     }
 
     static async _readTemplateAsJson(template) {

package/lib/build/provider/internalBuildTaskProvider.js

@@ -5,7 +5,7 @@ const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, norma
 const BuildTaskProvider = require('../buildTaskProvider')
 const { FILE_EXT_CDS, BUILD_TASK_HANA, BUILD_TASK_FIORI, BUILD_TASK_JAVA, BUILD_TASK_JAVA_CF, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF, BUILD_TASK_MTX,
     BUILD_TASKS, BUILD_TASK_MTX_SIDECAR, MTX_SIDECAR_FOLDER, BUILD_TASK_MTX_EXTENSION, NODEJS_MODEL_EXCLUDE_LIST,
-    IGNORE_DEFAULT_MODELS, CONTENT_WS } = require("../constants")
+    IGNORE_DEFAULT_MODELS, OPTION_WS } = require("../constants")
 const ResourcesTarBuilder = require('./mtx/resourcesTarBuilder')
 const DEBUG = cds.debug('cli|build')
 
@@ -285,7 +285,7 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
     }
 
     static async _setDefaultModel(task) {
-        const ws = hasOptionValue(task.options?.[CONTENT_WS], true) || cds.cli.options?.ws
+        const ws = hasOptionValue(task.options?.[OPTION_WS], true) || cds.cli.options?.[OPTION_WS]
         // REVISIT: filter nodejs bootstrap service models for Java - issues/12770#issuecomment-1805719
         const filter = hasJavaNature() ? (m) => !NODEJS_MODEL_EXCLUDE_LIST.includes(m) : null
         let taskModelPaths = task.options?.model

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

@@ -45,7 +45,7 @@ class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
      */
     async _buildNodeApp(sidecarEnv) {
         const destSidecar = this.task.dest
-        const destSidecarSrc = path.join(destSidecar, cds.env.folders.srv)
+        const destSidecarSrc = path.join(destSidecar, sidecarEnv.folders.srv)
         const model = this._compileSidecarSync(sidecarEnv)
         await this.compileToJson(model, path.join(destSidecarSrc, DEFAULT_CSN_FILE_NAME))
         await this.collectLanguageBundles(model, path.join(destSidecarSrc, getI18nDefaultFolder()))
@@ -129,8 +129,15 @@ class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
                 this.pushMessage(`CDS models [${unresolved.join(', ')}] required by MTX sidecar cannot be resolved. Make sure up-to-date versions of the missing npm modules are installed.`, ERROR)
             }
 
-            // synchronous compilation
-            return cds.load(modelFilePaths, { sync: true, ...this.options() })
+            // using synchronous compilation as cds.root and cds.env have been switched to mtx/sidecar
+            // using different messages array ensures that cds compilation doesn't fail because of 
+            // existing compilation error messages that have been downgraded to warnings
+            // see cap/issues/issues/16401#issuecomment-7205397
+            const messages = []
+            const model = cds.load(modelFilePaths, { sync: true, messages })
+            messages.forEach(msg => this.messages.push(msg))
+            
+            return model
         } finally {
             // restore project scope
             cds.root = root

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

@@ -5,7 +5,8 @@ const cmd = require('../../../util/command');
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
 const { BuildError, getWorkspaces } = require('../../util')
 const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX, CONTENT_PACKAGELOCK_JSON,
-    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
+    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX, 
+    OPTION_WS_PACK} = require('../../constants')
 const { WARNING } = EdmxBuildPlugin
 const DEBUG = cds.debug('cli|build')
 
@@ -36,7 +37,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         }
         // by default model contains all features
         const model = await this.model()
-        if (!model && !this.context.options['ws-pack']) {
+        if (!model && !this.context.options[OPTION_WS_PACK]) {
             return
         }
         if (model) {
@@ -55,7 +56,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         if (this.isStagingBuild() && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
             const srcSrv = this.task.src === cds.root ? path.resolve(this.task.src, cds.env.folders.srv) : this.task.src
             await this._copyNativeContent(cds.root, srcSrv, destRoot, destSrv)
-            if (this.context.options['ws-pack']) {
+            if (this.context.options[OPTION_WS_PACK]) {
                 await this._packWorkspaceDependencies(destRoot)
             }
         }

package/lib/compile/to-mermaid.js

@@ -2,12 +2,13 @@ const cds = require('../cds')
 
 module.exports = function to_mermaid (model, options={}) {
   options = Object.assign({
-    assocnames: false,    // include association names
-    elements  : false,    // include all elements { falsy | 'all'|true | 'keys' }
-    min       : false,    // minify the model, i.e. remove unused definitions, available in CLI
-    namespaces: true,     // group entities by namespace/service
-    queries   : false,    // include relations for queries
-    service   : undefined // filter service by name, available in CLI
+    assocnames: false,     // include association names
+    elements  : false,     // include all elements { falsy | 'all'|true | 'keys' }
+    min       : false,     // minify the model, i.e. remove unused definitions, available in CLI
+    namespaces: true,      // group entities by namespace/service
+    queries   : false,     // include relations for queries
+    service   : undefined, // filter service by name, available in CLI
+    direction : undefined  // direction of the graph
   }, cds.env.mermaid ?? {}, options)
 
   const elemOpts = options.elements === 'none' ? false : options.elements
@@ -27,6 +28,7 @@ module.exports = function to_mermaid (model, options={}) {
   const entityFilter = e => !e.name.startsWith('cds.') && !e.name.endsWith('.texts')
 
   let diag = ''
+  const direction = options.direction ? `  direction ${options.direction}\n` : ''
 
   // if requested, filter by one service
   model.all('service')
@@ -56,8 +58,10 @@ module.exports = function to_mermaid (model, options={}) {
     })
 
     // create namespace groups and classes
-    Object.keys(namespaces).forEach(ns => {
-      if (!diag.length)  diag = `classDiagram\n`
+    Object.keys(namespaces)
+    .filter (ns => namespaces[ns].length) // empty namespaces can cause rendering errors, so skip them
+    .forEach(ns => {
+      if (!diag.length)  diag = `classDiagram\n${direction}`
       diag += `  namespace ${ns.replaceAll('.','_')} {\n`
       namespaces[ns].forEach (e => {
         const simpleName = e.name.slice(e.name.lastIndexOf('.')+1)
@@ -65,7 +69,7 @@ module.exports = function to_mermaid (model, options={}) {
         diag += `["${simpleName}"]` // simple name as label
         if (elemOpts) {
           diag += ` {\n`
-          e.elements.forEach (el => {
+          e.elements?.forEach (el => {
             if ((elemOpts === 'all' || elemOpts === true) || (el.key && elemOpts == 'keys')) {
               diag += `      +${el._type?.replace('cds.','')} ${el.name}`
               diag += `\n`
@@ -85,8 +89,8 @@ module.exports = function to_mermaid (model, options={}) {
     ? Array.from(seenEntities).map(name => model.definitions[name])
     : model.all('entity').filter (entityFilter) // if no grouping and no service filter is on
   entities.forEach(e => {
-    if (!diag.length)  diag = `classDiagram\n`
-    e.elements.forEach (el => {
+    if (!diag.length)  diag = `classDiagram\n${direction}`
+    e.elements?.forEach (el => {
       if (el instanceof cds.Association) {
         if (el.target.endsWith('.texts'))  return
         const type = el.type === 'cds.Composition' ? '*-->' : '-->'
@@ -100,9 +104,20 @@ module.exports = function to_mermaid (model, options={}) {
     })
     // add relations for queries
     if (e.query && options.queries)  {
-      diag += `  \`${e.name}\` ..> \`${e.query.target.name}\`\n`
+      resolveTargets(e.query).forEach(t => {
+        diag += `  \`${e.name}\` ..> \`${t}\`\n`
+      })
     }
   })
 
   return diag.trim()
 }
+
+function resolveTargets (query) {
+  if (query.target)  return [ query.target.name ] // simple query, like projection on
+
+  // SELECT: { from: { args: [{ ref: ['t1'] }, { ref: ['t2'] }], join: ..., on: ... } }
+  const targets = query.SELECT?.from?.args?.filter(arg => arg.ref?.length).map (arg => arg.ref[0])
+
+  return targets
+}

package/lib/deploy/to-hana/hana.js

@@ -6,7 +6,6 @@ const cds = require('../../../lib/cds');
 const { exists, read } = cds.utils;
 
 const { build } = require('../../build');
-const buildConstants = require('../../build/constants');
 
 const hdi = require('./hdiDeployUtil');
 const cfUtil = require('../../util/cf');
@@ -16,6 +15,7 @@ const mtaUtil = require('./mtaUtil');
 const { bold, info, warn } = require('../../util/term');
 
 const { bind, storeBindings } = require('../../bind');
+const { BUILD_TASK_HANA, OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, OUTPUT_MODE_RESULT } = require('../../build/constants');
 
 const DEBUG = cds.debug('cli');
 
@@ -73,13 +73,13 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
       vcapEnv.TARGET_CONTAINER = process.env.TARGET_CONTAINER;
     }
 
-    for (const { task } of buildResults) {
+    for (const { task, result } of buildResults) {
       if (dry) {
-        const model = await cds.load(task.src);
-        const data = cds.compile.to.hdbtable(model);
-        for (const [src, { file }] of data) {
-          console.log(`-- ${file}`);
-          console.log(src);
+        const sortedResult = Array.from(result.hana).sort();
+        for (const file of sortedResult) {
+          const srcPath = path.join(result.dest, file);
+          console.log(`-- ${path.relative(cds.root, srcPath)}`);
+          console.log(await read(srcPath));
           console.log();
         }
       } else {
@@ -221,7 +221,9 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
 
   async _build() {
     const buildTaskOptions = {
-      for: buildConstants.BUILD_TASK_HANA
+      for: BUILD_TASK_HANA,
+      src: cds.env.folders.db,
+      [OUTPUT_MODE]: OUTPUT_MODE_FILESYSTEM | OUTPUT_MODE_RESULT
     }
 
     console.log(`Running build`);