@sap/cds-dk 7.1.0 → 7.2.0

package/bin/build.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(build, {
-    options: ['--project', '--src', '--dest', '--for', '--use', '--opts', '--log-level', '--options-model', '--clean'],
-    shortcuts: ['-in', '-s', '-o', '-4'],
+    options: ['--project', '--src', '--dest', '--for', '--workspaces', '--use', '--opts', '--log-level', '--options-model', '--clean'],
+    shortcuts: ['-in', '-s', '-o', '-4', '-ws'],
     help: `
 # SYNOPSIS
 
@@ -92,7 +92,7 @@ async function build([project], options = {}) {
     // IMPORTANT: call plugins before subsequent access to cds.env
     await cds.plugins
 
-    cds.root = path.resolve(process.cwd(), project || options.project || '.')
+        cds.root = path.resolve(process.cwd(), project || options.project || '.')
     cds.env = cds.env.for('cds', cds.root);
     delete options.project // avoid that relative project paths are resolved twice
 

package/bin/cds.js

@@ -102,7 +102,8 @@ const cli = { //NOSONAR
     }
 
     // if (env) require('../lib/cds').env.add (env) //> avoid loading env
-    process.env.CDS_CONFIG = JSON.stringify(env)
+    // unless it has already explicitly been set by the user
+    process.env.CDS_CONFIG ??= JSON.stringify(env)
     return [ args, options ]
   },
 

package/bin/compile/index.js

@@ -2,7 +2,7 @@ const path = require("path");
 
 module.exports = Object.assign ( compile, {
   options: [
-  '--from', '--service', '--lang', '--for', '--to', '--dest', '--log-level', '--flavor', '--dialect', '--sql-dialect', '--openapi:url', '--openapi:servers'
+  '--from', '--service', '--lang', '--for', '--to', '--dest', '--log-level', '--flavor', '--dialect', '--sql-dialect', '--openapi:url', '--openapi:servers', '--odata-version'
   ],
   shortcuts: [
   undefined, '-s', '-l', '-4', '-2', '-o', undefined, '-f'
@@ -114,6 +114,10 @@ module.exports = Object.assign ( compile, {
     The servers definition used in the generated OpenAPI document. *--openapi:url* is
     ignored when this option is specified.
 
+    *--odata-version* 4.0|4.01 
+
+    Adds the OData version's functionality of the input CDS/CSN file to the generated OpenAPI document.
+
   *--openapi:diagram*
 
     Include YUML diagram in the generated OpenAPI document, default: *false*.

package/bin/gen.js

@@ -0,0 +1,27 @@
+const { join } = require('path')
+const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) ? console.debug : undefined
+
+module.exports = require(global('@sap/cds-gen', 'bin/cds-gen'))
+
+function global (id, subpath) {
+  const pkgPath = join(id, 'package.json') // package.json gives a stable entry path
+  let mod
+  try {
+    mod = require.resolve (pkgPath, { paths: [ process.cwd(), __dirname ] })
+  } catch (err) { // one more try w/ NPM global paths
+      const paths = [ process.cwd(), __dirname, npmGlobalModules() ]
+      try {
+        mod = require.resolve (pkgPath, { paths })
+      } catch (error) {
+        DEBUG?.(error)
+        throw `\nNo '${id}' package found. Install it with\n\n  npm i -g ${id}\n`
+    }
+  }
+  return join(mod, '..', subpath)
+}
+
+function npmGlobalModules() {
+  try {
+    return require ('child_process').execSync('npm root -g').toString().trim()
+  } catch (err) { DEBUG?.(err); return '' }
+}

package/bin/help.js

@@ -10,6 +10,7 @@ module.exports = exports = Object.assign (help, {formatHelp, help:`
 
     *i* | *init*        jump-start cds-based projects
     *a* | *add*         add a feature to an existing project
+    * * | *gen*         generate models/data using a descriptive prompt [beta]
     *y* | *bind*        bind application to remote services
     *m* | *import*      add models from external sources
     *c* | *compile*     compile cds models to different outputs
@@ -27,7 +28,7 @@ module.exports = exports = Object.assign (help, {formatHelp, help:`
     * * | *logout*      logout from extensible multitenant SaaS app
     * * | *pull*        pull base model of extensible SaaS app
     * * | *push*        push extension to extensible SaaS app
-    *t* | *lint*        [beta] run linter for env or model checks
+    *t* | *lint*        run linter for env or model checks [beta]
     *v* | *version*     get detailed version information
     *?* | *help*        get detailed usage information
 

package/bin/watch.js

@@ -60,7 +60,7 @@ const t = module.exports.codes = {
 }
 const extDefaults = 'cds,csn,csv,ts,mjs,cjs,js,json,properties,edmx,xml,env'
 const fioriIncludes = /_?(change|variant)$/ // according to fiori: change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change.
-let ignore = /node_modules|target|\.cds-services\.json$/
+const ignore = RegExp(`app${sep}.*${sep}?webapp${sep}|node_modules|target|\\.cds-services\\.json$`)
 
 async function watch ([cwd], {
   args = ['serve', 'all'],
@@ -99,8 +99,6 @@ async function watch ([cwd], {
     env.CDS_LIVERELOAD_PATH = require.resolve ('../lib/watch/livereload-connect')
     env.CDS_LIVERELOAD_URL = await liveReload.start (options['livereload'])
       .catch(err => { console.log(`Error starting live reload: ${err.message}`); liveReload = null })
-  } else {
-    ignore = RegExp(`app${sep}.*\\.(js|ts)|`+ignore.source) // exclude more frontend stuff
   }
 
   const log = (first,...more) => console.log (t.yellow + (first||''), ...more, t.reset)
@@ -115,7 +113,8 @@ async function watch ([cwd], {
   log ()
   log (`${t.bold}cds ${args.join(' ')}`)
   DEBUG && log (process.pid, 'watching:', ext, '...')
-  if (includes) DEBUG && log (`also watching: ${includes.source}`)
+  includes && DEBUG && log (`also watching: ${includes.source}`)
+  DEBUG && log ('ignoring:', ignore.source)
   if (liveReload) log (`live reload enabled for browsers`)
 
   const BindingManager = require('../lib/bind/bindingManager')

package/bin/watched.js

@@ -21,9 +21,8 @@
     case 'NO_SERVICES_FOUND': return _no_services_found(e)
     case 'MODEL_NOT_FOUND': return _no_models_found(e)
     case 'EADDRINUSE': return process.send(e)  //> tell cds watch
-    default: if (!e.messages) { // compiler messages have been written by cli already
-      console.error('\n❗️ ERROR on server start: ❗️\n\n', e)
-    }
+    default: if (e.messages?.length) return cds._log(e.messages, { 'log-level': cds.env.log.levels.cli }) // REVISIT: no special handling for compiler messages
+             else console.error('\n❗️ ERROR on server start: ❗️\n\n', e)
   }}
 
   function _no_models_found(e) { console.log (`

package/lib/bind/bindingUtil.js

@@ -1,6 +1,7 @@
 
 const KindToRequiresNameMap = {
     xsuaa: 'auth',
+    'ias-auth': 'auth',
     'hana-cloud': 'db',
     hana: 'db',
     'hana-mt': 'db', // For compatibility only

package/lib/build/buildTaskEngine.js

@@ -5,7 +5,6 @@ const { sortMessagesSeverityAware, deduplicateMessages, CompilationError } = cds
 const { relativePaths, BuildError, resolveRequiredSapModels } = require('./util')
 const { SEVERITIES, LOG_LEVELS } = require('./constants')
 const BuildTaskFactory = require('./buildTaskFactory')
-const BuildTaskProviderFactory = require('./buildTaskProviderFactory')
 const BuildTaskHandlerInternal = require('./provider/buildTaskHandlerInternal')
 
 const COMPILATION_ERROR = 'CompilationError'
@@ -13,27 +12,26 @@ const COMPILE_MESSAGE = 'CompileMessage'
 
 class BuildTaskEngine {
     constructor(options) {
-        this._providerFactory = new BuildTaskProviderFactory(options)
+        this._taskFactory = new BuildTaskFactory(options)
     }
-    get providerFactory() {
-        return this._providerFactory
+    get taskFactory() {
+        return this._taskFactory
     }
     get logger() {
-        return this.providerFactory.logger
+        return this.taskFactory.logger
     }
-    get buildOptions() {
-        return this.providerFactory.buildOptions
+    get options() {
+        return this.taskFactory.options
     }
 
     async processTasks(tasks) {
         const startTime = Date.now()
 
-        this.logger.log(`building project [${cds.root}], clean [${this.buildOptions.clean}]`)
+        this.logger.log(`building project [${cds.root}], clean [${this.options.clean}]`)
         this.logger.log(`cds-dk [${require('../../package.json').version}], cds [${cds.version}], compiler [${cds.compiler.version()}], home [${cds.home}]\n`)
 
         if (!tasks) {
-            const buildTaskFactory = new BuildTaskFactory(this.buildOptions)
-            tasks = await buildTaskFactory.getTasks()
+            tasks = await this.taskFactory.getTasks()
         }
 
         // validate required @sap namespace models - log only
@@ -51,9 +49,6 @@ class BuildTaskEngine {
             }
         })
 
-        // use resolved tasks
-        this.providerFactory.context.tasks = handlers.map(handler => handler.task)
-
         try {
             await this._executePrepare(handlers)
             await this._executeCleanBuildTasks(handlers)
@@ -113,7 +108,7 @@ class BuildTaskEngine {
     }
 
     async _executeCleanBuildTasks(handlers) {
-        if (this.buildOptions.clean) {
+        if (this.options.clean) {
             // clean entire build staging folder once
             if (cds.env.build.target !== '.') {
                 const target = path.resolve(cds.root, cds.env.build.target)
@@ -208,7 +203,7 @@ class BuildTaskEngine {
     }
 
     _createHandler(task) {
-        const handler = this.providerFactory.createHandler(task)
+        const handler = this.taskFactory.createHandler(task)
         handler.init()
 
         if (!(handler instanceof BuildTaskHandlerInternal) && handler.priority !== 1) {
@@ -269,6 +264,7 @@ class BuildTaskEngine {
                 "log-level": this._getLogLevel() // ensures that for tests the correct cds.env is used
             }
             deduplicateMessages(messages)
+            sortMessagesSeverityAware(messages)
             log(messages, options)
         }
     }
@@ -317,7 +313,7 @@ class BuildTaskEngine {
     /**
      * Sort and filter the given errors of type CompileMessage or BuildMessage according to their severity and location,
      * but leave any other errors untouched as part of the result array.<br>
-     * The log level passed as 'buildOptions.log-level' or defined in 'cds.env' is used to filter the given messages.
+     * The log level ('command line' or 'cds.env' option) is used to filter the given messages.
      * @param  {...Error} messages
      */
     _sortMessagesUnique(...messages) {
@@ -336,7 +332,7 @@ class BuildTaskEngine {
      * Return user defined log level or default value 'warn'
      */
     _getLogLevel() {
-        return this.buildOptions["log-level"] || cds.env["log-level"]
+        return this.options["log-level"] || cds.env["log-level"]
     }
 }
 module.exports = BuildTaskEngine

package/lib/build/buildTaskFactory.js

@@ -15,8 +15,8 @@ class BuildTaskFactory {
     get logger() {
         return this.providerFactory.logger
     }
-    get buildOptions() {
-        return this.providerFactory.buildOptions
+    get options() {
+        return this.providerFactory.options
     }
 
     // the following order for determining build tasks is used
@@ -41,12 +41,16 @@ class BuildTaskFactory {
 
         // always resolve tasks for input validation
         const resolvedTasks = this.providerFactory.resolveTasks(tasks)
-        if (this.buildOptions.resolve) {
+        if (this.options.resolve) {
             return resolvedTasks
         }
         return tasks
     }
 
+    createHandler(task) {
+        return this.providerFactory.createHandler(task)
+    }
+
     async _createTasks() {
         this.logger.debug(`determining build tasks for project [${cds.root}].`)
 
@@ -148,24 +152,24 @@ class BuildTaskFactory {
     }
 
     _applyCliOptionsFilter(tasks) {
-        const buildOptions = this.buildOptions
+        const options = this.options
         // filter tasks using either option for, use, src
         let resultTasks = tasks.filter(task => {
-            return (!buildOptions.use || buildOptions.use === task.use)
-                && (!buildOptions.for || buildOptions.for === task.for)
-                && (!buildOptions.src || buildOptions.src === task.src)
+            return (!options.use || options.use === task.use)
+                && (!options.for || options.for === task.for)
+                && (!options.src || options.src === task.src)
         })
         if (resultTasks.length === 0) {
-            if (buildOptions.for || buildOptions.use) {
+            if (options.for || options.use) {
                 const task = {}
-                if ((buildOptions.for)) {
-                    task.for = buildOptions.for
+                if ((options.for)) {
+                    task.for = options.for
                 }
-                if ((buildOptions.use)) {
-                    task.use = buildOptions.use
+                if ((options.use)) {
+                    task.use = options.use
                 }
-                if (buildOptions.src) {
-                    task.src = buildOptions.src
+                if (options.src) {
+                    task.src = options.src
                 }
                 resultTasks.push(task)
             }
@@ -180,14 +184,14 @@ class BuildTaskFactory {
     }
 
     _applyCliOptions(tasks) {
-        const buildOptions = this.buildOptions
+        const options = this.options
         // apply remaining cli options to filtered tasks
         tasks.forEach(task => {
-            if (buildOptions.dest) {
-                task.dest = buildOptions.dest
+            if (options.dest) {
+                task.dest = options.dest
             }
-            if (buildOptions.opts) {
-                const opts = BuildTaskFactory._scanTaskOptionParams(buildOptions.opts)
+            if (options.opts) {
+                const opts = BuildTaskFactory._scanTaskOptionParams(options.opts)
                 task.options = task.options ? Object.assign(task.options, opts) : opts
             }
         })
@@ -237,14 +241,6 @@ class BuildTaskFactory {
         return taskOptions
     }
 
-    /**
-     * For valid paths remove trailing '/'. Otherwise return as is - important!!
-     * @param {*} dir
-     */
-    static _normalizePath(dir) {
-        return typeof dir === "string" ? dir.replace(/\/$/, '') : dir
-    }
-
     /**
      * Determines the module folder from the past list that may represent files or folders w or w/o .cds file extension.
      * @param {Array} filesOrFolders

package/lib/build/buildTaskHandler.js

@@ -3,7 +3,7 @@ const fs = require('fs').promises
 const cds = require('../cds')
 
 const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, SEVERITY_INFO, SEVERITY_WARNING, SEVERITY_ERROR, OVERRIDE_METHOD_MSG } = require('./constants')
-const { hasOptionValue, getProperty, relativePaths, copy, BuildMessage } = require('./util')
+const { hasOptionValue, getProperty, relativePaths, BuildMessage } = require('./util')
 
 /**
  * The build task handler creates the build output for a dedicated build task. It is uniquely identified
@@ -155,10 +155,7 @@ class BuildTaskHandler {
                         dest = path.resolve(this.task.dest, dest)
                     }
                     this.pushFile(dest)
-                    if (fs.cp) { // Node.js >= 16.7
-                        return fs.cp(src, dest, { recursive: true })
-                    }
-                    return copy(src, dest)
+                    return fs.cp(src, dest, { recursive: true })
                 }
                 return dest
             }
@@ -227,14 +224,11 @@ class BuildTaskHandler {
     // Returns the value of the given build option defined for this build task.
     _getBuildOption(qualifiedName) {
         // build task options overwriting other settings
-        let value = getProperty(this.task.options, qualifiedName)
-        if (value !== undefined) {
-            return value
-        }
-        value = getProperty(this.context.options, qualifiedName)
-        if (value !== undefined) {
-            return value
+        let value = getProperty(this.context.options, qualifiedName) // command line
+        if (value === undefined) {
+            value = getProperty(this.task.options, qualifiedName) // task options
         }
+        return value
     }
 }
 module.exports = BuildTaskHandler

package/lib/build/buildTaskProviderFactory.js

@@ -13,12 +13,12 @@ class BuildTaskProviderFactory {
             options.clean = true
         }
         this._buildOptions = options
-        this._context = { options }
+        this._context = { options, tasks: [] } // resolved tasks
     }
     get logger() {
-        return this.buildOptions.logger
+        return this.options.logger
     }
-    get buildOptions() {
+    get options() {
         return this._context.options
     }
     get context() {
@@ -83,6 +83,7 @@ class BuildTaskProviderFactory {
         handler._task = resolvedTask
         handler._logger = this.logger
         handler._context = this.context
+        this.context.tasks.push(resolvedTask)
         this.logger._debug && this.logger.debug(`created BuildTaskHandler [${resolvedTask.use}]`)
         return handler
     }
@@ -147,15 +148,11 @@ class BuildTaskProviderFactory {
     }
 
     _loadProviders() {
-        // order is important - the DefaultBuildTaskProvider has to be the last provider in the list
-        return [this._createProvider(BuildTaskProviderInternal), this._createProvider(DefaultBuildTaskProvider)]
-    }
-
-    _createProvider(clazz, plugin) {
-        const provider = new clazz()
-        provider._logger = this.logger
-        provider._plugin = plugin
-        return provider
+        // DefaultBuildTaskProvider must be last entry
+        return [
+            new BuildTaskProviderInternal(this.logger),
+            new DefaultBuildTaskProvider()
+        ]
     }
 }
 

package/lib/build/constants.js

@@ -33,8 +33,9 @@ exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-
 
 exports.CSV_FILE_DETECTION = "csvFileDetection"                 // detect CSV files based on CDS model location - ENABLED by default
 exports.EXTENSION_POINT_VALIDATION = "extensionPointValidation" // validate extension point restrictions defined by the extended SaaS app - ENABLED by default
-exports.DEFAULT_BUILT_IN_MODELS = "defaultBuiltInModels"        // add @sap/cds* built-in models to build tasks - ENABLED by default
 exports.MTX_SIDECAR_DB_VALIDATION = "mtxSidecarDbValidation"    // validate consistency of app and sidecar db configuration - ENABLED by default
+exports.CONTINUE_UNRESOLVED_SCHEMA_CHANGES = "continueUnresolvedSchemaChanges" // build doesn't fail if unresolved HANA schema changes are detected
+exports.IGNORE_DEFAULT_MODELS = "ignoreDefaultModels"           // do not add default models (@sap/cds-*, fts/*) to existing build task model options
 
 exports.FOLDER_GEN = "gen"
 exports.FILE_EXT_CDS = ".cds"

package/lib/build/index.js

@@ -20,7 +20,7 @@ async function build(options = {}) {
         return await new BuildTaskEngine(options).processTasks()
     } catch (e) {
         if (e instanceof BuildError || e.constructor.name === 'CompilationError') {
-            cds._log(e.messages.length ? [...e.messages, ''] : e.message + '\n', { 'log-level': options['log-level'] || cds.env['log-level'] })
+            cds._log(e.messages.length ? e.messages : e.message, { 'log-level': options['log-level'] || cds.env['log-level'] })
             // CompilationError.message also includes the detail messages - do not log twice
             const message = e.constructor.name === 'CompilationError' ? 'CDS compilation failed' : e.messages.length ? e.message : 'CDS build failed'
             throw message

package/lib/build/provider/buildTaskHandlerInternal.js

@@ -43,9 +43,9 @@ class BuildTaskHandlerInternal extends BuildTaskHandler {
     }
 
     /**
-     * Called by the framework after {@link #init()}. Handlers may want to perform more elaborate preparation.
+     * Called by the framework after {@link #init()}, used to perform more elaborate preparation.
      * E.g. caching some pre-calculated data that can be used across multiple build tasks. This kind of data
-     * has to be stored in the handler type specific buildOptions section.
+     * has to be stored in the handler type specific options section.
      * @returns {Promise<boolean>} A value 'false' indicates that {@link #prepare()} will not be called for other instances
      * of this handler type.
      * True indicates that {@link #prepare()} will be called for other instances of this of this handler type.

package/lib/build/provider/buildTaskProviderInternal.js

@@ -1,12 +1,12 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../cds')
-const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, isClassicMtx } = require('../util')
+const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, isClassicMtx, 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_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")
+    IGNORE_DEFAULT_MODELS } = require("../constants")
 
 class BuildTaskProviderInternal extends BuildTaskProvider {
     constructor(logger) {
@@ -49,8 +49,8 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     async _createTasks(tasks, addRequiredTasks) {
-        let db = typeof cds.env.folders.db === "string" ? [BuildTaskProviderInternal._normalizePath(cds.env.folders.db)] : cds.env.folders.db
-        let srv = typeof cds.env.folders.srv === "string" ? [BuildTaskProviderInternal._normalizePath(cds.env.folders.srv)] : cds.env.folders.srv
+        let db = typeof cds.env.folders.db === "string" ? [normalizePath(cds.env.folders.db)] : cds.env.folders.db
+        let srv = typeof cds.env.folders.srv === "string" ? [normalizePath(cds.env.folders.srv)] : cds.env.folders.srv
 
         const dbOptions = {
             model: []
@@ -269,16 +269,16 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     static _setDefaultSrcFolder(task) {
         switch (task.for) {
             case BUILD_TASK_HANA:
-                task.src = task.src || this._normalizePath(cds.env.folders.db)
+                task.src = task.src || 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)
+                task.src = task.src || normalizePath(cds.env.folders.srv)
                 break
             case BUILD_TASK_FIORI:
-                task.src = task.src || this._normalizePath(cds.env.folders.app)
+                task.src = task.src || normalizePath(cds.env.folders.app)
                 break
             case BUILD_TASK_MTX_SIDECAR:
                 task.src = task.src || MTX_SIDECAR_FOLDER
@@ -288,7 +288,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
                 break
             case BUILD_TASK_MTX:
                 // mtxs with nodejs, but without sidecar
-                task.src = task.src || this._normalizePath(cds.env.folders.srv)
+                task.src = task.src || normalizePath(cds.env.folders.srv)
                 break
             default:
                 throw new Error(`Unknown build task '${task.use || task.for}'`)
@@ -300,29 +300,27 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         if (taskModelPaths && !Array.isArray(taskModelPaths)) {
             taskModelPaths = [taskModelPaths]
         }
+        const toggles = cds.env.features.folders
+        const allowList = new RegExp(`^@sap/cds${toggles ? '|^' + toggles.replace('*', '') : ''}`)
         task.options = task.options || {}
         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().filter(p => p.match('@sap/cds'))
+            if (!hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
+                defaultModelPaths = getDefaultModelOptions().filter(p => p.match(allowList))
             }
         } else {
             defaultModelPaths = getDefaultModelOptions()
             defaultModelPaths.push(task.src)
-            if (hasOptionValue(task.options?.[DEFAULT_BUILT_IN_MODELS], false)) {
+            if (hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
                 // all default models except the built-in models
-                defaultModelPaths = defaultModelPaths.filter(p => !p.match('@sap/cds'))
+                defaultModelPaths = defaultModelPaths.filter(p => !p.match(allowList))
             }
         }
-
         // REVISIT: filter nodejs bootstrap service models for Java - issues/12770#issuecomment-1805719
         if (this._hasJavaNature()) {
             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) {
+        if (defaultModelPaths.length) {
             task.options.model = [...new Set(taskModelPaths?.length ? taskModelPaths.concat(defaultModelPaths) : defaultModelPaths)]
         }
     }
@@ -340,14 +338,6 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         return task.for ? task.for : task.use && task.use.substring(BUILD_TASK_PREFIX.length + 1)
     }
 
-    /**
-     * For valid paths remove trailing '/'. Otherwise return as is - important!!
-     * @param {*} dir
-     */
-    static _normalizePath(dir) {
-        return typeof dir === "string" ? dir.replace(/\/$/, '') : dir
-    }
-
     /**
      * Determines the module folder from the past list that may represent files or folders w or w/o .cds file extension.
      * @param {Array} filesOrFolders

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

@@ -52,8 +52,9 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
             appModelGroups.set(appFolder, appModels)
         }
 
-        const originFioriBuildOption = fioriBuildOptions[OUTPUT_MODE]
-        fioriBuildOptions[OUTPUT_MODE] = OUTPUT_MODE_RESULT
+        // ensure edmx is cached as build result 
+        const buildOption = this.context.options[OUTPUT_MODE]
+        this.context.options[OUTPUT_MODE] |= OUTPUT_MODE_RESULT
 
         try {
             const edmxOptions = { version: cds.env.odata?.version }
@@ -76,7 +77,7 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
                 fioriBuildOptions.appEdmx.set(appFolder, this._result.edmx)
             }
         } finally {
-            fioriBuildOptions[OUTPUT_MODE] = originFioriBuildOption
+            this.context.options[OUTPUT_MODE] = buildOption
         }
         return false
     }

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

@@ -3,11 +3,11 @@ const path = require('path')
 const cds = require('../../../cds')
 const to_hdbmigration = require('./2migration')
 const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
-const { BuildError, relativePaths } = require('../../util')
+const { BuildError, relativePaths, BuildMessage } = require('../../util')
 
 const { OUTPUT_MODE_NONE, OUTPUT_MODE, CONTENT_PACKAGE_JSON, CONTENT_HDBTABLEDATA, CSV_FILE_DETECTION,
-    CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, CONTENT_NODE_MODULES, OUTPUT_MODE_RESULT } = require('../../constants')
-const { ERROR, WARNING } = BuildTaskHandlerInternal
+    CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, CONTENT_NODE_MODULES, OUTPUT_MODE_RESULT, CONTINUE_UNRESOLVED_SCHEMA_CHANGES } = require('../../constants')
+const { WARNING } = BuildTaskHandlerInternal
 
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize("src/gen")
 
@@ -15,13 +15,11 @@ const FILE_EXT_CSV = ".csv"
 const FILE_EXT_HDBTABLEDATA = ".hdbtabledata"
 const FILE_EXT_HDBTABLE = ".hdbtable"
 const FILE_EXT_HDBMIGRATIONTABLE = ".hdbmigrationtable"
-
 const FILE_NAME_HDICONFIG = ".hdiconfig"
 const FILE_NAME_HDINAMESPACE = ".hdinamespace"
 const FILE_NAME_PACKAGE_JSON = "package.json"
 const PATH_LAST_DEV_CSN = "last-dev/csn.json"
 const FILE_NAME_UNDEPLOY_JSON = "undeploy.json"
-
 const DEPLOY_FORMAT = "deploy-format"
 
 class HanaModuleBuilder extends BuildTaskHandlerInternal {
@@ -478,18 +476,27 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
         })
         if (migrationTableFiles.length > 0) {
             const parser = require('./migrationtable')
+            const resolutionMessages = []
 
             await Promise.all(migrationTableFiles.map(async file => {
                 try {
                     const tableModel = await parser.read(file)
                     if (/^>>>>>/m.test(tableModel.migrations.toString())) {
                         // as this is not a build error, we do not abort cds build, instead only log as error
-                        this.pushMessage(`Current model changes require manual resolution. See migration file ${path.relative(cds.root, file)} for further details.`, ERROR)
+                        resolutionMessages.push(new BuildMessage(`Manual resolution required for file ${path.relative(cds.root, file)}. Check migration version content for further details.`))
                     }
                 } catch (e) {
-                    throw new Error(`${path.relative(cds.root, file)}: ${e.toString()}`, ERROR)
+                    throw new Error(`${path.relative(cds.root, file)}: ${e.toString()}`)
                 }
             }))
+            if (resolutionMessages.length) {
+                // REVISIT: undocumented, we may want to delete in future versions
+                if (!this.hasBuildOption(CONTINUE_UNRESOLVED_SCHEMA_CHANGES, true)) {
+                    throw new BuildError('Current model changes require manual resolution', resolutionMessages)
+                }
+                // adding to the task's message list
+                resolutionMessages.forEach(m => this._messages.push(m))
+            }
         }
     }