@sap/cds-dk 8.0.3 → 8.1.1

package/CHANGELOG.md

@@ -7,6 +7,56 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 8.1.1 - 2024-08-07
+
+### Added
+
+- Add more features to CAP project creation wizard in SAP Business Application Studio.
+- `cds.add.merge` now you specify a `key` in its `deletions` semantics.
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 3.1.0 for creating Java projects.
+
+### Fixed
+
+- `cds import` now gives proper error message for OData import in case of invalid OData version or invalid encoding.
+- `cds import` now able to ignore invalid escape sequence in the description of properties for OData V2.
+- `cds add mta` does not error when the `app/router` folder was deleted.
+- `cds version -i` does not show a globally installed version when none is installed or linked.
+- `cds compile --to openapi` no longer fails with `Error: Unknown protocol: graphql`.
+- `cds add data` can now correctly handle circular dependencies in entities that point to themselves via associations and compositions.
+- `cds add` returns correct suggestions for shell completion.
+- `cds version` reports correct `@sap/cds-compiler` version.
+- `cds deploy` falls back correctly to `@sap/hana-client` when `HDI_DEPLOY_OPTIONS='{"use_hdb":false}'` is set.
+
+## 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
@@ -36,6 +86,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds add helm` removed `saasRegistryParameters` key and moved parameters to `saas-registry`.
 - `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.
+- `cds build` now fully supports default model definitions for custom build plugins.
 
 ## Version 8.0.1 - 2024-07-09
 
@@ -142,7 +193,6 @@ 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

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,8 +55,15 @@ const cli = {
           argv = argv.slice(0, endOfOptions)
         }
 
-        const unknown = new Set
-        const args = this.args(task, argv, unknown)
+        // 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 = {
           command: cmd,
@@ -64,17 +71,6 @@ const cli = {
           options: args[1],
         }
 
-        if (cmd === 'add') { // cds add plugins allow additional custom options
-          await cds.plugins
-          for (const [, Plugin] of cds.add.registered) {
-            const options = Object.keys((new Plugin).options()).map(key => '--'+key)
-            task.options.push(options)
-            options.forEach(o => unknown.delete(o))
-          }
-        }
-        if (unknown.size === 1) throw 'Invalid option: ' + Array.from(unknown)[0]
-        if (unknown.size > 1) throw 'Invalid options: ' + Array.from(unknown).join(', ')
-
         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)
@@ -106,7 +102,7 @@ const cli = {
   },
 
   // TODO replace w/ common arg parser from node
-  args (task, argv, unknown) {
+  args (task, argv) {
 
     const { options:o=[], flags:f=[], shortcuts:s=[] } = task
     const _global = /^--(profile|production|sql|odata|add-.*|build-.*|cdsc-.*|odata-.*|folders-.*)$/
@@ -120,7 +116,7 @@ const cli = {
       else if ((k = o.indexOf(a)) >= 0) add(o[k],argv[++i])
       else if ((k = f.indexOf(a)) >= 0) add(f[k])
       else if (_global.test(a)) add_global(a, _flags[a] || argv[++i])
-      else unknown.add(a)
+      else throw 'Invalid option: '+ a
     }
     // consistent production setting for NODE_ENV and CDS_ENV
     // if (process.env.NODE_ENV !== 'production') process.env.NODE_ENV = process.env.CDS_ENV?.split(',').find(p => p === 'production') || process.env.NODE_ENV

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) {
@@ -70,14 +71,14 @@ function info({ root:cwd=process.cwd() }) {
 
   const npmRoot = execSync('npm root -g').toString().trim()
   let versions = {
-    ..._versions_from(_pkg_path('@sap/cds-dk', __dirname), '@sap/cds-dk (global)'), // ... linked in cap/dev setup
-    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // ... or installed globally
+    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // linked in cap/dev 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-compiler', cwd, __dirname)), // compiler is no direct dependency, so list it explicitly
+    ..._versions_from(_pkg_path('@sap/cds', cds.home)),  // ... or local @sap/cds
+    ..._versions_from(cwd), // ... more from local app dependencies
+    '@sap/cds-compiler': cds.compiler.version(),
     '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/lib/build/buildTaskFactory.js

@@ -3,7 +3,7 @@ const path = require('path')
 const cds = require('../cds')
 const BuildTaskProviderFactory = require('./buildTaskProviderFactory')
 const { hasJavaNature, getProperty, getDefaultModelOptions, hasOptionValue, BuildError } = require('./util')
-const { FILE_EXT_CDS, OPTION_WS } = require("./constants")
+const { FILE_EXT_CDS, OPTION_WS, IGNORE_DEFAULT_MODELS, NODEJS_MODEL_EXCLUDE_LIST, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF } = require("./constants")
 const term = require('../util/term')
 const DEBUG = cds.debug('cli|build')
 
@@ -95,11 +95,7 @@ class BuildTaskFactory {
                 task.options.model = [task.options.model]
             }
         })
-        // there must be at least one task without model options
-        if (!tasks.some(task => !task.options?.model?.length > 0)) {
-            return
-        }
-        const modelPaths = await getDefaultModelOptions()
+        const modelPaths = await getDefaultModelOptions(false)
         let wsModelPaths
         // calculate only once
         if (cds.cli.options?.[OPTION_WS] || tasks.some(task => hasOptionValue(task.options?.[OPTION_WS], true))) {
@@ -107,10 +103,12 @@ class BuildTaskFactory {
         }
         // set default model options
         tasks.forEach(task => {
-            this._setTaskModelOptions(task, cds.cli.options?.[OPTION_WS] || hasOptionValue(task.options?.[OPTION_WS], true) ? wsModelPaths : modelPaths)
             if (!task.src) {
                 throw new BuildError(`Mandatory property 'src' not defined for build task '${task.for}'.`)
             }
+            const optionWs = cds.cli.options?.[OPTION_WS] || hasOptionValue(task.options?.[OPTION_WS], true)
+            // shallow copy model paths
+            this._setTaskModelOptions(task, optionWs ? [...wsModelPaths] : [...modelPaths])
         })
     }
 
@@ -180,14 +178,33 @@ class BuildTaskFactory {
     }
 
     static _setTaskModelOptions(task, defaultModelPaths) {
+        // bootstrap service model is only required for Nodejs build task - issues/12770#issuecomment-1805719
+        if (task.for !== BUILD_TASK_NODEJS && task.for !== BUILD_TASK_NODE_CF) {
+            defaultModelPaths = defaultModelPaths.filter(p => !NODEJS_MODEL_EXCLUDE_LIST.includes(p))
+        }
+
+        let taskModelPaths = task.options?.model
+        if (taskModelPaths && !Array.isArray(taskModelPaths)) {
+            taskModelPaths = [taskModelPaths]
+        }
+        const allowList = new RegExp(`^@sap/cds${cds.env.requires.toggles ? '|^' + cds.env.features.folders.replace('*', '') : ''}`)
         task.options = task.options || {}
-        if (!task.options.model?.length > 0) {
-            defaultModelPaths = new Set(defaultModelPaths)
-            if (task.src) {
-                defaultModelPaths.add(task.src)
+        let modelPaths = []
+        if (taskModelPaths?.length) {
+            if (!hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
+                modelPaths = defaultModelPaths.filter(p => p.match(allowList))
+            }
+        } else {
+            modelPaths = [...defaultModelPaths]
+            if (!modelPaths.includes(task.src)) {
+                modelPaths.push(task.src)
+            }
+            if (hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
+                // all default models except the built-in models
+                modelPaths = modelPaths.filter(p => !p.match(allowList))
             }
-            task.options.model = [...defaultModelPaths]
         }
+        task.options.model = [...new Set(taskModelPaths?.length ? taskModelPaths.concat(modelPaths) : modelPaths)]
     }
 
     static _stringifyTask(task) {

package/lib/build/constants.js

@@ -48,7 +48,7 @@ exports.FILE_EXT_CDS = ".cds"
 exports.MTX_SIDECAR_FOLDER = "mtx/sidecar"                      // default name of the mtx sidecar folder
 exports.DEFAULT_CSN_FILE_NAME = "csn.json"
 // REVISIT: the models are not required if a custom server.js file is used for MTX bootstrap
-exports.NODEJS_MODEL_EXCLUDE_LIST = ['@sap/cds/srv/mtx', '@sap/cds-mtxs/srv/bootstrap']
+exports.NODEJS_MODEL_EXCLUDE_LIST = ['@sap/cds-mtxs/srv/bootstrap']
 
 exports.CDS_CONFIG_PATH_SEP = "/"
 exports.SEVERITY_ERROR = "Error"

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

@@ -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)
@@ -228,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
@@ -240,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))
             }
@@ -296,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) {
@@ -345,7 +344,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                     migrationTableFiles.push(path.join(relDbSrcDir, fileName))
                     if (changed) {
                         if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                            this._result.hana.push(path.join("src", fileName))
+                            this._result.hana.add(path.join("src", fileName))
                         }
                         promises.push(this.write(content).to(path.join(dbSrcDir, fileName)))
                     } else {
@@ -354,7 +353,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                 }
             } else {
                 if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                    this._result.hana.push(path.join(relDestDir, fileName))
+                    this._result.hana.add(path.join(relDestDir, fileName))
                 }
                 promises.push(this.write(content).to(path.join(this.task.options.compileDest, fileName)))
                 if (suffix === FILE_EXT_HDBTABLE) {

package/lib/build/provider/internalBuildTaskProvider.js

@@ -1,11 +1,10 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../cds')
-const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, normalizePath } = require('../util')
+const { hasJavaNature, BuildError, normalizePath } = require('../util')
 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, OPTION_WS } = require("../constants")
+    BUILD_TASKS, BUILD_TASK_MTX_SIDECAR, MTX_SIDECAR_FOLDER, BUILD_TASK_MTX_EXTENSION } = require("../constants")
 const ResourcesTarBuilder = require('./mtx/resourcesTarBuilder')
 const DEBUG = cds.debug('cli|build')
 
@@ -19,10 +18,7 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
     }
 
     async applyTaskDefaults(task) {
-        // src folder needs to be initialized first
         InternalBuildTaskProvider._setDefaultSrcFolder(task)
-
-        await InternalBuildTaskProvider._setDefaultModel(task)
     }
 
     getPlugin(task) {
@@ -284,35 +280,6 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
         }
     }
 
-    static async _setDefaultModel(task) {
-        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
-        if (taskModelPaths && !Array.isArray(taskModelPaths)) {
-            taskModelPaths = [taskModelPaths]
-        }
-        const allowList = new RegExp(`^@sap/cds${cds.env.requires.toggles ? '|^' + cds.env.features.folders.replace('*', '') : ''}`)
-        task.options = task.options || {}
-        let defaultModelPaths = []
-        if (taskModelPaths?.length) {
-            if (!hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
-                defaultModelPaths = await getDefaultModelOptions(ws, filter)
-                defaultModelPaths = defaultModelPaths.filter(p => p.match(allowList))
-            }
-        } else {
-            defaultModelPaths = await getDefaultModelOptions(ws, filter)
-            defaultModelPaths.push(task.src)
-            if (hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
-                // all default models except the built-in models
-                defaultModelPaths = defaultModelPaths.filter(p => !p.match(allowList))
-            }
-        }
-        if (defaultModelPaths.length) {
-            task.options.model = [...new Set(taskModelPaths?.length ? taskModelPaths.concat(defaultModelPaths) : defaultModelPaths)]
-        }
-    }
-
     /**
      * Determines the module folder from the given list that may represent files or folders w or w/o .cds file extension.
      * @param {Array} filesOrFolders

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

@@ -92,10 +92,10 @@ class ResourcesTarBuilder {
         
         return hanaTasks.find(hanaTask => {
             // if called from internalBuildTaskProvider, the src folder for the tenant db task might still not set
-            // while an existing second shared db always requires src to be configured using a relative path
+            // while an existing second shared db always requires src to be set
             if (!hanaTask.src) return true
             const srcFolder = path.isAbsolute(hanaTask.src) ? path.relative(cds.root, hanaTask.src) : hanaTask.src
-            return mtxTask.options?.model?.includes(srcFolder)
+            return mtxTask.options?.model?.includes(srcFolder) || srcFolder === cds.env.folders.db.replace('/', '')
         })
     }
 }

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

@@ -1,6 +1,7 @@
 /** @type { import('@sap/cds/lib') } */
 const cds = _local ('@sap/cds')
 
+/** @type { import('@sap/cds/lib') & {_local: (id: string) => any} } */
 module.exports = Object.defineProperties (cds, {
   // for internal use in cds-dk only
   _log: { value: _local ('../bin/util/log'), configurable: true },

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/compile/to_openapi.js

@@ -1,4 +1,5 @@
-const { compile } = require('@cap-js/openapi')
+const cds = require('../cds')
+const { compile } = cds._local('@cap-js/openapi') // load a local cap-js/openapi (fallback to our own)
 
 function cds_compile_to_openapi (csn, options) {
   return compile(csn, options)

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`);

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

@@ -37,6 +37,7 @@ module.exports = new class HdiDeployUtil {
           else throw e
         }
         if (options.use_hdb !== false) options.use_hdb = true
+        if (options.use_hdb === false) options.use_hdb = undefined
         deployerEnv.HDI_DEPLOY_OPTIONS = JSON.stringify(options)
 
         const asyncDeploy = util.promisify(deploy);
@@ -59,7 +60,15 @@ module.exports = new class HdiDeployUtil {
     Add it either to ${bold('devDependencies')} using 'npm install -D ${HDI_DEPLOY_LIB}' or install it globally using 'npm install -g ${HDI_DEPLOY_LIB}'.`);
         }
 
-        console.log(`Using HDI deployer from ${libPath}`)
+        console.log(`HDI deployer path: ${libPath}`)
+
+        const libRoot = path.dirname(libPath);
+        try {
+            const libPackageJson = require(path.join(libRoot, 'package.json'));
+            console.log(`HDI deployer version: ${libPackageJson.version}`);
+        } catch {
+            // ignore
+        }
 
         // let any error go through and abort deploy
         return require(libPath);

package/lib/import/common.js

@@ -67,7 +67,7 @@ async function getVersion(fileInputStream){
         oDataVersion = 'V4';
     }
     else {
-        throw new Error(messages.INVALID_EDMX_METADATA_VERSION);
+        throw new Error(messages.INVALID_ODATA_VERSION_OR_UNSUPPORTED_ENCODING);
     }
 
     return oDataVersion;

package/lib/import/message.js

@@ -2,7 +2,7 @@
 
 const messages = {
 	INVALID_EDMX_METADATA: 'The OData model is not valid. Specify the correct OData model.',
-	INVALID_EDMX_METADATA_VERSION: 'The OData version is not valid. Specify the correct OData version.',
+	INVALID_ODATA_VERSION_OR_UNSUPPORTED_ENCODING: 'Either the OData version is not valid, or the encoding of the file is not utf-8. Please specify the supported OData version and file encoding. OData version is expected one of [1.0, 2.0, 4.0, 4.01] and the input file encoding is expected UTF-8.',
 	INVALID_OUTPUT_FILE: 'Please provide an output file with one of these [cds, csn, json] file extension.',
 	SPECIFY_INPUT_FILE: 'Specify an input file that exists.',
 	SPECIFY_OUTPUT_FILE: 'Specify an output file or correct the output file path provided.',
@@ -45,4 +45,4 @@ function getMessages() {
 
 module.exports = {
 	getMessages
-};
+};