@sap/cds-dk 10.0.7 → 10.1.1

package/bin/pull.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(pull, {
-    options: ['--subdomain', '--passcode', '--user', '--client', '--from'],
+    options: ['--subdomain', '--passcode', '--user', '--client', '--mtls', '--from'],
     flags: [],
-    shortcuts: ['-s', '-p', '-u', '-c'],
+    shortcuts: ['-s', '-p', '-u', '-c', '-m'],
     help: `
 # SYNOPSIS
 
@@ -42,9 +42,17 @@ module.exports = Object.assign(pull, {
         Username and optionally password for authentication with Basic Auth in
         test scenarios.
 
-    *-c* | *--client* <clientid>[:<clientsecret>]
+    *-c* | *--client* [<clientid>[:<clientsecret>]]
 
-        Client ID and optionally Client Secret for authentication.
+        Client ID and optionally Client Secret for authentication. May also be
+        provided via the CDS_LOGIN_CLIENT_ID and CDS_LOGIN_CLIENT_SECRET
+        environment variables. See *cds login* for details.
+
+    *-m* | *--mtls* [<clientid>]
+
+        Client-certificate (mTLS) authentication. Client ID inline or via
+        CDS_LOGIN_CLIENT_ID; certificate and key via CDS_LOGIN_CLIENT_CERT and
+        CDS_LOGIN_CLIENT_KEY. See *cds login* for details.
 
 # SEE ALSO
 
@@ -61,8 +69,11 @@ module.exports = Object.assign(pull, {
 async function pull([url], options = {}) {
     const [username, password] = options.user?.split(':') ?? [];
     delete options.user;
-    const [clientid, clientsecret] = options.client?.split(':') ?? [];
+    const { clientid, clientsecret, certificate, key } = options.mtls
+        ? require('../lib/mtx/util/credentials').clientCertificate(options.mtls)
+        : require('../lib/mtx/util/credentials').clientCredentials(options.client);
     delete options.client;
+    delete options.mtls;
     if (options.from) url = options.from;
     delete options.from;
 
@@ -72,6 +83,8 @@ async function pull([url], options = {}) {
         username,
         password,
         clientid,
-        clientsecret
+        clientsecret,
+        certificate,
+        key
     });
 }

package/bin/push.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(push, {
-    options: ['--subdomain', '--passcode', '--user', '--client', '--to', '--async', '--sync'],
+    options: ['--subdomain', '--passcode', '--user', '--client', '--mtls', '--to', '--async', '--sync'],
     flags: [],
-    shortcuts: ['-s', '-p', '-u', '-c', '-2'],
+    shortcuts: ['-s', '-p', '-u', '-c', '-m', '-2'],
     help: `
 # SYNOPSIS
 
@@ -44,9 +44,17 @@ module.exports = Object.assign(push, {
         Username and optionally password for authentication with Basic Auth in
         test scenarios.
 
-    *-c* | *--client* <clientid>[:<clientsecret>]
+    *-c* | *--client* [<clientid>[:<clientsecret>]]
 
-        Client ID and optionally Client Secret for authentication.
+        Client ID and optionally Client Secret for authentication. May also be
+        provided via the CDS_LOGIN_CLIENT_ID and CDS_LOGIN_CLIENT_SECRET
+        environment variables. See *cds login* for details.
+
+    *-m* | *--mtls* [<clientid>]
+
+        Client-certificate (mTLS) authentication. Client ID inline or via
+        CDS_LOGIN_CLIENT_ID; certificate and key via CDS_LOGIN_CLIENT_CERT and
+        CDS_LOGIN_CLIENT_KEY. See *cds login* for details.
 
     *--async*
 
@@ -71,15 +79,20 @@ async function push([extArchive], options = {}) {
 
     const [username, password] = options.user?.split(':') ?? [];
     delete options.user;
-    const [clientid, clientsecret] = options.client?.split(':') ?? [];
+    const { clientid, clientsecret, certificate, key } = options.mtls
+        ? require('../lib/mtx/util/credentials').clientCertificate(options.mtls)
+        : require('../lib/mtx/util/credentials').clientCredentials(options.client);
     delete options.client;
+    delete options.mtls;
 
     const args = [{
         ...options,
         username,
         password,
         clientid,
-        clientsecret
+        clientsecret,
+        certificate,
+        key
     }];
     if (extArchive) {
         args.push({ extArchive });

package/bin/repl.js

@@ -1,6 +1,15 @@
+const { DIR } = require('./completion');
 module.exports = Object.assign (repl, {
-  options: [ '--run', '--use', '--ql' ],
-  shortcuts: [ '-r', '-u' ],
+  options: [ '--run', '--use' ],
+  flags: [ '--ql' ],
+  shortcuts: ['-r', '-u'],
+  staticCompletions: () => ({
+    '_':     DIR(),
+    '--run': DIR(),
+    '-r':    DIR(),
+    '--use': ['xl', 'ql', 'entities', 'services'],
+    '-u':    ['xl', 'ql', 'entities', 'services'],
+  }),
   help: `
 # SYNOPSIS
 

package/bin/run.js

@@ -1,6 +1,17 @@
+const { DIR } = require('./completion');
 const serve = require ('./serve')
 module.exports = Object.assign (
-    cds_run, serve, {help: `
+    cds_run, serve, {
+    staticCompletions: () => ({
+        '_':       DIR(),
+        '--from':  DIR(),
+        '-f':      DIR(),
+        '--with':  DIR(),
+        '-w':      DIR(),
+        '--to':    ['odata', 'fiori', 'rest'],
+        '-2':      ['odata', 'fiori', 'rest'],
+    }),
+    help: `
 # SYNOPSIS
 
     *cds run* [<project>] [<options>]

package/bin/serve.js

@@ -1,6 +1,17 @@
 // allows executing `cds serve` even when `cds` executable is removed from `@sap/cds`
-
-module.exports = require(_local('@sap/cds/bin/serve'))
+const { DIR } = require('./completion');
+const serve = require(_local('@sap/cds/bin/serve'))
+module.exports = Object.assign(serve, {
+  staticCompletions: () => ({
+    '_':      DIR(),
+    '--from': DIR(),
+    '-f':     DIR(),
+    '--with': DIR(),
+    '-w':     DIR(),
+    '--to':   ['odata', 'fiori', 'rest'],
+    '-2':     ['odata', 'fiori', 'rest'],
+  }),
+})
 
 function _local (id) {
   return require.resolve (id, { paths: [ process.cwd(), __dirname ] })

package/bin/up.js

@@ -1,4 +1,10 @@
+const { FILE } = require('./completion');
+
 module.exports = Object.assign(up, {
+  staticCompletions: () => ({
+      '--to':      ['cf', 'k8s'],
+      '--overlay': FILE('mtaext')
+  }),
   options: ['--to', '--namespace', '--overlay'],
   shortcuts: ['-2', '-n'],
   flags: [],
@@ -117,7 +123,7 @@ const _mtaextForOverlay = overlay => {
 
 async function up() {
   const project = readProject()
-  const { apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice, hasKyma, hasMta, k8s } = project
+  const { approuterPath, html5DeployerPath, apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice, hasKyma, hasMta, k8s } = project
   const toKyma = cds.cli.options.to === 'k8s' || hasKyma && !hasMta, toCf = !toKyma
 
   if (cds.cli.options.overlay && toKyma) {
@@ -175,10 +181,10 @@ async function up() {
     if (!exists('chart') || !exists('containerize.yaml')) run('cds add kyma')
 
     if (project.hasHtml5Repo) {
-      const html5DeployerPath = join(cds.root, cds.env.folders.app, 'html5-deployer', 'resources')
+      const html5DeployerResources = join(cds.root, html5DeployerPath, 'resources')
 
       if (apps.length > 0) {
-        await mkdirp(html5DeployerPath)
+        await mkdirp(html5DeployerResources)
       }
 
       for (const { app, archiveName } of apps) {
@@ -199,7 +205,7 @@ async function up() {
         if (needsBuild || process.env.SKIP_CHECK == 'true') {
           DEBUG?.(dim(`build required for '${app}' – checksums`, { old: storedChecksum, new: currentChecksum }))
           run(`npm run build --prefix ${appPath}`)
-          await copy(zipPath).to(html5DeployerPath, `${app}.zip`)
+          await copy(zipPath).to(html5DeployerResources, `${app}.zip`)
           writeStoredChecksum(app, currentChecksum)
         } else {
           console.log(info(`Skipping build for UI5 app '${app}' - no changes detected (checksum: ${currentChecksum.substring(0, 8)}...)`))
@@ -209,11 +215,11 @@ async function up() {
     }
 
     if (project.hasAppFrontend) {
-      const html5DeployerPath = join(cds.root, cds.env.folders.app, 'html5-deployer', 'resources')
+      const html5DeployerResources = join(cds.root, html5DeployerPath, 'resources')
       let isRootApp = true;
 
       if (apps.length > 0) {
-        await mkdirp(html5DeployerPath)
+        await mkdirp(html5DeployerResources)
       }
 
       for (const { app } of apps) {
@@ -235,13 +241,13 @@ async function up() {
         if (needsBuild || process.env.SKIP_CHECK == 'true') {
           DEBUG?.(dim(`build required for '${app}' – checksums`, { old: storedChecksum, new: currentChecksum }))
           run(`npm run build --prefix ${appPath}`)
-          await copy(zipPath).to(html5DeployerPath, `${app}.zip`)
+          await copy(zipPath).to(html5DeployerResources, `${app}.zip`)
           writeStoredChecksum(app, currentChecksum)
         } else {
           console.log(info(`Skipping build for React app '${app}' - no changes detected (checksum: ${currentChecksum.substring(0, 8)}...)`))
         }
       }
-      
+
       // for single UI app where Vite app is directly added into app/
       const appPath = path.join(cds.root, cds.env.folders.app)
       const rootPkgJson = exists(path.join(appPath, 'package.json'))
@@ -251,7 +257,7 @@ async function up() {
         const rootZipPath = path.join(appPath, `dist/${appName}.zip`)
         if(isRootApp) {
           run(`npm run build --prefix ${appPath}`)
-          await copy(rootZipPath).to(html5DeployerPath, `${appName}.zip`)
+          await copy(rootZipPath).to(html5DeployerResources, `${appName}.zip`)
         }
       }
     }
@@ -332,10 +338,10 @@ async function up() {
       if (m.path === 'gen/srv') {
         helmArgs.push(`--set srv.annotations.deployment.deployment-checksum=${m.checksum}`)
       }
-      if (m.path === 'app/router') {
+      if (m.path === approuterPath) {
         helmArgs.push(`--set approuter.annotations.deployment.deployment-checksum=${m.checksum}`)
       }
-      if (m.path === 'app/html5-deployer') {
+      if (m.path === html5DeployerPath) {
         helmArgs.push(`--set html5-apps-deployer.annotations.job.job-checksum=${m.checksum}`)
       }
       if (m.path === 'gen/db') {

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

@@ -3,7 +3,7 @@
 const UPGRADE_DIR = '.cds-upgrade'
 const REPORT_FILE = 'report.md'
 const FINDINGS_FILE = 'report.yaml'
-const JAVA_LATEST = require('../init/constants').MAVEN_ARCHETYPE_VERSION
+const JAVA_LATEST = require('../../lib/init/constants').MAVEN_ARCHETYPE_VERSION
 
 // CDS dependencies to rewrite (Node.js)
 const CDS_DEPS = ['@sap/cds', '@sap/cds-dk']

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,21 @@ 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
+  const dependencyMirrors = Object.keys(process.env).filter(key => key.startsWith('BP_DEPENDENCY_MIRROR_') && process.env[key])
   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'),
+    ...dependencyMirrors.flatMap(key => ['--env', key]),
+    ...(publish ? ['--publish'] : []),
     ...cacheArgs
   ]]
 }
@@ -107,14 +111,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 +143,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,20 @@
 const watchOnlyOptions = ['--ext', '--livereload', '--experimental-hot-reload', '--open', '--debug', '--inspect', '--inspect-brk', '--include', '--exclude']
+const { DIR } = require('../completion')
 
 module.exports = Object.assign ( watch, {
+  staticCompletions: () => ({
+    '_':                         DIR(),
+    '--from':                    DIR(),
+    '-f':                        DIR(),
+    '--with':                    DIR(),
+    '-w':                        DIR(),
+    '--to':                      ['odata', 'fiori', 'rest'],
+    '-2':                        ['odata', 'fiori', 'rest'],
+    '--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 +92,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 +163,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 +178,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 +192,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 +207,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 +218,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