@sap/cds-dk 7.7.1 → 7.8.0

package/bin/add.js

@@ -1,10 +1,31 @@
-const cds = require('../lib/cds')
-const term = require('../lib/util/term')
+const cds = require('../lib/cds'), { fs } = cds.utils
+const DEBUG = cds.debug('add')
+const { join } = require('path')
+
+const fromDk = fs.readdirSync(join(__dirname, '../lib/init/template'))
+const fromPlugins = require('../lib/init/add').registered
+const conf = {}
+for (const plugin of [...fromDk, ...Object.keys(Object.fromEntries(fromPlugins))]) {
+  const Plugin = fromPlugins.get(plugin) ?? require(join(__dirname, '../lib/init/template', plugin))
+  for (const [key, { type, help, short }] of Object.entries(new Plugin().options())) {
+    conf[plugin] ??= { options: [], flags: [], help: [] }
+    if (type === 'boolean')     conf[plugin].flags.push({   key: '--'+key, short: short ? '-'+short : undefined, help })
+    else if (type === 'number') conf[plugin].options.push({ key: '--'+key, short: short ? '-'+short : undefined, help })
+    else if (type === 'string') conf[plugin].options.push({ key: '--'+key, short: short ? '-'+short : undefined, help })
+  }
+}
+
+const byShortcut = (a, b) => (b.short ? 1 : 0) - (a.short ? 1 : 0)
+
+const options = ['--for', ...Object.values(conf).flatMap(p => p.options).sort(byShortcut).map(o => o.key)]
+const shortcuts = ['-4', ...Object.values(conf).flatMap(p => p.options).sort(byShortcut).map(o => o.short)]
+const flags = ['--force', ...Object.values(conf).flatMap(p => p.flags).map(o => o.key)]
+DEBUG?.('cli config ', { options, shortcuts, flags })
 
 module.exports = Object.assign(add, {
-  options: ['--for', '--out', '--data:for'],
-  shortcuts: ['-4', '-o'],
-  flags: ['--force', '--verbose', '--internal-unified-runtime-charts'],
+  options,
+  shortcuts,
+  flags,
   help: `
 # SYNOPSIS
 
@@ -12,7 +33,7 @@ module.exports = Object.assign(add, {
 
     Add one or more features to an existing project - grow as you go.
 
-    The following features can be added:
+    Pick any of these:
 
       *hana*                  - add support for SAP HANA
 
@@ -65,23 +86,24 @@ module.exports = Object.assign(add, {
 
 # OPTIONS
 
-    *--for* <profile>
+    *--for | -4* <profile>
 
       Write configuration data for the given profile.
 
-    *--data:for* <entity name or prefix>
+    *--force*
 
-      Add data content for entities matching the given pattern.  If it contains
-      meta characters like '^' or '*', it is treated like a regular expression,
-      otherwise as a prefix.
+      Overwrite all files in case the target files already exist.
 
-    *-o* | *--out* <target folder>
 
-      Specify output target folder (applicable to ${term.bold('data')} feature only).
+# FEATURE OPTIONS
 
-    *--force*
+${Object.entries(conf).sort(([a], [b]) => a.localeCompare(b)).flatMap(([pluginName, { options, flags }]) => {
+  const text4 = arr => arr.map(({ key, help, short }) => help && `      ${key}${short ? ' | '+short : ''}\n\n        ${help}`).join('\n\n')
+  const optionsText = text4(options), flagsText = text4(flags)
+  if (!optionsText && !flagsText) return []
+  return `    *cds add ${pluginName}*\n\n${optionsText}${flagsText}`
+}).join('\n\n\n')}
 
-      Overwrite all files in case the target files already exist.
 
 # EXAMPLES
 
@@ -98,9 +120,12 @@ module.exports = Object.assign(add, {
 
 `})
 
-async function add(args) {
+async function add(features) {
   await cds.plugins
   const CDSGenerator = require('../lib/init')
   const generator = new CDSGenerator()
-  await generator.addCmd(args[0])
+
+  const args = features.map(f => f.split(/[,\s+]/)).flat()
+
+  await generator.add(args)
 }

package/bin/bind.js

@@ -1,5 +1,7 @@
+const { warn } = require('../lib/util/term')
+
 module.exports = Object.assign(cds_bind, {
-    options: ['--to', '--for', '--on', '--kind', '--output-file', '--to-app-services', '--no-create-service-key'],
+    options: ['--to', '--for', '--on', '--kind', '--out', '--to-app-services', '--no-create-service-key', '--output-file'],
     flags: ['--exec'],
     shortcuts: ['-2', '-4', '-n', '-k', '-o', '-a'],
     help: `
@@ -12,7 +14,7 @@ module.exports = Object.assign(cds_bind, {
     information in *.cdsrc-private.json*
     in your project directory. Credentials are not stored in the file but rather
     retrieved dynamically during *cds watch*.
-    Use option *--output-file* to specify a different path or file.
+    Use option *--out* to specify a different path or file.
 
     With *--exec* you can execute arbitrary commands with your service bindings.
     The service bindings are provided
@@ -36,11 +38,11 @@ module.exports = Object.assign(cds_bind, {
 
         Kind of the service.
 
-    *-o | --output-file* <path>
+    *-o | --out* <path>
 
         Output file for added binding information. Use this option if binding configuration should
-        be added to *package.json* or *.cdsrc.json*. Defaults to *.cdsrc-private.json*.
-        If *path* is a directory, the *.cdsrc.json* file in that directory is used.
+        be added to *package.json* or *.cdsrc.json*. If *path* is a directory, the *.cdsrc.json*
+        file in that directory is used. Defaults to *.cdsrc-private.json*.
 
     *-a | --to-app-services <app>* (Beta)
 
@@ -56,8 +58,7 @@ module.exports = Object.assign(cds_bind, {
     cds bind --to bookshop-db,bookshop-auth
     cds bind auth --to bookshop-auth:bookshop-auth-key --kind xsuaa --for my-profile
 
-    cds bind --to bookshop-db --output-file .
-    cds bind --to bookshop-db --output-file package.json
+    cds bind --to bookshop-db --out .cdsrc.json
 
     cds bind --to bookshop-db --on k8s
     cds bind --to bookshop-db --for my-profile
@@ -74,7 +75,9 @@ const { bind, parseProfile } = require('../lib/bind');
 
 async function cds_bind(args, options) {
 
-    if (options.exec) {
+    const { on, 'to-app-services': app, to, out, 'output-file': outputFile, exec } = options
+
+    if (exec) {
         process.env.CDS_ENV = parseProfile(process.env.CDS_ENV);
         if (options.for) {
             console.warn('Parameter --for is not supported in combination with --exec. Its value will be ignored.');
@@ -87,7 +90,10 @@ async function cds_bind(args, options) {
         throw 'Option --profile is no longer supported. Use --for instead to specify the profile to use when storing connection settings.';
     }
 
-    const { on, 'to-app-services': app, to } = options
+    if (outputFile) {
+        console.warn(warn('Option --output-file is deprecated. Please use --out instead.'))
+        options.out ??= outputFile
+    }
 
     if (on === 'k8s' && app) {
         throw 'Option --to-app-services is only supported for Cloud Foundry.';
@@ -97,12 +103,15 @@ async function cds_bind(args, options) {
         throw `Use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`;
     }
 
-    const outputFile = options['output-file']
+    if (app === true) {
+        throw `Option '--to-app-services' requires an app name, for example 'cds bind --to-app-services bookshop-srv'.`
+    }
+
     if (app) {
         const services = await require('../lib/util/cf').getServices(app)
         // Later: optimize logging for parallelization, services.forEach(service => bind({ ...options, to: service.name, outputFile }))
         for (const service of services.filter(s => Object.keys(s.credentials).length > 0)) {
-            await bind({ ...options, to: service.name, outputFile })
+            await bind({ ...options, to: service.name, out })
         }
     } else {
         if (args.length > 1) {
@@ -120,7 +129,7 @@ async function cds_bind(args, options) {
             throw `The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`;
         }
 
-        await bind({ ...options, outputFile });
+        await bind({ ...options, out });
     }
 }
 

package/bin/build.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(build, {
     options: ['--project', '--src', '--dest', '--for', '--use', '--opts', '--log-level', '--options-model'],
     shortcuts: ['-in', '-s', '-o', '-4'],
-    flags: ['--clean', '--no-clean', '--ws'], // REVISIT: --clean is deprecated, backward compatibility
+    flags: ['--clean', '--no-clean', '--ws', '--ws-pack'], // REVISIT: --clean is deprecated, backward compatibility
     help: `
 # SYNOPSIS
 
@@ -73,13 +73,25 @@ module.exports = Object.assign(build, {
         operation. Clients need to clean the output folder upfront to ensure
         consistent build results.
 
-    *--ws* (beta)
+    *--ws-pack* (beta)
         Enable tarball based packaging of npm workspace dependencies - typically defined for
         Node.js mono or multi-repo setups.
         For each workspace dependency of your project using '*' as version identifier,
         a tarball will be created in folder 'gen/srv'. Dependencies in package.json
         will be adapted to point to the correct tarball file URL.
         Contents is packaged based on the rules of the 'npm pack' command.
+
+    *--ws* (beta)
+        Npm workspaces are typically used in mono or multi-repo setups whereas each workspace
+        folder represents a microservice CAP project with subfolders _db_, _srv_, _app_.
+        With the *ws* option the model scope used in executed build tasks is calculated based on
+        all workspaces. This also applies to the feature toggles. Feature toggles defined cross workspace 
+        are merged. The output is created in the _mtx/sidecar_ for multitenant applications
+        or in the 'srv' folder for node.js apps if no sidecar exists.
+        HANA native content distributed across the workspaces is copied into the top-level 'db'
+        folder of the project. This 'db' folder represents the single database shared by all workspaces.
+        *Note:* Make sure to use consistent package versions in your workspace dependencies in order
+        to avoid compilation errors caused by duplicate model definitions.
         
 # EXAMPLES
 

package/bin/deploy/to-sqlite.js

@@ -4,7 +4,7 @@ exports.deploy = function deploy_to_sqlite (_model, _db, options) {
 
     const cds = require('../../lib/cds')
     const conf = cds.env.requires.db ?? {}
-    const fts = cds.env.features.folders
+    const fts = cds.env.requires.toggles && cds.env.features.folders
     const model = _model || conf.model || cds.resolve(!fts ? '*' : ['*',fts], false)
     let file = 'db'
     if (options.to) {

package/bin/help.js

@@ -1,3 +1,5 @@
+const cds = require('../lib/cds')
+
 /* eslint-disable no-console */
 module.exports = exports = Object.assign (help, {formatHelp, help:`
 # USAGE
@@ -38,7 +40,8 @@ module.exports = exports = Object.assign (help, {formatHelp, help:`
 
 `})
 
-function help (topic) {
+async function help (topic) {
+  await cds.plugins
   if (Array.isArray(topic))  topic = topic[0]
   const task = !topic ? help : this.load?.(this.Shortcuts[topic] || topic)
   if (task?.help) console.log (formatHelp (task.help))

package/bin/import.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(_import, {
     _name: 'import',
     options: ['--out', '--as', '--include-namespaces', '--from', '--config'],
-    flags: ['--dry', '--force', '--no-copy', '--no-save', '--keep-namespace'],
+    flags: ['--dry', '--force', '--no-copy', '--no-save', '--keep-namespace', '--beta'],
     shortcuts: ['-o', '-as', '-ns', undefined, '-c', '-', '-f'],
     help: `
 # SYNOPSIS
@@ -47,6 +47,10 @@ module.exports = Object.assign(_import, {
     *-c | --config* <JSON Object>
         Adds the provided JSON Object as custom configuration data to the package.json.
 
+    *--beta*
+        Enables beta mode in cds import.
+        - Populates default value for optional action and function parameters in the CSN or CDS.
+
     *Below options are valid for OData only*
 
     *--keep-namespace*

package/bin/version.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 const { join, resolve } = require ('path')
-const { execSync } = require('child_process')
+const { execSync, spawnSync } = require('child_process')
 module.exports = Object.assign(list_versions, {
   flags: [ '--info', '--markdown', '--all', '--npm-list', '--npm-tree', '--no-colors'],
   shortcuts: [ '-i', '-m','-a', '-ls', '-ll' ],
@@ -35,38 +35,57 @@ module.exports = Object.assign(list_versions, {
 const MISSING = '-- missing --'
 
 function list_versions(args, options) {
+  const colorsOff = options['no-colors'] ?? !process.stdout.isTTY
+
   if (options['npm-list'] || options['npm-tree']) {
     let [pattern] = args, re = pattern ? RegExp(pattern) : /@sap\/cd[rs]|@sap\/eslint-plugin-cds/
     let cmd = 'npm ls --depth ' + (options['npm-tree'] ? 11 : 0)
-    console.log (cmd,'| grep', pattern)
+    console.log (cmd,'| grep', re.source)
     return require('child_process').exec(cmd, (e,stdout)=>{
       // if (e) console.error(e)
-      const replacement = (options['no-colors'] ? '$1 $2$3$4' : '\x1b[91m$1 \x1b[32m$2\x1b[0m\x1b[2m$3\x1b[32m$4\x1b[0m');
+      const replacement = (colorsOff ? '$1 $2$3$4' : '\x1b[91m$1 \x1b[32m$2\x1b[0m\x1b[2m$3\x1b[32m$4\x1b[0m');
       for (let line of stdout.split(/\n/)) if (line.match(re)) console.log(
         line.replace(/(@sap[^@]*)@([\S]+)( -> [\S]+)?(deduped)?/,replacement)
       )
     })
   }
-  const versions = info ()
-  if (options.markdown)  return _markdown (versions)
-  if (options.info)  return _markdown (versions)
-  const mark = options['no-colors'] ? s => s : require('../lib/util/term').info
-  for (let each of Object.keys(versions).sort())  console.log(`${mark(each)}: ${versions[each]}`)
+  const versions = info (options)
+
+  process.stdout.isTTY && console.log()
+  if (options.markdown || options.info) {
+    _markdown (versions)
+  } else {
+    const mark = colorsOff ? s => s : require('../lib/util/term').info
+    for (let each of Object.keys(versions))  console.log(`${mark(each)}: ${versions[each]}`)
+  }
+  process.stdout.isTTY && console.log()
 }
 
-function info() {
-  const cwd = process.cwd()
+function info({ root:cwd=process.cwd() }) {
+  const env = require('../lib').env.for('cds', cwd)
+  const isJava = env['project-nature'] === 'java'
+  if (isJava && process.stderr.isTTY) {
+    console.error('\x1b[2m'+'This takes a while. Collecting Java versions...', '\x1b[0m')
+  }
+
   const npmRoot = execSync('npm root -g').toString().trim()
-  return {
+  let versions = {
     ..._versions_from(_pkg_path('@sap/cds-dk', __dirname), '@sap/cds-dk (global)'), // ... linked in cap/dev setup
-    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot),   '@sap/cds-dk (global)'), // ... or installed globally
-    ..._versions_from(_pkg_path('@sap/cds-dk', cwd)),    // local dk, important for Java projects
+    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // ... or installed globally
+    ..._versions_from(_pkg_path('@sap/cds-dk', cwd)), // local dk, important for Java projects
     ..._versions_from(_pkg_path('@sap/cds', __dirname)), // @sap/cds from here
-    ..._versions_from(cwd),                              // ... or from local app dependencies
+    ..._versions_from(cwd), // ... or from local app dependencies
     ..._versions_from(_pkg_path('@sap/cds-compiler', cwd, __dirname)), // compiler is no direct dependency, so list it explicitly
     'Node.js': process.version,
-    'home': require('../lib/cds').home // effective (local) cds
+    'home': require('../lib/cds').home, // effective (local) cds
   }
+  // sort Node entries
+  versions = Object.keys(versions).sort().reduce((all, key) => { all[key] = versions[key]; return all }, {})
+
+  if (isJava) {
+    Object.assign(versions, capJavaVersion(cwd))
+  }
+  return versions
 }
 
 function _versions_from(pkg_path, pkg_label) {
@@ -95,7 +114,6 @@ function _markdown (versions) {
   const repo = pkg.repository.url || pkg.repository || 'https://github.com/<your/repo>'
   const valLength = Math.max(repo.length, versions.home.length)
 
-  console.log ()
   console.log ('|', $(pkg.name, repo), '|')
   console.log ('|', $('----------------------', '-'.repeat(valLength)), '|')
 
@@ -104,12 +122,6 @@ function _markdown (versions) {
     .sort()
     .forEach(id => console.log ('|', $(id, versions[id]), '|'))
 
-  // TODO get CAP Java version from mvn
-  // if (require('../lib').env['project-nature'] === 'java') {
-  //   console.log ('|', $('CAP Java Runtime'), '|')
-  // }
-  console.log()
-
   function $ (key, val=MISSING) {
     return ( key  + ' '.repeat(22)).slice(0,22)
     +' | '+ (val  + ' '.repeat(valLength)).slice(0,valLength)
@@ -124,3 +136,23 @@ function _pkg_path(id, ...paths) {
     if (e.code !== 'MODULE_NOT_FOUND')  throw e
   }
 }
+
+function capJavaVersion(cwd) {
+  const cmd = 'mvn com.sap.cds:cds-maven-plugin:version -B -Dcds.version.excludeCds -Dcds.version.json'
+
+  let out = ''
+  try {
+    out = spawnSync(cmd, {cwd, shell: true}).stdout.toString().trim()
+  } catch (e) { /* ignored */ }
+
+  const match = out.match(/===\n(.*)\n===/ms)
+  if (match?.[1])  {
+    const res = {}
+    Object.entries(JSON.parse(match[1])).forEach(([k,v]) => {
+      const entries = Object.entries(v)
+      res[k] = entries.map(([k,v]) => (k === 'version' || k === 'name') ? v : `${k}: ${v}`).join(', ')
+    })
+    return res
+  }
+  return { 'CAP Java SDK': MISSING }
+}

package/lib/bind/userCdsrcJsonStorageProvider.js

@@ -31,7 +31,7 @@ class UserCdsrcJsonStorageProvider {
     }
 
     async storeServices(services, options = {}) {
-        let jsonPath = options.outputFile || CDSRC_FILENAME;
+        let jsonPath = options.out || CDSRC_FILENAME;
 
         if (jsonPath === CDSRC_FILENAME) {
             await gitUtil.ensureFileIsGitignored(CDSRC_FILENAME);

package/lib/build/buildTaskFactory.js

@@ -106,12 +106,12 @@ class BuildTaskFactory {
         const modelPaths = await getDefaultModelOptions()
         let wsModelPaths
         // calculate only once
-        if (tasks.some(task => hasOptionValue(task.options?.[CONTENT_WS], true))) {
+        if (cds.cli.options?.ws || tasks.some(task => hasOptionValue(task.options?.[CONTENT_WS], true))) {
             wsModelPaths = await getDefaultModelOptions(true)
         }
         // set default model options
         tasks.forEach(task => {
-            this._setTaskModelOptions(task, hasOptionValue(task.options?.[CONTENT_WS], true) ? wsModelPaths : modelPaths)
+            this._setTaskModelOptions(task, cds.cli.options?.ws || hasOptionValue(task.options?.[CONTENT_WS], true) ? wsModelPaths : modelPaths)
             if (!task.src) {
                 throw new Error(`Invalid build task definition - value of property 'src' is missing in [${task.for || task.use}].`)
             }

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

@@ -50,7 +50,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                 await this._copyResourcesExt(src, dest, model)
             }
             // copy native hana artifacts from workspace dependencies
-            if (hasOptionValue(this.task.options?.[CONTENT_WS], true)) {
+            if (cds.cli.options?.ws || hasOptionValue(this.task.options?.[CONTENT_WS], true)) {
                 await this._addWorkspaceContent()
             }
 

package/lib/build/provider/internalBuildTaskProvider.js

@@ -1,18 +1,19 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../cds')
-const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, isClassicMtx, normalizePath } = require('../util')
+const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, 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,
     IGNORE_DEFAULT_MODELS, CONTENT_WS } = require("../constants")
+const ResourcesTarBuilder = require('./mtx/resourcesTarBuilder')
 const DEBUG = cds.debug('cli|build')
 
 class InternalBuildTaskProvider extends BuildTaskProvider {
     constructor() {
         super()
         // ensure that classic mtx is not used in combination with cds-dk@7
-        if (isClassicMtx()) {
+        if (InternalBuildTaskProvider._isClassicMtx()) {
             throw new BuildError(`@sap/cds-mtx is deprecated and not supported by @sap/cds-dk >= 7.
 Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/docs/guides/multitenancy/old-mtx-migration or install @sap/cds-dk version 6 instead.`)
         }
@@ -78,10 +79,12 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
                         }
                     })
                 }
-                let dbTask = tasks.find(task => task.for === BUILD_TASK_HANA)
+                let dbTask = ResourcesTarBuilder.getHanaTenantDbTask(tasks, mtxTask)
                 if (!dbTask) {
                     //  db task might be missing if mtx task is enforced by 'cds build --for mtx'
-                    dbTask = cds.env.build.tasks?.find(task => task.for === BUILD_TASK_HANA)
+                    if (cds.env.build.tasks) {
+                        dbTask = ResourcesTarBuilder.getHanaTenantDbTask(cds.env.build.tasks, mtxTask)
+                    }
                     if (!dbTask) {
                         dbTask = this._createDbTask(db, dbOptions)
                     }
@@ -251,6 +254,17 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         return !!cds.env.extends
     }
 
+    static _isClassicMtx() {
+        function _hasMtxDependency() {
+            try {
+                return !!require(path.join(cds.root, 'package.json'))?.dependencies?.['@sap/cds-mtx']
+            } catch (e) {
+                return false
+            }
+        }
+        return /true/i.test(process.env.OLD_MTX) || _hasMtxDependency()
+    }
+
     /**
      * Distinguishes whether the Nodejs project is a Streamlined MTX (cds >=6) or an old MTX project.
      */
@@ -294,7 +308,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     static async _setDefaultModel(task) {
-        const ws = hasOptionValue(task.options?.[CONTENT_WS], true)
+        const ws = hasOptionValue(task.options?.[CONTENT_WS], true) || cds.cli.options?.ws
         let taskModelPaths = task.options?.model
         if (taskModelPaths && !Array.isArray(taskModelPaths)) {
             taskModelPaths = [taskModelPaths]

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

@@ -21,16 +21,16 @@ class JavaBuildPlugin extends EdmxBuildPlugin {
         if (!model) {
             return
         }
-        const odata = await this._compileForOdata(model, compileDest)
+        await this._compileForJava(model, compileDest)
 
         if (!this.hasBuildOption(CONTENT_EDMX, false)) {
             // generate edmx files containing all features
             // REVISIT: localized edmx for backward compatibility
             if (!this.hasBuildOption(CONTENT_LOCALIZED_EDMX, false)) {
-                await this.compileToEdmx(odata, compileDest, { [FLAVOR_LOCALIZED_EDMX]: true })
+                await this.compileToEdmx(model, compileDest, { [FLAVOR_LOCALIZED_EDMX]: true })
             }
             // non-localized edmx
-            await this.compileToEdmx(odata, path.join(compileDest, 'odata', cds.env.odata.version), { [FLAVOR_LOCALIZED_EDMX]: this.hasBuildOption(FLAVOR_LOCALIZED_EDMX, true) })
+            await this.compileToEdmx(model, path.join(compileDest, 'odata', cds.env.odata.version), { [FLAVOR_LOCALIZED_EDMX]: this.hasBuildOption(FLAVOR_LOCALIZED_EDMX, true) })
         }
 
         if (!this.hasBuildOption(CONTENT_LANGUAGE_BUNDLES, false)) {
@@ -65,7 +65,7 @@ class JavaBuildPlugin extends EdmxBuildPlugin {
         })
     }
 
-    async _compileForOdata(model, csnDest, compileOptions = {}) {
+    async _compileForJava(model, csnDest, compileOptions = {}) {
         // csn for service providers
         const m = cds.compile.for.java(model, {
             ...this._options4odata(),

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

@@ -41,7 +41,7 @@ class ResourcesTarBuilder {
 
     async _getResources(model) {
         // distinguish HANA and SQLITE deployment
-        let root = await this._getHanaTenantDbDest()
+        let root = this._getHanaTenantDbPath()
         let resources
         if (root) {
             resources = this._getHanaResources(root)
@@ -82,9 +82,21 @@ class ResourcesTarBuilder {
         return Object.keys(await resources(model))
     }
 
-    async _getHanaTenantDbDest() {
-        const hanaTask = this.plugin.context.tasks.find(task => task.for === BUILD_TASK_HANA)
-        return hanaTask?.dest
+    _getHanaTenantDbPath() {
+        return ResourcesTarBuilder.getHanaTenantDbTask(this.plugin.context.tasks, this.plugin.task)?.dest
+    }
+
+    static getHanaTenantDbTask(tasks, mtxTask) {
+        const hanaTasks = tasks.filter(task => task.for === BUILD_TASK_HANA)
+        if (hanaTasks.length === 1) return hanaTasks[0]
+        
+        return hanaTasks.find(hanaTask => {
+            // if called from internalBuildTaskProvider, the src folder for the tenant db task might still not set
+            // while an existing second shared db always requires src to be configured using a relative path
+            if (!hanaTask.src) return true
+            const srcFolder = path.isAbsolute(hanaTask.src) ? path.relative(cds.root, hanaTask.src) : hanaTask.src
+            return mtxTask.options?.model?.includes(srcFolder)
+        })
     }
 }
 module.exports = ResourcesTarBuilder

package/lib/build/provider/mtx-extension/extensionCompilation.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const cds = require('../../../cds')
-const { WARNING } = require('../internalBuildPlugin')
+const { SEVERITY_WARNING, SEVERITY_INFO } = require('../../constants')
 
 class ExtensionCompilation {
     constructor(plugin) {
@@ -38,7 +38,7 @@ class ExtensionCompilation {
         const pkgNames = [...[...duplicates].reduce((acc, dir) => acc.add(getPkgName(dir)), new Set())]
         const modelPaths = this.plugin.task.options.model.filter(m => !pkgNames.some(pkg => m === pkg || m.startsWith(pkg + '/')))
         this.plugin.task.options.model = modelPaths
-        this.plugin.pushMessage(`Duplicate CDS model definitions found. Using CDS artifacts from base model instead and recompiling with model options ${JSON.stringify(modelPaths)}.\nMake sure to use compatible versions for the dependencies '${pkgNames.join(', ')}'.`, WARNING)
+        this.plugin.pushMessage(`Duplicate CDS model definitions found. Using CDS artifacts from base model instead and recompiling with model options ${JSON.stringify(modelPaths)}.\nMake sure to use compatible versions for the dependencies '${pkgNames.join(', ')}'.`, SEVERITY_WARNING)
         // recompile without duplicates
         return this.plugin.model()
     }
@@ -46,5 +46,16 @@ class ExtensionCompilation {
     resolveExtensionFiles(model, saasPkgFolder) {
         return model['$sources'].filter(file => file.startsWith(cds.root) && !file.startsWith(saasPkgFolder))
     }
+
+    reclassifyBaseModelMessages(messages, saasPkgPath) {
+        const severities = cds.env.cdsc?.severities ?? {}
+        messages.forEach(m => {
+            if (m.$location?.file && m.severity === SEVERITY_WARNING) {
+                if (path.resolve(cds.root, m.$location.file).startsWith(saasPkgPath) && !severities[m.messageId]) {
+                    m.severity = SEVERITY_INFO
+                }
+            }
+        })
+    }
 }
 module.exports = ExtensionCompilation

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

@@ -28,7 +28,7 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
         const saasPkgPath = MtxExtensionBuildPlugin._getSaasPkgPath()
         const extensionCompilation = new ExtensionCompilation(this)
 
-        // full compile of the extension using base model - ensuring consistency
+        // full model compilation including base model ensures consistency
         try {
             model = await this.model()
         } catch (e) {
@@ -39,8 +39,8 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
             }
         }
 
+        // extension model compilation with parsed format
         if (model) {
-            // extension CSN using parsed format
             const options = { ...this.options(), flavor: 'parsed' }
             const extensionFiles = extensionCompilation.resolveExtensionFiles(model, saasPkgPath)
             if (extensionFiles.length > 0) {
@@ -50,6 +50,10 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
                 }
             }
         }
+
+        // reclassify base model warnings as info messages
+        extensionCompilation.reclassifyBaseModelMessages(this.messages, saasPkgPath)
+
         if (extensionModel) {
             // IMPORTANT NOTE: perform all model operations before the linter is called as the linter
             // will modify the model causing the creation of 'unresolved' associations

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

@@ -36,7 +36,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         }
         // by default model contains all features
         const model = await this.model()
-        if (!model && !this.context.options['ws']) {
+        if (!model && !this.context.options['ws-pack']) {
             return
         }
         if (model) {
@@ -55,8 +55,8 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         if (this.isStagingBuild() && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
             const srcSrv = this.task.src === cds.root ? path.resolve(this.task.src, cds.env.folders.srv) : this.task.src
             await this._copyNativeContent(cds.root, srcSrv, destRoot, destSrv)
-            if (this.context.options['ws']) {
-                await this._addWorkspaceDependencies(destRoot)
+            if (this.context.options['ws-pack']) {
+                await this._packWorkspaceDependencies(destRoot)
             }
         }
         return this._result
@@ -158,7 +158,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         })
     }
 
-    async _addWorkspaceDependencies(dest) {
+    async _packWorkspaceDependencies(dest) {
         const wsRoot = NodejsBuildPlugin._findWorkspaceRoot(cds.root)
         const appPkg = require(path.join(dest, 'package.json'))
         let workspaces