@sap/cds-dk 9.6.1 → 9.7.0

package/CHANGELOG.md

@@ -6,6 +6,40 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 9.7.0 - 2026-02-02
+
+### Added
+
+- `cds debug` is now supported for Kubernetes/Kyma deployments.
+- `cds init --nodejs` as a shortcut for `cds init --add nodejs`.
+- Support for express 5 (in addition to express 4).
+- `cds deploy --to hana` now supports `--out` to specify the output directory for generated files.
+- `cds mock <service>` as a shortcut for `cds serve --mocked --project <service> --in-memory? --port 0`.
+- `cds add ias` adds a URL for local approuter testing to `redirect-uris` if approuter is configured.
+
+### Changed
+
+- `cds version` received major enhancements: It's now fully based on the `npm ls` command and always prints a tabular output. Also some new flags were added; check `cds version --help` for details.
+- `cds deploy --to k8s` increased the timeout to wait for the HDI container creation from 120 to 180 seconds.
+- `cds add` facets now abort when executed in a folder that is neither a Node.js nor a Java project.
+- `cds add lint` now also adds the .java extension to the files that are linted within VSCode.
+- `cds init` now restricts project names to 64 characters maximum, requiring them to start with an alphanumeric character or `_`, and contain only alphanumeric characters, `_`, and `-`.
+- `cds import` now generates an on condition for associations if the navigation property in an imported OData v4 service has a referential constraint.
+- `cds build` does not ignore wildcarded folders like `app/*` any more.
+- `cds env --resolve-bindings/-b` also considers local service bindings.
+
+### Fixed
+
+- `cds add sqlite --for production` adds `@cap-js/sqlite` to `dependencies`.
+- `cds build --ws` fixes a race condition.
+- `cds build` now places the `i18n` folder in the generated output in nested locations.
+- `cds build --for mtx-sidecar` loads CAP plugins from the MTX sidecar instead of the main app for generating the sidecar CSN.
+- `cds add ias` uses a matching `IASDependencyName` for the application content deployer.
+- `cds add ias` uses a more generic `redirect-uris` pattern.
+- `cds import` no longer generates a managed association for navigation properties of imported OData v4 services if the foreign key, the managed association would generate, already exists.
+- `cds add multitenancy` for Java correctly creates a `package-lock.json` in _mtx/sidecar_.
+- `cds add xsuaa` works properly when executed after `cds add workzone`.
+
 ## Version 9.6.1 - 2026-01-09
 
 ### Changed
@@ -415,6 +449,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - `cds add ams` for Java adds a custom builder to the `mta.yaml` to circumvent the missing `srv/src/gen/policies`.
 - `cds add multitenancy` requires the `srv-api` instead of the `mtx-api` for Java projects.
 
+## Version 8.9.13 - 2029-01-09
+
+### Fixed
+
+- CVE-2025-15284: update `express` to fix vulnerability with `qs` <6.14.1
 
 ## Version 8.9.12 - 2025-12-16
 

package/bin/add.js

@@ -48,9 +48,9 @@ ${cds.cli.command !== 'completion' && require('../lib/init').help({ exclude: ['j
 
       Overwrite all files in case the target files already exist.
 
-    *--package* <name>
+    *--package | -p* <name>
 
-      Pull a package from your npm registry.
+      Pull a package from your configured npm registry.
 
 
 # FEATURE OPTIONS
@@ -102,8 +102,11 @@ async function handleCompletion(currentWord, previousWord, argv, util) {
 }
 
 async function add(args) {
+  const cds = require('../lib/cds')
+  if (!cds.cli.options.dry) console.log()
   const CDSGenerator = require('../lib/init')
   const generator = new CDSGenerator()
   const features = args.map(f => f.split(/[,\s]/)).flat()
   await generator.add(features)
+  if (!cds.cli.options.dry) console.log()
 }

package/bin/cds.js

@@ -41,20 +41,14 @@ const cli = {
     DEBUG?.(`[cds] - @sap/cds ${cds.version} loaded: ${cds.home}`)
 
     try {
-      const allCmds = getCommands();
-
-      //TODO: make better; only POC for cds help
-      Object.assign(module.exports, { cmds: allCmds })
-
-      // const { handleCompletion } = require('./util/completion');
-      // await handleCompletion(process.argv, allCmds, this);
+      Object.assign(module.exports, { cmds: getCommands() })
 
       const task = this.load(cmd, /*else*/(f) => argv.unshift(cmd) && (cmd = 'compile') && _isDefaultCompile(argv, f))
       if (task) {
 
         if (task._is_new_cmd) return await task.exec (this)
 
-        // REVISIT bind: '--' handling for cds bind --exec. Should be moved to cds_cli
+        // '--' handling for cds bind --exec
         const endOfOptions = argv.indexOf('--')
         let appendArgs = []
         if (endOfOptions >= 0) {
@@ -62,7 +56,7 @@ const cli = {
           argv = argv.slice(0, endOfOptions)
         }
 
-        // REVISIT: Have to load plugins to allow for plugin-contributed flags!
+        // Have to load plugins to allow for cds add plugin-contributed flags!
         if (cmd === 'add') {
           cds.cli = { command: 'add' }
           if (argv.includes('-p') || argv.includes('--package')) {
@@ -118,7 +112,6 @@ const cli = {
     || _dieForUnknownCommand (cmd)
   },
 
-  // TODO replace w/ common arg parser from node
   args (task, argv) {
 
     const { options:o=[], flags:f=[], shortcuts:s=[] } = task
@@ -151,15 +144,13 @@ const cli = {
     }
 
     // always use 'plain' log format for cds-dk logging
-    // by default 'plain' log format is used for development while 'json' format is used for production, see cap/cds/blob/main/lib/env/defaults.js#L97
+    // by default 'plain' log format is used for development while 'json' format is used for production
     // the json formatter logs stringified JSON which causing any line breaks to get replaced by '\n'
     // using the env variable ensures that cds.env isn't loaded too early
     env ??= {}
     env.log ??= {}
     env.log.format = 'plain'
 
-    // if (env) require('../lib/cds').env.add (env) //> avoid loading env
-    // unless it has already explicitly been set by the user
     if (env) process.env.CDS_CONFIG ??= JSON.stringify(env)
     return [ args, options ]
   },
@@ -173,8 +164,8 @@ async function _resolveBindings(options) {
   const cds = require('../lib/cds')
   const { env: bindingEnv } = require('../lib/bind/shared')
   Object.assign(process.env, await bindingEnv(options))
-  cds.env = cds.env.for('cds') // reload env // FIXME: This is too early!
-  cds.requires = cds.env.requires // REVISIT: We should clean this up!
+  cds.env = cds.env.for('cds') // reload env
+  cds.requires = cds.env.requires
 }
 
 function _isDefaultCompile (argv, _force) {
@@ -221,18 +212,14 @@ function _dieForUnknownCommand(cmd) {
 }
 
 function getCommands() {
-  const fs = require('node:fs');
-  const path = require('node:path');
-
-  const excludeList = ['cds.js', 'cds-ts.js', 'fix-redirects.js'];
+  const excludeList = new Set(['cds.js', 'cds-ts.js', 'fix-redirects.js']);
 
   const files = fs.readdirSync(__dirname, { withFileTypes: true, encoding: 'utf8' })
   const result = new Set()
   for (const f of files) {
-    if (!excludeList.includes(f.name)) {
-      if (f.isDirectory() && fs.existsSync(path.join(__dirname, f.name, 'index.js')) || f.isFile() && f.name.endsWith('.js')) {
-        result.add(path.parse(f.name).name)
-      }
+    if (excludeList.has(f.name)) continue;
+    if ((f.isDirectory() && fs.existsSync(path.join(__dirname, f.name, 'index.js'))) || (f.isFile() && f.name.endsWith('.js'))) {
+      result.add(path.parse(f.name).name)
     }
   }
   return Array.from(result).sort()
@@ -277,5 +264,3 @@ function _prepareTsIfNeeded(cds) {
   }
 
 }
-
-/* eslint no-console:off */

package/bin/data-products/import.js

@@ -97,6 +97,9 @@ class Import extends Export {
           }
         }
       }
+    }, {
+      // we want to use the plugin option by default for data products
+      ...o, plugin: o.plugin !== false && o.plugin !== 'false'
     })
 
     return this.update_package_json();

package/bin/debug.js

@@ -1,53 +1,67 @@
 module.exports = Object.assign(debug, {
-  options: ['--port', '--host', '--force', '--no-devtools'],
-  shortcuts: ['-p', '-h', '-f'],
-  flags: [/*'--vscode', '--k8s'*/],
+  options: ['--port', '--host', '--no-devtools'],
+  shortcuts: ['-p', '-h', undefined, '-f'],
+  flags: ['--force', '--k8s', '--cf'],
   help: `
 # SYNOPSIS
 
     *cds debug* [<app>]
 
-    Debug applications running locally or remotely on Cloud Foundry.
-    Local applications will be started in debug mode, while remote applications
-    are put into debug mode.
+    Debug applications running locally or remotely on Cloud Foundry or Kubernetes.
 
-    If <app> is given, it's assumed to be running on the currently logged-in
-    Cloud Foundry space (check with 'cf target').
-    SSH access to the app is required (check with 'cf ssh-enabled').
-    Chrome DevTools are opened automatically for Node.js applications.
+    If <app> is given, it's assumed to be running on a remote system. The command defaults
+    to Kubernetes if Helm deployment descriptors are present, otherwise Cloud Foundry.
+
+    For Cloud Foundry, the currently targeted space is used (check with 'cf target').
+    For Kubernetes, the current context and namespace are used (check with 'kubectl config get-contexts').
+
+    SSH access to the app is required (check with 'cf ssh-enabled' on Cloud Foundry).
 
     If no <app> is given, the app in the current working directory is started
     (with 'cds watch --debug' for Node.js and 'mvn spring-boot:run' for Java).
 
+    For Node.js, Chrome DevTools are opened automatically unless *--no-devtools* is set.
+
 # OPTIONS
 
     *-h* | *--host*
 
-      the debug host (default: '127.0.0.1')
+      The debug host (default: '127.0.0.1').
 
     *-p* | *--port*
 
-      the debug port (default: '9229' for Node.js, '8000' for Java)
+      The debug port (default: '9229' for Node.js, '8000' for Java).
+
+    *--cf*
+
+      Force Cloud Foundry mode.
+
+    *--k8s*
+
+      Force Kubernetes mode. Use env vars KUBE_NAMESPACE or NAMESPACE to select a namespace.
 
     *--no-devtools*
 
-      don't open developer tools automatically
+      Don't open developer tools automatically (Node.js only).
 
     *-f* | *--force*
 
-      if necessary, automatically enable ssh for the app and restart it
+      If necessary, automatically enable SSH for the app and restart it.
 
 # EXAMPLES
 
     *cds debug*
     *cds debug* bookshop-srv --port 8001
     *cds debug* bookshop-srv --host 0.0.0.0
+    *cds debug* --k8s bookshop-srv
 `})
 
 async function debug() {
   const { fork, spawn, execSync, exec } = require('node:child_process')
   const os = require('node:os').platform()
   const cds = require('../lib/cds')
+  const { BOLD, RESET } = cds.utils.colors
+  const { readProject } = require('../lib/init/projectReader')
   const DEBUG = /\b(y|all|debug)\b/.test(process.env.DEBUG) ? console.debug : undefined
 
   const [appName] = cds.cli.argv
@@ -56,6 +70,9 @@ async function debug() {
   const maxAttempts = 15
   let attempts = 0
 
+  const { hasKyma, hasMta } = readProject()
+  const onKyma = cds.cli.options.k8s || hasKyma && !hasMta && !cds.cli.options.cf
+
   if (!appName) { // local app
     if (cds.env['project-nature'] === 'java') {
       const portLocal = port || 8000
@@ -71,8 +88,50 @@ async function debug() {
       fork(script, ['watch', '--debug', hostport]).on('error', e => { throw 'Failed to start debug process:' + e.message })
     }
   }
-  else if (cds.cli.options.k8s) { // Kyma/Kubernetes
-    // to be implemented
+  else if (onKyma) { // Kyma/Kubernetes (Node.js only)
+    if (!appName) throw `pass a deployment name, for example 'cds debug --k8s bookshop-srv'`
+
+    const namespace = process.env.KUBE_NAMESPACE || process.env.NAMESPACE || '' // optional
+    const ns = namespace ? `-n ${namespace}` : ''
+    const portLocal = port || 9229
+    const k = (cmd, opts) => _execSync(`kubectl ${ns} ${cmd}`, opts)
+
+    // Ensure deployment exists
+    k(`get deploy ${appName}`, { stdio: 'inherit' })
+
+    if (force) {
+      console.log(`\nEnabling Node inspector on deployment/${appName} at 0.0.0.0:${portLocal} ...`)
+      _execSyncSafe(`kubectl ${ns} set env deployment/${appName} NODE_OPTIONS="--inspect=0.0.0.0:${portLocal}"`, { stdio: 'inherit' })
+      _execSyncSafe(`kubectl ${ns} rollout restart deployment/${appName}`, { stdio: 'inherit' })
+      k(`rollout status deployment/${appName} --timeout=180s`, { stdio: 'inherit' })
+    } else {
+      // Bail out early if inspector isn't already enabled
+      const nodeOpts = _execSyncSafe(`kubectl ${ns} get deploy ${appName} -o jsonpath="{.spec.template.spec.containers[0].env[?(@.name=='NODE_OPTIONS')].value}"`)
+      if (!nodeOpts || !/--inspect/.test(nodeOpts)) {
+        throw (
+          `Node inspector not enabled on deployment/${appName}.\n` +
+          `Run ${BOLD}cds debug ${appName} --force${RESET} to set NODE_OPTIONS="--inspect=0.0.0.0:${portLocal}" and restart.`
+        )
+      }
+    }
+
+    const podsJson = _execSync(`kubectl ${ns} get pods -o json`)
+    const items = JSON.parse(podsJson).items || []
+    const candidates = items.filter(i => (i.metadata?.name || '').startsWith(`${appName}-`))
+    if (!candidates.length) throw `no Pod for deployment/${appName} found (namespace: ${namespace || '<current>'}).`
+    candidates.sort((a, b) => new Date(a.metadata.creationTimestamp) - new Date(b.metadata.creationTimestamp))
+    const pod = `pod/${candidates[candidates.length - 1].metadata.name}`
+
+    console.log(`\nusing ${pod}`)
+
+    console.log(`\nopening port-forward: localhost:${portLocal} -> ${pod}:${portLocal}`)
+    const args = []
+    if (namespace) args.push('-n', namespace)
+    args.push('port-forward', pod, `${portLocal}:${portLocal}`)
+    spawn('kubectl', args, { stdio: 'inherit' })
+
+    if (!cds.cli.options['no-devtools']) openDevTools(portLocal)
+    printHints(portLocal)
   }
   else { // Cloud Foundry
     const [pid, kind] = processInfo(appName, force)
@@ -129,6 +188,7 @@ async function debug() {
   function processInfo(appName, force) {
     if (force !== false) {
       const enabled = _execSyncSafe(`cf ssh-enabled ${appName}`)
+      if (!enabled) throw `Make sure the application is visible in your targeted Cloud Foundry space.`
       if (enabled.match(/disabled/i)) {
         if (force) {
           console.log(`Trying to enable SSH for app '${appName}'...`)

package/bin/env.js

@@ -66,7 +66,8 @@ async function env ([cmd, key, value], options={}) {
   // REVISIT: Currently only read in env.test.js
   env['_home_cds-dk'] = path.resolve(__dirname, '..')  // to help tools find the DK
 
-  if (!options.for && options.mocked) await cds.service.bindings
+  if (!options.for && options.mocked || options["resolve-bindings"]) 
+    await cds.service.bindings
   options.colors = cds.utils.colors.enabled === true
   return fn (env, key, value, options)
 }

package/bin/export.js

@@ -14,6 +14,7 @@ class Export extends Minify {
       '@restrict': true,
       '@requires': true,
       '@cds.api.': true,
+      '@cds.on.': true,
       '@UI.': true,
       includes: true,
       ignored: true,
@@ -22,11 +23,12 @@ class Export extends Minify {
       views: true,
     },
     reuse: [ '@sap/cds/common' ],
-    force: false,
-    texts: true,
-    data: true,
+    plugin: false,
+    texts: false,
+    data: false,
     as: 'csn',
     for: 'npm',
+    force: false,
   }
   static shortcuts = { ...super.shortcuts,
     to:'2',
@@ -38,7 +40,7 @@ class Export extends Minify {
   parseArgs (conf) {
     if (!process.stdout.isTTY) this.options.to = '-'
     let [sources,o] = super.parseArgs (conf)
- // -----------------------------------------------------------------------
+    // -----------------------------------------------------------------------
     // Java-specific adjustments -> shall this stay for GA?
     if (o.for === 'mvn' && !o.to.startsWith('./') && !o.to.startsWith('/'))
       o.to = './src/main/resources/cds/' + o.to
@@ -108,8 +110,8 @@ class Export extends Minify {
     return super.cleanse (csn,o)
   }
 
-  async export (minified,o) {
-    if (this.options.to === '-') return super.print (minified)
+  async output (minified,o) {
+    if (this.options.to === '-') return super.output (minified)
     if (this.options.to.endsWith('/*')) this.options.to = this.export_to()
     console.log(`\n${this.name}ing APIs to`, cds.utils.local(this.options.to), '...\n')
     const exports = []; exports.push(...this.export_models (minified))
@@ -117,6 +119,7 @@ class Export extends Minify {
     if (o.data) exports.push (this.export_data (minified))
     if (o.for === 'npm') exports.push (this.export_package_json())
     await Promise.all (exports)
+    console.log()
   }
 
   export_to() {
@@ -133,16 +136,19 @@ class Export extends Minify {
   }
 
   async export_package_json (pkg, o = this.options) {
-    await this.write ('// just a tag file for plug & play') .to ('cds-plugin.js', false)
     if (!o.force && exists (path.join (this.options.to, 'package.json'))) return null
     if (!pkg) {
       let { name, version } = await read ('package.json')
-      let requires = Object.fromEntries (Object.entries(this.min.definitions)
-        .filter (([,d]) => d.kind === 'service')
-        .map (([name]) => [ name, true ]))
       name += '-' + cds.utils.path.basename (this.options.to)
-      pkg = { name, version, cds:{requires} }
+      pkg = { name, version }
+      if (o.plugin) {
+        let requires = Object.fromEntries (Object.entries(this.min.definitions)
+          .filter (([,d]) => d.kind === 'service')
+          .map (([name]) => [ name, true ]))
+        pkg.cds = {requires}
+      }
     }
+    if (o.plugin) await this.write ('// just a tag file for plug & play') .to ('cds-plugin.js', false)
     return this.write (pkg) .to ('package.json')
   }
 
@@ -202,7 +208,7 @@ class Export extends Minify {
     async function _export (e) {
       if (!e || e['@cds.persistence.skip']) return
       const file = path.join (out, `${e.name}.csv`)
-      const columns = Object.keys(e.elements).filter(k => !e.elements[k]['@Core.Computed'])
+      const columns = Object.keys(e.elements) //.filter(k => !e.elements[k]['@Core.Computed'])
       const rows = await SELECT.from(e).columns(columns)
       let csv = fs.createWriteStream (file), i=0
       for (let r of await rows) {
@@ -230,7 +236,6 @@ class Export extends Minify {
     return write(x).to (file)
   }}}
 
-  print = undefined // tells the base class to use this.export()
 }
 
 

package/bin/help/export.md

@@ -9,12 +9,13 @@
    *-s | --services* <patterns>
    *-f | --from* <sources>
    *-2 | --to* <folder>
-   *-4 | --for* <npm|mvn>
    *-a | --as* <csn|cdl>
+   *-4 | --for* <npm|mvn>
 
    *-c | --cleanse* <properties>
    *-k | --keep* <kinds>
    *-x | --skip* <kinds>
+   *-p | --plugin*
    *-d | --data*
    *-t | --texts*
 

package/bin/import.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(_import, {
     _name: 'import',
-    options:   [ '--services', '--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group', '--into-namespace',  '--data-product' ],
+    options:   [ '--services', '--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group', '--into-namespace' ],
     shortcuts: [ '-s',            '-4',    '-o',  '-as',     '-n',                  '-ns',             '-d',undefined,       '-c',       undefined, undefined,                '-2',        '-', '-f'],
     flags: [ '--dry', '--force', '--no-copy', '--no-save', '--keep-namespace', '--data-product', '--edmx', '--rfc', '--odata', '--openapi', '--asyncapi' ],
     help: `
@@ -20,6 +20,22 @@ module.exports = Object.assign(_import, {
 
 # OPTIONS
 
+    *--odata*
+    *--edmx*
+    *--openapi*
+    *--asyncapi*
+    *--rfc*
+        Imports the model from the one of the API formats OData EDMX, OpenAPI, AsyncAPI or RFC.
+
+    *--data-product*
+        Tells cds import to import a data product. The source must be a valid
+        data product CSN file, e.g. as found on http://api.sap.com/dataproducts.
+        (Not released with general availability yet)
+
+
+    *--dry*
+        Writes the converted csn to stdout only.
+
     *--no-copy*
         Skips copying to ./srv/external.
 
@@ -29,9 +45,6 @@ module.exports = Object.assign(_import, {
     *-o | --out* <filename/dirname>
         Skips copying to ./srv/external and writes to the specified location.
 
-    *- | --dry*
-        Writes the converted csn to stdout only.
-
     *-as | --as <output_file_format>*
         Converts the input file into one of these supported formats "cds", "csn"
         or "json".
@@ -40,10 +53,6 @@ module.exports = Object.assign(_import, {
         Forcefully overwrites the contents in the CDS file and updates the
         checksum
 
-    *--from*
-        Imports the model from the one of the given options "edmx", "openapi" or
-        "asyncapi".
-
     *-c | --config* <JSON string | comma-separated key-value pairs>
         Adds the provided JSON or key-value pairs to the configuration.
 
@@ -55,11 +64,6 @@ module.exports = Object.assign(_import, {
         Destination name under which the remote service can be reached.
         Not supported by import types "edmx", "openapi" or "asyncapi".
 
-    *--data-product*
-        Tells cds import to import a data product. The source must be a valid
-        data product CSN file, e.g. as found on http://api.sap.com/dataproducts.
-        (Not released with general availability yet)
-
     *-2 | --into-namespace* <string>
         Specifies a custom namespace to be used for the imported service.
         This will override the namespace that was specified via the the
@@ -96,15 +100,14 @@ module.exports = Object.assign(_import, {
 # EXAMPLES
 
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx
-    cds import - ~/Downloads/API_BUSINESS_PARTNER.edmx
-    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --from edmx --as cds
+    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --dry
+    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --as cds
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --include-namespaces "sap,c4c"
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --include-namespaces "\x2A"
     cds import ~/Downloads/sap.graph.edmx -d ./sap.c4c.edmx,./sap.s4.edmx --as cds -o ./graph
     cds import ~/Downloads/Petstore_OpenAPI.json
-    cds import ~/Downloads/Petstore_OpenAPI.json --from openapi
-    cds import ~/Downloads/BookStore_AsyncAPI.json
-    cds import ~/Downloads/BookStore_AsyncAPI.json --from asyncapi
+    cds import --openapi ~/Downloads/Petstore_OpenAPI.json
+    cds import --asyncapi ~/Downloads/BookStore_AsyncAPI.json
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx -c "{\\"[production]\\":{\\"credentials\\":{\\"destination\\":\\"UI3_noauth\\",\\"path\\":\\"/sap/cap/odata\\"}}}"
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --for sandbox    -c "destination.properties.url=https://sandbox.api.sap.com/s4hanacloud/sap/opu/odata/sap"
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --for production -c "http.suffix=/sap/opu/odata/sap,http.csrf.enabled=true"

package/bin/init.js

@@ -9,7 +9,7 @@ module.exports = Object.assign(init, {
     handleCompletion,
     options: ['--add', '--java:mvn', '--java:package', '--lint:custom', '--lint:custom:example', '--no-db', '--base'],
     shortcuts: ['-a'],
-    flags: ['--java', '--force', '--verbose'],
+    flags: ['--nodejs', '--java', '--force', '--verbose'],
     help: `
 # SYNOPSIS
 
@@ -27,6 +27,10 @@ module.exports = Object.assign(init, {
 
 ${require('../lib/init').help()}
 
+    *--nodejs*
+
+        Create a CAP Node.js project.
+
     *--java*
 
         Create a CAP Java project.
@@ -44,6 +48,7 @@ ${require('../lib/init').help()}
 # EXAMPLES
 
     *cds init* bookshop
+    *cds init* bookshop --nodejs
     *cds init* bookshop --java
     *cds init* bookshop --add hana
     *cds init* bookshop --add multitenancy,mta
@@ -80,7 +85,9 @@ async function handleCompletion(currentWord, previousWord, argv, util) {
 }
 
 async function init(args) {
+    console.log()
     const CDSGenerator = require('../lib/init')
     const generator = new CDSGenerator()
     await generator.init(args[0])
+    console.log()
 }

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')