@sap/cds-dk 7.0.1 → 7.0.3

package/lib/compile/asyncapi/index.js

@@ -1,6 +1,6 @@
 const csnToJSONSchema = require('./components/schemas');
 const getMessageTraits = require('./components/messageTraits');
-const definitionsToMessages = require('./components/messages');
+const { definitionsToMessages, nestedAnnotation } = require('./components/messages');
 const getChannels = require('./channels');
 const cds = require('../../cds');
 const messages = require("./message");
@@ -75,13 +75,14 @@ function _getAsyncApi(csn, events, serviceName, applicationNamespace, presets) {
     const infoObject = getInfoObject(csn.definitions[serviceName]);
     const stateObj = getStateInfo(csn.definitions[serviceName]);
     const shortTextObj = getShortText(csn.definitions[serviceName]);
-
+    const extensionAnnotationObj = getExtensions(csn.definitions[serviceName], shortTextObj, stateObj);
     return {
         asyncapi: '2.0.0',
         'x-sap-catalog-spec-version': '1.2',
         'x-sap-application-namespace': applicationNamespace,
         ...Object.keys(stateObj).length && { 'x-sap-stateInfo': stateObj },
         ...Object.keys(shortTextObj).length && { 'x-sap-shortText': shortTextObj },
+        ...Object.keys(extensionAnnotationObj).length && extensionAnnotationObj,
         info: infoObject,
         defaultContentType: 'application/json',
         channels: getChannels(csn.definitions, events),
@@ -89,6 +90,26 @@ function _getAsyncApi(csn, events, serviceName, applicationNamespace, presets) {
     };
 }
 
+function getExtensions(serviceCsn, shortTextObj, stateObj) {
+    let extensionObj = {};
+    for (const [key, value] of Object.entries(serviceCsn)) {
+        if (key.startsWith('@AsyncAPI.Extensions')) {
+            const annotationProperties = key.split('@AsyncAPI.Extensions.')[1];
+            const keys = annotationProperties.split('.');
+            keys[0] = "x-" + keys[0];
+            if ((keys[0] === 'x-sap-shortText' && Object.keys(shortTextObj).length > 0) ||
+                (keys[0] === 'x-sap-stateInfo' && Object.keys(stateObj).length > 0)
+            ) continue;
+            if (keys.length === 1) {
+                extensionObj[keys[0]] = value;
+            } else {
+                nestedAnnotation(extensionObj, keys[0], keys, value);
+            }
+        }
+    }
+    return extensionObj;
+}
+
 function getShortText(serviceCsn, presetValue = undefined) {
     let shortTextValue = presetValue || serviceCsn["@AsyncAPI.ShortText"];
     if (shortTextValue) {

package/lib/import/odata/metadataconverter/MetadataConverter.js

@@ -371,6 +371,7 @@ class Expression {
     annotate(prefix = '', target, annotationExpressionResult) {
         let _target = target;
         for (const key of Object.keys(annotationExpressionResult)) {
+            if (prefix !== '') prefix = prefix + ".";
             _target[prefix + key] = annotationExpressionResult[key];
         }
         return target;

package/lib/init/constants.js

@@ -1,6 +1,6 @@
 const os = require('os');
 
-const MAVEN_ARCHETYPE_VERSION = '2.0.1';
+const MAVEN_ARCHETYPE_VERSION = '2.0.2';
 
 const constants = {
     IS_WIN: (os.platform() === 'win32'),
@@ -15,6 +15,9 @@ const constants = {
         JAVA_MVN: 'java:mvn',
         JAVA_PACKAGE: 'java:package',
         NODEJS: 'nodejs',
+        SAMPLES: 'samples', // deprecated
+        TINY_SAMPLE: 'tiny-sample',
+        SAMPLE: 'sample',
         PIPELINE: 'pipeline',
         MTA: 'mta',
         CONNECTIVITY: 'connectivity',
@@ -33,11 +36,8 @@ const constants = {
         REDIS_MESSAGING: 'redis-messaging',
         APPROUTER: 'approuter',
         DESTINATION: 'destination',
-        SAMPLES: 'samples', // deprecated
-        TINY_SAMPLE: 'tiny-sample',
-        SAMPLE: 'sample',
         DATA: 'data',
-        KIBANA_LOGGING: 'kibana-logging',
+        KIBANA: 'kibana',
         LINT: 'lint',
         LINT_GLOBAL: 'lint:global',
         LINT_DEV: 'lint:dev',

package/lib/init/index.js

@@ -2,7 +2,7 @@ const path = require('path');
 
 const term = require('../util/term');
 
-const { OPTIONS, COMMAND_ADD, COMMAND_INIT, PROJECT_FILES, REGEX_PROJECT_NAME } = require('./constants')
+const { OPTIONS, COMMAND_INIT, PROJECT_FILES, REGEX_PROJECT_NAME } = require('./constants')
 const { NODEJS, JAVA, HANA, MTA,PIPELINE, SAMPLES, CF_MANIFEST } = OPTIONS
 
 const cds = require('../cds'), { exists, readdir } = cds.utils
@@ -90,67 +90,56 @@ module.exports = class CDSGenerator {
      * @param {string} facets, comma separated list of templates, no blanks
      * @param {any} options, additional options
      */
-    async addCmd(facets, options = {}) {
-        options._cmd = COMMAND_ADD;
-        options.add = facets;
-
+    async addCmd(facets) {
         if (!facets) throw 'You must specify a facet to add to the project.'
 
-        this._initialize(null, options);
-        this._greetings(options._cmd);
+        this._initialize(null);
+        this._greetings();
 
         if (!PROJECT_FILES.find(exists)) {
-            throw new Error(`The current folder doesn't seem to contain a project. None of the following files found: ${PROJECT_FILES.join(', ')}.`);
+            throw `The current folder doesn't seem to contain a project. None of the following files found: ${PROJECT_FILES.join(', ')}.`
         }
 
-        await this._process(options);
-        await this.stepEnd(options);
+        await this._process();
+        await this.stepEnd();
     }
 
     /**
      * @param {string} projectName, the project name
-     * @param {any} options, additional options
      */
-    async initCmd(projectName, options = {}) {
-        await this.stepInit(projectName, options);
+    async initCmd(projectName) {
+        await this.stepInit(projectName);
         await this.stepEnd();
     }
 
-    async stepInit(projectName, options = {}) {
-        options._cmd = COMMAND_INIT;
+    async stepInit(projectName) {
 
-        this._initialize(projectName, options);
-        this._greetings(options._cmd);
+        this._initialize(projectName);
+        this._greetings();
 
         await this._process();
     }
 
-    _initialize(projectName, options = {}) {
-        // deprecated, only for compatibility
-        if (options.verbose) {
-            LOG.warn(`Parameter 'verbose' is no longer supported. Use environment variable 'DEBUG=true' to obtain detailed output.`);
-        }
-
+    _initialize(projectName) {
+        const { options } = cds.cli
         this.cwd = options.cwd || process.cwd();
         cds.root = path.resolve(this.cwd, projectName || '.');
         this.projectName = path.basename(cds.root);
 
-        this.options = options;
         this._cleanupOptions();
     }
 
     _greetings() {
-        switch (cds.cli.command) {
-            case COMMAND_INIT: {
-                const relativeProjectPath = path.relative(this.cwd, cds.root);
-                const folderName = (relativeProjectPath ? `.${path.sep}${relativeProjectPath}` : 'current folder');
-                LOG.info(`Creating new CAP project in ${term.bold(folderName)}\n`);
-                break;
-            }
+        if (cds.cli.command === COMMAND_INIT) {
+            const relativeProjectPath = path.relative(this.cwd, cds.root)
+            const folderName = relativeProjectPath ? `.${path.sep}${relativeProjectPath}` : 'current folder'
+            LOG.info(`Creating new CAP project in ${term.bold(folderName)}\n`)
         }
-
-        if (this.options.force) {
-            LOG.info(`Using '--force' ... existing files will be overwritten`);
+        if (cds.cli.options.for && typeof cds.cli.options.for !== 'string') {
+            throw 'The --for argument must not be empty.'
+        }
+        if (cds.cli.options.force) {
+            LOG.info(`Using '--force' ... existing files will be overwritten`)
         }
     }
 
@@ -161,9 +150,9 @@ module.exports = class CDSGenerator {
         await this._fillTemplateList();
 
         for (const template of this.templateList) {
-            const msg = `Adding feature '${template.name}'...`;
-            LOG.info(msg);
+            LOG.info(`Adding feature '${template.name}'...`);
             await template.run();
+            await template.runDependentMerging();
             await template.runRelatedMerging();
         }
 
@@ -176,9 +165,6 @@ module.exports = class CDSGenerator {
     }
 
     async _createTemplate(filename) {
-        // Compat
-        if (filename === 'sample-tiny') filename = 'tiny-sample'
-
         try {
             const TemplateClass = require(`./template/${filename}`);
             return new TemplateClass(this);
@@ -201,27 +187,30 @@ module.exports = class CDSGenerator {
     }
 
     async _fillTemplateList() {
-        const templates = new Map();
-        for (const option of this.options.add) {
-            if (!templates.has(option)) {
-                const template = await this._createTemplate(option);
+        const templates = new Map
+        const { command, options, argv } = cds.cli
+        const facets = command === COMMAND_INIT ? options.add : new Set(argv[0].split(','))
 
-                if (await template.canRun()) {
-                    DEBUG?.(`Adding feature '${template.name}'`);
+        for (let facet of facets) {
+            // Compat
+            if (facet === 'sample-tiny') facet = 'tiny-sample'
+            if (facet === 'kibana-logging') facet = 'kibana'
 
-                    templates.set(option, template);
-                    const deps = await template.getDependencies();
-                    if (deps) {
-                        deps.forEach(this.options.add.add, this.options.add)
-                    }
+            if (!templates.has(facet)) {
+                const template = await this._createTemplate(facet)
+                if (await template.canRun()) {
+                    DEBUG?.(`Adding feature '${template.name}'`)
+                    templates.set(facet, template)
+                    const dependencies = await template.getDependencies()
+                    dependencies?.forEach(d => facets.add(d))
                 }
             }
         }
 
-        const cmds = Object.values(OPTIONS);
-        this.templateList = Array.from(templates.entries()).sort(([a], [b]) => {
-            return cmds.indexOf(a) - cmds.indexOf(b);
-        }).map((entry) => entry[1]);
+        const cmds = Object.values(OPTIONS)
+        this.templateList = Array.from(templates.entries())
+            .sort(([a], [b]) => cmds.indexOf(a) - cmds.indexOf(b))
+            .map((entry) => entry[1])
 
         // check debug to avoid lengthy computation when not in debug mode
         DEBUG?.(`Features: ${this.templateList.map(({name}) => name).join(', ')}`);
@@ -236,56 +225,59 @@ module.exports = class CDSGenerator {
     _cleanupOptions() {
         let tokens = [];
 
-        if (typeof this.options.add === 'string') {
-            tokens = this.options.add.split(/[,\s+]/g);
+        const { options } = cds.cli
+        if (typeof options.add === 'string') {
+            tokens = options.add.split(/[,\s+]/g);
 
-        } else if (Array.isArray(this.options.add)) {
-            tokens = this.options.add
+        } else if (Array.isArray(options.add)) {
+            tokens = options.add
 
-        } else if (this.options.add instanceof Set) {
-            tokens = [...this.options.add];
+        } else if (options.add instanceof Set) {
+            tokens = [...options.add];
         }
 
         const trimmedTokens = tokens.map((token) => {
             token = token.replace(/\s+/g, '');
             const tokens = token.split(':'), [facet] = tokens
             if (tokens.length > 1) {
-                if (this.options[facet]) {
-                    this.options[facet].add(token);
+                if (options[facet]) {
+                    options[facet].add(token);
                 } else {
-                    this.options[facet] = new Set([token]);
+                    options[facet] = new Set([token]);
                 }
             }
             return facet;
         }).filter(Boolean);
 
         // set is ordered ... always
-        this.options.add = new Set(trimmedTokens);
+        options.add = new Set(trimmedTokens);
 
-        if (this.options._cmd === COMMAND_INIT && !this.options.add.has(JAVA)) {
-            this.options.add.add(NODEJS);
+        if (cds.cli.command === COMMAND_INIT && !options.add.has(JAVA)) {
+            options.add.add(NODEJS);
         }
 
         this._checkAdditionalOptions();
     }
 
     _checkAdditionalOptions() {
-        for (const [key] of Object.entries(this.options)) {
-            const keySplit = key.split(/:/);
+        const { options } = cds.cli
+        for (const [key] of Object.entries(options)) {
+            const keySplit = key.split(/:/)
             if (keySplit.length === 2) {
-                if (!this.options.add.has(keySplit[0])) {
-                    LOG.warn(`ignoring option ${key} since ${keySplit[0]} is not part of specified feature list: ${Array.from(this.options.add).join(', ')}`);
+                if (!options.add.has(keySplit[0])) {
+                    console.log(`ignoring option ${key} since ${keySplit[0]} is not part of specified feature list: ${Array.from(options.add).join(', ')}`)
                 }
             }
         }
     }
 
     async _validateOptions() {
-        if (this.options.force) {
+        const { options, command } = cds.cli
+        if (options.force) {
             return;
         }
 
-        if (this.options._cmd === COMMAND_INIT) {
+        if (command === COMMAND_INIT) {
             await this._validateProjectName(this.projectName);
             await this._validateProjectFolder(this.cwd);
         }
@@ -293,7 +285,7 @@ module.exports = class CDSGenerator {
 
     async _validateProjectName(projectName) {
         if (!projectName) {
-            throw new Error('Specify a project name.');
+            throw 'Specify a project name.'
         }
 
         // remove duplicates by using a set
@@ -302,9 +294,9 @@ module.exports = class CDSGenerator {
             case 0:
                 break;
             case 1:
-                throw new Error(`Project name ${projectName} contains an invalid character (${[...invalidChars].join(', ')}). Specify a different project name.`);
+                throw `Project name ${projectName} contains an invalid character (${[...invalidChars].join(', ')}). Specify a different project name.`
             default:
-                throw new Error(`Project name ${projectName} contains invalid characters (${[...invalidChars].join(', ')}). Specify a different project name.`);
+                throw `Project name ${projectName} contains invalid characters (${[...invalidChars].join(', ')}). Specify a different project name.`
         }
     }
 
@@ -317,7 +309,7 @@ module.exports = class CDSGenerator {
             } else {
                 message = `You seem to be trying to initialize an existing project. Use a different project name instead.`;
             }
-            throw new Error(`${message}\nDetails: File '${existingProjectFile}' exists in the project folder which indicates an existing project. Use ${term.bold('cds add')} to add more features.`);
+            throw `${message}\nDetails: File '${existingProjectFile}' exists in the project folder which indicates an existing project. Use ${term.bold('cds add')} to add more features.`
         }
     }
 }

package/lib/init/template/_merging/registry-mta.js

@@ -93,7 +93,7 @@ const enterpriseMessaging = {
     }]
 }
 
-const kibanaLogging = {
+const kibana = {
     in: 'resources',
     where: [{
         property: 'type',
@@ -278,6 +278,6 @@ module.exports = {
     requiredAppApi4,
     providedJavaApprouterApi4,
     providedJavaApprouterApi,
-    kibanaLogging,
+    kibana,
     approuterExtensibility
 }

package/lib/init/template/approuter/index.js

@@ -3,7 +3,7 @@ const { exists } = cds.utils
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, sort } = require('../../util/merge')
-const { XSUAA } = require('../../constants').OPTIONS
+const { XSUAA, KIBANA } = require('../../constants').OPTIONS
 const {
     srvNode4, srvJava4, mtxSidecar4, approuter, // Modules
     xsuaa, // BTP Services
@@ -23,18 +23,21 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
         return [XSUAA]
     }
 
+    getRelatedFacets() {
+        return [KIBANA]
+    }
+
     async run() {
-        const { appPath = 'app' } = await readProject(this.options)
+        const { appPath = 'app' } = await readProject()
         const appPackageJSONPath = join(appPath, 'package.json')
         await mergeJSON(appPackageJSONPath, join(__dirname, 'files', 'package.json'))
         await sort(appPackageJSONPath, 'dependencies')
         await mergeJSON(join(appPath, 'default-env.json'), join(__dirname, 'files', 'default-env.json'))
-        await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
-        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath } = project
+        const project = await readProject()
+        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath, appPath } = project
 
         if (hasMta) {
             const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
@@ -72,7 +75,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
 
             // add dependency entry in chart.yaml
             const HelmTemplate = require(`../helm`);
-            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
             await helmTemplate.addDependency('web-application', 'approuter');
 
             await mergeYAML(
@@ -113,7 +116,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
             if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }
 
-        const xsAppPath = join(project.appPath ?? 'app', 'xs-app.json')
+        const xsAppPath = join(appPath, 'xs-app.json')
         const additions = isExtensible ? [{ ...approuterExtensibility, at: 0 }] : []
         await mergeJSON(xsAppPath, join(__dirname, 'files', 'xs-app.json.hbs'), project, { additions })
     }

package/lib/init/template/auditlog/index.js

@@ -13,15 +13,14 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { configFile } = project
         project.shortcut = !(await read(configFile)).cds?.requires?.['audit-log']?.kind
         await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-        await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isNodejs, hasMta, hasHelm, srvPath } = project
 
         if (hasMta) {
@@ -63,7 +62,7 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
 
             // copy service instance chart if it is not present
             const HelmTemplate = require(`../helm`);
-            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            const helmTemplate = new HelmTemplate(context.oldTrackingData, context.newTrackingData);
             isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
 
             // add dependency entry in chart.yaml

package/lib/init/template/cf-manifest/files/manifest.yml.hbs

@@ -7,7 +7,7 @@ applications:
 # -----------------------------------------------------------------------------------
 # Backend Service
 # -----------------------------------------------------------------------------------
-- name: {{appName}}-{{srvName}}
+- name: {{appName}}-srv
   random-route: true  # for development only
 {{#isNodejs}}
   path: {{& srvPath}}
@@ -15,42 +15,34 @@ applications:
   buildpack: nodejs_buildpack
 {{/isNodejs}}
 {{#isJava}}
-  path: {{& srvPath}}/target/{{srvExt.archiveName}}
+  path: {{& srvPath}}/target/{{archiveName}}
   memory: 1G
   disk_quota: 512M
   env:
     SPRING_PROFILES_ACTIVE: cloud
   buildpack: java_buildpack
 {{/isJava}}
-{{#hasRequires}}
   services:
-{{#requires}}
-{{#resource.isHana}}
-  - {{resource.name}}
-{{/resource.isHana}}
-{{#resource.isXsuaa}}
-  - {{resource.name}}
-{{/resource.isXsuaa}}
-{{/requires}}
-{{/hasRequires}}
+{{#hasHana}}
+  - {{appName}}-db
+{{/hasHana}}
+{{#hasXsuaa}}
+  - {{appNames}}-auth
+{{/hasXsuaa}}
 
-{{#needsSidecar}}
+{{#hasHana}}
+{{^isMultitenant}}
 # -----------------------------------------------------------------------------------
 # HANA Database Content Deployer App
 # -----------------------------------------------------------------------------------
-- name: {{appName}}-{{db.0.name}}-deployer
-  path: {{& db.0.path}}
+- name: {{appName}}-{{db.name}}-deployer
+  path: {{& db.path}}
   no-route: true
   health-check-type: process
   memory: 256M
   instances: 1
   buildpack: nodejs_buildpack
-{{#hasRequires}}
   services:
-{{#requires}}
-{{#resource.isHana}}
-  - {{resource.name}}
-{{/resource.isHana}}
-{{/requires}}
-{{/hasRequires}}
-{{/needsSidecar}}
+  - {{appName}}-db
+{{/isMultitenant}}
+{{/hasHana}}

package/lib/init/template/cf-manifest/files/services-manifest.yml.hbs

@@ -2,21 +2,26 @@
 # appName = {{appName}}
 ---
 create-services:
-{{#requires}}
-# ------------------------------------------------------------
-  - name:   {{resource.name}}
-{{#resource.isHana}}
-{{#resource.isPlainHana}}
-    broker: {{resource.service}}  # 'hanatrial' on trial landscapes
-    plan: "hdi-shared"
-{{/resource.isPlainHana}}
-{{/resource.isHana}}
-{{#resource.isXsuaa}}
-    broker: {{resource.service}}
+{{#hasHana}}
+{{#isMultitenant}}
+  - name: {{appName}}-db
+    broker: service-manager
+    plan: container
+{{/isMultitenant}}
+{{^isMultitenant}}
+  - name: {{appName}}-db
+    broker: hana
+    plan: hdi-shared
+{{/isMultitenant}}
+{{/hasHana}}
+{{#hasXsuaa}}
+  - name: {{appName}}-auth
+    broker: xsuaa
     plan: application
-{{/resource.isXsuaa}}
-{{#resource.vcap.name}}
-    broker: {{resource.service}}
-    plan: {{resource.vcap.name}}
-{{/resource.vcap.name}}
-{{/requires}}
+    parameters: xs-security.json
+{{/hasXsuaa}}
+{{#hasAuditlog}}
+  - name: {{appName}}-auditlog
+    broker: auditlog
+    plan: application
+{{/hasAuditlog}}

package/lib/init/template/cf-manifest/index.js

@@ -9,17 +9,17 @@ const SERVICES_MANIFEST_FILE = 'services-manifest.yml'
 module.exports = class CfManifestTemplate extends require('../templateBase') {
 
     async canRun() {
-        if (this.options.force) {
-            return true;
+        if (cds.cli.options.force) {
+            return true
         }
         if (exists(MANIFEST_FILE) || exists(SERVICES_MANIFEST_FILE)) {
-            throw new Error(`File ${MANIFEST_FILE} or ${SERVICES_MANIFEST_FILE} already exist in current folder. Use --force to overwrite.`);
+            throw `File ${MANIFEST_FILE} or ${SERVICES_MANIFEST_FILE} already exist in current folder. Use --force to overwrite.`
         }
-        return true;
+        return true
     }
 
     async run() {
         const project = await readProject()
-        await copyFiles(join(__dirname, 'files'), cds.root, project, this.options.force);
+        await copyFiles(join(__dirname, 'files'), cds.root, project, true)
     }
 }

package/lib/init/template/connectivity/index.js

@@ -11,14 +11,13 @@ module.exports = class ConnectivityTemplate extends require('../templateBase') {
     }
 
     async run() {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { configFile } = project
         await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
-        await this.runDependentMerging()
     }
 
     async runDependentMerging(context = {}) {
-        const project = await readProject(this.options)
+        const project = await readProject()
         const { isJava, srvPath, hasHelm, hasMta } = project
 
         if (hasMta) {

package/lib/init/template/data/index.js

@@ -8,19 +8,19 @@ const DEBUG = cds.debug('cli')
 module.exports = class DataTemplate extends require('../templateBase') {
 
   async run() {
-    if (this.options['for']) {
+    if (cds.cli.options.for) {
       throw `\nError: Did you mean \`... --data:for\` ?`
     }
 
     const env = await this.getEnv();
 
-    let dest = (typeof this.options.out === 'string') // target folder
-      ? this.options.out
+    let dest = (typeof cds.cli.options.out === 'string') // target folder
+      ? cds.cli.options.out
       : getDefaultTargetFolder(env);
     dest = resolve(cds.root, dest);
 
-    const nameFilter = asRegex(this.options['data:for'])
-    const force = this.options.force;
+    const nameFilter = asRegex(cds.cli.options['data:for'])
+    const { force } = cds.cli.options
 
     let csn = await cds.compile.to.csn(cds.env.roots) // normal CSN
 
@@ -63,7 +63,7 @@ function asRegex(spec) {
         return new RegExp('^'+spec+'.*')
       }
     } catch (err) {
-      throw new Error (err.message) // user error, so cut off stack trace
+      throw err.message // user error, so cut off stack trace
     }
   }
   return /.*/