@sap/cds 6.1.2 → 6.2.1

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

@@ -79,7 +79,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
     }
 
     /**
-     * Deletes any content that has been created in folder '#this.task.dest/src/gen' by some inplace mode.
+     * Deletes any content that has been created in folder '#this.task.dest/src/gen' by inplace mode.
      * <br>
      * Note: Content created in staging build will be deleted by the #BuildTaskEngine itself.
      */
@@ -91,7 +91,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
     }
 
     /**
-     * Copies all files located at <src> (except HANA artefacts not contained in <db>/src/**) to the folder <dest>.
+     * Copies all files located at <src> (except HANA artifacts not contained in <db>/src/**) to the folder <dest>.
      * '*.csv' files are read based on the corresponding CDS model file location and copied as flat list into folder '<dest>/src/gen>'.
      *
      * @param {string} src
@@ -116,22 +116,24 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
         })
         await Promise.all(promises)
 
-        // 2. copy files except *.cds, *.csv, .env, default-env.json, ./node_modules/**
-        let blockList = "\\.cds$|\\.csv$|\\.hdbtabledata$"
-        blockList += this.hasBuildOption(CONTENT_ENV, false) ? "|\\.env($|\\..*$)" : ""
-        blockList += this.hasBuildOption(CONTENT_DEFAULT_ENV_JSON, false) ? "|default-env\\.json$" : ""
-        blockList = new RegExp(blockList)
-
-        await this.copyNativeContent(src, dest, (entry) => {
-            if (entry.startsWith(dbSrc)) {
-                // entire native content
-                return true
-            }
-            if (fs.statSync(entry).isDirectory()) {
-                return !/(\/|\\)node_modules(\/|\\)?$/.test(entry) || this.hasBuildOption(CONTENT_NODE_MODULES, true)
-            }
-            return !blockList.test(entry)
-        })
+        // 2. staging build: copy files except *.cds, .env, default-env.json, ./node_modules/**
+        if (this.isStagingBuild()) {
+            let blockList = "\\.cds$|\\.csv$|\\.hdbtabledata$"
+            blockList += this.hasBuildOption(CONTENT_ENV, false) ? "|\\.env($|\\..*$)" : ""
+            blockList += this.hasBuildOption(CONTENT_DEFAULT_ENV_JSON, false) ? "|default-env\\.json$" : ""
+            blockList = new RegExp(blockList)
+
+            await this.copyNativeContent(src, dest, (entry) => {
+                if (entry.startsWith(dbSrc)) {
+                    // entire native content
+                    return true
+                }
+                if (fs.statSync(entry).isDirectory()) {
+                    return !/(\/|\\)node_modules(\/|\\)?$/.test(entry) || this.hasBuildOption(CONTENT_NODE_MODULES, true)
+                }
+                return !blockList.test(entry)
+            })
+        }
     }
 
     /**
@@ -145,15 +147,20 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
         const dbCsvDir = path.join(src, "csv")
         const dbDataDir = path.join(src, "data")
         const csvDirs = [dbCsvDir, dbDataDir]
-        const regex = RegExp('\\.cds$|\\.csv$|\\.hdbtabledata$')
         const regexData = RegExp('\\.csv$|\\.hdbtabledata$')
-        await this.copyNativeContent(src, dest, (entry) => {
-            if (fs.statSync(entry).isDirectory()) {
-                return !/(\/|\\)node_modules(\/|\\)?$/.test(entry)
-            }
-            return (!regex.test(entry) && entry !== this.env.build.outputfile) ||
-                (regexData.test(entry) && !entry.startsWith(dbCsvDir) && !entry.startsWith(dbDataDir))
-        })
+
+        if (this.isStagingBuild()) {
+            const regex = RegExp('\\.cds$|\\.csv$|\\.hdbtabledata$')
+
+            await this.copyNativeContent(src, dest, (entry) => {
+                if (fs.statSync(entry).isDirectory()) {
+                    return !/(\/|\\)node_modules(\/|\\)?$/.test(entry)
+                }
+                return (!regex.test(entry) && entry !== this.env.build.outputfile) ||
+                    (regexData.test(entry) && !entry.startsWith(dbCsvDir) && !entry.startsWith(dbDataDir))
+            })
+        }
+
         // handle *.csv and *.hdbtabledata located in '<dbSrc>/data' and '<dbSrc>/csv' folder
         const allFiles = csvDirs.reduce((acc, csvDir) => {
             return acc.concat(BuildTaskHandlerInternal._find(csvDir, (entry) => {
@@ -244,7 +251,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
         const pluginTypes = new Set([...REQUIRED_PLUGIN_TYPES, ...undeployTypes])
 
         // compile to old format (.hdbcds) or new format (.hdbtable / .hdbview)
-        const format = this.getBuildOption(DEPLOY_FORMAT) || this.env.get("requires.db." + DEPLOY_FORMAT) || this.env.get("hana." + DEPLOY_FORMAT)
+        const format = this.getBuildOption(DEPLOY_FORMAT) || this.env.requires.db?.[DEPLOY_FORMAT] || this.env.hana?.[DEPLOY_FORMAT]
         if (!this.cds.compile.to[format]) {
             return Promise.reject(new Error(`Invalid deploy-format defined: ${format}`))
         }

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

@@ -4,7 +4,7 @@ const path = require('path')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const { isOldJavaStack, BuildError } = require('../../util')
 
-const { BUILD_OPTION_OUTPUT_MODE, ODATA_VERSION, ODATA_VERSION_V2, OUTPUT_MODE_RESULT_ONLY, FILE_EXT_CDS, SKIP_ASSERT_COMPILER_V2, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
+const { BUILD_OPTION_OUTPUT_MODE, ODATA_VERSION_V2, OUTPUT_MODE_RESULT_ONLY, FILE_EXT_CDS, SKIP_ASSERT_COMPILER_V2, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
 const { INFO } = require('../../buildTaskHandler')
 
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize('src/main/resources/edmx')
@@ -19,15 +19,15 @@ class JavaModuleBuilder extends BuildTaskHandlerEdmx {
         const { src, dest } = this.task
 
         const odataOptions = {
-            version: this.env.get(ODATA_VERSION)
+            version: this.env.odata?.version
         }
 
         if (await isOldJavaStack([src, this.buildOptions.root])) {
-            if (!this._isCompilerV1() && !this.env.get(`build.${SKIP_ASSERT_COMPILER_V2}`)) {
+            if (!this._isCompilerV1() && !this.env.build?.[SKIP_ASSERT_COMPILER_V2]) {
                 throw new BuildError('CDS compiler version 2 does no longer support the classic CAP Java runtime. It is recommended to migrate to the current CAP Java runtime SDK. See https://cap.cloud.sap/docs/java/migration for more.')
             }
             // default is now v4 and not v2 anymore, so warn and overwrite with v2 if using default
-            if (!this.env.for('cds', this.buildOptions.root, false).get(ODATA_VERSION)) {
+            if (!this.env.for('cds', this.buildOptions.root, false).odata?.version) {
                 odataOptions.version = ODATA_VERSION_V2
                 this.pushMessage('Forcing OData v2 for building though the default is v4. Make sure to define OData v2 in cds configuration.', INFO)
             }
@@ -53,7 +53,7 @@ class JavaModuleBuilder extends BuildTaskHandlerEdmx {
                 this._result.languageBundles = i18n.bundles
             }
         }
-        if (!this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
+        if (this.isStagingBuild() && !this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
             await this._copyNativeContent(src, dest)
         }
         return this._result
@@ -61,8 +61,7 @@ class JavaModuleBuilder extends BuildTaskHandlerEdmx {
 
     async clean() {
         if (this.isStagingBuild()) {
-            await super.clean()
-            return
+            return super.clean()
         }
         this.logger._debug && this.logger.debug(`Deleting build target folder ${this.task.options.compileDest}`)
         await fs.promises.rm(this.task.options.compileDest, { force: true, recursive: true })

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

@@ -7,7 +7,7 @@ const { isStreamlinedMtx } = require('../../util')
 const ResourcesTarProvider = require('./resourcesTarBuilder')
 
 const { BUILD_TASK_HANA, FOLDER_GEN } = require('../../constants')
-const { WARNING } = require('../../buildTaskHandler')
+const { WARNING, ERROR } = BuildTaskHandlerEdmx
 const FOLDER_SDC = "sdc"
 const FOLDER_NODE_MODULES = "node_modules"
 const FOLDER_TEMPLATES = "tpl"
@@ -42,7 +42,7 @@ class StreamlinedMtxBuilder {
     async build() {
         // Non-sidecar scenario: model-provider is implemented by the Nodejs app itself (default for Nodejs).
         // Only create resources TAR, compiled CSN(s) are created by the Nodejs app build task.
-        const dest = this._handler.env.get("build.target") !== "." ? this._handler.task.dest : path.join(this._handler.task.dest, FOLDER_GEN)
+        const dest = this._handler.env.build?.target !== "." ? this._handler.task.dest : path.join(this._handler.task.dest, FOLDER_GEN)
         const model = await this._handler.model()
         if (!model) {
             return
@@ -64,7 +64,7 @@ class ClassicMtxBuilder {
     }
 
     async build() {
-        if (this._handler.env.get("requires.toggles") === true) {
+        if (this._handler.env.requires.toggles === true) {
             throw new Error("Feature toggles are only supported by Streamlined MTX")
         }
 
@@ -78,7 +78,7 @@ class ClassicMtxBuilder {
         // custom build tasks for srv and db modules might be defined
         const tenantDbPath = await this._getHanaTenantDbPath()
 
-        // validate extension whitlists defined for this SaaS application
+        // validate extension whitelists defined for this SaaS application
         this._validateExtensionAllowLists(model, tenantDbPath)
 
         // copy base model sources
@@ -100,7 +100,7 @@ class ClassicMtxBuilder {
         if (i18n) {
             this._handler._result.languageBundles = i18n.bundles
         }
-        
+
         // copy native hana content and templates
         await this._copyNativeContent(this._handler.task.src, destSdc, tenantDbPath)
     }
@@ -114,7 +114,7 @@ class ClassicMtxBuilder {
     }
 
     async _copyNativeContent(src, dest, tenantDbPath) {
-        // copying tmplates
+        // copying templates
         const tplSrc = path.join(src, FOLDER_TEMPLATES)
         if (fs.existsSync(tplSrc)) {
             const tplDest = path.join(path.dirname(dest), FOLDER_TEMPLATES)
@@ -122,9 +122,13 @@ class ClassicMtxBuilder {
         }
 
         if (tenantDbPath) {
-            // copy any static HANA artifacts, e.g. .csv files
+            // copy native HANA artifacts, e.g. .csv files
             const dbDest = path.resolve(dest, path.relative(this._handler.buildOptions.root, tenantDbPath))
-            await this._copyNativeHanaContent(tenantDbPath, dbDest)
+            if (!src.startsWith(dbDest)) { // ensure valid paths
+                await this._copyNativeHanaContent(tenantDbPath, dbDest)
+            } else {
+                this.pushMessage(`Invalid mtx build task configuration detected, destination folder ${dbDest} must not be nested within 'src' folder`, ERROR)
+            }
         }
     }
 
@@ -158,18 +162,16 @@ class ClassicMtxBuilder {
      * @param {Object} model - the reflected csn for this SaaS application
      */
     _validateExtensionAllowLists(model, tenantDbPath) {
-        let entityWhitelist = this._handler.env.get("mtx.entity-whitelist")
-        let serviceWhitelist = this._handler.env.get("mtx.service-whitelist")
-        let extensionAllowlist = this._handler.env.get("mtx.extension-allowlist")
+        let entityWhitelist = this._handler.env.mtx?.["entity-whitelist"]
+        let serviceWhitelist = this._handler.env.mtx?.["service-whitelist"]
+        let extensionAllowlist = this._handler.env.mtx?.["extension-allowlist"]
 
         // for java projects mtx configuration is part of sidecar config
         if (!entityWhitelist && !serviceWhitelist && !extensionAllowlist && tenantDbPath) {
             const dbEnv = this._handler.env.for("cds", tenantDbPath)
-            if (dbEnv && dbEnv.get("mtx")) {
-                entityWhitelist = dbEnv.get("mtx.entity-whitelist")
-                serviceWhitelist = dbEnv.get("mtx.service-whitelist")
-                extensionAllowlist = dbEnv.get("mtx.extension-allowlist")
-            }
+            entityWhitelist = dbEnv.mtx?.["entity-whitelist"]
+            serviceWhitelist = dbEnv.mtx?.["service-whitelist"]
+            extensionAllowlist = dbEnv.mtx?.["extension-allowlist"]
         }
 
         function isValid(e, pattern, nsPattern, kind) {
@@ -231,14 +233,14 @@ class ClassicMtxBuilder {
         // ensure that the hana task is contained even if this mtx task has been executed solely using "cds build --for mtx"
         if (!tasks.find(task => task.for === BUILD_TASK_HANA)) {
             //mtx task might have been executed as separate task
-            tasks = this._handler.env.get("build.tasks") || []
+            tasks = this._handler.env.build?.tasks || []
             if (tasks.length === 0) {
                 const provider = new BuildTaskProviderInternal(this._handler.cds, this._handler.logger)
                 await provider.lookupTasks(tasks, this._handler.buildOptions)
             }
         }
         // the SaaS app might use a tenant aware db as well as a shared db deployed using static hdi-deployer
-        // pick the hana build task refering to the tenant aware db - the src path has to be contained in this build task's model options
+        // pick the hana build task referring to the tenant aware db - the src path has to be contained in this build task's model options
         const hanaDbPaths = tasks.filter(task => task.for === BUILD_TASK_HANA).map(hanaTask => path.resolve(this._handler.buildOptions.root, hanaTask.src || this._handler.env.folders.db))
         let tenantDbPath = hanaDbPaths.find(hanaDbPath => hanaDbPaths.length === 1 || modelPaths.some(modelPath => path.dirname(modelPath) === hanaDbPath))
 

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

@@ -22,12 +22,9 @@ class ResourcesTarBuilder {
         await this.writeTarFile(files, root, path.join(dest, DEFAULT_TAR_NAME))
     }
 
-    async writeTarFile(files, root, tarFile) {
-        const { packTarArchive } = require('../../../../lib/utils/resources')
-        const buffer = await packTarArchive(files, root)
-        if (buffer) {
-            await this.handler.write(buffer).to(tarFile)
-        }
+    async writeTarFile(files, root, tarFile) { // REVISIT: eliminate this anti-pattern helper
+        const { tar } = require('../../../../lib').utils
+        await tar.czfd (tarFile, root, files) // REVISIT: tar.czfd was created for this case only -> it ensures the target's dir exists
     }
 
     async _getResources(model) {
@@ -45,10 +42,10 @@ class ResourcesTarBuilder {
 
     /**
      * Reads all resources for HANA deployment - 'db/src/**' and 'db/undeploy.json'.
-     * - CSV files, native HANA artefacts, generated HANA artefacts, undeploy.json
+     * - CSV files, native HANA artifacts, generated HANA artifacts, undeploy.json
      * See '../../../../lib.deploy'
      * Note: the hana build task has already been executed
-     * @param {string} root 
+     * @param {string} root
      * @returns an array containing all resources
      */
     _getHanaResources(root) {
@@ -65,9 +62,9 @@ class ResourcesTarBuilder {
 
     /**
      * Reads all resources for Sqlite deployment - see '../../../../lib.deploy'
-     * 
-     * @param {object} model 
-     * @returns 
+     *
+     * @param {object} model
+     * @returns
      */
     async _getSqliteResources(model) {
         const { resources } = this.handler.cds.deploy

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

@@ -4,7 +4,7 @@ const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
 const NodeCfModuleBuilder = require('../nodejs')
 const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
 const { INFO, ERROR } = NodeCfModuleBuilder
-const { relativePaths, BuildError } = require('../../util')
+const { relativePaths, BuildError, resolveRequiredSapModels } = require('../../util')
 
 const DEFAULT_MAIN_FOLDER = "_main"
 
@@ -47,7 +47,7 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         const model = this._compileSidecarSync(sidecarEnv)
         await this.compileToJson(model, path.join(destSidecarSrc, DEFAULT_CSN_FILE_NAME))
         await this.collectLanguageBundles(model, destSidecarSrc)
-        await this._copyProjectRootContent(this.task.src, destSidecar)
+        await this.copyProjectRootContent(this.task.src, destSidecar)
     }
 
     /**
@@ -56,15 +56,15 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
      */
     async _buildMainApp(sidecarEnv) {
         if (sidecarEnv.requires['cds.xt.ModelProviderService']?.kind !== 'in-sidecar') {
-            throw new Error("Invalid MTX sidecar configuration - \"cds.xt.ModelProviderService\": \"in-sidecar\" missing")
+            throw new BuildError("CDS build failed", "Invalid MTX sidecar configuration - \"cds.xt.ModelProviderService\": \"in-sidecar\" missing.")
         }
         let main = sidecarEnv.requires['cds.xt.ModelProviderService']?.root
-        const profiles = this.env.get("profiles") || []
+        const profiles = this.env.profiles || []
 
         if (!profiles.includes("production") && !profiles.includes("prod")) {
             main = DEFAULT_MAIN_FOLDER
             // root should represent the production use case and not development
-            this.pushMessage(`Sidecar main application build results are created in folder '${main}'. Enable the 'production' or 'prod' profile if the folder is configured differently.`, INFO)
+            this.pushMessage(`MTX sidecar build results are created in folder '${main}'. Enable 'production' or 'prod' profile if the folder is configured differently.`, INFO)
         }
         const destRoot = this.task.dest
         const destMain = path.join(destRoot, main)
@@ -98,21 +98,17 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
             const modelFilePaths = this.cds.resolve(modelPaths)
 
             if (!modelFilePaths || modelFilePaths.length === 0) {
-                throw new BuildError("No model found for MTX sidecar app")
-            }
-            // candidate for strict mode support
-            // entries for @sap/** model paths are missing if the module hasn't been installed, e.g. @sap/cds-mtxs
-            const missingModels = modelPaths.filter(p => {
-                if (p.startsWith('@sap/')) {
-                    const files = this.cds.resolve(p)
-                    return !files || files.length === 0
-                }
-            })
-            if (missingModels.length > 0) {
-                this.pushMessage(`Some model paths could not be resolved. Make sure the npm modules have been installed: ${missingModels.join(', ')}`, ERROR)
+                throw new BuildError("No CDS service models found in MTX sidecar. Make sure required npm modules are installed.")
             }
             this._logger._debug && this._logger.debug(`sidecar model: ${relativePaths(this.buildOptions.root, modelFilePaths).join(", ")}`)
 
+            // check whether all models belonging to the @sap namespace can be resolved
+            const unresolved = resolveRequiredSapModels(this.cds, modelPaths)
+            if (unresolved.length > 0) {
+                // log error, but don't fail
+                this.pushMessage(`CDS service models [${unresolved.join(', ')}] required by MTX sidecar cannot be resolved. Make sure to install the missing npm modules.`, ERROR)
+            }
+
             // synchronous compilation
             return this.cds.load(modelFilePaths, { sync: true, ...this.options() })
         } finally {

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

@@ -2,7 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const { BuildError } = require('../../util')
-const { BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY, ODATA_VERSION, ODATA_VERSION_V2, FOLDER_GEN, BUILD_NODEJS_EDMX_GENERAION, EDMX_GENERATION,
+const { BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY, ODATA_VERSION_V2, FOLDER_GEN, BUILD_NODEJS_EDMX_GENERAION, EDMX_GENERATION,
     SKIP_PACKAGE_JSON_GENERATION, CONTENT_EDMX, CONTENT_PACKAGE_JSON, CONTENT_PACKAGELOCK_JSON, CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, SEMVER_REGEX } = require('../../constants')
 const { WARNING, ERROR } = BuildTaskHandlerEdmx
 
@@ -29,7 +29,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
     }
 
     options() {
-        const options = super.options(), {cds} = this
+        const options = super.options(), { cds } = this
         if (cds.requires.extensibility || cds.requires.toggles) options.flavor = 'xtended'
         return options
     }
@@ -38,7 +38,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
         const destSrv = this.isStagingBuild() ? this.destSrv : path.resolve(this.destSrv, this.env.folders.srv)
         const destRoot = this.isStagingBuild() ? this.task.dest : this.destSrv
 
-        if (this.env.get(ODATA_VERSION) === ODATA_VERSION_V2) {
+        if (this.env.odata?.version === ODATA_VERSION_V2) {
             // log warning as nodejs is only supporting odata version V4
             this.pushMessage("OData v2 is not supported by node runtime. Make sure to define OData v2 in cds configuration.", WARNING)
         }
@@ -58,7 +58,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
             await this.compileToEdmx(m, this.destSrv)
         }
 
-        if (!this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
+        if (this.isStagingBuild() && !this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
             const srcSrv = this.task.src === this.buildOptions.root ? path.resolve(this.task.src, this.env.folders.srv) : this.task.src
             await this._copyNativeContent(this.buildOptions.root, srcSrv, destRoot, destSrv)
         }
@@ -80,11 +80,11 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
         const filesFilter = await this._copySrvContent(srcSrv, destRoot, destSrv)
 
         // project/* -> 'gen/srv/*'
-        await this._copyProjectRootContent(srcRoot, destRoot, (entry) => !filesFilter.includes(path.basename(entry)))
+        await this.copyProjectRootContent(srcRoot, destRoot, (entry) => !filesFilter.includes(path.basename(entry)))
     }
 
     /**
-     * Copy files from the given <em>src</em>' folder (e.g. 'project/srv') to either <em>destRoot</em> (e.g. 'project/gen/srv')
+     * Copy files for nodejs staging builds from the given <em>src</em>' folder (e.g. 'project/srv') to either <em>destRoot</em> (e.g. 'project/gen/srv')
      * or <em>destSrv</em> (e.g. 'project/gen/srv/srv') folders according to the file semantics.
      * Files with project semantics like 'package.json' or '.npmrc' file are copied to <em>destRoot</em> while others like '.js' service handlers
      * are copied to <em>destSrv</em>.
@@ -127,6 +127,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
                 return this.copy(path.join(src, fileName)).to(path.join(destRoot, fileName))
             }
         }))
+
         return srvRootFileNames
     }
 
@@ -137,7 +138,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
      * @param {*} dest
      * @param {*} filter - copy file if filter function returns true
      */
-    async _copyProjectRootContent(src, dest, filter) {
+    async copyProjectRootContent(src, dest, filter) {
         let { folders = ['i18n'] } = this.env.i18n
         folders.push('handlers')
         folders = folders.map(folder => path.join(src, folder))

package/bin/build/util.js

@@ -127,17 +127,34 @@ function isStreamlinedMtx(cds) {
     if (hasOptionValue(process.env.OLD_MTX, true)) {
         return false
     }
-    return (cds.env.get("requires.toggles")
+    return (cds.env.requires.toggles
         || cds.env.requires['cds.xt.ModelProviderService']
-        || (typeof cds.env.get("requires.multitenancy") === "object")
+        || (typeof cds.env.requires.multitenancy === "object")
     ) && !(() => { try { return cds.mtx } catch (e) { /**/ } })()
 }
 
+/**
+ * Returns a list of fully qualified model names belonging to the '@sap' namespace that cannot be resolved. 
+ * E.g. the npm module might NOT be installed.
+ * @param {*} cds 
+ * @param {Array} modelPaths 
+ * @returns {Array}
+ */
+function resolveRequiredSapModels(cds, modelPaths) {
+    return modelPaths.filter(p => {
+        if (p.startsWith('@sap/')) {
+            const files = cds.resolve(p)
+            return !files || files.length === 0
+        }
+    })
+}
+
 class BuildMessage extends Error {
-    constructor(message, severity) {
+    constructor(message, severity = SEVERITY_ERROR) {
         super(message)
         this.name = "BuildMessage"
         this.severity = severity
+        this.stack = ""
     }
     toString() {
         return this.severity + ": " + this.message
@@ -148,7 +165,7 @@ class BuildError extends BuildMessage {
     constructor(message, messages = []) {
         super(message, SEVERITY_ERROR)
         this.name = "BuildError"
-        this.messages = messages
+        this.messages = Array.isArray(messages) ? messages : [messages]
     }
 
     // for compatibility reasons
@@ -170,6 +187,7 @@ module.exports = {
     hasOptionValue,
     relativePaths,
     isStreamlinedMtx,
+    resolveRequiredSapModels,
     BuildMessage,
     BuildError
 }

package/bin/cds.js

@@ -8,10 +8,6 @@ const cli = { //NOSONAR
   },
 
   exec (cmd = process.argv[2], ...argv) {
-    if (process[Symbol.for('ts-node.register.instance')]) {
-      process.env.CDS_TYPESCRIPT = process.env.CDS_TYPESCRIPT || 'true'
-    }
-    require('util').inspect.defaultOptions = { colors: !!process.stderr.isTTY, depth:11 }
     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]
@@ -102,6 +98,14 @@ const _die_needsDk = (cmd) => {
   return console.error (message)
 }
 
+require('util').inspect.defaultOptions = {
+  colors: !!process.stdout.isTTY && !!process.stderr.isTTY,
+  depth:11, breakLength:111
+}
+if (process[Symbol.for('ts-node.register.instance')]) {
+  process.env.CDS_TYPESCRIPT = process.env.CDS_TYPESCRIPT || 'true'
+}
+
 module.exports = Object.assign ((..._) => cli.exec(..._), cli)
 if (!module.parent)  cli.exec()
 /* eslint no-console:off */

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

@@ -14,6 +14,11 @@ const CF_COMMAND = 'cf';
 const POLL_COUNTER = 40;
 const POLL_DELAY = 2500; //ms
 
+const OPERATION_STATE_INITIAL = 'initial';
+const OPERATION_STATE_IN_PROGRESS = 'in progress';
+const OPERATION_STATE_FAILED = 'failed';
+const OPERATION_STATE_SUCCEEDED = 'succeeded';
+
 
 class CfUtil {
 
@@ -94,7 +99,11 @@ class CfUtil {
         }
 
         const response = await this._cfRun(...args);
-        const result = response ? JSON.parse(response) : {};
+        if (!response) {
+            throw new Error(`The response from the server was empty. Maybe your token is expired. Run the command again and re-log on in case the problem persists.`);
+        }
+
+        const result = JSON.parse(response);
         if (result.errors) {
             const errorMessage = result.errors.map((entry) => `${entry.title}: ${entry.detail} (${entry.code})`).join('\n');
             throw new Error(errorMessage);
@@ -104,10 +113,10 @@ class CfUtil {
 
     _extract(string, pattern, errorMsg) {
         const match = string.match(pattern);
-        if (!match || !match[1]) {
-            throw new Error(errorMsg);
+        if (match?.[1]) {
+            return match[1];
         }
-        return match[1];
+        throw new Error(errorMsg);
     }
 
     async getCfTargetFromConfigFile() {
@@ -138,6 +147,8 @@ class CfUtil {
     }
 
     async getCfTarget() {
+        // check if token is valid or expired / missing
+        await this._cfRun('oauth-token');
         return await this.getCfTargetFromConfigFile() || await this.getCfTargetFromCli();
     }
 
@@ -149,13 +160,13 @@ class CfUtil {
 
             const { org, space } = target;
             const orgs = await this._cfRequest(`/v3/organizations`, { names: org });
-            if (!orgs.resources || orgs.resources.length !== 1) {
+            if (!orgs?.resources?.length) {
                 throw new Error(`CF org ${bold(org)} not found!`);
             }
 
             const orgGuid = orgs.resources[0].guid;
             const spaces = await this._cfRequest(`/v3/spaces`, { names: space, organization_guids: orgGuid });
-            if (!spaces.resources || spaces.resources.length !== 1) {
+            if (!spaces?.resources?.length) {
                 throw new Error(`CF space ${bold(space)} not found in org ${bold(org)}!`);
             }
 
@@ -179,16 +190,27 @@ class CfUtil {
                 space_guids: spaceInfo.spaceGuid,
                 organization_guids: spaceInfo.orgGuid
             });
-            if (!serviceInstances || !serviceInstances.resources || serviceInstances.resources.length < 1) {
+            if (!serviceInstances?.resources?.length) {
                 return null;
             }
 
             const serviceInstance = serviceInstances.resources[0];
-            if (serviceInstance && serviceInstance.last_operation && serviceInstance.last_operation.state !== 'in progress') {
-                return serviceInstance;
-            }
+            switch (serviceInstance?.last_operation?.state?.toLowerCase()) {
+                case OPERATION_STATE_INITIAL:
+                case OPERATION_STATE_IN_PROGRESS:
+                    await this._sleep(POLL_DELAY);
+                    break;
+
+                case OPERATION_STATE_SUCCEEDED:
+                    return serviceInstance;
+
+                case OPERATION_STATE_FAILED:
+                    throw new Error(`The returned service reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(serviceInstance, null, 4)}`);
 
-            await this._sleep(POLL_DELAY);
+                default:
+                    LOG.log(`Unsupported server response state '${serviceInstance?.last_operation?.state}'. Waiting for next response.`);
+                    break;
+            }
         }
 
         throw new Error(`Timeout occurred while getting service ${bold(serviceName)}`);
@@ -214,7 +236,7 @@ class CfUtil {
             service_offering_names: serviceOfferingName
         });
 
-        if (!servicePlan.resources || servicePlan.resources.length === 0) {
+        if (!servicePlan?.resources?.length) {
             throw new Error(`No service plans found`);
         }
 
@@ -261,16 +283,29 @@ class CfUtil {
         while (counter > 0) {
             counter--;
             const bindings = await this._cfRequest(`/v3/service_credential_bindings`, { names: serviceKeyName, service_instance_guids: serviceInstance.guid });
-            if (!bindings || !bindings.resources || bindings.resources.length < 1) {
+            if (!bindings?.resources?.length) {
                 return null;
             }
+
             const binding = bindings.resources[0];
-            if (binding && binding.last_operation && binding.last_operation.state !== 'in progress') {
-                const keyDetails = await this._cfRequest(`/v3/service_credential_bindings/${encodeURIComponent(binding.guid)}/details`);
-                return keyDetails.credentials;
-            }
+            switch (binding?.last_operation?.state?.toLowerCase()) {
+                case OPERATION_STATE_INITIAL:
+                case OPERATION_STATE_IN_PROGRESS:
+                    await this._sleep(POLL_DELAY);
+                    break;
+
+                case OPERATION_STATE_SUCCEEDED: {
+                    const keyDetails = await this._cfRequest(`/v3/service_credential_bindings/${encodeURIComponent(binding.guid)}/details`);
+                    return keyDetails.credentials;
+                }
+
+                case OPERATION_STATE_FAILED:
+                    throw new Error(`The returned binding reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(binding, null, 4)}`);
 
-            await this._sleep(POLL_DELAY);
+                default:
+                    LOG.log(`Unsupported server response state '${binding?.last_operation?.state}'. Waiting for next response.`);
+                    break;
+            }
         }
 
         throw new Error(`Timeout occurred while getting service key ${bold(serviceKeyName)}`);