@sap/cds 6.5.0 → 6.6.0

package/CHANGELOG.md

@@ -4,6 +4,41 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 6.6.0 - 2023-02-27
+
+### Added
+
+- Improved error handling for `cds build` if the SaaS base model is missing in an extension project.
+- Support for reliable paging using `$skiptoken`. Can be activated via `cds.query.limit.reliablePaging = true`
+
+### Changed
+
+- `cds.serve(ServiceName)` (and `cds serve -s ServiceName`) now exactly serve services with the given names. Previously, all services that ended with the given name were served as well, e.g. `MyServiceName` and `ServiceName`, which might be problematic for applications that bootstrap services one by one.
+- Optimize `@cds.persistence.journal` filtering for `last-dev` CSN file.
+- `process.exit()` is no longer called during server shutdown, so that other/custom exit handlers get a chance to execute.
+
+### Fixed
+
+- `cds deploy --to hana` no longer calls `cds bind` when `VCAP_SERVICES` is provided, e.g via `default-env.json`.
+- `$search` on an entity without String elements
+- Only elements from type `cds.String` are searchable when combining `$apply` and `$search`
+- Error message for missing database connection in draft case
+- Extensibility with in-memory Sqlite
+- OData adapter error messages
+- Columns in navigation path are now added to the SELECT.columns in new parser
+- Application service calls on draft enabled entities using aliases
+- Custom mtxs build tasks now use the correct default `src` folder value.
+- `cds build` adds a `.hdiconfig` file when creating HANA migration tables if none is existing.
+- UPSERTs using reserved keywords
+- Fix outbound-streaming error handling
+- Rollback transaction if inbound streaming fails
+- Custom database initialization in `db/init.js` now skips the `t0` tenant for multitenant apps.
+- Concurrent etag calculation for UPDATE and DELETE
+- Typings for `cds.delete()`
+- CQN for `not` operator with OData functions
+- Expand on composition of aspect for draft enabled entities
+- Better error messages are provided for errors with HTTP status code `400`, `500` and `501`
+
 ## Version 6.5.0 - 2023-01-27
 
 ### Added
@@ -15,13 +50,13 @@
 
 - Successive calls to `SELECT.where()` wraps existing clause in brackets if it contains `or`. E.g.
    ```js
-   SELECT.from `X` .where `x` .or `y` .where `z` 
+   SELECT.from `X` .where `x` .or `y` .where `z`
    //> SELECT from X where (x or y) and z`
    ```
 - `cds build` for HANA now adds an `engines.node` version to the generated `db/package.json`. This will help in the future when runtime environments change their default to some version higher than the one supported by `@sap/hdi-deploy`.
 - `cds build` checks the consistency of built-in models for java projects. An error is logged if some model files could not successfully be resolved indicating that a required npm module might be missing.
 - Status code of draft actions are set in respective handler instead of protocol adapter
-- `cds deploy --dry` no longer loads the `sqlite3` module by mistake. This fixes a regression when building Java projects. As a side effect a file with the name `undefined` was created in the project root folder. 
+- `cds deploy --dry` no longer loads the `sqlite3` module by mistake. This fixes a regression when building Java projects. As a side effect a file with the name `undefined` was created in the project root folder.
 - Internal representation of pseudo roles `internal-user` and `system-user`
 
 ### Fixed
@@ -57,6 +92,7 @@
 - fix view resolving and managed data for UPSERT
 - `cds.linked` supports polymorphic self links like in: `action foo( self: [many] $self, ...)`
 - Error with `@odata.draft.enabled` and `@restrict`
+- Skip mandatory check on navigation properties for write requests
 
 ## Version 6.4.0 - 2022-12-15
 

package/README.md

@@ -4,5 +4,10 @@ The API package for the [SAP Cloud Application Programming Model (CAP)](https://
 
 See the [API documentation](https://cap.cloud.sap/docs/node.js/api) for more details.
 
+## How to Obtain Support**
+
+In case you find a bug, please report an [incident](https://cap.cloud.sap/docs/resources/#reporting-incidents) on SAP Support Portal.
+
 ## License
+
 This package is provided under the terms of the [SAP Developer License Agreement](https://tools.hana.ondemand.com/developer-license-3.1.txt).

package/apis/services.d.ts

@@ -54,6 +54,11 @@ export class QueryAPI {
     (query: Query): Promise<ResultSet | any>
     (query: string, args?: any[] | object): Promise<ResultSet | any>
   }
+ 
+  /**
+   * @see [docs](https://cap.cloud.sap/docs/node.js/cds-facade?q=cds.delete)
+   */
+  delete<T>(entity: Definition | string, key?: any): DELETE<T>
 
   /**
    * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-run)

package/bin/build/buildTaskEngine.js

@@ -257,8 +257,6 @@ class BuildTaskEngine {
         const files = BuildTaskEngine._getBuildOutput(handlers, buildOptions)
         if (files.length > 0) {
             this.logger.log(`done > wrote output to:\n   ${files.join("\n   ")}\n`)
-        } else {
-            this.logger.log('done >')
         }
     }
 

package/bin/build/buildTaskFactory.js

@@ -56,7 +56,7 @@ class BuildTaskFactory {
 
     async _createTasks(providerFactory) {
         const buildOptions = providerFactory.buildOptions
-        this.logger.log(`determining build tasks for project [${buildOptions.root}].`)
+        this.logger.debug(`determining build tasks for project [${buildOptions.root}].`)
 
         // clearing model cache (details https://github.tools.sap/cap/cds/pull/181) is no longer required 
         // because of changes https://github.tools.sap/cap/cds/pull/1121

package/bin/build/buildTaskHandler.js

@@ -184,7 +184,7 @@ class BuildTaskHandler {
     async model() {
         const files = this._resolveModel()
         if (!files || files.length === 0) {
-            this._logger.log("no CDS model found")
+            this._logger.log(`no CDS model found for [${this.task.for}] build task [${this.task.src}] - nothing to be done`)
             return null
         }
         this._logger._debug && this._logger.debug(`model: ${relativePaths(this._buildOptions.root, files).join(", ")}`)

package/bin/build/provider/buildTaskProviderInternal.js

@@ -63,7 +63,11 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 break
             case BUILD_TASK_MTX_EXTENSION:
             case BUILD_TASK_MTX:
-                task.src = task.src || "."
+                if (isStreamlinedMtx()) {
+                    task.src = task.src || BuildTaskProviderInternal._normalizePath(cds.env.folders.srv)
+                } else {
+                    task.src = task.src || "."
+                }
                 break
             default:
                 throw new Error(`Unknown build task '${task.use || task.for}'`)
@@ -84,13 +88,13 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
         if (Array.isArray(db) && db.length > 0) {
             db = BuildTaskProviderInternal._getModuleFolder(projectPath, db) || null
             if (!db && !addRequiredTasks) { // log once
-                this.logger.log("No database module found")
+                this.logger.debug("No database module found")
             }
         }
         if (Array.isArray(srv) && srv.length > 0) {
             srv = BuildTaskProviderInternal._getModuleFolder(projectPath, srv) || null
             if (!srv && !addRequiredTasks) { // log once
-                this.logger.log("No service module found")
+                this.logger.debug("No service module found")
             }
         }
         // create required build tasks
@@ -205,7 +209,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
 
                 const sidecarPath = path.join(projectPath, MTX_SIDECAR_FOLDER)
                 if (!fs.existsSync(sidecarPath)) {
-                    throw new BuildError("CDS build failed", `MTX sidecar directory '${sidecarPath}' not existing. Custom build task configuration necessary if the folder is named differently.`)
+                    throw new BuildError(`MTX sidecar directory '${sidecarPath}' not existing. Custom build task configuration necessary if the folder is named differently.`)
                 }
                 const sidecarEnv = cds.env.for("cds", sidecarPath)
                 if (sidecarEnv.requires["cds.xt.ModelProviderService"]?.kind === "in-sidecar") {
@@ -213,12 +217,12 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                         for: BUILD_TASK_MTX_SIDECAR
                     }
                 }
-                throw new BuildError("CDS build failed", 'Invalid MTX sidecar configuration. Make sure to add required service "cds.xt.ModelProviderService": "in-sidecar".')
+                throw new BuildError("Invalid MTX sidecar configuration - \"cds.xt.ModelProviderService\": \"in-sidecar\" missing.")
             }
 
             if (cds.env.requires["cds.xt.ModelProviderService"]?.kind === "in-sidecar") {
                 // cds build is executed in sidecar folder
-                throw new BuildError("CDS build failed", "Invalid working directory. Make sure to execute 'cds build' in CAP project root directory.")
+                throw new BuildError("Invalid working directory. Make sure to execute 'cds build' in CAP project root directory.")
             }
 
             this.logger.debug("Nodejs Streamlined MTX app without sidecar")

package/bin/build/provider/fiori/index.js

@@ -62,10 +62,9 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
             }
 
             for (let [appFolder, appModelGroup] of appModelGroups.entries()) {
-                this.logger.log(`building module [${appFolder}] using [${this.constructor.name}]`)
+                this.logger.debug(`building module [${appFolder}] using [${this.constructor.name}]`)
                 const modelPaths = cds.resolve(Array.from(appModelGroup.values()), this.buildOptions)
                 if (!modelPaths || modelPaths.length === 0) {
-                    this.logger.log(`no model found`)
                     continue
                 }
                 this.logger._debug && this.logger.debug(`model: ${relativePaths(this.buildOptions.root, modelPaths).join(", ")}`)
@@ -89,19 +88,15 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
     /**
      * This version only creates a odata representation for the 'mainService' data source
      * as defined by the fiori wizard - everything else is currently not supported.
-     * Therefore errors are only logged, the build does not fail in case a the service
+     * Therefore errors are only logged, the build does not fail in case a service
      * cannot be resolved based on the defined service URI
      */
     async build() {
-        const { src, dest } = this.task
-        const modelPaths = this.resolveModel()
-        if (!modelPaths || modelPaths.length === 0) {
-            this.logger.log(`no model found`)
+        const model = await this.model()
+        if (!model) {
             return
         }
-        this.logger._debug && this.logger.debug(`model: ${relativePaths(this.buildOptions.root, modelPaths).join(", ")}`)
-
-        await this._writeEdmxToWebapp(src, dest)
+        await this._writeEdmxToWebapp(this.task.src, this.task.dest)
     }
 
     async _writeEdmxToWebapp(src, dest) {

package/bin/build/provider/hana/2migration.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const parser = require('./migrationtable')
-const { BuildError } = require('../../util')
+const { BuildError, hasOptionValue } = require('../../util')
 const { LOG_MODULE_NAMES } = require('../../constants')
 const cds = require('../../cds'), { compiler: cdsc } = cds
 const cdscVersion = `-- generated by cds-compiler version ${cdsc.version()}`
@@ -160,7 +160,7 @@ function _filterJournalArtifacts(csn) {
   }
   const dict = csn.definitions
   for (const name in dict) {
-    if (dict[name][ANNO_PERSISTENCE_JOURNAL] !== true) {
+    if (!_isPersistedAsJournalTable(dict[name])) {
       delete dict[name]
     }
   }
@@ -168,3 +168,12 @@ function _filterJournalArtifacts(csn) {
   csn.meta.build = `CDS Build v${cds.version}`
   return csn;
 }
+
+// see cds-compiler/lib/model/csnUtils.js#isPersistedAsTable
+function _isPersistedAsJournalTable(artifact) {
+  return artifact.kind === 'entity' && hasOptionValue(artifact['@cds.persistence.journal'], true) &&
+    !artifact.abstract &&
+    !hasOptionValue(artifact['@cds.persistence.skip'], true) &&
+    !hasOptionValue(artifact['@cds.persistence.exists'], true) &&
+    (!artifact.query && !artifact.projection || hasOptionValue(artifact['@cds.persistence.table'], true))
+}

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

@@ -338,6 +338,12 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
                 if (!HanaModuleBuilder._toEqualIgnoreMeta(lastDev, afterImage)) {
                     await this.write(afterImage).to(lastDevCsnDir)
                 }
+
+                // add src/.hdiconfig if not existing
+                if (!fs.existsSync(path.join(dbSrcDir, '.hdiconfig'))) {
+                    const template = await HanaModuleBuilder._readTemplateAsJson('.hdiconfig-hanacloud')
+                    await this.write(template).to(path.join(dbSrcDir, '.hdiconfig'))
+                }
             }
         } else {
             throw new BuildError(`Inconsistent CDS compilation results - file ${lastDevCsnFolder} missing`)
@@ -352,7 +358,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
             this.logger._debug && this.logger.debug(`skip create [${relativePaths(this.buildOptions.root, packageJson)}], already existing`)
         }
         if (this.isStagingBuild() && !exists) {
-            const content = await this._readTemplateAsJson(FILE_NAME_PACKAGE_JSON)
+            const content = await HanaModuleBuilder._readTemplateAsJson(FILE_NAME_PACKAGE_JSON)
             await this.write(content).to(path.join(this.task.dest, FILE_NAME_PACKAGE_JSON))
         }
     }
@@ -362,7 +368,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
      */
     async _writeHdiConfig(plugins) {
         const hdiConfig = path.join(this.task.options.compileDest, FILE_NAME_HDICONFIG)
-        const template = await this._readTemplateAsJson(FILE_NAME_HDICONFIG)
+        const template = await HanaModuleBuilder._readTemplateAsJson('.hdiconfig-haas')
         let content = {
             'file_suffixes': {}
         }
@@ -372,7 +378,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
             }
         }
         if (Object.keys(content['file_suffixes']).length !== plugins.size) {
-            this.logger.error(`'HANA plugin not found for file suffix [${Array.from(plugins).join(',')}]`)
+            this.pushMessage(`'HANA plugin not found for file suffix [${Array.from(plugins).join(',')}]`)
         }
         // TODO - Be on the save side for now - go for the content use case later on if this works as expected.
         if (cds.env.hana['deploy-format'] === 'hdbtable') {
@@ -388,7 +394,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
     async _writeHdiNamespace() {
         // see issue #64 - add .hdinamespace file to prevent HDI from adding gen/ folder to the namespace.
         const hdiNamespace = path.join(this.task.options.compileDest, FILE_NAME_HDINAMESPACE)
-        const content = await this._readTemplateAsJson(FILE_NAME_HDINAMESPACE)
+        const content = await HanaModuleBuilder._readTemplateAsJson(FILE_NAME_HDINAMESPACE)
         return await this.write(content).to(hdiNamespace)
     }
 
@@ -400,7 +406,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
             // see issue #64 - add .hdinamespace file to prevent HDI from adding gen/ folder to the namespace.
             const undeployJsonDest = path.join(this.task.dest, FILE_NAME_UNDEPLOY_JSON)
             const undeployJsonSrc = path.join(this.task.src, FILE_NAME_UNDEPLOY_JSON)
-            const templateEntries = await this._readTemplateAsJson(FILE_NAME_UNDEPLOY_JSON)
+            const templateEntries = await HanaModuleBuilder._readTemplateAsJson(FILE_NAME_UNDEPLOY_JSON)
             let newEntries = []
             if (fs.existsSync(undeployJsonSrc)) {
                 newEntries = await JSON.parse((await fs.promises.readFile(undeployJsonSrc, 'utf-8')).toString())
@@ -423,20 +429,12 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
         }
     }
 
-    async _readTemplateAsJson(template) {
-        const templatePath = path.join(__dirname, 'template', template)
-        return fs.promises.readFile(templatePath, 'utf-8').then(f => JSON.parse(f.toString()))
-            .catch((error) => {
-                this.logger.error(`Failed to read template [${templatePath}]`)
-                return Promise.reject(error)
-            })
-    }
 
     async _readTypesFromUndeployJson() {
         const result = new Set()
         const file = path.join(this.task.src, "undeploy.json")
         if (fs.existsSync(file)) {
-            const undeployList = JSON.parse((await fs.promises.readFile(file)).toString())
+            const undeployList = JSON.parse((await fs.promises.readFile(file)).toString(), 'utf-8')
             if (Array.isArray(undeployList)) {
                 undeployList.forEach(entry => result.add(path.extname(entry)))
             }
@@ -466,6 +464,11 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
         }
     }
 
+    static async _readTemplateAsJson(template) {
+        const content = await fs.promises.readFile(path.join(__dirname, 'template', template), 'utf-8')
+        return JSON.parse(content.toString())
+    }
+
     static _toEqualIgnoreMeta(csn1, csn2) {
         function toString(csn) {
             return JSON.stringify(csn, (k, v) => {

package/bin/build/provider/hana/template/.hdiconfig-hanacloud

@@ -0,0 +1,137 @@
+
+{
+    "file_suffixes": {
+        "csv": {
+            "plugin_name": "com.sap.hana.di.tabledata.source"
+        },
+        "hdbafllangprocedure": {
+            "plugin_name": "com.sap.hana.di.afllangprocedure"
+        },
+        "hdbanalyticprivilege": {
+            "plugin_name": "com.sap.hana.di.analyticprivilege"
+        },
+        "hdbcalculationview": {
+            "plugin_name": "com.sap.hana.di.calculationview"
+        },
+        "hdbcollection": {
+            "plugin_name": "com.sap.hana.di.collection"
+        },
+        "hdbconstraint": {
+            "plugin_name": "com.sap.hana.di.constraint"
+        },
+        "hdbdropcreatetable": {
+            "plugin_name": "com.sap.hana.di.dropcreatetable"
+        },
+        "hdbflowgraph": {
+            "plugin_name": "com.sap.hana.di.flowgraph"
+        },
+        "hdbfunction": {
+            "plugin_name": "com.sap.hana.di.function"
+        },
+        "hdbgraphworkspace": {
+            "plugin_name": "com.sap.hana.di.graphworkspace"
+        },
+        "hdbhadoopmrjob": {
+            "plugin_name": "com.sap.hana.di.virtualfunctionpackage.hadoop"
+        },
+        "hdbindex": {
+            "plugin_name": "com.sap.hana.di.index"
+        },
+        "hdblibrary": {
+            "plugin_name": "com.sap.hana.di.library"
+        },
+        "hdbmigrationtable": {
+            "plugin_name": "com.sap.hana.di.table.migration"
+        },
+        "hdbprocedure": {
+            "plugin_name": "com.sap.hana.di.procedure"
+        },
+        "hdbprojectionview": {
+            "plugin_name": "com.sap.hana.di.projectionview"
+        },
+        "hdbprojectionviewconfig": {
+            "plugin_name": "com.sap.hana.di.projectionview.config"
+        },
+        "hdbreptask": {
+            "plugin_name": "com.sap.hana.di.reptask"
+        },
+        "hdbresultcache": {
+            "plugin_name": "com.sap.hana.di.resultcache"
+        },
+        "hdbrole": {
+            "plugin_name": "com.sap.hana.di.role"
+        },
+        "hdbroleconfig": {
+            "plugin_name": "com.sap.hana.di.role.config"
+        },
+        "hdbsearchruleset": {
+            "plugin_name": "com.sap.hana.di.searchruleset"
+        },
+        "hdbsequence": {
+            "plugin_name": "com.sap.hana.di.sequence"
+        },
+        "hdbstatistics": {
+            "plugin_name": "com.sap.hana.di.statistics"
+        },
+        "hdbstructuredprivilege": {
+            "plugin_name": "com.sap.hana.di.structuredprivilege"
+        },
+        "hdbsynonym": {
+            "plugin_name": "com.sap.hana.di.synonym"
+        },
+        "hdbsynonymconfig": {
+            "plugin_name": "com.sap.hana.di.synonym.config"
+        },
+        "hdbsystemversioning": {
+            "plugin_name": "com.sap.hana.di.systemversioning"
+        },
+        "hdbtable": {
+            "plugin_name": "com.sap.hana.di.table"
+        },
+        "hdbtabledata": {
+            "plugin_name": "com.sap.hana.di.tabledata"
+        },
+        "hdbtabletype": {
+            "plugin_name": "com.sap.hana.di.tabletype"
+        },
+        "hdbtrigger": {
+            "plugin_name": "com.sap.hana.di.trigger"
+        },
+        "hdbview": {
+            "plugin_name": "com.sap.hana.di.view"
+        },
+        "hdbvirtualfunction": {
+            "plugin_name": "com.sap.hana.di.virtualfunction"
+        },
+        "hdbvirtualfunctionconfig": {
+            "plugin_name": "com.sap.hana.di.virtualfunction.config"
+        },
+        "hdbvirtualpackagehadoop": {
+            "plugin_name": "com.sap.hana.di.virtualpackage.hadoop"
+        },
+        "hdbvirtualpackagesparksql": {
+            "plugin_name": "com.sap.hana.di.virtualpackage.sparksql"
+        },
+        "hdbvirtualprocedure": {
+            "plugin_name": "com.sap.hana.di.virtualprocedure"
+        },
+        "hdbvirtualprocedureconfig": {
+            "plugin_name": "com.sap.hana.di.virtualprocedure.config"
+        },
+        "hdbvirtualtable": {
+            "plugin_name": "com.sap.hana.di.virtualtable"
+        },
+        "hdbvirtualtableconfig": {
+            "plugin_name": "com.sap.hana.di.virtualtable.config"
+        },
+        "properties": {
+            "plugin_name": "com.sap.hana.di.tabledata.properties"
+        },
+        "tags": {
+            "plugin_name": "com.sap.hana.di.tabledata.properties"
+        },
+        "txt": {
+            "plugin_name": "com.sap.hana.di.copyonly"
+        }
+    }
+}

package/bin/build/provider/mtx-extension/index.js

@@ -5,6 +5,7 @@ const cds = require('../../cds')
 const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
 const { FOLDER_GEN } = require('../../constants')
 const ResourcesTarBuilder = require('../mtx/resourcesTarBuilder')
+const { BuildError } = require('../../util')
 
 class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
     init() {
@@ -18,7 +19,19 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
         const { src, dest } = this.task
         const destExt = path.join(dest, 'ext')
 
-        await this.copy(path.join(src, 'package.json')).to(path.join(destExt, 'package.json'))
+        const packageJson = path.join(src, 'package.json')
+        if (!fs.existsSync(packageJson)) {
+            throw new BuildError(`The package.json file is missing`)
+        }
+        await this.copy(packageJson).to(path.join(destExt, 'package.json'))
+
+        // validate existence of base model by simply checking existence of appPackage folder 
+        // cds.resolve might fail for the extension migration use case as no index.csn file exists.
+        // A compilation error is thrown anyhow if any base model using statement cannot be resolved.
+        const appPackage = MtxExtensionModuleBuilder._getAppPackageName()
+        if (!fs.existsSync(path.join(src, 'node_modules', appPackage))) {
+            throw new BuildError(`The SaaS application base model '${appPackage}' is missing. Have you run the 'cds pull' command?`)
+        }
 
         // copy handlers
         const folders = [path.join(src, cds.env.folders.srv, 'handlers')]
@@ -58,5 +71,9 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
         // add all resources contained in the 'ext' folder
         await new ResourcesTarBuilder(this).writeTarFile(path.join(this.task.dest, 'extension.tgz'), destExt)
     }
+
+    static _getAppPackageName() {
+        return cds.env.extends || '_base';
+    }
 }
 module.exports = MtxExtensionModuleBuilder

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

@@ -59,7 +59,7 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
      */
     async _buildMainApp(sidecarEnv) {
         if (sidecarEnv.requires['cds.xt.ModelProviderService']?.kind !== 'in-sidecar') {
-            throw new BuildError("CDS build failed", "Invalid MTX sidecar configuration - \"cds.xt.ModelProviderService\": \"in-sidecar\" missing.")
+            throw new BuildError('Invalid MTX sidecar configuration - "cds.xt.ModelProviderService": "in-sidecar" missing.')
         }
         let main = sidecarEnv.requires['cds.xt.ModelProviderService']?.root
         const profiles = cds.env.profiles || []

package/bin/build/util.js

@@ -228,7 +228,7 @@ class BuildError extends BuildMessage {
     }
 
     toString() {
-        return this.message + '\n' + this.messages.map(m => m.toString()).join('\n')
+        return this.message + (this.messages.length > 0 ? '\n' + this.messages.map(m => m.toString()).join('\n') : '')
     }
 }
 

package/bin/cds.js

@@ -9,7 +9,6 @@ const cli = { //NOSONAR
 
   exec (cmd = process.argv[2], ...argv) {
     if (!argv.length) argv = process.argv.slice(3)
-    if (process.env.NODE_ENV !== 'test')  this.errorHandlers()
     if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
     let task = this.load ('./'+cmd)
     if (task && cmd !== 'build')  return task.apply (this, this.args(task,argv))
@@ -59,10 +58,7 @@ const cli = { //NOSONAR
   },
 
   errorHandlers () {
-    const _error = (e) => { cli.log(e.errors || e, { 'log-level': cds.env.log.levels.cli }); _exit(1) }
-    const _exit = (c) => { console.log(); process.exit(c) }
-    cds.repl || process.on ('unhandledRejection', _error)
-    cds.repl || process.on ('uncaughtException', _error)
+    // for compatibility with lkg -> remove after next release of cds-dk
   },
 
   get log() { return this.log = require('./utils/log') }

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

@@ -71,8 +71,8 @@ class HanaDeployer {
         await fs.write(path.join(currentModelFolder, 'undeploy.json'), JSON.stringify(undeployWhitelist, null, 2));
       }
 
-      const isEmpty = !Object.keys(vcapEnv).length;
-      if (!isEmpty) {
+      const hasVCAPEnv = Object.keys(vcapEnv).length > 0;
+      if (hasVCAPEnv) {
         await fs.mkdir(currentModelFolder, { recursive: true });
       } else {
         const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =
@@ -106,7 +106,14 @@ class HanaDeployer {
 
       await hdiDeployUtil.deploy(currentModelFolder, vcapEnv, hdiOptions);
 
-      if (bindCallback) {
+      // let isLoggedInToCF;
+      // try {
+      //   isLoggedInToCF = !!(await cfUtil.getCfTarget());
+      // } catch (err) {
+      //   // valid state: not logged in
+      // }
+      // if (bindCallback && isLoggedInToCF) {
+      if (!hasVCAPEnv && bindCallback) {
         const args = [path.relative(projectPath, buildResult.task.src)];
         const options = { to: `${serviceName}:${serviceKeyName}`, kind: buildResult.task.for }
         await bindCallback(args, options);