@sap/cds 6.6.1 → 6.7.0

package/bin/build/provider/buildTaskProviderInternal.js

@@ -1,11 +1,12 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../cds')
-const { hasJavaNature, getProperty, isStreamlinedMtx, getDefaultModelOptions, BuildError } = require('../util')
+const { hasJavaNature, getProperty, isStreamlinedMtx, getDefaultModelOptions, BuildError, hasOptionValue } = 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_TASK_PREFIX, BUILD_TASKS, BUILD_TASK_MTX_SIDECAR, MTX_SIDECAR_FOLDER, BUILD_TASK_MTX_EXTENSION, CDS_MODEL_EXCLUDE_LIST } = require("../constants")
+    BUILD_TASK_PREFIX, BUILD_TASKS, BUILD_TASK_MTX_SIDECAR, MTX_SIDECAR_FOLDER, BUILD_TASK_MTX_EXTENSION, NODEJS_MODEL_EXCLUDE_LIST,
+    DEFAULT_BUILT_IN_MODELS } = require("../constants")
 
 class BuildTaskProviderInternal extends BuildTaskProvider {
     constructor(logger) {
@@ -37,41 +38,10 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
         task.for = task.for || taskFor
         task.use = task.use || `${BUILD_TASK_PREFIX}/${taskFor}`
 
-        switch (taskFor) {
-            case BUILD_TASK_HANA:
-                task.src = task.src || BuildTaskProviderInternal._normalizePath(cds.env.folders.db)
-                break
-            case BUILD_TASK_JAVA:
-            case BUILD_TASK_JAVA_CF:
-                task.src = task.src || BuildTaskProviderInternal._normalizePath(cds.env.folders.srv)
-                if (!task.options?.model) {
-                    BuildTaskProviderInternal._setDefaultModelOptionsForJava(task, projectPath)
-                }
-                break
-            case BUILD_TASK_NODEJS:
-            case BUILD_TASK_NODE_CF:
-                task.src = task.src || BuildTaskProviderInternal._normalizePath(cds.env.folders.srv)
-                break
-            case BUILD_TASK_FIORI:
-                task.src = task.src || BuildTaskProviderInternal._normalizePath(cds.env.folders.app)
-                break
-            case BUILD_TASK_MTX_SIDECAR:
-                task.src = task.src || MTX_SIDECAR_FOLDER
-                if (!task.options?.model && BuildTaskProviderInternal._hasJavaNature(projectPath, cds.env.folders.srv)) {
-                    BuildTaskProviderInternal._setDefaultModelOptionsForJava(task, projectPath)
-                }
-                break
-            case BUILD_TASK_MTX_EXTENSION:
-            case BUILD_TASK_MTX:
-                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}'`)
-        }
+        BuildTaskProviderInternal._setDefaultSrcFolder(task)
+
+        // src folder needs to be initialized first
+        BuildTaskProviderInternal._setDefaultModel(task, projectPath)
     }
 
     async _createTasks(tasks, buildOptions, addRequiredTasks) {
@@ -136,10 +106,14 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
             if (srvTask) {
                 tasks.push(srvTask)
             }
-            // create mtx build task
-            const mtxTask = this._createMtxTask(projectPath, srv, srv, tasks)
-            if (mtxTask) {
-                tasks.push(mtxTask)
+
+            // REVISIT: disable for cds-dk projectReader - causing error due to inconsistent state during project creation
+            if (buildOptions.resolve !== false) {
+                // create mtx build task
+                const mtxTask = this._createMtxTask(projectPath, srv, srv, tasks)
+                if (mtxTask) {
+                    tasks.push(mtxTask)
+                }
             }
         }
     }
@@ -189,55 +163,60 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
     }
 
     _createMtxTask(projectPath, src, dest, tasks) {
-        // MTX build task creation is NOT supported for Java projects
-        if (tasks.some(task => task.for === BUILD_TASK_JAVA || task.for === BUILD_TASK_JAVA_CF)) {
-            return null
-        }
         this.logger.debug("determining mtx version of nodejs project")
 
         // preserve order of creation
         if (BuildTaskProviderInternal._isMtxExtension()) {
-            this.logger.debug("Streamlined MTX extension app")
-            return {
-                for: BUILD_TASK_MTX_EXTENSION
-            }
+            this.logger.debug("MTX extension app")
+            return { for: BUILD_TASK_MTX_EXTENSION }
         }
 
         if (isStreamlinedMtx()) {
-            if (cds.env.requires["cds.xt.ModelProviderService"]?.kind === "rest") { // "cds.xt.ModelProviderService": "from-sidecar"
-                this.logger.debug("Nodejs Streamlined MTX app with sidecar")
-
-                const sidecarPath = path.join(projectPath, MTX_SIDECAR_FOLDER)
-                if (!fs.existsSync(sidecarPath)) {
-                    throw new BuildError(`MTX sidecar directory '${sidecarPath}' not existing. Custom build task configuration necessary if the folder is named differently.`)
+            const sidecarPath = path.join(projectPath, MTX_SIDECAR_FOLDER)
+            let sidecarEnv
+            if (fs.existsSync(sidecarPath)) {
+                sidecarEnv = cds.env.for("cds", sidecarPath)
+            }
+            if (
+                cds.env.profiles.includes('with-mtx-sidecar') || // new presets
+                cds.env.requires["cds.xt.ModelProviderService"]?.external // for compatibility with former mtxs presets
+            ) {
+                this.logger.debug("MTX app with sidecar")
+                if (!sidecarEnv) {
+                    throw new BuildError(`MTX sidecar directory '${sidecarPath}' not existing. Custom build task configuration required if the folder is named differently.`)
                 }
-                const sidecarEnv = cds.env.for("cds", sidecarPath)
-                if (sidecarEnv.requires["cds.xt.ModelProviderService"]?.kind === "in-sidecar") {
-                    return {
-                        for: BUILD_TASK_MTX_SIDECAR
-                    }
+                if (!sidecarEnv.requires["cds.xt.ModelProviderService"]?._in_sidecar) {
+                    throw new BuildError(`Invalid MTX sidecar configuration - profile 'mtx-sidecar' not set.`)
                 }
-                throw new BuildError("Invalid MTX sidecar configuration - \"cds.xt.ModelProviderService\": \"in-sidecar\" missing.")
+                return { for: BUILD_TASK_MTX_SIDECAR }
+            }
+            if (sidecarEnv?.requires["cds.xt.ModelProviderService"]?._in_sidecar) {
+                throw new BuildError(`MTX sidecar configuration requires profile 'with-mtx-sidecar' or custom build task configuration.`)
             }
 
-            if (cds.env.requires["cds.xt.ModelProviderService"]?.kind === "in-sidecar") {
+            if (cds.env.requires["cds.xt.ModelProviderService"]?._in_sidecar) {
                 // cds build is executed in sidecar folder
-                throw new BuildError("Invalid working directory. Make sure to execute 'cds build' in CAP project root directory.")
+                throw new BuildError(`Invalid working directory ${projectPath}. Make sure to execute 'cds build' in the CAP project root directory.`)
             }
 
-            this.logger.debug("Nodejs Streamlined MTX app without sidecar")
-            return {
-                for: BUILD_TASK_MTX,
-                src
+            // without sidecar
+            if (!tasks.some(task => task.for === BUILD_TASK_JAVA || task.for === BUILD_TASK_JAVA_CF)) {
+                this.logger.debug("Nodejs MTX app without sidecar")
+                return {
+                    for: BUILD_TASK_MTX,
+                    src
+                }
             }
         }
 
-        if (cds.env.requires.multitenancy) {
-            this.logger.debug("Nodejs Classic MTX app without sidecar")
-            return {
-                src: ".",
-                for: BUILD_TASK_MTX,
-                dest
+        if (!tasks.some(task => task.for === BUILD_TASK_JAVA || task.for === BUILD_TASK_JAVA_CF)) {
+            if (cds.env.requires.multitenancy) {
+                this.logger.debug("Nodejs Classic MTX app without sidecar")
+                return {
+                    src: ".",
+                    for: BUILD_TASK_MTX,
+                    dest
+                }
             }
         }
     }
@@ -284,25 +263,78 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
         return !!cds.env.extends
     }
 
-    /**
-     * REVISIT: filter model options in order to avoid that the bootstrap service gets added to the application model
-     * https://github.tools.sap/cap/issues/issues/12770#issuecomment-1805719
-     */
-    static _setDefaultModelOptionsForJava(task, projectPath) {
-        const defaultModelPaths = new Set(getDefaultModelOptions(projectPath))
-        defaultModelPaths.add(task.src)
-        CDS_MODEL_EXCLUDE_LIST.forEach(m => defaultModelPaths.delete(m))
+    static _setDefaultSrcFolder(task) {
+        switch (task.for) {
+            case BUILD_TASK_HANA:
+                task.src = task.src || this._normalizePath(cds.env.folders.db)
+                break
+            case BUILD_TASK_JAVA:
+            case BUILD_TASK_JAVA_CF:
+            case BUILD_TASK_NODEJS:
+            case BUILD_TASK_NODE_CF:
+                task.src = task.src || this._normalizePath(cds.env.folders.srv)
+                break
+            case BUILD_TASK_FIORI:
+                task.src = task.src || this._normalizePath(cds.env.folders.app)
+                break
+            case BUILD_TASK_MTX_SIDECAR:
+                task.src = task.src || MTX_SIDECAR_FOLDER
+                break
+            case BUILD_TASK_MTX_EXTENSION:
+                task.src = task.src || "."
+                break
+            case BUILD_TASK_MTX:
+                if (isStreamlinedMtx()) {
+                    task.src = task.src || this._normalizePath(cds.env.folders.srv)
+                } else {
+                    task.src = task.src || "."
+                }
+                break
+            default:
+                throw new Error(`Unknown build task '${task.use || task.for}'`)
+        }
+    }
+
+    static _setDefaultModel(task, projectPath) {
+        let taskModelPaths = task.options?.model
+        if (taskModelPaths && !Array.isArray(taskModelPaths)) {
+            taskModelPaths = [taskModelPaths]
+        }
         task.options = task.options || {}
-        task.options.model = [...defaultModelPaths]
+        let defaultModelPaths = []
+        // add default models to custom build tasks if this hasn't been disabled
+        if (taskModelPaths?.length) {
+            if (!hasOptionValue(task.options?.[DEFAULT_BUILT_IN_MODELS], false)) {
+                // get the built-in models
+                defaultModelPaths = getDefaultModelOptions(projectPath).filter(p => p.match('@sap/cds'))
+            }
+        } else {
+            defaultModelPaths = getDefaultModelOptions(projectPath)
+            defaultModelPaths.push(task.src)
+            if (hasOptionValue(task.options?.[DEFAULT_BUILT_IN_MODELS], false)) {
+                // all default models except the built-in models
+                defaultModelPaths = defaultModelPaths.filter(p => !p.match('@sap/cds'))
+            }
+        }
+
+        // REVISIT: filter nodejs bootstrap service models for Java - issues/12770#issuecomment-1805719
+        if (this._hasJavaNature(projectPath, cds.env.folders.srv)) {
+            defaultModelPaths = defaultModelPaths.filter(p => !NODEJS_MODEL_EXCLUDE_LIST.includes(p))
+        }
+        // also add built-in models to custom build tasks already containing model options
+        if (!taskModelPaths || defaultModelPaths.length) {
+            task.options.model = [...new Set(taskModelPaths?.length ? taskModelPaths.concat(defaultModelPaths) : defaultModelPaths)]
+        }
     }
 
     /**
      * Returns whether this project is a java project or not.
      * @param {string} projectPath - the absolute project path
-     * @param {string} src - the folder name of the service module
+     * @param {string} srv - the folder name of the service module
      */
-    static _hasJavaNature(projectPath, src) {
-        return hasJavaNature([path.join(projectPath, src), projectPath])
+    static _hasJavaNature(projectPath, srv) {
+        srv = this._getModuleFolder(projectPath, Array.isArray(srv) ? srv : [srv])
+        return hasJavaNature([projectPath, srv && path.join(projectPath, srv)])
     }
 
     static _getForValueFromTask(task) {

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

@@ -436,7 +436,12 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
         if (fs.existsSync(file)) {
             const undeployList = JSON.parse((await fs.promises.readFile(file)).toString(), 'utf-8')
             if (Array.isArray(undeployList)) {
-                undeployList.forEach(entry => result.add(path.extname(entry)))
+                undeployList.forEach(entry => {
+                    const extName = path.extname(entry)
+                    if (extName) {
+                        result.add(extName)
+                    }
+                })
             }
         }
         return result

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

@@ -3,9 +3,9 @@ const fs = require('fs')
 const cds = require('../../cds')
 
 const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
-const { FOLDER_GEN } = require('../../constants')
+const { FOLDER_GEN, EXTENSION_POINT_VALIDATION } = require('../../constants')
 const ResourcesTarBuilder = require('../mtx/resourcesTarBuilder')
-const { BuildError } = require('../../util')
+const { BuildError, BuildMessage } = require('../../util')
 
 class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
     init() {
@@ -18,43 +18,32 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
     async build() {
         const { src, dest } = this.task
         const destExt = path.join(dest, 'ext')
-
-        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?`)
+        // check existence of appPackage folder only
+        // REVISIT: cds.resolve will fail as no index.csn file exists in this folder for the extension migration use case
+        // a compilation error is thrown anyhow if any base model refs cannot be resolved
+        const appPackageFolder = this._getAppPackageFolder()
+        if (!fs.existsSync(path.join(src, appPackageFolder))) {
+            throw new BuildError(`The SaaS application base model '${appPackageFolder}' is missing. Have you run the 'cds pull' command?`)
         }
 
-        // copy handlers
-        const folders = [path.join(src, cds.env.folders.srv, 'handlers')]
-        await this.copyNativeContent(src, destExt, res => {
-            if (fs.statSync(res).isDirectory()) {
-                return folders.some(folder => folder.startsWith(res))
-            }
-            if (folders.includes(path.dirname(res)) && /\.js$/.test(res)) {
-                return true
-            }
-        })
-
+        // full compile of the extension using base model - ensuring consistency
         const model = await this.model()
+
         if (model) {
             // extension CSN using parsed format
             const options = { ...this.options(), flavor: 'parsed' }
-            const extCsn = await cds.load(this.resolveModel(), options)
-            if (extCsn.requires) {
-                extCsn.requires.length = 0
+            const extModel = await cds.load(this.resolveModel(), options)
+            if (extModel.requires) {
+                extModel.requires.length = 0
             }
-            await this.compileToJson(extCsn, path.join(destExt, 'extension.csn'))
 
-            await this.collectLanguageBundles(extCsn, path.join(destExt, 'i18n'))
+            if (!this.hasBuildOption(EXTENSION_POINT_VALIDATION, false)) {
+                this._lintExtModel(extModel, model) // throws error in case of linting errors
+            }
+
+            await this.compileToJson(extModel, path.join(destExt, 'extension.csn'))
+
+            await this.collectLanguageBundles(extModel, path.join(destExt, 'i18n'))
 
             const files = Object.keys(await cds.deploy.resources(model))
             if (files.length > 0) {
@@ -68,12 +57,63 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
                 )
             }
         }
-        // add all resources contained in the 'ext' folder
+
+        const packageJson = path.join(src, 'package.json')
+        if (!fs.existsSync(packageJson)) {
+            throw new BuildError(`package.json file not found in ${src}`)
+        }
+        await this.copy(packageJson).to(path.join(destExt, 'package.json'))
+
+        // copy handlers
+        const folders = [path.join(src, cds.env.folders.srv, 'handlers')]
+        await this.copyNativeContent(src, destExt, res => {
+            if (fs.statSync(res).isDirectory()) {
+                return folders.some(folder => folder.startsWith(res))
+            }
+            if (folders.includes(path.dirname(res)) && /\.js$/.test(res)) {
+                return true
+            }
+        })
+
+        // add all resources contained in 'gen/ext' folder
         await new ResourcesTarBuilder(this).writeTarFile(path.join(this.task.dest, 'extension.tgz'), destExt)
     }
 
-    static _getAppPackageName() {
-        return cds.env.extends || '_base';
+    _lintExtModel(extModel, model) {
+        const linter = this._linter()
+        if (!linter) {
+            return
+        }
+        const env = cds.env.for('cds', path.join(this.task.src, this._getAppPackageFolder()))
+        this.logger._debug && this.logger.debug(`Saas extension point restrictions:\n${env.requires?.['cds.xt.ExtensibilityService']}`)
+
+        const messages = linter.lint(extModel, model, env)
+        if (messages.length) {
+            // REVISIT: lint messages can be passed as is with cds-mtxs version >= 1.7
+            throw new BuildError('SaaS extension point restrictions violated. Check the concrete restrictions defined by the SaaS app provider.',
+                messages.map(f => new BuildMessage(f.message, f.severity, f.location || f.element?.$location)))
+        }
+    }
+
+    _linter() {
+        let linter
+        try {
+            // Make sure cds-mtxs APIs are loaded
+            linter = require('@sap/cds-mtxs').xt?.linter // eslint-disable-line cds/no-missing-dependencies
+            if (!linter) {
+                this.pushMessage('MTXS linter cannot be loaded. Update of @sap/cds-dk and @sap/cds-mtxs modules required? Skipping extension model lint step.')
+                return null // too old mtxs
+            }
+        } catch (e) {
+            if (e.code !== 'MODULE_NOT_FOUND') throw e
+            this.pushMessage('MTXS linter cannot be loaded, @sap/cds-mtxs not installed. Skipping extension model lint step.')
+        }
+        return linter
+    }
+
+    _getAppPackageFolder() {
+        return path.join('node_modules', cds.env.extends || '_base');
     }
 }
+
 module.exports = MtxExtensionModuleBuilder

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

@@ -58,10 +58,10 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
      * @param {object} sidecarEnv cds env based on the sidecar dir
      */
     async _buildMainApp(sidecarEnv) {
-        if (sidecarEnv.requires['cds.xt.ModelProviderService']?.kind !== 'in-sidecar') {
-            throw new BuildError('Invalid MTX sidecar configuration - "cds.xt.ModelProviderService": "in-sidecar" missing.')
-        }
         let main = sidecarEnv.requires['cds.xt.ModelProviderService']?.root
+        if (!main) {
+            throw new BuildError('Invalid MTX sidecar configuration - "cds/requires/cds.xt.ModelProviderService/root" missing.')
+        }
         const profiles = cds.env.profiles || []
 
         if (!profiles.includes("production") && !profiles.includes("prod")) {

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

@@ -3,7 +3,7 @@ const path = require('path')
 const cds = require('../../cds')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const { BuildError } = require('../../util')
-const { BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY, 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_GENERATION, 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 } = require('../../constants')
 const { WARNING } = BuildTaskHandlerEdmx
@@ -19,7 +19,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
         this.task.options[CONTENT_CDSRC_JSON] = !this.hasBuildOption(CONTENT_CDSRC_JSON, false) ? true : false
 
         // default value false
-        this.task.options[CONTENT_EDMX] = this.hasBuildOption(CONTENT_EDMX, true) || this.hasCdsEnvOption(BUILD_NODEJS_EDMX_GENERAION, true) || this.hasBuildOption(EDMX_GENERATION, true) ? true : false
+        this.task.options[CONTENT_EDMX] = this.hasBuildOption(CONTENT_EDMX, true) || this.hasCdsEnvOption(BUILD_NODEJS_EDMX_GENERATION, true) || this.hasBuildOption(EDMX_GENERATION, true) ? true : false
         this.task.options[CONTENT_ENV] = this.hasBuildOption(CONTENT_ENV, true) ? true : false
         this.task.options[CONTENT_DEFAULT_ENV_JSON] = this.hasBuildOption(CONTENT_DEFAULT_ENV_JSON, true) ? true : false
 

package/bin/build/util.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('./cds')
-const { SEVERITY_ERROR, CDS_MODEL_EXCLUDE_LIST, FILE_EXT_CDS } = require('./constants')
+const { SEVERITY_ERROR, FILE_EXT_CDS } = require('./constants')
 
 function getProperty(src, segments) {
     segments = Array.isArray(segments) ? segments : segments.split('.')
@@ -126,20 +126,21 @@ function isStreamlinedMtx() {
         return false
     }
     return (cds.env.requires.toggles
+        || cds.env.profiles.includes('with-mtx-sidecar') // new presets
         || cds.env.requires['cds.xt.ModelProviderService']
         || (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 {Array} modelPaths 
+ * Returns a list of fully qualified model names belonging to the '@sap' namespace that cannot be resolved.
+ * E.g. the module might NOT have been installed.
+ * @param {Array} modelPaths
  * @returns {Array}
  */
 function resolveRequiredSapModels(modelPaths) {
-    return modelPaths.filter(p => {
-        if (p.startsWith('@sap/') && !CDS_MODEL_EXCLUDE_LIST.includes(p)) {
+    return Array.isArray(modelPaths) && modelPaths.filter(p => {
+        if (p.startsWith('@sap/')) {
             const files = cds.resolve(p)
             return !files || files.length === 0
         }
@@ -173,7 +174,7 @@ function _pushModelPaths(projectPath, ...modelPaths) {
             }
         }
     })
-    return model
+    return [...model]
 }
 
 function flatten(modelPaths) {
@@ -203,23 +204,71 @@ async function copy(src, dest) {
     }
 }
 
-class BuildMessage extends Error {
-    constructor(message, severity = SEVERITY_ERROR) {
-        super(message)
+/**
+ * Return gnu-style error string for location `loc`:
+ *  - 'File:Line:Col' without `loc.end`
+ *  - 'File:Line:StartCol-EndCol' if Line = start.line = end.line
+ *  - 'File:StartLine.StartCol-EndLine.EndCol' otherwise
+ *
+ * @param {CSN.Location|CSN.Location} location
+ */
+function _locationString(loc) {
+    if (!loc)
+        return '<???>';
+    if (!(loc instanceof Object))
+        return loc;
+    if (!loc.line) {
+        return loc.file;
+    }
+    else if (!loc.endLine) {
+        return (loc.col)
+            ? `${loc.file}:${loc.line}:${loc.col}`
+            : `${loc.file}:${loc.line}`;
+    }
+
+    return (loc.line === loc.endLine)
+        ? `${loc.file}:${loc.line}:${loc.col}-${loc.endCol}`
+        : `${loc.file}:${loc.line}.${loc.col}-${loc.endLine}.${loc.endCol}`;
+}
+
+/**
+ * Class for individual build message.
+ *
+ * @class BuildMessage
+ */
+class BuildMessage {
+    /**
+     * Creates an instance of BuildMessage.
+     * @param {string} message The message text
+     * @param {string} [severity='Error'] Severity: Debug, Info, Warning, Error
+     * @param {any} location Location of the message
+     * 
+     * @memberOf BuildMessage
+     */
+    constructor(message, severity = SEVERITY_ERROR, location) {
+        this.message = message
         this.name = "BuildMessage"
         this.severity = severity
-        this.stack = ""
+        this.$location = location
     }
     toString() {
-        return this.severity + ": " + this.message
+        return `${this.$location?.file ? _locationString(this.$location) + ':' : ''} ${this.severity}: ${this.message}`
     }
 }
 
-class BuildError extends BuildMessage {
+/**
+ * Class for combined build and compiler errors. 
+ * Additional members:
+ *   messages: vector of detailed build messages
+ * @class BuildError
+ * @extends {Error}
+ */
+class BuildError extends Error {
     constructor(message, messages = []) {
-        super(message, SEVERITY_ERROR)
+        super(message)
         this.name = "BuildError"
         this.messages = Array.isArray(messages) ? messages : [messages]
+        this.stack = ""
     }
 
     // for compatibility reasons

package/bin/cds-serve.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+
+const cds = require('./cds')
+const args = process.argv.slice(2)
+
+cds.exec ('serve', ...args)

package/bin/cds.js

@@ -10,13 +10,20 @@ const cli = { //NOSONAR
   exec (cmd = process.argv[2], ...argv) {
     if (!argv.length) argv = process.argv.slice(3)
     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))
+    if (!module.parent && ['serve', 'run'].includes(cmd))  _deprecationHint(cmd)
+
+    const task = this.load ('./'+cmd)
+
+    let args
+    try { args = task && cmd !== 'build' && this.args(task, argv) }
+    catch (err) { process.exitCode = 1; return console.error(err) }
+
+    if (task && cmd !== 'build')  return task.apply (this, args)
 
     // delegate to cds-dk for rest of commands (usually shortcuts like `cds c` including cds build if cds-dk is available)
     const dk = _requireDk('cds')
     if (dk) return dk.exec(cmd, ...argv)
-    if (cmd === 'build') return task.apply (this, this.args(task,argv))
+    if (cmd === 'build') return task.apply (this, args)
     _die_needsDk (cmd)
   },
 
@@ -40,7 +47,7 @@ const cli = { //NOSONAR
       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 throw cds.error ('invalid option: '+ a)
+      else throw 'Invalid option: '+ a
     }
 
     function add (k,v) { options[k.slice(2)] = v || true }
@@ -94,6 +101,15 @@ const _die_needsDk = (cmd) => {
   return console.error (message)
 }
 
+function _deprecationHint(cmd) {
+  console.error(require('./utils/term').warn(`
+  Warning: \`cds ${cmd}\` will be removed with the next major version.
+  Use \`cds-serve\` instead in your start script. Set it with:
+
+    npm pkg set scripts.start="cds-serve"
+  `))
+}
+
 require('util').inspect.defaultOptions = {
   colors: !!process.stdout.isTTY && !!process.stderr.isTTY,
   depth:11, breakLength:111