@sap/cds-dk 9.6.0 → 9.7.0

package/bin/minify.js

@@ -34,13 +34,11 @@ class Minify extends Command {
   async exec ( args, options ) {
     let [sources,o] = this.parseArgs ({ args, options })
     try {
-      let csn = await this.load (sources,o); this.csn = csn
-      let min = await this.minify (csn,o); this.min = min
+      this.csn = await this.load (sources,o)
+      this.min = await this.minify (this.csn,o)
       if (o.dry) return
-      if (o.inspect) return this.inspect (min,o)
-      if (this.print) return this.print (min)
-      else await this.export (min,o)
-      console.log()
+      if (o.inspect) return this.inspect (this.min,o)
+      else return this.output (this.min,o)
     } catch (e) {
       if (typeof e === 'string') return console.error (e)
       if (e.code) return console.error (e.message)
@@ -66,7 +64,7 @@ class Minify extends Command {
    * Subclasses override this method to provide custom minification behavior.
    */
   async minify (csn,o) {
-    let m = this.minifier ??= o.dry ? new Dryifier(csn) : new Minifier()
+    let m = this.minifier ??= o.dry ? (new Dryifier).for(csn) : new Minifier
     csn = await this.cleanse (csn,o)
     return m.minify (csn,o)
   }
@@ -79,7 +77,7 @@ class Minify extends Command {
   /**
    * Subclasses override this method to provide custom print behavior.
    */
-  print (csn,o) { // eslint-disable-line no-unused-vars
+  output (csn,o) { // eslint-disable-line no-unused-vars
     console.log (cds.compile.to.json (csn))
   }
 
@@ -95,12 +93,13 @@ class Minify extends Command {
  */
 class Dryifier extends Minifier {
 
-  constructor(csn) { super(); this.all = Object.keys (csn.definitions) }
+  for (csn) { this.all = Object.keys (csn.definitions); return this }
   capture = {}
   level = 0
 
   keep (each,d) {
-    if (each in this.kept) return; else this.capture[each] = ++this.level
+    if (each in this.kept) return
+    if (each in this.defs) this.capture[each] = ++this.level
     super.keep (each, d)
     this.level--
   }
@@ -109,10 +108,10 @@ class Dryifier extends Minifier {
     const { GREEN, GRAY, DIMMED, RESET } = cds.utils.colors
     const min = super.minify (csn, o)
     const kept = Object.keys(this.capture)
-    console.log (RESET+'\n', 'Keep:', kept.length, '\n')
+    console.log (RESET+'\n', 'Kept:', kept.length, '\n')
     for (let [ each, level ] of Object.entries(this.capture))
       console.log ('  '+GRAY,'•'.repeat(level)+GREEN, each, RESET)
-    console.log (RESET+'\n', 'Skip:', this.all.length - kept.length, '\n')
+    console.log (RESET+'\n', 'Skipped:', this.all.length - kept.length, '\n')
     for (let each of this.all)
       each in this.capture || console.log (DIMMED, '  -', each, RESET)
     console.log (RESET+'\n', 'Total:', this.all.length, '\n')

package/bin/mock.js

@@ -1,22 +1,30 @@
-const cds = require ('../lib/cds')
-const serve = cds._local('@sap/cds/bin/serve')
-module.exports = Object.assign (
-    cds_mock, serve, {help: `
+const cds = require ('../lib/cds'); require = cds._local // eslint-disable-line no-global-assign
+const serve = require ('@sap/cds/bin/serve') // eslint-disable-line cds-dk/use-api-require, cds-dk/use-relative-require
+
+module.exports = exports = Object.assign (cds_mock, serve)
+
+exports.help = `
 # SYNOPSIS
 
     *cds mock* <service> [<options>]
 
     This command is essentially just a convenience shortcut to
-    _cds serve --mocked <service> --in-memory? --port 0_
+    _cds serve --mocked <service> --in-memory? --port 0_.
+
+    If <service> resolves to an existing CAP project root, that changes to
+    _cds serve --mocked --project <service> --in-memory? --port 0_.
 
 # OPTIONS
 
     - see _cds help serve_
 
 # OPTIONS
-`})
+`
 
-function cds_mock (projects, options) {
-    if (!projects || !projects.length) return this.help('mock')
-    return serve (projects, { mocked:true, port:'0', 'in-memory?':true, ...options })
+function cds_mock (argv, options) {
+  const [service] = argv
+  const o = { mocked: true, port: '0', 'in-memory?': true, ...options }
+  if (!o.project && cds.utils.isfile (service, 'package.json'))
+    o.project = true
+  return serve (argv, o)
 }

package/bin/repl.js

@@ -46,7 +46,6 @@ async function repl ([project], options={}) {
   inspect.defaultOptions.depth = 11
 
   Object.defineProperty (cds,'repl',{value:true})
-  await cds.service.bindings // REVISIT: this pre-populates many of the cds facade's lazy properties
   let context={}, repl = { context, displayPrompt(){} }
   if ((options.run ??= project)) await _run (options.run)
   if (options.use) _export (...options.use.split(','))
@@ -95,8 +94,9 @@ async function repl ([project], options={}) {
 
   async function _run (project) {
     await require('../bin/serve') ([project], { project, port: 0, 
+      'with-bindings': true, 
+      'with-mocks': true,
       'in-memory?': true, 
-      'with-mocks': true 
     })
     _export ('entities', 'services')
   }

package/bin/up.js

@@ -33,15 +33,16 @@ const { execSync } = require('node:child_process')
 const { tmpdir } = require('node:os')
 const crypto = require('node:crypto')
 const cds = require('../lib/cds')
-const { highlight, warn, dim, info } = require('../lib/util/term')
+const { highlight, warn, dim, info, bold, link } = require('../lib/util/term')
 const { exists, fs, path, path: { join }, read, write } = cds.utils
 const { ask4 } = require('../lib/util/question')
 const { readProject } = require('../lib/init/projectReader')
 const { mkdirp, copy } = cds.utils
 const { containerize } = require('../bin/util/containerize')
 const { calcDirChecksum } = require('../lib/util/checksum')
+const { URLS } = require('../lib/init/constants')
 
-const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) ? console.debug : undefined
+const DEBUG = /\b(y|all|cli|up)\b/.test(process.env.DEBUG) ? console.debug : undefined
 
 const run = (cmd, { continueOnFail = false, silent = false } = {}) => {
   const redactedCmd = cmd.replace(/(--docker-password=)(['"]?)[^'"\s]+(['"]?)/, '$1[REDACTED]$3')
@@ -101,9 +102,26 @@ function writeStoredChecksum(appName, checksum) {
 async function up() {
   const project = readProject()
   const { apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice, hasKyma, hasMta, k8s } = project
-  const toKyma = cds.cli.options.to === 'k8s' || hasKyma && !hasMta
+  const toKyma = cds.cli.options.to === 'k8s' || hasKyma && !hasMta, toCf = !toKyma
 
-  const html5DeployerPath = join(cds.root, cds.env.folders.app, 'html5-deployer', 'resources')
+  if (toCf) {
+    if (!hasCommand('mbt')) {
+      throw `Missing 'mbt' command. Run ${bold('npm install -g mbt')} to install the Cloud MTA Build Tool.`
+    }
+    if (!hasCommand('cf')) {
+      throw `Missing 'cf' command. Refer to ${link(URLS.CF_INSTALL)} to install the Cloud Foundry CLI.`
+    }
+  } else if (toKyma) {
+    if (!hasCommand('docker')) {
+      throw `Missing 'docker' command. Refer to ${link(URLS.DOCKER_INSTALL)} to install Docker.`
+    }
+    if (!hasCommand('helm')) {
+      throw `Missing 'helm' command. Refer to ${link(URLS.HELM_INSTALL)} to install Helm.`
+    }
+    if (!hasCommand('kubectl')) {
+      throw `Missing 'kubectl' command. Refer to ${link(URLS.KUBECTL_INSTALL)} to install kubectl.`
+    }
+  }
 
   for (const { app } of apps) {
     const appPath = path.join(cds.root, cds.env.folders.app, app)
@@ -137,6 +155,8 @@ 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')
+
       if (apps.length > 0) {
         await mkdirp(html5DeployerPath)
       }
@@ -270,3 +290,13 @@ async function up() {
     run(`cf deploy gen/mta.tar -f ${retries}`)
   }
 }
+
+const hasCommand = cmd => {
+  try {
+    execSync(process.platform === 'win32' ? `where ${cmd}` : `command -v ${cmd}`, { stdio: 'ignore' })
+    return true
+  } catch (e) {
+    DEBUG?.(e)
+    return false
+  }
+}

package/bin/version.js

@@ -1,166 +1,237 @@
-const { join, resolve } = require ('path')
-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' ],
-  info,
-  help: `
+
+module.exports = exports = async function cds_version (pattern, options) {
+  console.log()
+  const o = canonic_options4 (pattern, options)
+  const all = await Promise.all([
+    node_versions(o),
+    java_versions(o),
+  ])
+  print_versions (all.flat(),o)
+  if (o.info) console.log ('\n','> Project:', project_info (o))
+  if (o._elsp) console.log ('\n', `${RED}ELSPROBLEMS${RESET} reported by ${BOLD}npm ls${RESET}. Run ${BOLD}npm install${RESET} to fix dependency problems, then rerun ${BOLD}cds version${RESET}.`)
+  console.log()
+}
+
+exports.options = [ '--depth', '--omit'  ]
+exports.flags = [ '--info', '--markdown', '--abs', '--all' ]
+exports.shortcuts = [ '-d', '-o', '-i', '-m', '-a' ]
+exports.help = `
 # SYNOPSIS
 
     *cds version* <options>
     *cds -v* <option>
 
-    Prints the versions of all @sap/cds packages in your package dependencies.
+    Uses _npm ls_ to fetch the versions of installed CAP packages, and
+    prints them in a tabular layout.
 
 # OPTIONS
 
-    *-i  | --info*
+    *-d  | --depth* <n>
 
-      Prints version information in a tabular markdown format, which you
-      can embed into your bug reports.
+      Specifies the depth of the dependency tree to traverse.
+      Passed to _npm ls --depth_.
 
-    *-a  | --all*
+    *-o  | --omit* <dev/optional/peer>
 
-      Also lists sub-packages and optional dependencies.
+      Omits certain types of dependencies when traversing the
+      dependency tree. Passed to _npm ls --omit_.
 
-    *-ls | --npm-list* <pattern>
-    *-ll | --npm-tree* <pattern>
+    *-m  | --markdown*
 
-      Prints an npm ls tree filtered to the specified pattern.
-      (default: '@sap/cds')
+      Prints version information in a tabular markdown format,
+      which you can embed into your bug reports.
 
-`})
+    *-i  | --info*
 
-const MISSING = '-- missing --'
+      Same as *--markdown*, plus prints project name and
+      repository URL at the end as a markdown link.
+`
 
-function list_versions (args, options) {
-  const {colors} = require('../lib/util/term')
 
-  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', re.source)
-    return require('child_process').exec(cmd, (e,stdout)=>{
-      // if (e) console.error(e)
-      const replacement = (!colors ? '$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 (options)
-
-  process.stdout.isTTY && console.log()
-  if (options.markdown || options.info) {
-    _markdown (versions, options)
-  } else {
-    const mark = !colors ? 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()
+const DEBUG = process.env.DEBUG ? (...args) => console.debug('[cds.version] -',...args) : undefined
+const child_process = require ('node:child_process')
+const $ = (cmd,..._) => {
+  if (cmd.raw) cmd = String.raw (cmd,..._) // the cmd may be a tagged template
+  DEBUG?.(cmd)
+  return new Promise ((resolve, reject) => child_process.exec (cmd,
+    (e,stdout) => e ? reject(e) : resolve (stdout.trim().split('\n'))
+  ))
 }
 
-function info({ root: cwd = process.cwd() }) {
-
-  const cds = require('../lib')
-  const env = cds.env.for('cds', cwd)
-
-  // Fetch versions for all CAP Node packages in the current project
-  const npmRoot = execSync('npm root -g').toString().trim()
-  const versions = {
-    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // linked in cap/dev 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(_pkg_path('@sap/cds', cds.home)),  // ... or local @sap/cds
-    ..._versions_from(_pkg_path('@cap-js/db-service', cwd)), // only required transitively
-    ..._versions_from(cwd,false), // ... more from local app dependencies
-    '@sap/cds-compiler': cds.compiler.version(),
-    'Node.js': process.version,
-    'home': cds.home, // effective cds home
-  }
+// Like $, but tolerates npm ls ELSPROBLEMS
+const $npm_ls = (cmd,..._) => {
+  if (cmd.raw) cmd = String.raw (cmd,..._) // the cmd may be a tagged template
+  DEBUG?.(cmd)
+  return new Promise ((resolve, reject) => child_process.exec (cmd, (e, stdout, stderr) => {
+    const out = (stdout || '').trim()
+    const err = (stderr || '').trim()
+    if (err) DEBUG?.('npm ls stderr:\n' + err)
+    const isELSPROBLEMS = !!(e && /\bELSPROBLEMS\b/.test(err))
+    if (e && !isELSPROBLEMS) {
+      const code = e.code ?? e.signal ?? 'UNKNOWN'
+      const msg =
+        `Failed to run ${BOLD}npm ls${RESET} to collect Node.js package versions.\n` +
+        `\n` +
+        `  Command: ${cmd}\n` +
+        `  Exit:    ${code}\n` +
+        `\n` +
+        `Re-run with DEBUG=1 to see npm output.\n` +
+        `Run ${BOLD}npm install${RESET}, then rerun ${BOLD}cds version${RESET}.`
+      const nice = new Error(msg, {cause: e})
+      return reject(nice)
+    }
+    resolve({
+      lines: out ? out.split('\n') : [],
+      elsp: isELSPROBLEMS
+    })
+  }))
+}
 
-  // Sort entries, with @sap/cds packages on top, followed by @cap-js packages
-  const keys = Object.keys(versions).sort(), sorted={}
-  for (let k of ['@sap/cds']) if (!(k in sorted)) sorted[k] = versions[k]
-  for (let k of keys) if (!(k in sorted) && k.startsWith('@sap/cds')) sorted[k] = versions[k]
-  for (let k of keys) if (!(k in sorted) && k.startsWith('@cap-js')) sorted[k] = versions[k]
-  for (let k of keys) if (!(k in sorted)) sorted[k] = versions[k]
-
-  // For Java projects we also need to collect the Java SDK version
-  const javaInfo = !env.cli?.version?.skipjava && env['project-nature'] === 'java'
-  if (javaInfo) {
-    if (process.stderr.isTTY) console.error('\x1b[2m'+'This takes a while. Collecting Java versions...', '\x1b[0m')
-    Object.assign(sorted, capJavaVersion(cwd))
-  }
+const cds = require('../lib')
+const home = require('os').homedir()
+const cap_packages = /@sap\/cds|@cap-js\//
+const { GREEN, YELLOW, RED, DIMMED, BOLD, RESET } = cds.utils.colors
+const { join, dirname } = require ('node:path')
 
-  return sorted
-}
 
-function _versions_from(pkg_path, pkg_label) {
-  let pkg; try { pkg = require(join(pkg_path, 'package.json')) } catch { return {} }
-  let versions = {}
-  if (pkg.name && pkg_label !== false)  versions[pkg_label || pkg.name] = pkg.version
-
-  const deps = { ...pkg.dependencies, ...pkg.devDependencies }
-  for (let dep in deps) {
-    if (!dep.match(/@sap\/.*cds.*/) && !dep.startsWith('@cap-js/'))  continue
-    try {
-      const dep_path = require.resolve(join(dep, 'package.json'), {paths:[pkg_path]})
-      const dep_pkg = require(dep_path)
-      versions[dep_pkg.name] = dep_pkg.version
-    } catch (e) {
-      if (e.code !== 'MODULE_NOT_FOUND')  console.error(e)
-     }
+function canonic_options4 ([pattern], options) {
+  const o = {
+    root: cds.root,
+    depth: options.all ? 11 : 1,
+    ...options,
   }
-  return versions
+  if (pattern) o.pattern = pattern
+  if (o.info) o.markdown ??= true
+  DEBUG?.('options:',o)
+  return o
 }
 
-function _markdown (versions, { root: cwd = process.cwd() }) {
-  const pkg = { name:'', repository:'', version:'' }; try {
-    Object.assign (pkg, require (require.resolve('./package.json', { paths:[cwd] })))
-  } catch (e) {/* ignored */}
-  const repo = pkg.repository.url || pkg.repository || 'https://github.com/<your/repo>'
-  const valLength = Math.max(repo.length, versions.home.length)
-
-  console.log ('|', $(pkg.name, repo), '|')
-  console.log ('|', $('----------------------', '-'.repeat(valLength)), '|')
+async function node_versions(o) {
+
+  // Call npm root and npm ls in parallel...
+  const [ [npm_root_g],[npm_root_l], { lines, elsp } ] = await Promise.all ([
+    $`npm root --global`,
+    $`npm root --local`,
+    $npm_ls`npm ls -lp ${
+      (o.omit ? o.omit.split(',').map(o => `--omit=${o} `).join('') : '') +
+      (o.depth ? `--depth=${o.depth}` : '--depth=1')
+    }`
+  ])
+
+  // Parse information returned by npm ls -lp
+  // Example macOS: /Users/me/projects/bookshop/node_modules/@sap/cds-dk:@sap/cds-dk@1.0.0:/Users/me/projects/bookshop/cds-dk
+  // Example Windows: C:\Users\me\projects\bookshop\node_modules\@sap\cds-dk:@sap/cds-dk@1.0.0:C:\Users\me\projects\bookshop\cds-dk
+  const _path = /(?:\\\\\?\\)?[A-Za-z]:[^:]+|[^:]+/.source
+  const _line = new RegExp(`^(${_path}):(@?.+)@([^:]+):?(.*)?$`)
+  const _pkg = o.pattern ? RegExp(o.pattern) : cap_packages
+  const deps = lines.map (line => {
+    let [, path, name, version, location = path ] = _line.exec(line) || []
+    if (!location || location.includes('EXTRANEOUS')) return
+    if (name.match(_pkg)) return [ name, version, location ]
+  }) .filter (x => x)
+
+  // 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'
+    let b_is_cdk = b === '@sap/cds-dk'
+    if (a_is_cdk && !b_is_cdk) return -1
+    if (b_is_cdk && !a_is_cdk) return 1
+    let a_is_sap = a.startsWith('@sap/cds')
+    let b_is_sap = b.startsWith('@sap/cds')
+    if (a_is_sap && !b_is_sap) return -1
+    if (b_is_sap && !a_is_sap) return 1
+    let a_is_cap = a.startsWith('@cap-js')
+    let b_is_cap = b.startsWith('@cap-js')
+    if (a_is_cap && !b_is_cap) return -1
+    if (b_is_cap && !a_is_cap) return 1
+    return a < b ? -1 : a > b ? 1 : 0
+  })
+
+  // Put global cds-dk at the top
+  try {
+    const loc = require.resolve ('@sap/cds-dk/package.json', { paths: [npm_root_g] })
+    const gdk = require (loc)
+    entries.unshift (
+      [ '@sap/cds-dk (global)', gdk.version, dirname(loc) ]
+    )
+  } catch (e) { if (e.code !== 'MODULE_NOT_FOUND') throw e }
+
+  // Add some environment info at the end
+  entries.push (
+    [ 'cds.home', null, cds.home ],
+    [ 'cds.root', null, o.root ],
+    [ 'npm root -l', null, npm_root_l ],
+    [ 'npm root -g', null, npm_root_g ],
+    [ 'Node.js', process.version.slice(1), process.execPath ],
+  )
+
+  if (elsp) o._elsp = true
+
+  return entries
+}
 
-  Object.keys(versions)
-    .filter(mod => mod != pkg.name)
-    .forEach(id => console.log ('|', $(id, versions[id]), '|'))
 
-  function $ (key, val=MISSING) {
-    return ( key  + ' '.repeat(22)).slice(0,22)
-    +' | '+ (val  + ' '.repeat(valLength)).slice(0,valLength)
-  }
+function java_versions (o) {
+  const javaInfo = !cds.env.cli?.version?.skipjava && cds.env['project-nature'] === 'java'
+  if (!javaInfo) return []
+  else if (process.stderr.isTTY) console.warn (DIMMED, 'This takes a while. Collecting Java versions...', RESET)
+  const { MAVEN_ARCHETYPE_VERSION:mav } = require ('../lib/init/constants')
+  const cmd = `mvn com.sap.cds:cds-maven-plugin:${mav}:version -B -ntp -Dcds.version.excludeCds -Dcds.version.json`
+  try {
+    const out = child_process.spawnSync (cmd, { cwd: o.root, shell: true }).stdout.toString().trim()
+    const [,match] = out.match (/===\n(.*)\n===/ms) || []
+    if (match) return Object.entries(JSON.parse(match)).map(([name,v]) => {
+      let versions = Object.entries(v).map(([k,v]) => (k === 'version' || k === 'name') ? v : `${k}:${v}`).join(', ')
+      return [ name, versions ]
+    })
+  } catch { /* ignored */ }
+  return [[ 'CAP Java SDK', '-- missing --' ]]
 }
 
-function _pkg_path(id, ...paths) {
+
+function project_info (o) {
   try {
-    const pk_path = require.resolve(join(id, 'package.json'), { paths })
-    return resolve(pk_path, '..')
-  } catch (e) {
-    if (e.code !== 'MODULE_NOT_FOUND')  throw e
-  }
+    const { name, repository } = require (join (o.root,'package.json'))
+    const repo = repository?.url || repository || ''
+    return `[${GREEN}${name}${RESET}](${DIMMED}${repo}${RESET})`
+  } catch { /* ignored */ }
 }
 
-function capJavaVersion(cwd) {
-  const { MAVEN_ARCHETYPE_VERSION } = require('../lib/init/constants')
-  const cmd = `mvn com.sap.cds:cds-maven-plugin:${MAVEN_ARCHETYPE_VERSION}:version -B -ntp -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
+function print_versions (rows, o, cwd = o.root+'/') {
+
+  if (!rows || rows.length === 0) return console.error (YELLOW, '  No CAP packages found.', RESET)
+  const local = o.abs ? p => p : p => !p ? '' : p.startsWith(cwd) ? p.replace(cwd,'./') : p.replace(home,'~')
+
+  if (cds.env['project-nature'] === 'java') { // cds10: remove
+      console.log(rows.map(([name,version,location]) => `${GREEN}${name}:${RESET} ${version??location}`).join('\n'))
+      return
   }
-  return { 'CAP Java SDK': MISSING }
+
+  // compute column widths for tabular printing
+  const header = o.markdown && [ 'Package', 'Version', 'Location' ]
+  const all = Object.values(rows); if (header) all.push (header)
+  const w1 = Math.max (...all.map(s => s[0]?.length || 0))
+  const w2 = Math.max (...all.map(s => s[1]?.length || 0))
+  const w3 = Math.max (...all.map(s => (s[2] = local(s[2]))?.length || 0))
+
+  // prepare line printer function for column-aligned output
+  const I = header ? '|' : ''
+  const print = ([ name, version, location ], [c1,c2,c3]) => console.log(
+    RESET,I+c1, (name||'').padEnd(w1),
+    RESET+I+c2, (version||'').padEnd(w2),
+    RESET+I+c3, (location||'').padEnd(w3),
+    RESET+I
+  )
+
+  // print table header
+  if (header) {
+    const uncolored = ['','','']
+    print (header, uncolored)
+    print ([w1,w2,w3].map(n => '-'.repeat(n)), uncolored)
+  }
+
+  // print table rows
+  const colored = [ GREEN, YELLOW, DIMMED ]
+  for (let each of rows) print (each, colored)
 }

package/lib/build/buildTaskEngine.js

@@ -15,6 +15,10 @@ const DEBUG = cds.debug('cli|build')
 const LOG_LIMIT = 30
 
 class BuildTaskEngine {
+
+    /**
+     * @param {import('../build').BuildOptions} options - command options
+     */
     constructor(options) {
         this._taskFactory = new BuildTaskFactory(options)
     }

package/lib/build/buildTaskFactory.js

@@ -1,13 +1,11 @@
 // @ts-check
-const fs = require('fs')
-const path = require('path')
 const cds = require('../cds')
 const BuildTaskProviderFactory = require('./buildTaskProviderFactory')
-const { hasJavaNature, getProperty, getDefaultModelOptions, hasOptionValue, BuildError } = require('./util')
-const { FILE_EXT_CDS, OPTION_WS, IGNORE_DEFAULT_MODELS, NODEJS_MODEL_EXCLUDE_LIST, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF } = require("./constants")
+const { hasJavaNature, getProperty, getDefaultModelPaths, hasOptionValue, BuildError } = require('./util')
+const { OPTION_WS, IGNORE_DEFAULT_MODELS, NODEJS_MODEL_EXCLUDE_LIST, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF } = require("./constants")
 const DEBUG = cds.debug('cli|build')
 
-class BuildTaskFactory {
+module.exports = class BuildTaskFactory {
     constructor(options) {
         this._providerFactory = new BuildTaskProviderFactory(options)
     }
@@ -86,11 +84,11 @@ class BuildTaskFactory {
                 task.options.model = [task.options.model]
             }
         })
-        const modelPaths = await getDefaultModelOptions(false)
+        const modelPaths = await getDefaultModelPaths(false)
         let wsModelPaths
         // calculate only once
         if (cds.cli.options?.[OPTION_WS] || tasks.some(task => hasOptionValue(task.options?.[OPTION_WS], true))) {
-            wsModelPaths = await getDefaultModelOptions(true)
+            wsModelPaths = await getDefaultModelPaths(true)
         }
         // set default model options
         tasks.forEach(task => {
@@ -197,32 +195,4 @@ class BuildTaskFactory {
         }
         task.options.model = [...new Set(taskModelPaths?.length ? taskModelPaths.concat(modelPaths) : modelPaths)]
     }
-
-    /**
-     * Determines the module folder from the past list that may represent files or folders w or w/o .cds file extension.
-     * @param {Array} filesOrFolders
-     */
-    static _getModuleFolder(filesOrFolders) {
-        const resources = [...filesOrFolders]
-        filesOrFolders.forEach(fileOrFolder => {
-            if (path.extname(fileOrFolder) !== FILE_EXT_CDS) {
-                resources.push(fileOrFolder + FILE_EXT_CDS)
-            }
-        })
-        return resources.reduce((acc, resource) => {
-            if (!acc) {
-                let resourcePath = path.resolve(cds.root, resource)
-                if (fs.existsSync(resourcePath)) {
-                    if (cds.utils.isdir(resourcePath)) {
-                        acc = resource
-                    } else {
-                        // represents file
-                        acc = path.dirname(resource)
-                    }
-                }
-            }
-            return acc
-        }, null)
-    }
 }
-module.exports = BuildTaskFactory