@sap/cds-dk 10.0.6 → 10.1.0

package/bin/{upgrade.js → upgrade/index.js}

@@ -1,7 +1,7 @@
 'use strict'
 
 // Thin redirect wrapper for smart routing
-const upgradeTenant = require('./upgrade-tenant')
+const upgradeTenant = require('../upgrade-tenant')
 
 module.exports = Object.assign(upgrade, {
     _name: 'upgrade',
@@ -75,6 +75,6 @@ async function upgrade(args, options = {}) {
         return upgradeTenant(args, options)
     }
 
-    const versionUpgrade = require('../lib/upgrade')
+    const versionUpgrade = require('./upgrade')
     return versionUpgrade(options)
 }

package/{lib → bin}/upgrade/preflight/consistency.js

@@ -47,7 +47,7 @@ function collectJava(ctx, cds) {
 }
 
 function printListing(occurrences) {
-  const { bold, error } = require('../../util/term');
+  const { bold, error } = require('../../../lib/util/term');
   console.log(error('✗ Inconsistent cds versions detected'));
   console.log();
   const byFile = new Map();

package/{lib → bin}/upgrade/preflight/index.js

@@ -15,7 +15,7 @@ function deriveTarget() {
 }
 
 async function runPreflight(ctx, cds) {
-  const { info, error, bold } = require('../../util/term');
+  const { info, error, bold } = require('../../../lib/util/term');
 
   ctx.target = deriveTarget();
   console.log(`${bold(`Upgrading project to cds ${ctx.target}`)}`);

package/{lib → bin}/upgrade/steps/analyze/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { info, warn, bold, dim, error } = require('../../../util/term');
+const { info, warn, bold, dim, error } = require('../../../../lib/util/term');
 const { UPGRADE_DIR, REPORT_FILE } = require('../../constants');
 
 const { setup } = require('./setup');

package/{lib → bin}/upgrade/steps/install.js

@@ -62,7 +62,7 @@ async function runNpmInstalls(ctx, cds) {
 
 async function runInstall(ctx, cds) {
   const { askYesNo, NonTTYError } = require('../util/prompt');
-  const { error } = require('../../util/term');
+  const { error } = require('../../../lib/util/term');
   let nodeRan = false, javaRan = false, aborted = false;
 
   const mismatches = ctx.verifyMismatches || [];

package/{lib → bin}/upgrade/steps/openrewrite.js

@@ -7,7 +7,7 @@ const { execFile, execSync } = require('child_process');
 const { promisify } = require('util');
 const cds = require('@sap/cds');
 
-const { info, warn, dim } = require('../../util/term');
+const { info, warn, dim } = require('../../../lib/util/term');
 
 const execFileAsync = promisify(execFile);
 const TIMEOUT_MS = 120_000;

package/{lib → bin}/upgrade/steps/removals.js

@@ -18,7 +18,7 @@ const REMOVAL_COPY = {
 
 async function runRemovals(ctx, cds) {
   const { askYesNo, NonTTYError } = require('../util/prompt');
-  const { info, bold, dim } = require('../../util/term');
+  const { info, bold, dim } = require('../../../lib/util/term');
 
   const removals = ctx.proposal?.removals || [];
   if (removals.length === 0) return;

package/{lib → bin}/upgrade/steps/rewrite.js

@@ -81,7 +81,7 @@ function buildProposal(ctx, cds) {
 async function runRewrite(ctx, cds) {
   const { askYesNo, NonTTYError } = require('../util/prompt');
   const path = require('node:path');
-  const { info, bold, dim } = require('../../util/term');
+  const { info, bold, dim } = require('../../../lib/util/term');
 
   const { updates, removals } = buildProposal(ctx, cds);
   ctx.proposal = { updates, removals };

package/{lib → bin}/upgrade/steps/verify.js

@@ -76,7 +76,7 @@ function verifyJava(ctx, cds) {
 }
 
 async function runVerify(ctx, cds) {
-  const { error, bold, dim } = require('../../util/term');
+  const { error, bold, dim } = require('../../../lib/util/term');
   const mismatches = [
     ...(ctx.project.isNode ? await verifyNode(ctx, cds) : []),
     ...(ctx.project.isJava ? verifyJava(ctx, cds) : []),

package/{lib/upgrade/index.js → bin/upgrade/upgrade.js}

@@ -13,8 +13,8 @@ const { runOpenRewrite } = require('./steps/openrewrite');
 const { generate } = require('./steps/analyze/reporter');
 
 async function upgrade(options = {}) {
-  const cds = require('../cds');
-  const { error } = require('../util/term');
+  const cds = require('../../lib/cds');
+  const { error } = require('../../lib/util/term');
 
   console.log();
   try {

package/{lib → bin}/upgrade/util/pom.js

@@ -1,13 +1,13 @@
 'use strict'
 
-const { parseXml } = require('../../init/xml')
+const { parseXml } = require('../../../lib/init/xml')
 
 function parsePomXml(filePath) {
   return parseXml(filePath)
 }
 
 function updatePomPropertyInFile(filePath, propertyName, newValue) {
-  const cds = require('../../cds')
+  const cds = require('../../../lib/cds')
   const { fs } = cds.utils
 
   const content = fs.readFileSync(filePath, 'utf8')

package/{lib → bin}/upgrade/util/prompt.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { ask4 } = require('../../util/question');
+const { ask4 } = require('../../../lib/util/question');
 
 class NonTTYError extends Error {
   constructor(message = 'non-interactive stdin') {

package/bin/util/containerize.js

@@ -57,17 +57,19 @@ function processDockerfile(bp, name, tag) {
 function processCommands(bp) {
   return bp.commands ? bp.commands.map(c => c.trim().split(' ')) : []
 }
-function processBuildpack(bp, name, tag, clearCache = false) {
+function processBuildpack(bp, name, tag, clearCache = false, image, publish = false) {
   let { type, path, env, builder } = bp.buildpack
   type = type ? type.split(',').map(t => buildpacks.has(t.trim()) ? `paketo-buildpacks/${t.trim()}` : t.trim()) : []
   if (builders.has(builder)) builder = `paketobuildpacks/${builder}`
   const cacheArgs = clearCache ? ['--clear-cache'] : []
+  const target = publish ? image : `${name}:${tag}`
   return [['pack',
-    ...appendSubcommand(`${name}:${tag}`, 'build'),
+    ...appendSubcommand(target, 'build'),
     ...appendSubcommand(path, '--path'),
     ...type.flatMap(t => appendSubcommand(t, '--buildpack')),
     ...appendSubcommand(builder, '--builder'),
     ...appendSubcommand(env, '--env'),
+    ...(publish ? ['--publish'] : []),
     ...cacheArgs
   ]]
 }
@@ -107,14 +109,16 @@ async function parseYAML(filename, repoOpt = '', options) {
     const buildType = keyProcessorMap[key]
 
     if (!buildType) throw `'build-parameters' ${Object.keys(bp)} in ${filename} is invalid`
+    const publish = key === 'buildpack' && options.push
     return {
       name,
       tag,
-      buildCmd: buildType(bp, name, tag, key === 'buildpack' && options.clearCache),
+      buildCmd: buildType(bp, name, tag, key === 'buildpack' && options.clearCache, repoImg, publish),
       pushCmd: ['docker', 'push', repoImg],
       tagCmd: [['docker', 'tag', source, repoImg]],
       image: rawImg,
       source,
+      publish,
       path: bp.buildpack?.path
     }
   }))
@@ -137,7 +141,7 @@ async function executeModules(modules, options) {
     }
 
     for (const cmd of m.buildCmd) run(cmd)
-    if (options.push) {
+    if (options.push && !m.publish) {
       for (const cmd of m.tagCmd) run(cmd)
       run(m.pushCmd)
     }

package/bin/version.js

@@ -20,6 +20,9 @@ module.exports = exports = async function cds_version (pattern, options) {
   console.log()
 }
 
+exports.staticCompletions = () => ({
+  '--omit': ['dev', 'optional', 'peer'],
+})
 exports.options = [ '--depth', '--omit'  ]
 exports.flags = [ '--info', '--markdown', '--abs', '--all', '--json' ]
 exports.shortcuts = [ '-d', '-o', '-i', '-m', '-a' ]
@@ -79,7 +82,9 @@ function canonic_options4 ([pattern], options) {
 async function node_versions(o) {
 
   // Call npm root and npm ls in parallel...
-  const [ [npm_root_g],[npm_root_l], lines ] = await Promise.all ([
+  const [ [npm_version], [npm_exec], [npm_root_g],[npm_root_l], lines ] = await Promise.all ([
+    $`npm --version`,
+    process.platform === 'win32' ? $`where npm.cmd` : $`which npm`,
     $`npm root --global`,
     $`npm root --local`,
     $`npm ls -lp ${
@@ -118,6 +123,9 @@ async function node_versions(o) {
     if (name.match(_pkg)) return [ name, version, location ]
   }) .filter (x => x)
 
+  // windows adds \r at the end of line
+  const _npm_exec = npm_exec.trim()
+
   // Sort SAP packages and CAP packages on top
   const entries = deps.sort (function sap_then_cap_on_top ([a],[b]) {
     let a_is_cdk = a === '@sap/cds-dk'
@@ -151,6 +159,7 @@ async function node_versions(o) {
     [ 'npm root -l', null, npm_root_l ],
     [ 'npm root -g', null, npm_root_g ],
     [ 'Node.js', process.version.slice(1), process.execPath ],
+    [ 'npm', npm_version, _npm_exec ]
   )
 
   return entries

package/{lib → bin}/watch/hot-reload.js

@@ -1,6 +1,6 @@
 const crypto = require('crypto')
 const stream = require('stream/promises')
-const cds = require('../cds');
+const cds = require('../../lib/cds');
 const log = cds.log('cds');
 
 module.exports = async function hotReloading() {

package/bin/{watch.js → watch/index.js}

@@ -1,6 +1,13 @@
 const watchOnlyOptions = ['--ext', '--livereload', '--experimental-hot-reload', '--open', '--debug', '--inspect', '--inspect-brk', '--include', '--exclude']
+const { DIR } = require('../completion')
 
 module.exports = Object.assign ( watch, {
+  staticCompletions: () => ({
+    '--experimental-hot-reload': ['true', 'false'],
+    '--livereload':              ['false'],
+    '--include':                 DIR(),
+    '--exclude':                 DIR(),
+  }),
   flags: [ '--in-memory', '--in-memory?', '--with-mocks', '--with-mtx' ],
   options: [ '--port', ...watchOnlyOptions ],
   help: `
@@ -78,14 +85,15 @@ module.exports = Object.assign ( watch, {
 `})
 
 const fs = require ('node:fs')
-const cds = require('../lib/cds')
+const cds = require('../../lib/cds')
 const DEBUG = /\b(y|all|cli|watch)\b/.test (process.env.DEBUG) ? ((..._) => console.debug ('[cli] -', ..._)) : undefined
 const {delimiter,relative,resolve,sep} = require ('path')
-const {codes} = require('../lib/util/term'), t = codes
+const {codes} = require('../../lib/util/term'), t = codes
 
 const escapedSep = sep === '\\' ? '\\\\' : sep // escape backslash for windows
 const ignoreDefaults = [
   /\.git/,
+  new RegExp(`${escapedSep}\\.cds(${escapedSep}|$)`), // .cds folder — but not .cds model files or .cdsrc.json
   /node_modules/,
   /_out/,
   /@types/,
@@ -148,7 +156,7 @@ async function watch ([cwd], {
   // if sap/cds is not installed locally, run with cds-dk's deps. (sap/cds, sqlite etc)
   if (!installed('@sap/cds', cwd)) {
     env.NODE_PATH = [...paths(cwd), ...paths(__dirname)].join(delimiter)
-    env.NODE_OPTIONS = [env.NODE_OPTIONS, `--import ${require.resolve('../lib/watch/esm-resolve-registration.js')}`].filter(Boolean).join(' ')
+    env.NODE_OPTIONS = [env.NODE_OPTIONS, `--import ${require.resolve('./esm-resolve-registration.js')}`].filter(Boolean).join(' ')
   }
 
   const delay = parseInt(process.env.CDS_WATCH_DELAY) || 200
@@ -163,8 +171,8 @@ async function watch ([cwd], {
   let liveReload //= ...
   if (!/false|no/.test(options.livereload)) {
     log ('( live reload enabled for browsers )')
-    liveReload = new (require ('../lib/watch/livereload-server'))
-    env.CDS_LIVERELOAD_PATH = require.resolve ('../lib/watch/livereload-connect')
+    liveReload = new (require ('./livereload-server'))
+    env.CDS_LIVERELOAD_PATH = require.resolve ('./livereload-connect')
     env.CDS_LIVERELOAD_URL = await liveReload.start (options['livereload'], cwd, delay)
       .catch(err => { console.log(`Error starting live reload: ${err.message}`); liveReload = null })
   }
@@ -177,7 +185,7 @@ async function watch ([cwd], {
   })
 
   if (process.argv.includes('--profile') || process.env.CDS_ENV) {
-    const bind = require('../lib/bind/shared')
+    const bind = require('../../lib/bind/shared')
     Object.assign(env, await bind.env({cwd}))
   }
 
@@ -192,9 +200,9 @@ async function watch ([cwd], {
   //   return
   // }
 
-  const nodemon = require('../lib/watch/node-watch')
+  const nodemon = require('./node-watch')
   const watcher = nodemon ({
-    script: resolve(__dirname,'../lib/watch/watched'), cwd, env, ext, ignore, watched,
+    script: resolve(__dirname,'./watched'), cwd, env, ext, ignore, watched,
     delay,
     options
   }).on('restart', (files)=>{
@@ -203,7 +211,7 @@ async function watch ([cwd], {
   }).on('message', async (msg) => { switch (msg.code) { // messages from child process
     case 'listening':
       env.PORT = msg.address?.port || msg.port
-      if (options.open) require('../lib/watch/open').openURL (options.open, env.PORT)
+      if (options.open) require('./open').openURL (options.open, env.PORT)
       else liveReload?.reload()
       delete options.open
       break

package/{lib → bin}/watch/livereload-connect.js

@@ -1,4 +1,4 @@
-const cds = require('../cds');
+const cds = require('../../lib/cds');
 const DEBUG = cds.debug('cli|watch|livereload');
 
 module.exports = function livereload(opt) {

package/{lib → bin}/watch/vite-watch.js

@@ -1,4 +1,4 @@
-const cds = require('../cds')
+const cds = require('../../lib/cds')
 const { pathToFileURL } = require('node:url')
 const { path, stat, readdir, isdir, colors: { BOLD, RESET } } = cds.utils
 

package/{lib → bin}/watch/watched.js

@@ -1,13 +1,13 @@
 //
 // Child process impl launched by cds watch
-// Extracted from watch.js to avoid cds.env loaded too eagerly
+// Extracted from watch/index.js to avoid cds.env loaded too eagerly
 //
 
 (async () => {
 
   // run through cli in order to use its error handling
   const args = JSON.parse(process.env._args)
-  const cds = require('../cds'); cds.watched = true
+  const cds = require('../../lib/cds'); cds.watched = true
   require('./vite-watch')
   const bootstrap = require('../../bin/cds')(...args)
 

package/lib/build/constants.js

@@ -21,7 +21,7 @@ exports.CONTENT_PACKAGE_JSON = "contentPackageJson"             // create packag
 exports.CONTENT_PACKAGELOCK_JSON = "contentPackageLockJson"     // copy package-lock.json file into deployment folder - ENABLED by default
 exports.CONTENT_HDBTABLEDATA = "contentHdbtabledata"            // create .hdbtabledata files for .csv files if not already existing - ENABLED by default
 exports.CONTENT_NPMRC = "contentNpmrc"                          // copy .npmrc file into deployment folder - ENABLED by default
-exports.CONTENT_CDSRC_JSON = "contentCdsrcJson"                 // copy .cdsrc.json file into deployment folder - ENABLED by default
+exports.CONTENT_CDSRC = "contentCdsrc"                          // copy .cdsrc.* config files into deployment folder - ENABLED by default
 exports.CONTENT_NODE_MODULES = "contentNodeModules"             // copy node_modules folder into deployment folder - DISABLED by default
 exports.CONTENT_ENV = "contentEnv"                              // copy .env file into deployment folder - DISABLED by default
 exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-env.json file into deployment folder - DISABLED by default

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

@@ -3,6 +3,7 @@ const cds = require('../../../cds')
 const { normalizePath } = require('../../util')
 const { BUILD_TASK_FIORI, CDS_CONFIG_PATH_SEP } = require('../../constants')
 const DEBUG = cds.debug('cli|build')
+const { exists } = cds.utils
 
 /**
  * With cds 4 service metadata for the UI service binding is no longer created by default.
@@ -86,7 +87,8 @@ module.exports = class FioriBuildPlugin extends require('../edmx') {
     }
 
     async _writeEdmxToWebapp(src, dest) {
-        const manifestPath = path.join(src, 'webapp', 'manifest.json')
+        const subfolder = this._resolveAppFolder(src)
+        const manifestPath = path.join(src, subfolder, 'manifest.json')
         let manifest
 
         try {
@@ -124,10 +126,37 @@ module.exports = class FioriBuildPlugin extends require('../edmx') {
             return
         }
 
-        const edmxPath = path.resolve(path.join(dest, 'webapp'), this._strippedUrlPath(localUri))
+        const edmxPath = path.resolve(path.join(dest, subfolder), this._strippedUrlPath(localUri))
         return this.write(edmx).to(edmxPath)
     }
 
+    /**
+     * Folder holding manifest.json relative to the UI module root.
+     * Defaults: `webapp` (UI5 v4 application), `src` (UI5 v5 component/library);
+     * overridable via ui5.yaml path mapping, see https://ui5.github.io/cli/v4/pages/Configuration/#path-mapping
+     */
+    _resolveAppFolder(src) {
+        for (const yamlFile of ['ui5.yaml', 'ui5-build.yaml']) {
+            const yamlPath = path.join(src, yamlFile)
+            if (!exists(yamlPath)) {
+                continue
+            }
+            let paths
+            try {
+                paths = cds.load.yaml(yamlPath)?.resources?.configuration?.paths
+            } catch (e) {
+                if (e.name !== 'YAMLParseError') throw e // only tolerate malformed yaml
+                DEBUG?.(`ignoring malformed [${path.relative(cds.root, yamlPath)}]: ${e.code}`)
+                continue
+            }
+            const mapped = paths?.webapp ?? paths?.src
+            if (mapped) {
+                return mapped
+            }
+        }
+        return exists(path.join(src, 'src', 'manifest.json')) ? 'src' : 'webapp'
+    }
+
     _getEdmxForUri(model, appFolder, uri) {
         const uriSegments = this._strippedUrlPath(uri).split('/')
 

package/lib/build/plugins/internal.js

@@ -142,10 +142,12 @@ module.exports = class InternalBuildPlugin extends require('./plugin') {
     /**
      * Collect and write message bundles from CAP plugins into messages.properties files.
      * @param {string} bundleDest
-     * @param {Object} model - the CSN model (used for neighborhood resolution of message files)
+     * @param {Object} model - passed for signature consistency with subclass overrides; not used here
+     * as Java does not require neighborhood resolution of plugin i18n files.
      */
+    // eslint-disable-next-line no-unused-vars
     async collectMessageBundles(bundleDest, model) {
-        const messageBundle = cds.i18n.bundle4('messages', { model })
+        const messageBundle = cds.i18n.bundle4('messages')
         const messagesData = messageBundle.translations4?.(cds.env.i18n.languages) ?? {}
 
         // Write messages.properties files for each locale

package/lib/build/plugins/mtx-sidecar/index.js

@@ -122,14 +122,13 @@ module.exports = class MtxSidecarBuildPlugin extends require('../nodejs') {
         // resources are determined based on available database build task, SQLite as fallback
         promises.push(new ResourcesTarBuilder(this).createTar(destMain, model))
 
-        // copy package.json and .cdsrc.json from project root
-        const packageJson = path.join(cds.root, 'package.json')
-        const cdsrcJson = path.join(cds.root, '.cdsrc.json')
-        if (exists('package.json')) {
-            promises.push(this.copy(packageJson).to(path.join(destMain, 'package.json')))
-        }
-        if (exists('.cdsrc.json')) {
-            promises.push(this.copy(cdsrcJson).to(path.join(destMain, '.cdsrc.json')))
+        // copy package.json and .cdsrc.json/.cdsrc.yaml from project root
+        for (const file of ['package.json', '.cdsrc.json', '.cdsrc.yaml']) {
+            if (exists(file)) {
+                promises.push(this
+                    .copy(path.join(cds.root, file))
+                    .to(path.join(destMain, file)))
+            }
         }
         return Promise.all(promises)
     }

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

@@ -3,7 +3,7 @@ const { path, exists, rimraf, isdir, read, write } = cds.utils
 const cmd = require('../../../util/command')
 const { BuildError, getWorkspaces, findWorkspaceRoot, normalizePath } = require('../../util')
 const { ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX, CONTENT_PACKAGELOCK_JSON,
-    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX,
+    CONTENT_NPMRC, CONTENT_CDSRC, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX,
     OPTION_WS_PACK, SEVERITY_WARNING } = require('../../constants');
 const LOG = cds.log('cli|build')
 const DEBUG = cds.debug('cli|build')
@@ -68,6 +68,7 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
         if (this.isStagingBuild()) {
             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)
+            await this.#copyWorkspaceLock(destRoot)
             try {
                 // add minimal node engine to effective package.json.
                 // CloudFoundry uses this entry to choose the node engine in buildpack and may
@@ -146,6 +147,18 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
 
     }
 
+    // copy the workspace root lock into gen/srv when the module has none, so monorepo deployments install frozen dependencies
+    async #copyWorkspaceLock(destRoot) {
+        if (this.hasBuildOption(CONTENT_PACKAGELOCK_JSON, false)) return
+        if (exists(path.join(destRoot, 'package-lock.json'))) return
+        const wsRoot = findWorkspaceRoot(cds.root)
+        if (!wsRoot || wsRoot === cds.root) return
+        const rootLock = path.join(wsRoot, 'package-lock.json')
+        if (!exists(rootLock)) return
+        DEBUG?.(`Copying workspace root package-lock.json from '${wsRoot}' into build destination`)
+        await this.copy(rootLock).to(path.join(destRoot, 'package-lock.json'))
+    }
+
     async clean() {
         // staging build content is deleted by default
         if (cds.env.build.target === '.') {
@@ -175,7 +188,7 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
      * @returns the list of files that have been copied
      */
     async copySrvContent(src, destRoot, destSrv) {
-        const srvRootBlockList = RegExp('package\\.json$|package-lock\\.json$|\\.npmrc$|\\.cdsrc\\.json$')
+        const srvRootBlockList = RegExp('package\\.json$|package-lock\\.json$|\\.npmrc$|\\.cdsrc\\.json$|\\.cdsrc\\.yaml$')
         const srvBlockList = RegExp('\\.cds$|csn\\.json$|\\.csn$|manifest\\.y.?ml$|\\.env($|\\..*$)|default-env\\.json$|\\.cdsrc-private.json$')
         const srvRootFileNames = []
 
@@ -201,7 +214,7 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
         let srvAllowList = "package\\.json$" // always copy package.json, modify only if CONTENT_PACKAGE_JSON is true
         srvAllowList += !this.hasBuildOption(CONTENT_PACKAGELOCK_JSON, false) ? "|package-lock\\.json$" : ""
         srvAllowList += !this.hasBuildOption(CONTENT_NPMRC, false) ? "|\\.npmrc$" : ""
-        srvAllowList += !this.hasBuildOption(CONTENT_CDSRC_JSON, false) ? "|\\.cdsrc\\.json$" : ""
+        srvAllowList += !this.hasBuildOption(CONTENT_CDSRC, false) ? "|\\.cdsrc\\.json$|\\.cdsrc\\.yaml$" : ""
         srvAllowList += this.hasBuildOption(CONTENT_ENV, true) ? "|\\.env($|\\..*$)" : ""
         srvAllowList += this.hasBuildOption(CONTENT_DEFAULT_ENV_JSON, true) ? "|default-env\\.json$" : ""
         srvAllowList = new RegExp(srvAllowList)
@@ -228,7 +241,7 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
         let srvAllowList = "package\\.json$" // always copy package.json, modify only if CONTENT_PACKAGE_JSON is true
         srvAllowList += !this.hasBuildOption(CONTENT_PACKAGELOCK_JSON, false) ? "|package-lock\\.json$" : ""
         srvAllowList += !this.hasBuildOption(CONTENT_NPMRC, false) ? "|\\.npmrc$" : ""
-        srvAllowList += !this.hasBuildOption(CONTENT_CDSRC_JSON, false) ? "|\\.cdsrc\\.json$" : ""
+        srvAllowList += !this.hasBuildOption(CONTENT_CDSRC, false) ? "|\\.cdsrc\\.json$|\\.cdsrc\\.yaml$" : ""
         srvAllowList += this.hasBuildOption(CONTENT_ENV, true) ? "|\\.env($|\\..*$)" : ""
         srvAllowList += this.hasBuildOption(CONTENT_DEFAULT_ENV_JSON, true) ? "|default-env\\.json$" : ""
         srvAllowList = new RegExp(srvAllowList)
@@ -290,18 +303,48 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
                 }
             }
         }
+        await this._packWorkspaceRoot(dest, wsRoot, appPkg)
+    }
+
+    async _packWorkspaceRoot(dest, wsRoot, appPkg) {
+        if (!wsRoot || wsRoot === cds.root) return
+        // The workspace root package is not a member of its own `workspaces` globs, so
+        // `getWorkspaces` never returns it. Pack it explicitly when the app depends on it
+        // via a `file:` spec that resolves to the workspace root.
+        const rootName = require(path.join(wsRoot, 'package.json')).name
+        const spec = appPkg.dependencies?.[rootName]
+        if (!spec?.startsWith('file:')) return
+        if (path.resolve(cds.root, spec.slice('file:'.length)) !== path.resolve(wsRoot)) return
+        let pkgDescriptors
+        try {
+            pkgDescriptors = await NodejsBuildPlugin._execNpmPack(dest, wsRoot)
+        } catch (e) {
+            DEBUG?.(e)
+            throw new BuildError(`Failed to package npm workspace root\n${e.message}`)
+        }
+        const pkgDescriptor = pkgDescriptors?.find(d => d.name === rootName)
+        if (!pkgDescriptor) return
+        const { filename: fileName } = pkgDescriptor
+        appPkg.dependencies[rootName] = `file:${fileName}`
+        this.pushFile(path.join(dest, fileName))
+        await this.write(JSON.stringify(appPkg, 0, 2)).to(path.join(dest, 'package.json'))
     }
 
     /**
      * @param {import('fs').PathLike} dest - destination folder
      * @param {import('fs').PathLike} wsRoot - workspace root folder
-     * @param {string[]} workspaces - list of workspace names
+     * @param {string[]} [workspaces] - list of workspace names; when omitted, the workspace root package itself is packed
      * @returns {Promise<object[]>} - array of pack descriptors ({ name, filename, ... })
      * @private
      */
     static async _execNpmPack(dest, wsRoot, workspaces) {
-        const args = ['pack', '--ws', '--json', `--pack-destination=${dest}`]
-        workspaces.forEach(w => args.push(`-w=${w}`))
+        const args = ['pack', '--json', `--pack-destination=${dest}`]
+        if (workspaces) {
+            args.push('--ws')
+            workspaces.forEach(w => args.push(`-w=${w}`))
+        } else {
+            args.push(wsRoot)
+        }
         const result = await cmd.spawnCommand('npm', args, { cwd: wsRoot }, true, !!LOG._debug)
         DEBUG?.(result)
         const parsed = JSON.parse(result)
@@ -309,4 +352,18 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
         // package name as of npm 12 — normalize to an array of descriptors.
         return Array.isArray(parsed) ? parsed : Object.values(parsed)
     }
+
+    // Override to pass model for neighborhood resolution of plugin i18n files.
+    // Cannot be done in InternalBuildPlugin because Java relies on the model-less behaviour.
+    async collectMessageBundles(bundleDest, model) {
+        const messageBundle = cds.i18n.bundle4('messages', { model })
+        const messagesData = messageBundle.translations4?.(cds.env.i18n.languages) ?? {}
+        for (const [locale, messages] of Object.entries(messagesData)) {
+            if (Object.keys(messages).length > 0) {
+                const fileName = locale ? `messages_${locale}.properties` : 'messages.properties'
+                const content = Object.entries(messages).map(([k, v]) => `${k}=${v}`).join('\n') + '\n'
+                await this.write(content).to(path.join(bundleDest, fileName))
+            }
+        }
+    }
 }

package/lib/compile/to_asyncapi.js

@@ -4,4 +4,4 @@ function cds_compile_to_asyncapi (csn, options) {
   return compile(csn, options)
 }
 
-module.exports = cds_compile_to_asyncapi
+module.exports = cds_compile_to_asyncapi

package/lib/env/schema.js

@@ -26,6 +26,22 @@ function mergePluginSchema(pluginSchema) {
                     targetSchema._cds_schema_overlays.push('root')
                 }
             }
+
+            if (pluginSchema.export) {
+                const exp = targetSchema.$defs?.cdsRoot?.properties?.export?.properties
+                if (exp) {
+                    Object.assign(exp, pluginSchema.export)
+                    targetSchema._cds_schema_overlays.push('export')
+                }
+            }
+
+            if (pluginSchema.importFrom) {
+                const oneOf = targetSchema.$defs?.importOptions?.from?.oneOf
+                if (oneOf) {
+                    oneOf.push(pluginSchema.importFrom)
+                    targetSchema._cds_schema_overlays.push('importFrom')
+                }
+            }
         }
     }
 }