@sap/cds-dk 8.1.2 → 8.2.1

package/CHANGELOG.md

@@ -7,6 +7,50 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 8.2.1 - 2024-09-05
+
+### Fixed
+
+- Update `@sap/hdi-deploy` to fix CVE-2024-4067 with `micromatch` 4.0.7
+- `cds add` plugins now correctly parse flags (options with `type: 'boolean'`) if not used as the last argument.
+
+## Version 8.2.0 - 2024-09-02
+
+### Added
+
+- `cds add dynatrace` adds configuration for Dynatrace.
+- `cds add cloud-logging` adds configuration for SAP Cloud Logging. Option `--with-telemetry` allows for configuration with telemetry.
+- `cds version` shows version information for `@cap-js/db-service`.
+- `cds add portal` now adds portal configuration for Kyma.
+- `cds add handler` allows to create handler stubs (for Java only, beta)
+- `cds init --add java --no-db` lets you create a Java project without persistent database.
+- `cds import` supports plugins.
+- `cds add containerize` now supports unified-runtime.
+- `cds add helm` now supports templating in the mountPath in the additionalVolumes.
+- Experimental support for `tsx` through `cds-tsx`.
+- `cds bind --to-app-services` now uses `vcap.name` to resolve multiple services with same type. A warning is issued in case of ambiguities.
+- `cds compile --to ord -o <name>` supports `.json` file extension.
+- `cds import --destination` applies destination credentials to existing service configurations.
+
+### Changed
+
+- `cds add hana` writes configuration for `cds build/compile` to no longer produce native SAP HANA associations. This improves deployment performance, but has a one-time performance penalty (in the next deployment).
+- `cds login` prints shorter messages about refresh tokens.
+- `cds init` uses latest Maven Java archetype version 3.2.0 for creating Java projects.
+
+### Fixed
+
+- `cds import` fix for single entity schema in OData V2.
+- `cds add portal` correctly sets the `appId` in its `CommonDataModel.json` from the `manifest.json` app ID.
+- `cds add html5-repo` adds the SAP BTP Destination service as a hard dependency again for Kyma projects.
+- `cds build --ws-pack` correctly creates tarball archives for workspaces with nested `node_modules` folders.
+- `cds import` now shows proper error message in case of bound action collision.
+- `cds deploy --to hana` now runs an existing `hana` build task configuration instead of a default one.
+
+### Removed
+
+- Removed `build` and `build:ts` npm scripts that were generated into `package.json` when adding the `typescript` facet.
+
 ## Version 8.1.2 - 2024-08-17
 
 ### Fixed
@@ -201,6 +245,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 - `cds add notebook` is removed.  CAP Jupyter Notebooks have been replaced by custom CAP Notebooks for VS Code which are now part of the CDS Editor.  See https://cap.cloud.sap/docs/tools/#add-cds-editor for more.
 
+
+## Version 7.9.7 - 2024-08-22
+
+### Fixed
+
+- Dependency update for `axios` to fix CVE-2024-39338
+- `cds build --for mtx-sidecar` now correctly supports different `srv` folder name.
+- `cds build --ws-pack` correctly creates tarball archives for workspaces with nested `node_modules` folders.
+- `cds version` now reports the correct version of `@sap/cds` if this one is installed locally along with a local `@sap/cds-dk` installation.
+- `cds version -i` does not show a globally installed version when none is installed or linked.
+- `cds version` reports correct `@sap/cds-compiler` version.
+- `cds version` can skip over check for Java version
+
 ## Version 7.9.6 - 2024-07-19
 
 ### Fixed

package/bin/bind.js

@@ -110,6 +110,16 @@ async function cds_bind(args, options) {
         throw `Option ${term.bold('--credentials')} requires a JSON object or a file path.`;
     }
 
+    if (!to && !app) {
+        // we currently don't support binding to a service without specifying the target instance
+        // const cds = require('../lib/cds');
+        // if (args[0] && cds.env.requires[args[0]]?.vcap?.name) {
+        //     options.to = cds.env.requires[args[0]].vcap.name
+        // } else {
+        throw `Use option ${term.bold('--to')} or ${term.bold('-2')} to specify the target instance, e.g. ${term.bold('cds bind --to myInstance:myService')}`;
+        // }
+    }
+
     // read credentials from file if it is a file, from JSON if it is JSON
     if (credentials) {
         let credentialsJson = options.credentials;
@@ -137,10 +147,6 @@ async function cds_bind(args, options) {
         }
     }
 
-    if (!to && !app) {
-        throw `Use option ${term.bold('--to')} or ${term.bold('-2')} to specify the target instance, e.g. ${term.bold('cds bind --to myInstance:myService')}`;
-    }
-
     if (app === true) {
         throw `Option ${term.bold('--to-app-services')} requires an app name, for example ${term.bold('cds bind --to-app-services bookshop-srv')}.`
     }
@@ -148,13 +154,40 @@ async function cds_bind(args, options) {
     options.for ??= 'hybrid';
 
     if (app) {
-        const services = await require('../lib/util/cf').getServices(app)
-        const allServices = await Promise.all(
-            services
-                .filter(s => Object.keys(s.credentials).length > 0)
-                .map(s => bind({ ...options, to: s.name, out }))
-        )
-        await storeBindings(allServices.flat(), options);
+        const cds = require('../lib/cds');
+        const resolvedServices = [], unresolvedServices = {}
+        const services = (await require('../lib/util/cf').getServices(app)).filter(s => Object.keys(s.credentials).length > 0)
+
+        services.forEach(service => {
+            const type = service.label || service.type;
+            const requiredServiceEntry = Object.entries(cds.env.requires).find(([, requiredService]) => requiredService.kind === type && requiredService?.vcap?.name === service.name)
+            if (requiredServiceEntry) {
+                resolvedServices.push({ options: { ...options, ...{ to: service.name, serviceArg: requiredServiceEntry[0] } } })
+            } else {
+                // check whether we can resolve this service
+                // multiple services of the same type cannot be resolved
+                if (services.some(s => (s.label || s.type) === type && s.name != service.name)) {
+                    unresolvedServices[type] ??= [];
+                    unresolvedServices[type].push(service);
+                } else {
+                    resolvedServices.push({ options: { ...options, ...{ to: service.name } } })
+                }
+            }
+        })
+
+        const resolvedServiceBindings = (await Promise.all(resolvedServices.map(service => bind(service.options, service.options.to, out)))).flat();
+
+        if (resolvedServiceBindings.length > 0) {
+            await storeBindings(resolvedServiceBindings, options);
+        }
+
+        Object.values(unresolvedServices)
+            .filter(services => services.length > 1)
+            .forEach(services => {
+                console.warn(`Found multiple service instances of the same type ${services[0].label || services[0].type}. This is not supported.`);
+                console.warn('Instead, bind each service individually, e.g.:');
+                services.forEach((service, idx) => console.warn(`    cds bind <your local service name ${idx + 1}> --to ${service.name}`));
+            });
     } else {
         if (args.length > 1) {
             throw 'Too many arguments: Please specify only one or no service.';

package/bin/cds-tsx.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env tsx
+require('./cds').apply(process.argv)

package/bin/cds.js

@@ -60,7 +60,11 @@ const cli = {
           cds.cli = { command: 'add' }
           await cds.plugins
           for (const [, Plugin] of cds.add.registered) {
-            task.options.push(...Object.keys((new Plugin).options()).map(key => '--'+key))
+            const all = Object.entries((new Plugin).options())
+            const flags   = all.filter(([,f]) => f.type === 'boolean')
+            const options = all.filter(([,o]) => o.type !== 'boolean')
+            task.options.push(...options.map(([key]) => '--'+key))
+            task.flags.push(...flags.map(([key]) => '--'+key))
           }
         }
         const args = this.args(task, argv)
@@ -215,9 +219,11 @@ function _require (id,o) {
   return require (resolved)
 }
 
-if (process[Symbol.for('ts-node.register.instance')]) {
-  process.env.CDS_TYPESCRIPT = process.env.CDS_TYPESCRIPT || 'true'
-}
+const { sep } = require ('path')
+if (process[Symbol.for('ts-node.register.instance')])
+  process.env.CDS_TYPESCRIPT = 'ts-node'
+else if (process._preload_modules?.some(m => m?.includes(`${sep}tsx${sep}`)))
+  process.env.CDS_TYPESCRIPT = 'tsx'
 
 module.exports = Object.assign ((..._) => cli.exec(..._), cli)
 

package/bin/compile/index.js

@@ -345,7 +345,8 @@ async function compile (models, options={}) {
     sql: '.sql',
     edm: '.json',
     asyncapi: '.json',
-    xsuaa: '.json'
+    xsuaa: '.json',
+    ord: '.json'
   }[x] || '.'+x) }
 
 }

package/bin/deploy/index.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(deploy, {
   options: ['--to', '--for', '--tunnel-address', '--vcap-file', '--delta-from' ],
-  flags: ['--no-save', '--auto-undeploy', '--dry', '--xdry', '--with-mocks', '--store-credentials', '--model-only', '--with-auto-schema-evolution' ],
+  flags: ['--no-save', '--auto-undeploy', '--dry', '--xdry', '--with-mocks', '--store-credentials', '--model-only', '--script', '--with-auto-schema-evolution' ],
   shortcuts: ['-2', '-4'],
   help: `
 # SYNOPSIS
@@ -81,6 +81,12 @@ module.exports = Object.assign(deploy, {
       *cds deploy --model-only --dry*. When used with *--dry* it writes the
       generated SQL to stdout.
 
+    *--script
+
+      This is a schema evolution option to be used with --delta-from to generate
+      a script of SQL statements to then check and execute manually or for usage with tools such as LiquiBase.
+      This script might contain potentially lossy statements!
+
 
 # EXAMPLES
     cds deploy --to sqlite:db
@@ -127,7 +133,11 @@ async function deploy(_model, options) { // NOSONAR
     }
   }
   try {
+    options.messages = []
+    if(options.script) options.dry = true // to ensure that we don't accidentally execute any SQLs
     await deployer.deploy(_model, _db, options)
+    const log = this.log || _log
+    if (options.messages.length) log (options.messages, options)
   } catch (e) {
     if (e.code === 'MODEL_NOT_FOUND') {
       if (!_model) throw new Error('No .cds models found, please specify one as an argument')
@@ -135,3 +145,11 @@ async function deploy(_model, options) { // NOSONAR
     } else throw e
   }
 }
+
+function _log (messages, options) {
+  const cds = require('../../lib/cds')
+  const { sortMessagesSeverityAware, deduplicateMessages } = cds.compiler
+  deduplicateMessages(messages)
+  messages = sortMessagesSeverityAware (messages)
+  cds._log (messages, options)
+}

package/bin/import.js

@@ -1,8 +1,8 @@
 module.exports = Object.assign(_import, {
     _name: 'import',
-    options: ['--out', '--as', '--include-namespaces', '--from', '--config'],
+    options: ['--out', '--as', '--include-namespaces', '--from', '--config', '--destination'],
     flags: ['--dry', '--force', '--no-copy', '--no-save', '--keep-namespace', '--beta'],
-    shortcuts: ['-o', '-as', '-ns', undefined, '-c', '-', '-f'],
+    shortcuts: ['-o', '-as', '-ns', undefined, '-c', undefined, '-', '-f'],
     help: `
 # SYNOPSIS
 
@@ -62,6 +62,9 @@ module.exports = Object.assign(_import, {
         For OData V2 attributes with the namespace "sap" & "m" are captured by
         default.
 
+    *--destination*
+        Destination name under which the remote service can be reached.
+        Not supported by import types "edmx", "openapi" or "asyncapi".
 
 
 # EXAMPLES
@@ -75,7 +78,7 @@ module.exports = Object.assign(_import, {
     cds import ~/Downloads/Petstore_OpenAPI.json --from openapi
     cds import ~/Downloads/BookStore_AsyncAPI.json
     cds import ~/Downloads/BookStore_AsyncAPI.json --from asyncapi
-    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx -c {\\"[production]\\":{\\"credentials\\":{\\"destination\\":\\"UI3_noauth\\",\\"path\\":\\"/sap/cap/odata\\"}}}
+    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx -c "{\\"[production]\\":{\\"credentials\\":{\\"destination\\":\\"UI3_noauth\\",\\"path\\":\\"/sap/cap/odata\\"}}}"
 
 `})
 const messages = require('../lib/import/message').getMessages();
@@ -93,10 +96,16 @@ async function _import(file, options = {}) {
     await common.processOptions(options, apiOptions);
     const srcFilePath = await common.preProcess(file, options, cwd);
 
+    const cds = require('../lib/cds')
+    await cds.plugins
+
     // process - csn generation
     // if --from option is given, call api directly accordingly
     if (options.from) {
-        if (!cdsImport.import.from[options.from]) throw new Error(messages.INVALID_FROM_OPTION);
+        if (!cdsImport.import.from[options.from]) {
+            // the required plugin might not be installed, e.g. rfc importer
+            throw messages.UNSUPPORTED_FROM_OPTION;
+        }
         csn = await cdsImport.import.from[options.from](srcFilePath, apiOptions);
     } else {
         csn = await cdsImport.import(srcFilePath, apiOptions);

package/bin/init.js

@@ -7,7 +7,7 @@ cds.root = join(process.cwd(), process.argv[3]?.startsWith('--') ? '.' : process
 
 module.exports = Object.assign(init, {
     handleCompletion,
-    options: ['--add', '--java:mvn', '--java:package', '--lint:custom', '--lint:custom:example'],
+    options: ['--add', '--java:mvn', '--java:package', '--lint:custom', '--lint:custom:example', '--no-db'],
     shortcuts: ['-a'],
     flags: ['--force', '--verbose'],
     help: `

package/bin/version.js

@@ -75,6 +75,7 @@ function info({ root:cwd=process.cwd() }) {
     ..._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), // ... more from local app dependencies
     '@sap/cds-compiler': cds.compiler.version(),
     'Node.js': process.version,

package/bin/watch.js

@@ -49,7 +49,7 @@ module.exports = Object.assign ( watch, {
 `})
 
 const cds = require('../lib/cds')
-const DEBUG = cds.debug('cli|watch')
+const DEBUG = cds.log('cli|watch')._debug
 const {delimiter,dirname,relative,resolve,sep} = require ('path')
 const {codes} = require('../lib/util/term'), t = codes
 const fs = require ('fs')
@@ -90,7 +90,7 @@ async function watch ([cwd], {
     _args: JSON.stringify(args),
     _options: JSON.stringify(options)
   })
-  if (process.env.CDS_TYPESCRIPT) {
+  if (process.env.CDS_TYPESCRIPT === 'ts-node' || process.env.CDS_TYPESCRIPT === 'true') {
     // Needed by ts-node/tsc to find the tsconfig.json. Same as `--project`.
     env.TS_NODE_PROJECT = env.TS_NODE_PROJECT ?? _cwd
   }

package/lib/bind/bindingManager.js

@@ -1,7 +1,7 @@
 const bindingResolver = require('./bindingResolver')
 const { logger } = require('./bindingUtil')
 const cds = require('../cds')
-const DEBUG = cds.debug('cli') // REVISIT: This loads cds.env too early!
+const DEBUG = cds.log('cli')._debug // REVISIT: This loads cds.env too early!
 
 class BindingManager {
     constructor(options = {}) {

package/lib/bind/cfKeyProvider.js

@@ -1,5 +1,5 @@
 const cds = require('../cds');
-const DEBUG = cds.debug('cli')
+const DEBUG = cds.log('cli')._debug
 
 const cfUtil = require('../util/cf');
 const { bold } = require('../util/term');

package/lib/build/buildTaskProviderFactory.js

@@ -4,7 +4,7 @@ const cds = require('../cds')
 const { OUTPUT_MODE_FILESYSTEM, DEFAULT_SRC_FOLDER } = require('./constants')
 const InternalBuildTaskProvider = require('./provider/internalBuildTaskProvider')
 const BuildTaskProvider = require('./buildTaskProvider')
-const { BuildError } = require('./util')
+const { BuildError, normalizePath } = require('./util')
 const DEBUG = cds.debug('cli|build')
 
 class BuildTaskProviderFactory {
@@ -14,8 +14,14 @@ class BuildTaskProviderFactory {
             options.clean = true
         }
         ['for', 'src', 'dest'].forEach(key => {
-            if (options[key] && typeof options[key] !== 'string') {
-                throw new BuildError(`Invalid build options - property '${key}' must be a string`)
+            if (options[key]) {
+                if (typeof options[key] !== 'string') {
+                    throw new BuildError(`Invalid build options - property '${key}' must be a string`)
+                }
+                if (key === 'src' || key === 'dest') {
+                    // normalize path separator and remove trailing slash
+                    options[key] = normalizePath(options[key])
+                }
             }
         })
         this._context = { options, tasks: [] } // resolved tasks

package/lib/build/plugins/helm/files/subcharts/content-deployment/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 description: A Helm Chart for creating a Content Deployment job
 name: content-deployment
 type: application
-version: 1.6.1
+version: 1.6.2

package/lib/build/plugins/helm/files/subcharts/content-deployment/values.yaml

@@ -15,7 +15,7 @@ global:
     _internal:
       content-deployment:
         versions:
-          1.6.1: true
+          1.6.2: true
 # Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 

package/lib/build/plugins/helm/files/subcharts/service-instance/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 description: A Helm chart for creating service instances on btp-service-operator
 name: service-instance
 type: application
-version: 1.5.1
+version: 1.5.2

package/lib/build/plugins/helm/files/subcharts/service-instance/values.yaml

@@ -65,4 +65,4 @@ global:
     _internal:
       service-instance:
         versions:
-          1.5.1: true
+          1.5.2: true

package/lib/build/plugins/helm/files/subcharts/web-application/Chart.yaml

@@ -3,4 +3,4 @@ description: A Helm chart for web app
 kubeVersion: '>= 1.21'
 name: web-application
 type: application
-version: 1.16.0
+version: 1.17.0

package/lib/build/plugins/helm/files/subcharts/web-application/templates/deployment.yaml

@@ -83,7 +83,7 @@ spec:
           mountPath: /bindings
         {{- range $volume := .Values.additionalVolumes }}
         - name: {{ $volume.name | quote }}
-          {{- toYaml $volume.volumeMount  | nindent 10 }}
+          {{- tpl ($volume.volumeMount | toYaml) $ | nindent 10 }}
         {{- end }}
         {{- include "web-application.internal.serviceMounts" . | nindent 8 }}
         resources:
@@ -136,7 +136,7 @@ spec:
           mountPath: /bindings
         {{- range $volume := $.Values.additionalVolumes }}
         - name: {{ $volume.name | quote }}
-          {{- toYaml $volume.volumeMount  | nindent 10 }}
+          {{- tpl ($volume.volumeMount | toYaml) $ | nindent 10 }}
         {{- end }}
         {{- include "web-application.internal.serviceMounts" $ | nindent 8 }}
         {{- if $sidecar.resources }}

package/lib/build/plugins/helm/files/subcharts/web-application/values.yaml

@@ -15,7 +15,7 @@ global:
     _internal:
       web-application:
         versions:
-          1.16.0: true
+          1.17.0: true
 ## Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 

package/lib/build/provider/hana/2migration.js

@@ -5,7 +5,7 @@ const { SEVERITY_WARNING } = require('../../constants')
 const cds = require('../../../cds'), { compiler: cdsc } = cds
 const cdscVersion = `-- generated by cds-compiler version ${cdsc.version()}`
 const { getArtifactCdsPersistenceName } = cdsc
-const DEBUG = cds.debug('cli|build')
+const LOG = cds.log('cli|build'), DEBUG = cds.debug('cli|build')
 
 module.exports = async (model, beforeImage, srcPath, options = {}) => {
     const { definitions, migrations, afterImage, journalFileNames } = _compileToHana(model, options, beforeImage)
@@ -204,7 +204,7 @@ function _isPersistedAsJournalTable(artifact) {
 }
 
 function _debug(definitions, migrations, journalFileNames) {
-    if (DEBUG) {
+    if (LOG._debug) {
         DEBUG('compile.to.hana returned')
         for (const { name, suffix, sql } of definitions) {
             if (suffix === '.hdbtable' && journalFileNames.has(name)) {

package/lib/build/provider/nodejs/index.js

@@ -5,10 +5,10 @@ const cmd = require('../../../util/command');
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
 const { BuildError, getWorkspaces } = require('../../util')
 const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX, CONTENT_PACKAGELOCK_JSON,
-    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX, 
+    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX,
     OPTION_WS_PACK} = require('../../constants')
 const { WARNING } = EdmxBuildPlugin
-const DEBUG = cds.debug('cli|build')
+const LOG = cds.log('cli|build'), DEBUG = cds.debug('cli|build')
 
 class NodejsBuildPlugin extends EdmxBuildPlugin {
     init() {
@@ -166,6 +166,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         if (this.task.options.workspaces) {
             workspaces = Array.isArray(this.task.options.workspaces) ? this.task.options.workspaces : [this.task.options.workspaces]
         } else {
+            // devDependencies are not considered
             workspaces = await getWorkspaces(true, false, wsRoot);
         }
         if (workspaces.length) {
@@ -204,7 +205,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         } catch (err) {
             // ignore
         }
-        if (fs.existsSync(path.join(dir, '.gitmodules')) || fs.existsSync(path.join(dir, 'node_modules'))) {
+        if (fs.existsSync(path.join(dir, '.gitmodules'))) {
             return // project root reached
         }
         if (path.dirname(dir) !== dir) {
@@ -217,7 +218,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         workspaces.forEach(w => args.push(`-w=${w}`))
 
         DEBUG?.(`execute command: npm ${args.join(', ')}`)
-        const result = await cmd.spawnCommand('npm', args, { cwd: wsRoot }, true, !!DEBUG)
+        const result = await cmd.spawnCommand('npm', args, { cwd: wsRoot }, true, !!LOG._debug)
         DEBUG?.(result)
         return JSON.parse(result)
     }

package/lib/build/util.js

@@ -190,7 +190,8 @@ async function getWorkspaces(resolve = false, devDependencies = true, wsRoot = c
         // read npm workspaces
         const pkgs = await _execNpmWs(wsRoot)
         pkgs.forEach(pkg => {
-            if (!resolve || devDependencies && pgkJson.devDependencies?.[pkg] || pgkJson.dependencies?.[pkg]) {
+            // only create tarball archives for dependencies with version '*' 
+            if (!resolve || devDependencies && pgkJson.devDependencies?.[pkg] === '*' || pgkJson.dependencies?.[pkg] === '*') {
                 const workspace = _getWorkspace(wsRoot, pkg)
                 if (workspace) {
                     workspaces.push(workspace)

package/lib/compile/to-mermaid.js

@@ -35,12 +35,10 @@ module.exports = function to_mermaid (model, options={}) {
   .filter (srv => !srvFilter || srv.name === srvFilter)
   .forEach(srv => {
     namespaces[srv.name] = []
-    model.entities(srv)
-    .filter (entityFilter)
-    .forEach (e => {
+    for (let e of model.entities(srv)) if (entityFilter(e)) {
       namespaces[srv.name].push(e)
       seenEntities.add(e.name)
-    })
+    }
   })
 
   // group other namespaces/services
@@ -69,7 +67,7 @@ module.exports = function to_mermaid (model, options={}) {
         diag += `["${simpleName}"]` // simple name as label
         if (elemOpts) {
           diag += ` {\n`
-          e.elements?.forEach (el => {
+          if (e.elements) [...e.elements].forEach (el => {
             if ((elemOpts === 'all' || elemOpts === true) || (el.key && elemOpts == 'keys')) {
               diag += `      +${el._type?.replace('cds.','')} ${el.name}`
               diag += `\n`
@@ -90,7 +88,7 @@ module.exports = function to_mermaid (model, options={}) {
     : model.all('entity').filter (entityFilter) // if no grouping and no service filter is on
   entities.forEach(e => {
     if (!diag.length)  diag = `classDiagram\n${direction}`
-    e.elements?.forEach (el => {
+    if (e.elements) [...e.elements].forEach (el => {
       if (el instanceof cds.Association) {
         if (el.target.endsWith('.texts'))  return
         const type = el.type === 'cds.Composition' ? '*-->' : '-->'

package/lib/import/common.js

@@ -239,7 +239,7 @@ async function _generateChecksumValidate(dest, output, force) {
         }
     }
 
-    // if force flag enbabled
+    // if force flag enabled
     if (force) {
         // current and existing file content are same, and the existing
         // checksum is not modified, then return the existing file content
@@ -296,12 +296,12 @@ async function _getResult(output, as, dest, force, kind) {
 }
 
 async function _write(result, service, cwd) {
-    let dest, output, using, message, extenstion;
+    let dest, output, using, message, extension;
     output = result[0];
     dest = result[1];
     await write(dest, output, "utf-8");
-    extenstion = dest.substring(dest.lastIndexOf('.'));
-    dest = dest.replace(extenstion, '');
+    extension = dest.substring(dest.lastIndexOf('.'));
+    dest = dest.replace(extension, '');
      if (service.length > 1){
         using = `using { ${service.join(', ')}} from './${path.relative('srv', dest).replace(/\\/g, '/')}'`;
      }
@@ -322,20 +322,21 @@ async function _updatePackageJson(dest, services, kind, cwd, config) {
     const package_json = path.resolve(cwd, 'package.json');
     const conf = await exists(package_json) ? require(package_json) : {};
     const requires = ['cds', 'requires'].reduce((p, n) => p[n] || (p[n] = {}), conf);
-    if (kind !== 'rest') {
+    if (kind !== 'rest' && kind !== 'rfc') {
         kind = (kind === "V2") ? 'odata-v2' : 'odata';
     }
     let package_json_updated = false;
     for (let service of services) {
-        if (!requires[service]) {
-            const initial_model = path.relative(cwd, dest);
-            const model = isLinux() ? initial_model.replace(/\\/g, '/') : initial_model;
-            cds.env.requires[service] = requires[service] = { kind: kind, model, ...config };
-            await write(package_json, JSON.stringify(conf, null, '  '));
+        // existing service configuration data can be updated, e.g. in case of delta imports
+        const model = path.relative(cwd, dest).replace(/\\/g, '/'); // cds env must not be platform specific
+        const serviceConfig = { kind, model, ...config }
+        if (!requires[service] || JSON.stringify(serviceConfig) !== JSON.stringify(requires[service])) {
+            cds.env.requires[service] = requires[service] = serviceConfig;
             package_json_updated = true;
         }
     }
     if (package_json_updated) {
+        await write(package_json, JSON.stringify(conf, null, '  '));
         console.log(`[cds] - updated ./package.json`);
     }
 }
@@ -353,6 +354,13 @@ function _parseValidJsonConfig(config) {
 async function postProcess(filePath, options, csn, cwd) {
     const services = _getServiceNames(csn);
     let config = _parseValidJsonConfig(options.config);
+    
+    // add destination configuration
+    if (options.destination) {
+        config ??= {};
+        config.credentials = { destination: options.destination };
+    }
+
     const external = path.resolve(cwd, 'srv/external');
     const destFilePath = path.join(external, path.basename(filePath));
     if (options.out) options.out = _validateAndComputeOutputFilePath(options.out, options.as, destFilePath);
@@ -385,13 +393,6 @@ async function identifyFile(filepath) {
         return extension;
 }
 
-function isLinux() {
-    let platform = process.platform;
-    if (platform === 'linux' || platform === 'win32') {
-        return true;
-    }
-}
-
 function readEnvVariables(options, cliCheck) {
     if (cds.env.import) {
         if (cliCheck) {