@sap/cds-dk 6.5.2 → 6.6.1

package/CHANGELOG.md

@@ -7,6 +7,46 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 6.6.1 - 2023-03-09
+
+### Added
+
+- `cds compile --to openapi` now adds extension validation keywords `x-sap-precision` and `x-sap-scale` for decimal values.
+
+### Fixed
+
+- `cds add helm` fixed html5 cloud service is now read properly.
+- `cds import` now flattens the `@Capabilities` anotation in the CSN for OData V4 files.
+- `cds import` for OData V4 files now captures the `EnumTypes` information in the CSN according to `UnderlyingType`.
+- `cds import` now captures the `@Common.Text` annotation value properly in the CSN for OData V4 files.
+- `cds init --add java` now uses local Java version when creating new Java project.
+- `cds watch` terminates properly in case livereload websocket clients are connected
+- `cds watch`'s livereload feature works again on Node.js >= 17, where local IPv6 addresses are the default (`::1` instead of `127.0.0.1`)
+
+## Version 6.6.0 - 2023-02-28
+
+### Added
+
+- `cds compile` added a new target format `asyncapi` to convert CDS models to AsyncAPI documents.
+- `cds pull` now hints at base-model name for `using` statement.
+
+### Changed
+
+- `cds env` now allows inspecting entries with optional `get` command. E.g. `cds env requires.db`.
+- `cds add multitenancy` now uses async SaaS Provisioning Service onboarding by default.
+- `cds add multitenancy` for Java will now add  `sqlite3` to `devDependencies` in the sidecar `package.json`.
+- `cds add extensibility` now works for Java projects out-of-the-box.
+- `cds import` now captures the Edm Primitive types without [CDS mapping](https://github.tools.sap/cap/cds-dk/blob/main/edm2cdsTypeMapping.md) with annotation `@odata.Type` and marks the type as `cds.String`.
+- `cds add helm` connectivity service instance is no longer created.
+- `cds init` uses latest Maven Java archetype version 1.32.0 for creating Java projects.
+
+### Fixed
+
+- `cds unsubscribe --from` flag now recognized
+- `cds import` now adds `cds.Boolean` as dummy return type if `ReturnType` for `FunctionImport` is missing in the OData V2 edmx.
+- `cds import` resolves the `$Cast` construct in the CSN for OData V4 files.
+- `cds lint` now reports like ESLint in case of missing plugin `@sap/eslint-plugin-cds`
+
 ## Version 6.5.2 - 2023-02-10
 
 ### Changed

package/bin/activate.js

@@ -7,6 +7,8 @@ module.exports = Object.assign(activate, {
 
     *cds activate* [ <extension-project-directory> ]
 
+    **Deprecated - for use with previous MTX Services (@sap/cds-mtx).**
+
     Activate an extension project.
     By default, the current working directory is used as project directory.
 
@@ -44,6 +46,11 @@ module.exports = Object.assign(activate, {
 
         Use the synchronous server API to upload extensions.
 
+# SEE ALSO
+
+    *cds push* to push an extension to a SaaS app based on current MTX Services (@sap/cds-mtxs).
+    https://cap.cloud.sap/docs/guides/multitenancy/mtxs for information on @sap/cds-mtxs.
+
 `})
 
 

package/bin/add.js

@@ -44,8 +44,7 @@ module.exports = Object.assign(add, {
 
     *helm*          - adds helm chart folder that contains the files needed to deploy the application using Kyma.
 
-                    To add a specific feature in the helm chart you can use the command 'cds add helm:<featureName>'.
-                    For example cds add helm:xsuaa and cds add helm:html5_apps_deployer.
+    *html5-repo*    - adds configuration for HTML5 Application Deployer to Helm Chart (Kyma Only).
 
 
 # OPTIONS

package/bin/build/all.js

@@ -48,7 +48,7 @@ module.exports = Object.assign(build, {
 `
 })
 
-function build([project], options = {}) {
+async 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,14 +66,19 @@ function build([project], options = {}) {
     }
 
     const cds = require('../../lib/cds')
-    if (typeof cds.build === 'function') {
-        return cds.build(options)
+    try {
+        if (typeof cds.build === 'function') {
+            return await cds.build(options)
+        }
+        console.warn(`
+    > WARNING: This application uses a very old version ${cds.version} of package '@sap/cds',
+    > which will no longer be supported with the next major version of '@sap/cds-dk'.
+    > We strongly recommend an upgrade to latest version 6 of '@sap/cds'.
+    `)
+        return await cds.build.build(options)
+    } catch (e) {
+        process.exitCode = 1
+        cds._log(e.errors || e, { 'log-level': cds.env.log.levels.cli })
     }
-    console.warn(`
-> WARNING: This application uses a very old version ${cds.version} of package '@sap/cds',
-> which will no longer be supported with the next major version of '@sap/cds-dk'.
-> We strongly recommend an upgrade to latest version 6 of '@sap/cds'.
-`)
-    return cds.build.build(options)
 
 }

package/bin/cds.js

@@ -25,14 +25,13 @@ const cli = { //NOSONAR
     '-e':'eval'
   },
 
-  exec (cmd = process.argv[2], ...argv) {
+  async exec (cmd = process.argv[2], ...argv) {
     if (!argv.length) argv = process.argv.slice(3)
     if (!cmd) cmd = process.stdin.isTTY ? 'help' : 'compile'
     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'))
-    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))
@@ -44,11 +43,15 @@ const cli = { //NOSONAR
         appendArgs = argv.slice(endOfOptions+1)
         argv = argv.slice(0, endOfOptions)
       }
-      const args = cds_cli.args(task,argv)
-      args[0].push(...appendArgs)
-      const resolveBindings = cmd in { run: 1, serve: 1, migrate: 1 } && argv.includes('--resolve-bindings')
-      if (resolveBindings) return _resolveBindings().then(() => task.apply(this, args))
-      else return task.apply(this, args)
+      try {
+        const args = cds_cli.args(task,argv)
+        args[0].push(...appendArgs)
+        if (args[1]?.['resolve-bindings']) await _resolveBindings()
+        return task.apply(this, args)
+      } catch (e) {
+        process.exitCode = 1
+        console.error (e)
+      }
     }
   },
 
@@ -135,7 +138,7 @@ function _dieForUnknownCommand(cmd) {
 `
   console.error(msg)
 
-  process.exit(1)
+  process.exitCode = 1
 }
 
 function _require (id,o) {

package/bin/compile/index.js

@@ -1,3 +1,5 @@
+const path = require("path");
+
 module.exports = Object.assign ( compile, {
   options: [
   '--from', '--service', '--lang', '--for', '--to', '--dest', '--log-level', '--flavor', '--dialect', '--sql-dialect', '--openapi:url', '--openapi:servers'
@@ -6,7 +8,7 @@ module.exports = Object.assign ( compile, {
   undefined, '-s', '-l', '-4', '-2', '-o', undefined, '-f'
   ],
   flags: [
-  '--parse', '--plain', '--clean', '--files', '--sources', '--resolved', '--all', '--beta', '--conceptual', '--min', '--docs', '--locations', '--openapi:diagram'
+  '--parse', '--plain', '--clean', '--files', '--sources', '--resolved', '--all', '--beta', '--conceptual', '--min', '--docs', '--locations', '--openapi:diagram', '--asyncapi:merged'
   ],
   help: `
 # SYNOPSIS
@@ -41,6 +43,7 @@ module.exports = Object.assign ( compile, {
     - cdl [beta]
     - xsuaa
     - openapi
+    - asyncapi
 
   *-4* | *--for* <target>
 
@@ -54,6 +57,7 @@ module.exports = Object.assign ( compile, {
   *-s* | *--service* <name> | all
 
     Chooses a specific service or _all_ to force output for all services.
+    The service name must be fully qualified, including the namespace, if any.
 
   *-l* | *--lang* <languages> | all
 
@@ -114,11 +118,17 @@ module.exports = Object.assign ( compile, {
 
     Include YUML diagram in the generated OpenAPI document, default: *false*.
 
+  *--asyncapi:merged*
+
+    A single AsyncAPI document is generated using the details of all input services. Information of _title_
+    and _version_ should be provided as preset.
+    
 # EXAMPLES
 
    *cds* compile model.cds
    *cds* c model.json --to sql
    *cds* srv -s all -l all -2 edmx -o _out
+   *cds* compile srv -s sap.sample.TestService -2 asyncapi -o _out
 
 `})
 
@@ -196,12 +206,11 @@ function compile (models, options={}) {
       }()
     }))
   }
-
   // add output processor
   const write = require ('../../lib/util/write')
   chain = chain.then (write.to ({
     folder: options.dest,
-    file: options.file || options.service === 'all' ? src : options.service,
+    file: options.file || options.service === 'all' ? path.basename(src) : options.service,
     suffix: options.suffix || suffix4(_suffix),
     [options.dest ? 'foreach' : 'log']: options.log || consoleLog
   }))
@@ -274,6 +283,7 @@ function compile (models, options={}) {
     ddl: '.sql',
     sql: '.sql',
     edm: '.json',
+    asyncapi: '.json',
     xsuaa: '.json'
   }[x] || '.'+x) }
 

package/bin/env.js

@@ -3,19 +3,16 @@ module.exports = Object.assign (env, {
   help: `
 # SYNOPSIS
 
-    *cds env*
-    *cds env* <ls | list> [<key>]
-    *cds env* set <key> <value>
-    *cds env* get <key>
+    *cds env* [get] [<key>]
+    *cds env* list [<key>]
+    *cds env* ls [<key>]
     *cds env* src
 
 # EXPLANATION
 
-    Lists the effective configuration of the current environment in
-    _.properties_ format if no command, *ls*, or *list* is given.
-
-    The other commands either get or set a single property or display
-    the sources from which the effective configuration has been loaded.
+    Displays the effective configuration for the given key, or all of the
+    current environment. By default and when using *get* the output is in
+    _object_ format. When using *list* or *ls* it's in _.properties_ format.
 
 # OPTIONS
 
@@ -45,13 +42,12 @@ const info = (s) => process.stdout.isTTY ? term.info (s) : s
 async function env ([cmd, key, value], options={}) {
 
   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 fn = (
+    options["process-env"] ? processEnvCommands[cmd] :
+    commands[cmd] || ((key = cmd), commands.get)
+  )
 
   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, silent: true })
@@ -59,25 +55,20 @@ async function env ([cmd, key, value], options={}) {
     Object.assign(process.env, bindingEnv)
     env = cds.env.for(options.for || 'cds') // reload env
   }
-
-
   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)
+  return fn (env, key, value)
 }
 
 
 const commands = {
 
-  get [undefined]() { return commands.list },
-  get ''() { return commands.list },
-  get ls()   { return commands.list },
+  get ls()   { return this.list },
 
   // eslint-disable-next-line no-unused-vars
   list (conf, _key, val) { // NOSONAR
-    (function _list (o = _key ? conf.get(_key) : conf, key = _key || '') {  // NOSONAR, ...tzefix!!
+    (function _list (o = _key ? conf.get(_key.replace(/^cds\./,'')) : conf, key = _key || '') {  // NOSONAR, ...tzefix!!
       if (o && typeof o === 'object' && !Array.isArray(o)) for (let p of Object.keys(o).sort()) {
         const d = Reflect.getOwnPropertyDescriptor (o,p)
         if (d.value === undefined && d.get === undefined)  continue
@@ -96,19 +87,19 @@ const commands = {
   get (conf, key, val) {
     if (!process.stdout.isTTY)  return commands.json (conf, key, val)
     // tty: display formatted object
-    const obj = (key ? conf.get(key) : conf)
+    const obj = key ? conf.get(key.replace(/^cds\./,'')) : conf
     console.log (inspect (obj, {depth:22,colors:true}).replace(/\s+use:.*\[Getter\][^,]+,?/g,''))
   },
 
   // eslint-disable-next-line no-unused-vars
   json (conf, key, val) {
-    const obj = (key ? conf.get(key) : conf)
+    const obj = (key ? conf.get(key.replace(/^cds\./,'')) : conf)
     const str = JSON.stringify(obj, null, 2)
     return console.log (str ? str.replace(/\s+use:.*\[Getter\][^,]+,?/g,'') : str)
   },
 
   set () {
-    throw new Error ('cds config set is not yet implemented, sorry')
+    console.error ('cds env set is not yet implemented, sorry.')
   }
 }
 

package/bin/extend.js

@@ -7,6 +7,8 @@ module.exports = Object.assign(extend, {
 
     *cds extend* <app-url>
 
+    **Deprecated - for use with previous MTX Services (@sap/cds-mtx).**
+
     Create an extension project from an extensible SaaS app.
     Obtain the app URL from the SaaS application provider.
 
@@ -45,6 +47,12 @@ module.exports = Object.assign(extend, {
 # SEE ALSO
 
     *cds activate* to activate an extension project.
+
+# SEE ALSO
+
+    *cds pull* to get the CDS model of a SaaS app based on current MTX Services (@sap/cds-mtxs).
+    https://cap.cloud.sap/docs/guides/multitenancy/mtxs for information on @sap/cds-mtxs.
+
 `})
 
 

package/bin/init.js

@@ -52,9 +52,6 @@ module.exports = Object.assign(init, {
 
         *helm*        - adds helm chart folder that contains the files needed to deploy the application using Kyma.
 
-                      To add a specific feature in the helm chart you can use the command 'cds add helm:<featureName>'. 
-                      For example cds add helm:xsuaa and cds add helm:html5_apps_deployer.
-
     *--java:mvn* <Comma separated maven archetype specific parameters>
 
         Add the given parameters to the archetype call.

package/bin/login.js

@@ -1,19 +1,15 @@
-const { bold } = require('../lib/util/term');
-
 module.exports = Object.assign(login, {
     options: ['--subdomain', '--directory', '--passcode', '--user', '--client'],
     shortcuts: ['-s', '-d', '-p', '-u', '-c'],
     flags: ['--plain'],
     get help() {
         const config = require('../lib/client/settings_manager').SettingsManager.config
-        const cdsExtendAndCdsActivate = `${bold('cds extend')} and ${bold('cds activate')}`
-        const keyring = config.keyringDesignation
         return `
 # SYNOPSIS
 
     *cds login* [ <app-url> ]
 
-    Simplifies usage of ${cdsExtendAndCdsActivate} commands related to multitenant
+    Simplifies usage of *cds extend* and *cds activate* commands related to multitenant
     SaaS applications by providing them with automatic authentication: fetches and
     saves authentication tokens and provides relevant tokens to those commands.
 
@@ -25,7 +21,7 @@ module.exports = Object.assign(login, {
     When re-running this command with different app URLs and subdomains, previous
     logins are not affected, allowing simultaneous logins to different API endpoints
     on SAP Business Technology Platform, Cloud Foundry environment.
-    ${cdsExtendAndCdsActivate} will be authenticated according to the given target.
+    *cds extend* and *cds activate* will be authenticated according to the given target.
 
     If the Cloud-Foundry command-line client is installed, the SaaS-app URL <app-url>
     may be omitted. In that case, suitable apps from the org and space you're currently
@@ -41,7 +37,7 @@ module.exports = Object.assign(login, {
     *Storing Authentication Data*
 
     Authentication data for all logins is saved by <app-url> and <tenant-subdomain> in the
-    desktop keyring (${keyring} on your platform) or, if requested, in config
+    desktop keyring (${(config.keyringDesignation)} on your platform) or, if requested, in config
     file ${config.paths.auth}.
 
     To make use of keyring storage, the 'keytar' Node.js module must be installed.

package/bin/logout.js

@@ -1,20 +1,15 @@
-const { bold } = require('../lib/util/term');
-
 module.exports = Object.assign(logout, {
     options: ['--url', '--subdomain'],
     shortcuts: ['-l', '-s'],
     flags: ['--delete-settings', '--clear-invalid'],
     get help() {
-        const cdsLogin = `${bold('cds login')}`
-        const cdsExtend = bold('cds extend')
-        const cdsActivate = bold('cds activate')
         return `
 # SYNOPSIS
 
     *cds logout* [ <extension-project-directory> ]
 
-    Removes authentication data saved locally by ${cdsLogin} for use by ${cdsExtend}
-    and ${cdsActivate}. In default mode, deletes only data for a specific app URL
+    Removes authentication data saved locally by *cds login* for use by *cds extend*
+    and *cds activate*. In default mode, deletes only data for a specific app URL
     and subdomain, optionally including relevant project settings.
     
     <app-url> and <tenant-subdomain> will be determined from project settings unless given

package/bin/watch.js

@@ -109,8 +109,8 @@ async function watch ([cwd], {
   }
   log ()
   log (`${t.bold}cds ${args.join(' ')}`)
-  log (`watching: ${ext}...`)
-  DEBUG && log (`also watching: ${includes.source}`)
+  log (process.pid, 'watching:', ext, '...')
+  if (includes) DEBUG && log (`also watching: ${includes.source}`)
   if (liveReload) log (`live reload enabled for browsers`)
 
   const BindingManager = require('../lib/bind/bindingManager')
@@ -125,7 +125,6 @@ async function watch ([cwd], {
     options
   }).on('restart', (files)=>{
     log (`\n${t.bold}        ___________________________\n\n`)
-    DEBUG && DEBUG (files)
     if (liveReload) liveReload.markPending(files)
     if (this.delayed) clearTimeout (this.delayed)
     this.delayed = setTimeout(()=>{
@@ -137,7 +136,7 @@ async function watch ([cwd], {
         }
       })
       FileHandlers.changed (files,cwd)
-    }, 111)
+    }, 111) .unref()
   }).on('message', async (msg) => { switch (msg.code) { // messages from child process
     case 'listening':
       env.PORT = (msg.address && msg.address.port) || msg.port
@@ -210,7 +209,7 @@ if (!module.parent) (async()=>{ // launched by nodemon
     case 'NO_SERVICES_FOUND': return _no_services_found(e)
     case 'MODEL_NOT_FOUND': return _no_models_found(e)
     case 'EADDRINUSE': return process.send(e)  //> tell cds watch
-    default: { throw e } // cli error handling will catch and format
+    default: console.error('\n❗️ Error on server start: ❗️'); throw e
   }}
   function _no_models_found(e) { console.log (`
     No models found in ${cds.resolve(e.model||'*',false)}.

package/lib/client/activate.js

@@ -198,7 +198,7 @@ module.exports = class Activate extends BaseCommand {
                     finished: false,
                     timer: null
                 };
-                finisher.timer = setInterval(checkFinished.bind(undefined, jobId, statusUrl, params, finisher), 250);
+                finisher.timer = setInterval(checkFinished.bind(undefined, jobId, statusUrl, params, finisher), 250).unref();
             });
         });
     }

package/lib/client/helper/errors.js

@@ -4,7 +4,10 @@ class CliError extends Error {
     // noinspection JSAnnotator
     constructor(message, { error, command } = {}) {
         const help = command && getCommandHelp(command);
-        throw getMessage(message, { error, help });
+        const stackLimit = Error.stackTraceLimit;
+        Error.stackTraceLimit = 0
+        super(getMessage(message, { error, help }));
+        Error.stackTraceLimit = stackLimit;
     }
 }
 

package/lib/client/params.js

@@ -176,8 +176,9 @@ class BasicParams {
 
         // PERSISTED PARAMS (SETTINGS)
         this.appUrl                 = new Param('appUrl',                 '', { persist: Persistence.setting });
-        this.to                     = this.appUrl.newAlias('to');
         this.url                    = this.appUrl.newAlias('url');
+        this.from                   = this.appUrl.newAlias('from');
+        this.to                     = this.appUrl.newAlias('to');
         this.subdomain              = new Param('subdomain',              '', { persist: Persistence.setting }); // only needed to fetch token
         this.passcodeUrl            = new Param('passcodeUrl',            '', { persist: Persistence.setting, abbreviate: true });
         this.passcode_url           = this.passcodeUrl.newAlias('passcode_url');
@@ -398,7 +399,7 @@ class ParamCollection {
      * Return an object mapping each of the contained params' names to its corresponding value.
      * @param persistence the type of persistence to filter for (omit to disable filtering)
      */
-    toValueMap(persistence) {
+    toEntries(persistence) {
         return this.toArray()
             .filter(param => param.persist === persistence || persistence === undefined)
             .reduce(collect, {});
@@ -409,7 +410,7 @@ class ParamCollection {
      * Used by `JSON.stringify`.
      */
     toJSON() {
-        return this.toValueMap();
+        return this.toEntries();
     }
 
     /**

package/lib/client/pull.js

@@ -18,20 +18,25 @@ module.exports = class Pull extends BaseCommand {
 
         const params = await login(paramValues);
         const url = params.get('appUrl')
-        const home = params.get('projectFolder');
-        const target = join(home, 'node_modules', this.getAppPackageName(home));
+        const projectFolder = params.get('projectFolder');
+        const env = cds.env.for('cds', projectFolder);
+        const target = join(projectFolder, 'node_modules', this.getAppPackageName(env));
         const subdomain = params.get('subdomain') // REVISIT: Why are subdomains not transparently encoded in URLs?
+
+        this.amendPackageJson(projectFolder, env);
+
         console.log(`Pulling app base model`, Object.assign({ from: url, to: local(target) }, subdomain && {subdomain}))
 
         fs.rmSync(target, { force: true, recursive: true });
         fs.mkdirSync(target, { recursive: true });
 
         const baseModelTgz = await this.getTgz(params);
-        return tar.xz(baseModelTgz).to(target);
+        await tar.xz(baseModelTgz).to(target);
+
+        console.log(`Finished. Refer to the base model like so:   using from '${this.getAppPackageName(env)}'`);
     }
 
-    static getAppPackageName(projectFolder) {
-        const env = cds.env.for('cds', projectFolder);
+    static getAppPackageName(env) {
         return env.extends || '_base';
     }
 
@@ -43,4 +48,25 @@ module.exports = class Pull extends BaseCommand {
             .then(response => Buffer.from(response.data))
             .catch(error => this.handleHttpError(error, params, { url: pullUrl }));
     }
+
+    static amendPackageJson(projectFolder, env) {
+        if ('extends' in env) {
+            return;
+        }
+        console.log(`Amending extension package.json with project configuration`);
+        const packageJson = join(projectFolder, 'package.json');
+        let packageContents;
+        try {
+            packageContents = JSON.parse(fs.readFileSync(packageJson, { encoding: 'utf-8' }));
+        } catch (error) {
+            throw new CliError('package.json missing or unreadable', { error });
+        }
+        fs.writeFileSync(packageJson, JSON.stringify({
+            ...packageContents,
+            cds: {
+                ...(packageContents.cds ?? {}),
+                extends: this.getAppPackageName(projectFolder) // Default unless configured through current process.env
+            }
+        }));
+    }
 }

package/lib/client/push.js

@@ -1,6 +1,6 @@
 const cds = require ('../cds'), { local } = cds.utils;
-const fs = require('fs');
 const { join } = require('path');
+const { readFileSync, existsSync } = require('fs');
 const axios = require('axios');
 
 const { login } = require('./auth_manager');
@@ -33,8 +33,8 @@ module.exports = class Push extends BaseCommand {
     static async readSource(params, pushOptions) {
         let src = pushOptions?.extArchive ?? join(params.get('projectFolder'), 'gen/extension.tgz');
         let content;
-        if (fs.existsSync(src)) {
-            content = fs.readFileSync(src, { encoding: 'base64' });
+        if (existsSync(src)) {
+            content = readFileSync(src, { encoding: 'base64' });
             src = local(src);
         } else {
             if (!schemaRegex.test(src)) {

package/lib/client/settings_manager.js

@@ -158,7 +158,7 @@ class SettingsManager {
     static async saveSettings(params) {
         log.debug(`Saving settings for project ${params.get('projectFolder')}`);
 
-        const paramsMap = params.toValueMap(Persistence.setting);
+        const paramsMap = params.toEntries(Persistence.setting);
         if (params.has('username')) {
             // Save username only for localhost for security reasons.
             if (localhostRegex.test(params.get('appUrl'))) {
@@ -182,10 +182,10 @@ class SettingsManager {
         }
 
         if (params.get('tokenStorage') === 'plain') {
-            await this._saveAuthToFile(params, params.toValueMap(Persistence.auth));
+            await this._saveAuthToFile(params, params.toEntries(Persistence.auth));
         } else if (params.get('tokenStorage') === 'keyring') {
-            await this.checkKeytar(params);
-            await this._saveAuthToKeyring(params, params.toValueMap(Persistence.auth));
+            await this.setKeytar(params);
+            await this._saveAuthToKeyring(params, params.toEntries(Persistence.auth));
         } else {
             console.log('Note: the authentication token is not saved by default. To save the token for later commands, please run `cds login`.');
         }
@@ -211,7 +211,7 @@ class SettingsManager {
             params.set('skipToken', true);
         }
         await this.updateUrls(params, logout, loadedAppUrl);
-        await this.checkKeytar(params, logout);
+        await this.setKeytar(params, logout);
         await this.addAuth(params, logout);
         log.debug(`Effective project settings: ${params.format()}`);
     }
@@ -282,7 +282,7 @@ class SettingsManager {
         }
     }
 
-    static async checkKeytar(params, logout = false) {
+    static async setKeytar(params, logout = false) {
         if (params.get('skipToken')) {
             return;
         }

package/lib/client/subscription.js

@@ -29,7 +29,7 @@ module.exports = class ToggleSubscription extends BaseCommand {
             await this.runWithServer(params, tenant);
         } else {
             // Connect to running MTXS server
-            params = await AuthManager.login(params.toValueMap());
+            params = await AuthManager.login(params.toEntries());
             if (!params.has('username')) {
                 throw new CliError('Username is required if app URL is given.', { command: this.command });
             }