@sap/cds-dk 4.9.7 → 6.0.3

package/CHANGELOG.md

@@ -6,6 +6,83 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 6.0.3 - 2022-07-14
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 1.26.0 for creating Java projects.
+- `cds init` now creates Node.js projects with version 6 of `@sap/cds`
+
+### Fixed
+
+- `--vcap-file` parameter of `cds deploy` is available again (removed in 6.0.0)
+- `cds add helm:connectivity`: `connectivity.configMapName` was not used for the `connectivity-proxy-info`.
+- `cds add helm:connectivity`: Environment variables added for connectivity service for Java.
+- `cds add helm`: Generation of `xs-security.json` file works on Windows now (`cds compile srv -2 xsuaa` command failed).
+
+
+## Version 6.0.2 - 2022-07-06
+
+### Changed
+
+- Use `@sap/cds` 6.0.2
+
+## Version 6.0.1 - 2022-07-05
+
+### Changed
+
+- Deprecated the `--for <filterPattern>` parameter of `cds add data` in favor of the new `--data:for`.  The former is still supported, but will eventually be removed, as it collides with the general `--for <profile>` parameter of `cds add`.
+
+### Fixed
+
+- `cds bind` api endpoint regex for cli now ignores trailing version info in url
+
+## Version 6.0.0 - 2022-07-01
+
+### Added
+
+- `cds import` now supports importing external openapi specification file into CSN.
+- `cds import` now supports the `--from` option to specify the protocol for importing an external file.
+- `cds import` can be programmatically accessed using APIs `cds.import()`, `cds.import.from.edmx()` and `cds.import.from.openapi()`.
+- `cds compile --to openapi` allows describing custom headers and custom query options.
+- `cds import` now supports `HasStream="true"` for both OData V4 and V2.
+- `cds compile --to openapi` now adds properties with `@mandatory` to the required field.
+- Added a link to VS Code CAP Notebooks documentation to `cds init --add notebooks` and `cds add notebooks`.
+
+### Changed
+
+- `cds import` now uses `@odata.Type` and `@odata.Precision` for edm to cds type mapping.
+- `cds compile --to openapi` now has better description for `$expand` query option.
+- The original package `sqlite3` is now used again in its latest version.
+- `cds import` now deprecated `cds.DecimalFloat` type.
+- `cds import` now allows OData version 4.01 edmx files and supports `Scale="floating"`.
+- `cds import` now adds `@odata.Type` annotation for `Edm.Byte` and `Edm.SByte`.
+- `cds import` now has improved tests to check `--as`option with `force` flag file overwriting.
+- `cds init` uses latest Maven Java archetype version 1.25.0 for creating Java projects.
+- `cds import` now imports edmx file without any entities containing only unbounded action/function.
+- `cds import` API now supports includeNamespaces option.
+- `cds compile --to openapi` now adds `format`, `multipleOf`, `maximum` and `minimum` to anyOf.
+- `cds import` will now mark an association as a composition when `OnDelete Action="Cascade"` is present.
+- `cds import` has deprecated `--into` option.
+- `cds bind` reads Cloud Foundry file `config.json` to get org and space information.
+- `cds deploy` now stores connection information without credentials by default in `.cdsrc-private.json`.
+- `cds deploy` has a new option `--store-credentials` to enforce the former behavior of storing credentials in `default-env.json`.
+- If a `@sap/cds` is installed locally in a project, it must be version 4 or higher for CLI commands to run.
+- `cds import` now doesn't trim the bound action/function name in the csn if the format of the name is A_B.
+- `@sap/cds` version 6 is now required in new projects added by `cds init` and `cds add`.
+
+### Fixed
+
+- `cds compile --to openapi` fixes annotations on bound action overloads.
+- `cds add cf-manifest` now uses the correct `application` plan for the `xsuaa` service
+- A combination of `cds add approuter`, `cds add mtx`, and `cds add mta` will now use a safer approach to determine the subscription URL.
+- `cds init` and `cds add` output the feature names correctly in case the names contain a dash
+- `cds compile --to openapi` fix for type error when entity/action is not specified in the service definition.
+- `cds import` API fix for race condition issue.
+- `cds somecdsfile --profile ...` (without the `compile` command) no longer ignores the given profile
+- `cds watch` got more robust against unlucky timing and no longer runs into port conflicts
+
+
 ## Version 4.9.7 - 2022-06-08
 
 ### Changed

package/bin/activate.js

@@ -9,7 +9,7 @@ module.exports = Object.assign(activate, {
 
     Activate an extension project.
     By default, the current working directory is used as project directory.
-    
+
     To facilitate running this multiple times against the same app, refer to the *cds login* command.
 
 
@@ -25,14 +25,14 @@ module.exports = Object.assign(activate, {
 
     *-p* | *--passcode* <passcode>
 
-        Tenant-specific passcode for authentication. 
+        Tenant-specific passcode for authentication.
         Also see cds login --help or https://cap.cloud.sap/docs/guides/extensibility/#save-an-authentication-token-for-a-simplified-workflow
 
     *-u* | *--username* <name>
 
         Deprecated. Use the passcode parameter.
 
-    *-c* | *--clientid* <clientid> 
+    *-c* | *--clientid* <clientid>
 
         Client ID for authentication. This will override the default Client ID from environment.
 
@@ -49,7 +49,7 @@ module.exports = Object.assign(activate, {
 
 async function activate ([projectFolder], options = {}) {
     const injection = {
-        cds: require('@sap/cds/lib')
+        cds: require('../lib/cds')
     }
 
     Object.assign(options, { projectFolder })

package/bin/add.js

@@ -1,6 +1,6 @@
 
 module.exports = Object.assign(add, {
-  options: ['--for', '--out'],
+  options: ['--for', '--out', '--data:for'],
   shortcuts: ['-4', '-o'],
   flags: ['--force', '--verbose'],
   help: `
@@ -15,7 +15,13 @@ module.exports = Object.assign(add, {
 
     *hana*        - adds configuration for SAP HANA deployment
 
-    *mta*         - adds an _mta.yaml_ file for MTA based SAP Business Technology Platform deployment
+    *xsuaa*       - adds configuration for authentication via XSUAA
+
+    *mtx*         - adds configuration for multitenancy and extensibility
+
+    *approuter*   - adds configuration for the Cloud Foundry approuter
+
+    *mta*         - adds an _mta.yaml_ file for MTA-based SAP Business Technology Platform deployment
 
     *cf-manifest* - adds _manifest.yml_ and _services-manifest.yml_ files for Cloud Foundry native deployment
 
@@ -34,9 +40,9 @@ module.exports = Object.assign(add, {
 
 # OPTIONS
 
-    *-4* | *--for* <entity name or prefix>
+    *--data:for* <entity name or prefix>
 
-      Filters entity names with the given string.  If it contains meta characters like
+      Adds data content for entities matching the given pattern.  If it contains meta characters like
       '^' or '*', it is treated like a regular expression, otherwise as a prefix.
 
     *-o* | *--out* <target folder>
@@ -51,7 +57,7 @@ module.exports = Object.assign(add, {
 # EXAMPLES
 
     *cds add* hana,mta,pipeline
-    *cds add* mta
+    *cds add* mtx --for production
     *cds add* cf-manifest
     *cds add* data --for my.namspace.MyEntity
 

package/bin/bind.js

@@ -46,31 +46,28 @@ module.exports = Object.assign(cds_bind, {
 `
 });
 
-const cds = require('@sap/cds/lib');
+const cds = require('../lib/cds');
 const LOG = cds.log('bind');
 // required for spinner
 LOG.isDebug = LOG._debug;
 LOG.isTTY = process.stdout.isTTY;
+const resolveBinding = require('../lib/bind/bindingResolver').resolver(LOG);
 
 const { highlight, bold, info } = require('../lib/util/term');
 
 const Spinner = require('../lib/init/util/spinner');
-const resolveBinding = require('../lib/bind/bindingResolver').resolver(LOG);
 const { determineKinds, getRequiresNameFromKind, execAndExit, checkIsJavaProject, throwError, platformText, bindingText } = require('../lib/bind/bindingUtil');
 
-const VCAP_LABEL_PLACEHOLDER = '<replace with service label>';
-
 async function cds_bind(args, options, logger = LOG) {
+
     options.profile = parseProfile(options.profile);
     setProfile(options.profile);
 
     if (options.exec) {
-        cds_bind_exec(args, options)
+        await cds_bind_exec(args, options)
         return;
     }
 
-    const env = cds.env.for('cds', process.cwd());
-
     if (!options.to) {
         throw new Error(`use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`);
     }
@@ -138,25 +135,16 @@ async function cds_bind(args, options, logger = LOG) {
             resolvedService.name = getRequiresNameFromKind(resolvedService.binding.instance, resolvedService.kind);
         }
 
-        if (!resolvedService.name) {
-            if (isJavaProject) {
-                const { binding } = resolvedService;
-                // Generate a custom service entry for Java projects w/o the need to specify a name manually
-                resolvedService.name = `custom-service:${binding.instance || binding.secret}`
-            } else {
-                throw new Error(`Unknown CDS service name for service "${resolvedService._target}". Please specify as argument for "cds bind".`)
-            }
-        }
-
         const { kind, name, binding } = resolvedService;
         const kindText = kind && `with kind ${highlight(kind)}`;
-        const nameText = !isJavaProject && highlight(name);
+        const nameText = !isJavaProject && name && highlight(name);
 
         logger.log(['Binding', nameText, 'to', platformText(binding), bindingText(binding, highlight), kindText].filter(t => t).join(' '));
 
-        if (isJavaProject && !hasVcapLabel(binding) && !hasVcapLabel(env.requires[resolvedService.name]) && !(kind && hasVcapLabel(env.requires[kind]))) {
-            resolvedService.vcap = { label: VCAP_LABEL_PLACEHOLDER };
-            logger.log(`${info('INFO:')} Please add a "vcap.label" property to the binding for consumption in CAP Java projects`);
+        if (!resolvedService.name) {
+            const { binding } = resolvedService;
+            // Generate a custom service entry for Java projects w/o the need to specify a name manually
+            resolvedService.name = `custom-service:${binding.instance || binding.secret}`
         }
     }
 
@@ -173,15 +161,15 @@ async function cds_bind(args, options, logger = LOG) {
 }
 
 async function cds_bind_exec(command) { // eslint-disable-lint
-    const cds = require('@sap/cds/lib');
+    const cds = require('../lib/cds');
     const env = cds.env.for('cds', process.cwd());
-    env._emulate_vcap_services();
-    await require('../lib/bind/bindingResolver').applyTo({ env, output: 'info' });
-    execAndExit(...command);
-}
 
-function hasVcapLabel(service) {
-    return service && service.vcap && service.vcap.label && service.vcap.label != VCAP_LABEL_PLACEHOLDER;
+    const BindingManager = require('../lib/bind/BindingManager')
+    const bindingManager = new BindingManager({ env, output: 'info' })
+    const bindingEnv = await bindingManager.bindingEnv()
+    const processEnv = Object.assign(process.env, bindingEnv)
+
+    execAndExit({ env: processEnv }, ...command);
 }
 
 function runCmd({ profile }, isJavaProject) {

package/bin/build/all.js

@@ -48,7 +48,7 @@ module.exports = Object.assign(build, {
 `
 })
 
-function build([project], options = {}, /* for unit tests only: */ _env = null) {
+function build([project], options = {}) {
     options.project = options.project || project
     // switch-off error logging as CLI is logging any exceptions by default
     // otherwise errors are logged twice
@@ -66,7 +66,7 @@ function build([project], options = {}, /* for unit tests only: */ _env = null)
     }
 
     try {
-        return require('@sap/cds').build.build(options, _env)
+        return require('../../lib/cds').build(options)
     } catch (error) {
         return Promise.reject(error.message)
     }

package/bin/build/index.js

@@ -4,7 +4,7 @@ module.exports = Object.assign(build, {
     help: `
 # SYNOPSIS
 
-    *cds build* [<options>]
+    *cds build* [<project>] [<options>]
 
     Builds all modules in the current project by compiling contained CDS sources.
     The modules are folders in the project root directory. All well known modules (db, srv, app)
@@ -12,28 +12,22 @@ module.exports = Object.assign(build, {
 
 # OPTIONS
 
-     *-4* | *--for* hana | java-cf | node-cf | mtx
+     *-4 | --for* hana | java | nodejs | mtx
 
         Name of the build task that is applied to the source folder, either explicitly configured in
         the build task list or generated out of the project setup
         For example, the "hana" build task will create SAP HANA artefacts.
         The module folder can be defined using option "--src", a default is used otherwise.
 
-    *--use* <qualified node module name>
+    *-s | --src* <folder>
 
-        Fully qualified name of the build task that is applied to the source folder.
-        For example, "@sap/cds/build/hana" represents the fully qualified name of the "hana" build task.
-        The module folder can be defined using option "--src", a default is used otherwise.
-
-    *-s* | *--src* <folder>
-
-        The module folder to build using the build task defined by option "--for" or "--use".
+        The module folder to build using the build task defined by option "--for".
         This option is only supported when building an individual module of the project.
         The folder is resolved based on "<project>/<cds.env.build.target>".
         A default is used based on the type of the build task, for example, the folder "db" is used for a
-        "hana" build task, "srv" for "node-cf" or "java-cf" build task.
+        "hana" build task, "srv" for "nodejs" or "java" build task.
 
-    *-o* | *--dest* <folder>
+    *-o | --dest* <folder>
 
         Output folder of the build task. The type of build task is defined by option "--for".
         The folder is resolved based on "<project>/<cds.env.build.target>".
@@ -56,12 +50,11 @@ module.exports = Object.assign(build, {
         Builds the project using the "production" profile - same when NODE_ENV environment variable is set to "production".
         E.g. HANA deployment artefacts will be created if "sql" has been set as database kind in cds configuration.
 
-    *-in* | *--project* <folder> deprecated
+    *-in | --project* [<project>]
 
-        Use the specified folder as the project root.
-        Default - current working directory.
+        Runs _cds build_ for the specified project, default is current working directory.
 
-    *-c* | *--clean* deprecated
+    *-c | --clean* deprecated
 
         Incremental builds are not supported.
         Build output folders are always cleaned before build.
@@ -73,17 +66,17 @@ module.exports = Object.assign(build, {
    *cds* build --production
    *cds* build --log-level info
    *cds* build --for hana
-   *cds* build --for java-cf --dest ../srv/target --opts model=[db/model,srv,schema]
+   *cds* build --for java --dest ../srv/target --opts model=[db/model,srv,schema]
 `})
 
 /**
  * Redirect to modular build system.
  */
-function build(project, options = {}, config = null) {
+function build(project, options = {}) {
     if (options.dry) {
         // eslint-disable-next-line no-console
         console.warn("[cds] - CLI option 'dry' is no longer supported.\n")
         delete options.dry
     }
-    return require('./all')(project, options, config)
+    return require('./all')(project, options)
 }

package/bin/cds.js

@@ -34,9 +34,9 @@ const cli = { //NOSONAR
     if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
     if (argv.some(a => this.Shortcuts[a]==='help'))  return this.help (cmd)
 
-    const cds_cli = require (_local('@sap/cds/bin/cds'))  // this triggers loading of sap/cds lib
-    DEBUG && DEBUG (`[cds] - @sap/cds ${global.cds.version} loaded: ${global.cds.home}`)
+    const cds_cli = require (_local('@sap/cds/bin/cds'))
     if (cmd !== 'repl' && process.env.NODE_ENV !== 'test')  cds_cli.errorHandlers()
+    DEBUG && DEBUG (`[cds] - @sap/cds ${require('../lib/cds').version} loaded: ${require('../lib/cds').home}`)
 
     const task = this.load (cmd, /*else*/ (f)=> argv.unshift(cmd) && _defaultCompile (argv,f))
     if (task) {
@@ -67,17 +67,28 @@ const cli = { //NOSONAR
 
 const DEBUG = /\b(cli)\b/.test (process.env.DEBUG) && console.error
 
-function _local (id) {
-  return require.resolve (id, {paths:[process.cwd(), __dirname]})
+function _local (id, _else) {
+  try { return require.resolve (id, {paths:[process.cwd(), __dirname]}) }
+  catch(e) {
+    if (_else) return _else(e)
+    else throw e
+  }
 }
 
 function _defaultCompile (argv, _force) {
   // Try all arguments if one resolves to a model.  If yes, we assume 'compile' is intended.
-  const model = _force || require (_local('@sap/cds')).resolve(argv)
+  const model = _force || _is_model(argv)
   if (model)  return _require ('./compile')
   DEBUG && DEBUG (`[cds] - Command is not a model to compile: ${argv}`)
 }
 
+function _is_model (argv) {
+  // IMPORTANT: have a separate env here, so that the normal one is not initialized before `cds_cli.args` above
+  const env = require (_local('@sap/cds/lib/env/cds-env', ()=>_local('@sap/cds/lib/env'))).for('cds')
+  const cds = require (_local('@sap/cds'))
+  return !!cds.resolve(argv,{env,cache:{}})
+}
+
 function _dieForUnknownCommand(cmd) {
   const term = require('../lib/util/term');
   const fuzzySearch = _require('./util/fuzzySearch');
@@ -92,19 +103,20 @@ function _dieForUnknownCommand(cmd) {
       bestMatchText = '';
       break;
     case 1:
-      bestMatchText = `A similar command is \n\n  ${term.bold("cds " + bestMatches[0])}`;
+      bestMatchText = `A similar command is \n\n    ${term.bold("cds " + bestMatches[0])}`;
       break;
     default:
-      bestMatchText = `Similar commands are \n\n  ${term.bold("cds " + bestMatches.join('\n  cds '))}`;
+      bestMatchText = `Similar commands are \n\n    ${term.bold("cds " + bestMatches.join('\n    cds '))}`;
   }
 
   const msg = `
   Unknown command '${term.bold(cmd)}'. ${bestMatchText}
 
   Haven't found the proper command yet? Here are all supported commands:
-  ${term.bold(commands.join(', '))}
 
-  You can use ${term.bold("cds help {command}")} to get more information on the command.
+    ${term.bold(commands.join('\n    '))}
+
+  You can use ${term.bold("cds help [command]")} to get more information on the command.
 `
   console.error(msg)
 
@@ -117,17 +129,8 @@ function _require (id,o) {
   return require (resolved)
 }
 
-function _minVersion (id, minVersion) {
-  const { version } = require (_local (id+'/package.json'))
-  return version.split('.')[0] >= minVersion
-}
+module.exports = Object.assign ((..._) => cli.exec(..._), cli)
 
-if (_minVersion ('@sap/cds', 4)) {
-  module.exports = Object.assign ((..._) => cli.exec(..._), cli)
-}
-else { // TODO compat to cds 3 remove after a while.
-  module.exports = require (_local('@sap/cds/bin/cds'))
-}
 if (!module.parent)  module.exports()
 
 /* eslint no-console:off */

package/bin/compile/index.js

@@ -120,7 +120,7 @@ module.exports = Object.assign ( compile, {
 function compile_all (root='.') {
 
   const {exec} = require ('child_process')
-  const cds = require ('@sap/cds')
+  const cds = require('../../lib/compile') // get the enhanced cds w/ additional compile processors
 
   exec(`find ${root} -name *.cds ! -path '*/node_modules/*'`, (_,stdout)=>{
     const all = stdout.split('\n').slice(0,-1)
@@ -142,7 +142,7 @@ function compile (models, options={}) {
   if (options.all)  return compile_all (models[0])
 
   const { inspect } = require('util')
-  const cds = require ('../../lib/compile')
+  const cds = require('../../lib/compile') // get the enhanced cds w/ additional compile processors
 
   let model, src, _suffix; //> be filled in below
   if (!options.as && !/,/.test(options.to))  options.as = 'str'
@@ -202,7 +202,7 @@ function compile (models, options={}) {
   }))
 
   // add processor for logging compiler messages and errors
-  const log = this.log || require('@sap/cds/bin/utils/log')
+  const log = this.log || _log
   chain = chain.then ((results)=>{
     if (messages.length) log (messages, options)
     return results
@@ -272,4 +272,13 @@ function compile (models, options={}) {
   }[x] || '.'+x) }
 
 }
+
+function _log (messages, options) {
+  const cds = require('../../lib/cds')
+  const { sortMessagesSeverityAware, deduplicateMessages } = cds.compiler
+  deduplicateMessages(messages)
+  messages = sortMessagesSeverityAware (messages)
+  cds.utils._log (messages, options)
+}
+
 /* eslint no-console:0 */

package/bin/deploy/index.js

@@ -1,5 +1,6 @@
 module.exports = Object.assign(deploy, {
-  options: ['--to', '--tunnel-address', '--vcap-file'], flags: [ '--no-save', '--auto-undeploy', '--dry', '--with-mocks', '--bind' ],
+  options: ['--to', '--tunnel-address', '--vcap-file'],
+  flags: [ '--no-save', '--auto-undeploy', '--dry', '--with-mocks', '--store-credentials', '--bind' ],
   shortcuts: ['-2'],
   help: `
 # SYNOPSIS
@@ -47,23 +48,28 @@ module.exports = Object.assign(deploy, {
       creating new credentials. File must be in *default-env.json* format, with a root
       node *VCAP_SERVICES*.
 
-    *--bind* (beta feature, only in combination with *--to hana*)
+    *--store-credentials* (only in combination with *--to hana*)
+
+      Stores credentials in *default-env.json file*. This is the former default behavior
+      which has been replaced by creating and storing connection information in file
+      *.cdsrc-private.json*.
 
-      Use *cds bind* to connect the created service after deployment.
-      This will no longer create default-env.json files. Instead, cds bind is used to
-      create and store connection information in file *.cdsrc-private.json*.
 
 # EXAMPLES
     cds deploy --to sqlite:db
+    cds deploy --to hana
     cds deploy --to hana:myService --auto-undeploy
-    cds deploy --to hana --vcap-file ./secret/default-env.json
 
 `})
 
-const cds = require('@sap/cds/lib')
+const cds = require('../../lib/cds')
 
 async function deploy (_model, options) { // NOSONAR
 
+  if (options.bind) {
+    console.log (`Option '--bind' is now active by default and can therefore be omitted.`)
+  }
+
   if (_model && _model.length === 0)  _model = undefined // empty array (no model args) means default models
   const { 'to':url, 'no-save':no_save = cds.env.deploy.no_save } = options
   if (!options.mocked) { options.mocked  = options['with-mocks'] }
@@ -90,7 +96,7 @@ async function deploy (_model, options) { // NOSONAR
     await deployer.deploy (_model, _db, options)
     if (options.dry)  return
     if (kind === 'hana')  return // REVISIT: the hana deployer is a bit special
-    if (url && !no_save)  await updata_package_json (_kind, _model, _db)
+    if (url && !no_save)  await update_package_json (_kind, _model, _db)
   } catch (e) {
     if (e.code === 'MODEL_NOT_FOUND') {
       if (!_model) throw new Error ('No .cds models found, please specify one as an argument')
@@ -100,7 +106,7 @@ async function deploy (_model, options) { // NOSONAR
 }
 
 
-async function updata_package_json (kind, model, database) {
+async function update_package_json (kind, model, database) {
   const { fs, path, isfile } = cds.utils
   const { readFile, writeFile } = fs.promises
   const package_json = path.resolve ('package.json'), exists = isfile (package_json)

package/bin/deploy/to-hana.js

@@ -1,10 +1,10 @@
 const { join } = require('path');
 
 exports.deploy = (_model, _db, options) => {
-  // locate deployer relative to already located sap/cds -> local cds takes precedence
-  const cdsHome = require('@sap/cds').home;
+  // locate deployer relative to sap/cds
+  const cdsHome = require('../../lib/cds').home;
   const deployer = require(join(cdsHome, 'bin/deploy/to-hana'));
 
-  const bind = require('../bind');
-  return deployer.deploy(_model, _db, options, options.bind ? bind : null);
+  const bind = !options['store-credentials'] ? require('../bind') : undefined;
+  return deployer.deploy(_model, _db, options, bind);
 }

package/bin/deploy/to-sqlite.js

@@ -1,5 +1,5 @@
 exports.deploy = function deploy_to_sqlite (_model, _db, options) {
-    const cds = require('@sap/cds/lib')
+    const cds = require('../../lib/cds')
     const {to:_dbrl} = options
     const conf = cds.env.requires.db || {}
     const fts = cds.env.features.folders

package/bin/env.js

@@ -44,22 +44,31 @@ const info = (s) => process.stdout.isTTY ? term.info (s) : s
 
 async function env ([cmd, key, value], options={}) {
 
-  const cds = require('@sap/cds/lib')
+  const cds = require('../lib/cds')
   const fn = (options["process-env"] ? processEnvCommands[cmd] : commands[cmd]) || (()=>{
     this.help ('env')
     throw new Error (`Don't understand '${cmd}' here...`)
   })
 
-  const env = options.for ? cds.env.for (options.for) : cds.env
-  env['_home_cds-dk'] = path.resolve(__dirname, '..')  // to help tools find the DK
+  let env = options.for ? cds.env.for(options.for) : cds.env
+
+  if (options["resolve-bindings"]) {
+    const BindingManager = require('../lib/bind/BindingManager')
+    const bindingManager = new BindingManager({env, output: "debug"})
+    const bindingEnv = await bindingManager.bindingEnv()
+    Object.assign(process.env, bindingEnv)
+    env = cds.env.for(options.for || 'cds') // reload env
+  }
 
-  if (options["resolve-bindings"]) await require('../lib/bind/bindingResolver').applyTo({env, output: "debug"})
+
+  env['_home_cds-dk'] = path.resolve(__dirname, '..')  // to help tools find the DK
 
   if (!options.for && options.mocked)  await cds.service.bindings
 
   fn (env, key, value)
 }
 
+
 const commands = {
 
   get [undefined]() { return commands.list },

package/bin/eval.js

@@ -21,7 +21,7 @@ module.exports = Object.assign ( run, { help: `
 function run ([code]) {
   if (!code)  return console.error (`Please specify the code to execute, like\n\n  cds -e "cds.compile('my-model').to.json()"\n`)
   // eslint-disable-next-line no-unused-vars
-  const cds = require('@sap/cds/lib')
+  const cds = require('../lib/cds')
   if (code[0] === '.')  code = 'cds' + code
   const outcome = eval(code) //NOSONAR
   console.log (outcome)

package/bin/fix-redirects.js

@@ -1,5 +1,5 @@
 const [arg0, arg1, _, ...args] = process.argv  // eslint-disable-line no-unused-vars
-const files = require('@sap/cds').resolve(args.length ? args : '*')
+const files = require('../lib/cds').resolve(args.length ? args : '*')
 process.argv = [ arg0, arg1, 'ria', ...files ]
 
 console.log ('[cds] - searching for ambiguous redirects in', files)