@sap/cds-dk 9.7.2 → 9.8.1

package/bin/version.js

@@ -7,13 +7,15 @@ module.exports = exports = async function cds_version (pattern, options) {
     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}.`)
+  if (!o.json) {
+    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.flags = [ '--info', '--markdown', '--abs', '--all', '--json' ]
 exports.shortcuts = [ '-d', '-o', '-i', '-m', '-a' ]
 exports.help = `
 # SYNOPSIS
@@ -89,7 +91,7 @@ const $npm_ls = (cmd,..._) => {
 
 const cds = require('../lib')
 const home = require('os').homedir()
-const cap_packages = /@sap\/cds|@cap-js\//
+const cap_packages = /@sap\/[\w-]*\bcds\b|@cap-js\//
 const { GREEN, YELLOW, RED, DIMMED, BOLD, RESET } = cds.utils.colors
 const { join, dirname } = require ('node:path')
 
@@ -98,6 +100,7 @@ function canonic_options4 ([pattern], options) {
   const o = {
     root: cds.root,
     depth: options.all ? 11 : 1,
+    java: cds.env['project-nature'] === 'java',
     ...options,
   }
   if (pattern) o.pattern = pattern
@@ -126,7 +129,7 @@ async function node_versions(o) {
   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 (!location || (location.includes('EXTRANEOUS') && !o.java)) return
     if (name.match(_pkg)) return [ name, version, location ]
   }) .filter (x => x)
 
@@ -172,9 +175,9 @@ async function node_versions(o) {
 
 
 function java_versions (o) {
-  const javaInfo = !cds.env.cli?.version?.skipjava && cds.env['project-nature'] === 'java'
+  const javaInfo = !cds.env.cli?.version?.skipjava && o.java
   if (!javaInfo) return []
-  else if (process.stderr.isTTY) console.warn (DIMMED, 'This takes a while. Collecting Java versions...', RESET)
+  else if (process.stderr.isTTY && !o.json) 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 {
@@ -199,17 +202,26 @@ function project_info (o) {
 
 
 function print_versions (rows, o, cwd = o.root+'/') {
+  if (o.json) {
+    const json = rows?.reduce((acc, [name, version, location]) => {
+      acc[name] = {}
+      if (version) acc[name].version = version
+      if (location) acc[name].location = location
+      return acc
+    }, {})
+    return console.log(JSON.stringify(json||{}, null, 2))
+  }
 
   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,'~')
 
   // cds10: remove and offer --json option instead
-  if (cds.env['project-nature'] === 'java' || process.env.WS_BASE_URL) {
+  if (process.env.WS_BASE_URL || o.java || findPom(cwd)) {
     console.log(rows.map(([name,version,location]) => `${GREEN}${name === 'cds.home'?'home':name}:${RESET} ${version??location}`).join('\n'))
     return
   }
 
   // compute column widths for tabular printing
+  const local = o.abs ? p => p : p => !p ? '' : p.startsWith(cwd) ? p.replace(cwd,'./') : p.replace(home,'~')
   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))
@@ -236,3 +248,12 @@ function print_versions (rows, o, cwd = o.root+'/') {
   const colored = [ GREEN, YELLOW, DIMMED ]
   for (let each of rows) print (each, colored)
 }
+
+const { existsSync } = require('fs')
+function findPom (dir) {
+  if (!dir || dir === '/' || dir === '.') return false
+  if (existsSync(join(dir,'pom.xml'))) return true
+  const parent = dirname(dir)
+  if (parent === dir) return false  // reached filesystem root
+  return findPom(parent)
+}

package/bin/watch.js

@@ -1,4 +1,4 @@
-const watchOnlyOptions = ['--ext', '--livereload', '--open', '--debug', '--inspect', '--inspect-brk', '--include', '--exclude']
+const watchOnlyOptions = ['--ext', '--livereload', '--experimental-hot-reload', '--open', '--debug', '--inspect', '--inspect-brk', '--include', '--exclude']
 
 module.exports = Object.assign ( watch, {
   flags: [ '--in-memory', '--in-memory?', '--with-mocks', '--with-mtx' ],
@@ -41,6 +41,11 @@ module.exports = Object.assign ( watch, {
     Specify the port for the livereload server. Defaults to '35729'.
     Disable it with value _false_.
 
+  *--experimental-hot-reload* <true | false>
+
+    Specify if the experimental hot reload should be used. Changes to the CDS model
+    in most scenarios no longer restart the server
+
   *--open* <url>
 
     Open the given URL (suffix) in the browser after starting.
@@ -85,7 +90,8 @@ const ignoreDefaults = [
   /_out/,
   /@types/,
   /@cds-models/,
-  new RegExp(`app${escapedSep}.+?${escapedSep}webapp${escapedSep}`),
+  new RegExp(`app${escapedSep}.+?${escapedSep}webapp`),
+  new RegExp(`app${escapedSep}.+?${escapedSep}.*\\.json`),
   new RegExp(`app${escapedSep}.+?${escapedSep}dist${escapedSep}`),
   new RegExp(`app${escapedSep}.+?${escapedSep}target${escapedSep}`),
   new RegExp(`app${escapedSep}.+?${escapedSep}tsconfig\\.json$`),
@@ -119,12 +125,15 @@ async function watch ([cwd], {
     if (fs.existsSync(cwd)) cwd = resolve (cwd)
     else try { // try module name like `@capire/bookshop`
       cwd = require.resolve (cwd+'/package.json', {paths:[ ocwd ]}).slice(0,-13)
-    } catch (err) { throw `Error: No such folder or package: '${cwd}'` }
+    } catch { throw `Error: No such folder or package: '${cwd}'` }
     log (`cd ${relative(ocwd,cwd)}`)
   }
   else cwd = cds.root
 
-  if (isJava) options.livereload = false
+  if (isJava) {
+    options.livereload = false
+    options['experimental-hot-reload'] = false
+  }
   if (!isJava) log (`\n${t.bold}cds ${args.join(' ')}`)
 
   const env = Object.assign (process.env, {
@@ -198,6 +207,13 @@ async function watch ([cwd], {
       delete options.open
       break
     case 'EADDRINUSE': env.PORT = 0; _addr_in_use(msg); break
+    case 'model-refreshed':
+    case 'refreshModel':
+      liveReload?.reload()
+      break;
+    case 'restart':
+      watcher.restart()
+      break;
     default: console.error (msg)
   }})
 

package/lib/bind/cf.js

@@ -74,8 +74,8 @@ module.exports = new class CFBind extends require('./plugin') {
                     orgGuid = sharedFromOrgObj.guid;
                 }
             }
-        } catch (error) {
-            throw `service instance ${bold(instance)} not found.`;
+        } catch {
+            throw `service instance ${bold(instance)} not found in the currently targeted Cloud Foundry space`
         }
         switch (instanceObj.type) {
             case 'managed':

package/lib/bind/k8s.js

@@ -81,7 +81,6 @@ module.exports = new class K8SBind extends require('./plugin') {
     )
 
     // REVISIT: Proper API
-    // eslint-disable-next-line cds-dk/use-relative-require, cds-dk/use-api-require
     const serviceBinding = require('@sap/cds/lib/env/serviceBindings').parseBinding('/', name, properties)
     const { credentials } = serviceBinding
     const vcap = { ...serviceBinding, credentials: undefined }

package/lib/bind/plugin.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-unused-vars */
+
 module.exports = class BindPlugin {
 
   /**

package/lib/bind/shared.js

@@ -3,6 +3,7 @@ const cds = require('../cds')
 const { exists, read, fs, path } = cds.utils
 const git = require('../util/git')
 const { bold } = require('../util/term')
+const { readProject } = require('../init/projectReader')
 
 // REVISIT: We should get rid of this...
 const KindToRequiresNameMap = {
@@ -36,7 +37,11 @@ const PreferredKinds = {
     'saas-registry': 1
 }
 
-async function bind(options = { on: 'cf' }) {
+async function bind(options = {}) {
+    const { hasKyma, hasMta } = readProject()
+    const onKyma = cds.cli.options.on === 'k8s'  || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
+    options.on = onKyma ? 'k8s' : 'cf'
+
     let on
     switch (options.on) {
         case 'k8s':

package/lib/build/constants.js

@@ -1,8 +1,3 @@
-exports.OUTPUT_MODE = "outputMode"
-exports.OUTPUT_MODE_NONE = 0x0
-exports.OUTPUT_MODE_FILESYSTEM = 0x1
-exports.OUTPUT_MODE_RESULT = 0x2
-
 exports.DEFAULT_SRC_FOLDER = '.'
 exports.BUILD_TASK_JAVA = "java"
 exports.BUILD_TASK_JAVA_CF = "java-cf"
@@ -13,9 +8,6 @@ exports.BUILD_TASK_FIORI = "fiori"
 exports.BUILD_TASK_MTX = "mtx"
 exports.BUILD_TASK_MTX_SIDECAR = "mtx-sidecar"
 exports.BUILD_TASK_MTX_EXTENSION = "mtx-extension"
-exports.BUILD_TASKS = [this.BUILD_TASK_JAVA, this.BUILD_TASK_JAVA_CF, this.BUILD_TASK_NODEJS, this.BUILD_TASK_NODE_CF, this.BUILD_TASK_HANA, this.BUILD_TASK_FIORI, this.BUILD_TASK_MTX, this.BUILD_TASK_MTX_SIDECAR, this.BUILD_TASK_MTX_EXTENSION]
-exports.DEFAULT_BUILTIN_PRIORITY_MIN = 0
-exports.DEFAULT_BUILTIN_PRIORITY_MAX = 524
 
 exports.ODATA_VERSION_V2 = "v2"
 exports.ODATA_VERSION_V4 = "v4"