@sap/cds-dk 7.0.2 → 7.0.3

package/bin/add.js

@@ -91,8 +91,8 @@ module.exports = Object.assign(add, {
 
 `});
 
-async function add(args, options = {}) {
+async function add(args) {
   const CDSGenerator = require('../lib/init');
   const generator = new CDSGenerator();
-  await generator.addCmd(args[0], options);
+  await generator.addCmd(args[0]);
 }

package/bin/bind.js

@@ -72,7 +72,6 @@ async function cds_bind(args, options) {
     if (process.env.CDS_ENV && process.argv[2] === 'bind') {
         throw new CliError('Option --profile is no longer supported. Use --for instead to specify the profile to use when storing connection settings.');
     }
-    options.for = options.for ?? 'hybrid';
 
     if (!options.to) {
         throw new CliError(`Use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`);

package/bin/cds.js

@@ -152,13 +152,15 @@ function _dieForUnknownCommand(cmd) {
 
   let bestMatchText = '';
 
-  const excludeList = ['cds.js', 'cds-ts.js', 'fix-redirects.js'];
+  const excludeList = ['cds.js', 'cds-ts.js', 'fix-redirects.js', 'util'];
   const { readdirSync } = require('fs');
   const { resolve } = require('path');
-  const commands = readdirSync(__dirname, { withFileTypes: true })
+  let commands = readdirSync(__dirname, { withFileTypes: true })
     .concat(readdirSync(resolve(_local('@sap/cds'), '..', '..', 'bin'), { withFileTypes: true }))
-    .filter((f) => f.isFile() && !excludeList.includes(f.name))
-    .map((f) => f.name.split('.')[0]).sort();
+    .filter((f) => !excludeList.includes(f.name))
+    .map((f) => f.name.split('.')[0])
+  commands = [...new Set(commands)] // make unique
+    .sort();
 
   const bestMatches = fuzzySearch(cmd, commands, DEBUG);
 

package/bin/deploy/to-hana.js

@@ -8,6 +8,6 @@ exports.deploy = (model, serviceName, options) => {
     tunnelAddress: options['tunnel-address'],
     vcapFile: options['vcap-file'],
     hdiOptions: { autoUndeploy: options['auto-undeploy'] },
-    storeCredentials: options['store-credentials']
+    storeCredentials: options['store-credentials'] // TODO: Remove with cds-dk 8
   });
 }

package/bin/init.js

@@ -98,11 +98,11 @@ module.exports = Object.assign(init, {
 
 `})
 
-async function init (args, options = {}) {
+async function init (args) {
     if (process.argv.some(a => legacyOptions.includes(a))) return _showWarningMessage()
     const CDSGenerator = require('../lib/init')
     const generator = new CDSGenerator()
-    await generator.initCmd(args[0], options)
+    await generator.initCmd(args[0])
 }
 
 

package/lib/bind/cfKeyProvider.js

@@ -4,6 +4,7 @@ const DEBUG = cds.debug('cli')
 const cfUtil = require('../util/cfUtil');
 
 const axios = require('axios');
+require('../util/pruneAxiosErrors');
 const { URL } = require('url');
 const { bold, highlight } = require('../util/term');
 const { CliError } = require('../client/helper/errors');

package/lib/bind/index.js

@@ -15,6 +15,9 @@ module.exports = { bind, parseProfile }
  * @param {object} options - command options as defined by build command.
  */
 async function bind(options) {
+
+    options.for = options.for || 'hybrid';
+
     let on;
     switch(options.on) {
         case 'k8s':

package/lib/bind/userCdsrcJsonStorageProvider.js

@@ -58,11 +58,7 @@ class UserCdsrcJsonStorageProvider {
 
         cdsRoot.requires = cdsRoot.requires || {};
         let section;
-        if (options.for) {
-            section = cdsRoot.requires[profileKey] = cdsRoot.requires[profileKey] || {};
-        } else {
-            section = cdsRoot.requires;
-        }
+        section = cdsRoot.requires[profileKey] = cdsRoot.requires[profileKey] || {};
 
         for (const service of services) {
             const { name, kind, binding, credentials } = service;
@@ -72,11 +68,7 @@ class UserCdsrcJsonStorageProvider {
         }
 
         await this.writeJsonFile(jsonPath, jsonObject);
-        if (options.for) {
-            logger.log(`Saving bindings to ${highlight(jsonPath)} in profile ${highlight(options.for)}`);
-        } else {
-            logger.log(`Saving bindings to ${highlight(jsonPath)}`);
-        }
+        logger.log(`Saving bindings to ${highlight(jsonPath)} in profile ${highlight(options.for)}`);
     }
 
     async readJsonSafely(filePath) {

package/lib/build/constants.js

@@ -19,20 +19,22 @@ exports.BUILD_TASKS = [this.BUILD_TASK_JAVA, this.BUILD_TASK_JAVA_CF, this.BUILD
 exports.ODATA_VERSION_V2 = "v2"
 exports.ODATA_VERSION_V4 = "v4"
 
-exports.CONTENT_LANGUAGE_BUNDLES = "contentLanguageBundles" // create i18n.json language bundles
-exports.CONTENT_DEFAULT_CSN = "contentDefaultCsn"           // create default CSN format flavor: "inferred"
-exports.CONTENT_EDMX = "contentEdmx"                        // create EDMX for required languages
-exports.CONTENT_PACKAGE_JSON = "contentPackageJson"         // create package.json file if not existing, or modify existing package.json
-exports.CONTENT_PACKAGELOCK_JSON = "contentPackageLockJson" // copy package-lock.json file if existing into deployment folder
-exports.CONTENT_HDBTABLEDATA = "contentHdbtabledata"        // create .hdbtabledata files for .csv files if not existing
-exports.CONTENT_NPMRC = "contentNpmrc"                      // copy .npmrc file if existing into deployment folder
-exports.CONTENT_CDSRC_JSON = "contentCdsrcJson"             // copy .cdsrc.json file if existing into deployment folder
-exports.CONTENT_NODE_MODULES = "contentNodeModules"         // copy node_modules folder if existing into deployment folder
-exports.CONTENT_ENV = "contentEnv"                          // copy .env file if existing into deployment folder
-exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"  // copy default-env.json file if existing into deployment folder
-exports.CSV_FILE_DETECTION = "csvFileDetection"             // detect CSV files based on CDS model location
-exports.EXTENSION_POINT_VALIDATION = "extensionPointValidation" // validate extension point restrictions defined by the extended SaaS app
-exports.DEFAULT_BUILT_IN_MODELS = "defaultBuiltInModels"    // add @sap/cds* built-in models to build tasks
+exports.CONTENT_LANGUAGE_BUNDLES = "contentLanguageBundles"     // create i18n.json language bundles - build task specific
+exports.CONTENT_DEFAULT_CSN = "contentDefaultCsn"               // create default CSN format flavor: "inferred" - build task specific
+exports.CONTENT_EDMX = "contentEdmx"                            // create EDMX for required languages - build task specific
+exports.CONTENT_PACKAGE_JSON = "contentPackageJson"             // create package.json file if not existing, or modify existing package.json - ENABLED by default
+exports.CONTENT_PACKAGELOCK_JSON = "contentPackageLockJson"     // copy package-lock.json file if existing into deployment folder - ENABLED by default
+exports.CONTENT_HDBTABLEDATA = "contentHdbtabledata"            // create .hdbtabledata files for .csv files if not existing - ENABLED by default
+exports.CONTENT_NPMRC = "contentNpmrc"                          // copy .npmrc file if existing into deployment folder - ENABLED by default
+exports.CONTENT_CDSRC_JSON = "contentCdsrcJson"                 // copy .cdsrc.json file if existing into deployment folder - ENABLED by default
+exports.CONTENT_NODE_MODULES = "contentNodeModules"             // copy node_modules folder if existing into deployment folder - DISABLED by default
+exports.CONTENT_ENV = "contentEnv"                              // copy .env file if existing into deployment folder - DISABLED by default
+exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-env.json file if existing into deployment folder - DISABLED by default
+
+exports.CSV_FILE_DETECTION = "csvFileDetection"                 // detect CSV files based on CDS model location - ENABLED by default
+exports.EXTENSION_POINT_VALIDATION = "extensionPointValidation" // validate extension point restrictions defined by the extended SaaS app - ENABLED by default
+exports.DEFAULT_BUILT_IN_MODELS = "defaultBuiltInModels"        // add @sap/cds* built-in models to build tasks - ENABLED by default
+exports.MTX_SIDECAR_DB_VALIDATION = "mtxSidecarDbValidation"    // validate consistency of app and sidecar db configuration - ENABLED by default
 
 exports.FOLDER_GEN = "gen"
 exports.FILE_EXT_CDS = ".cds"

package/lib/build/provider/mtx/resourcesTarBuilder.js

@@ -83,12 +83,8 @@ class ResourcesTarBuilder {
     }
 
     async _getHanaTenantDbDest() {
-        let hanaTask = this.handler.context.tasks.find(task => task.for === BUILD_TASK_HANA)
-        if (!hanaTask) {
-            this.handler.pushMessage(`Found SQLite database configuration. Ensure that productive cloud deployments requiring SAP HANA database are built with 'production' profile.`, WARNING)
-            return null
-        }
-        return hanaTask.dest
+        const hanaTask = this.handler.context.tasks.find(task => task.for === BUILD_TASK_HANA)
+        return hanaTask?.dest
     }
 }
 module.exports = ResourcesTarBuilder

package/lib/build/provider/mtx-sidecar/index.js

@@ -1,10 +1,10 @@
 const path = require('path')
 const cds = require('../../../cds')
 const fs = require('fs')
-const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
+const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME, MTX_SIDECAR_DB_VALIDATION } = require('../../constants')
 const NodeCfModuleBuilder = require('../nodejs')
 const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
-const { WARNING, ERROR } = NodeCfModuleBuilder
+const { ERROR } = NodeCfModuleBuilder
 const { relativePaths, BuildError, resolveRequiredSapModels, getI18nDefaultFolder } = require('../../util')
 
 const DEFAULT_MAIN_FOLDER = "_main"
@@ -61,13 +61,18 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         if (!main) {
             throw new BuildError(`Invalid MTX sidecar configuration. Make sure that the profile 'mtx-sidecar' is configured and an up-to-date version of @sap/cds-mtxs is installed.`)
         }
-        const profiles = cds.env.profiles || []
+        if (!this.hasBuildOption(MTX_SIDECAR_DB_VALIDATION, false)
+            && !cds.env.build.tasks?.length                     // disable if custom build tasks exist
+            && sidecarEnv.requires.db && cds.env.requires.db    // ensure database is configured
+            && sidecarEnv.requires.db.kind !== cds.env.requires.db.kind) {
+            throw new BuildError(`Inconsistent database configuration found - application db '${cds.env.requires.db?.kind}', sidecar db '${sidecarEnv.requires.db?.kind}'`)
+        }
+        const profiles = cds.env.profiles ?? []
+        if (!profiles.includes("production") && !profiles.includes("prod")) {
+            // need to overwrite 'development' profile setting '../..' with '_main', although it is questionable why cds build is executed with development profile
+            main = DEFAULT_MAIN_FOLDER
+        }
 
-            if (!profiles.includes("production") && !profiles.includes("prod")) {
-                main = DEFAULT_MAIN_FOLDER
-                // root should represent the production use case and not development
-                this.pushMessage(`MTX sidecar build results are created in folder '${main}'. Enable 'production' or 'prod' profile if the folder is configured differently.`, WARNING)
-            }
         const destRoot = this.task.dest
         const destMain = path.join(destRoot, main)
         const destMainSrv = path.join(destMain, cds.env.folders.srv)

package/lib/client/base_command.js

@@ -1,6 +1,8 @@
 const path = require('path');
 const fs = require('fs').promises;
 
+require('../util/pruneAxiosErrors');
+
 const { CliError } = require('./helper/errors');
 
 const MTX_URL_PATH_PREFIX = 'mtx/v1/model/';
@@ -26,17 +28,12 @@ module.exports = class BaseCommand {
             case 403:
                 throw new CliError(prefix + ': insufficient authorization. Ensure client has all necessary roles.', { error, command });
             case 404:
-                throw new CliError(prefix + ': resource not found.', { command });
+                throw new CliError(prefix + ': resource not found.', { error, command });
             case 422:
                 // Compilation or native-extension error.
                 throw new CliError(prefix + '.', { error, command });
             default:
                 // Unexpected error should be transparent to user.
-                if (!require('..').debug('axios')) {
-                    error.config?.auth && (error.config.auth = '...'); // TODO use &&= with Node > 14
-                    delete error.request;
-                    delete error.response;
-                }
                 throw error;
         }
     }

package/lib/compile/asyncapi/components/messages/index.js

@@ -16,11 +16,31 @@ function getHeaderProperties(name) {
     return { type: { const: name } };
 }
 
+function nestedAnnotation(resObj, asyncapiProperty, keys, value) {
+    if (resObj[asyncapiProperty] === undefined) {
+        resObj[asyncapiProperty] = {};
+    }
+
+    let node = resObj[asyncapiProperty];
+
+    // traverse the annotation property and define the objects if they're not defined
+    for (let nestedIndex = 1; nestedIndex < keys.length - 1; nestedIndex++) {
+        const nestedElement = keys[nestedIndex];
+        if (node[nestedElement] === undefined) {
+            node[nestedElement] = {};
+        }
+        node = node[nestedElement];
+    }
+
+    // set value annotation property
+    node[keys[keys.length - 1]] = value;
+}
+
 function readAnnotations(definition, presets) {
     let resObj = {};
 
     for (const [key, value] of Object.entries(definition)) {
-        if (key.startsWith('@AsyncAPI')) {
+        if (key.startsWith('@AsyncAPI') && !key.startsWith('@AsyncAPI.Extensions')) {
             // get annotation value after @AsyncAPI
             const annotationProperties = key.split('@AsyncAPI.')[1];
             const keys = annotationProperties.split('.');
@@ -35,23 +55,22 @@ function readAnnotations(definition, presets) {
             if (keys.length === 1) {
                 resObj[asyncapiProperty] = value;
             } else {
-                if (resObj[asyncapiProperty] === undefined) {
-                    resObj[asyncapiProperty] = {};
-                }
-
-                let node = resObj[asyncapiProperty];
+                nestedAnnotation(resObj, asyncapiProperty, keys, value)
+            }
+        }
 
-                // traverse the annotation property and define the objects if they're not defined
-                for (let nestedIndex = 1; nestedIndex < keys.length-1; nestedIndex++) {
-                    const nestedElement = keys[nestedIndex];
-                    if (node[nestedElement] === undefined) {
-                        node[nestedElement] = {};
-                    }
-                    node = node[nestedElement];
-                }
+        else if (key.startsWith('@AsyncAPI.Extensions')) {
+            const annotationProperties = key.split('@AsyncAPI.Extensions.')[1];
+            const keys = annotationProperties.split('.');
+            keys[0] = "x-" + keys[0];
 
-                // set value annotation property
-                node[keys[keys.length-1]] = value;
+            if (keys.length === 1) {
+                // if the key is already present, that means, Annotations have already been considered
+                if (resObj[keys[0]]) continue;
+                // else we populate
+                resObj[keys[0]] = value;
+            } else {
+                nestedAnnotation(resObj, keys[0], keys, value);
             }
         }
     }
@@ -142,9 +161,13 @@ function entriesToMessages(definitions, events, presets) {
 /**
  * Combining the definition objects from CSN into one schema
  */
-module.exports = function definitionsToMessages(definitions, events, presets) {
+function definitionsToMessages(definitions, events, presets) {
     const messages = {};
-
     Object.assign(messages, entriesToMessages(definitions, events, presets));
     return messages;
 }
+
+module.exports = {
+    definitionsToMessages,
+    nestedAnnotation
+}

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

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 `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,7 +165,6 @@ module.exports = class CDSGenerator {
     }
 
     async _createTemplate(filename) {
-
         try {
             const TemplateClass = require(`./template/${filename}`);
             return new TemplateClass(this);
@@ -199,21 +187,22 @@ module.exports = class CDSGenerator {
     }
 
     async _fillTemplateList() {
-        const templates = new Map();
-        for (let option of this.options.add) {
+        const templates = new Map
+        const { command, options, argv } = cds.cli
+        const facets = command === COMMAND_INIT ? options.add : new Set(argv[0].split(','))
+
+        for (let facet of facets) {
             // Compat
-            if (option === 'sample-tiny') option = 'tiny-sample'
-            if (option === 'kibana-logging') option = 'kibana'
+            if (facet === 'sample-tiny') facet = 'tiny-sample'
+            if (facet === 'kibana-logging') facet = 'kibana'
 
-            if (!templates.has(option)) {
-                const template = await this._createTemplate(option);
+            if (!templates.has(facet)) {
+                const template = await this._createTemplate(facet)
                 if (await template.canRun()) {
-                    DEBUG?.(`Adding feature '${template.name}'`);
-                    templates.set(option, template);
-                    const deps = await template.getDependencies();
-                    if (deps) {
-                        deps.forEach(this.options.add.add, this.options.add) // REVISIT: Ugly add.add
-                    }
+                    DEBUG?.(`Adding feature '${template.name}'`)
+                    templates.set(facet, template)
+                    const dependencies = await template.getDependencies()
+                    dependencies?.forEach(d => facets.add(d))
                 }
             }
         }
@@ -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);
         }