@sap/cds-dk 7.4.1 → 7.5.1

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

@@ -6,6 +6,7 @@ const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES,
     OUTPUT_MODE_FILESYSTEM, FLAVOR_LOCALIZED_EDMX, CONTENT_EDMX, CONTENT_LOCALIZED_EDMX } = require('../../constants')
 const { getI18nDefaultFolder } = require('../../util')
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize('src/main/resources/edmx')
+const DEBUG = cds.debug('cli|build')
 
 class JavaBuildPlugin extends EdmxBuildPlugin {
     init() {
@@ -49,7 +50,7 @@ class JavaBuildPlugin extends EdmxBuildPlugin {
         if (this.isStagingBuild()) {
             return super.clean()
         }
-        this.logger._debug && this.logger.debug(`Deleting build target folder ${this.task.options.compileDest}`)
+        DEBUG?.(`Deleting build target folder ${this.task.options.compileDest}`)
         await fs.promises.rm(this.task.options.compileDest, { force: true, recursive: true })
     }
 

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

@@ -1,11 +1,11 @@
 const path = require('path')
 const fs = require('fs')
 const cds = require('../../../cds')
-
 const InternalBuildPlugin = require('../internalBuildPlugin')
 const { FOLDER_GEN, EXTENSION_POINT_VALIDATION } = require('../../constants')
 const ResourcesTarBuilder = require('../mtx/resourcesTarBuilder')
 const { BuildError, BuildMessage } = require('../../util')
+const DEBUG = cds.debug('cli|build')
 
 class MtxExtensionBuildPlugin extends InternalBuildPlugin {
     init() {
@@ -43,7 +43,8 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
             await this.collectLanguageBundles(extModel, path.join(destExt, 'i18n'))
 
             // perform SQL backend validation to prevent extension deployment problems later on
-            cds.compile.to.sql(model)
+            // REVISIT: disabled - causing stack overflow errors in LinkedCSN for some scenarios
+            // cds.compile.to.sql(model)
 
             const files = Object.keys(await cds.deploy.resources(model))
             if (files.length > 0) {
@@ -61,7 +62,7 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
                 try {
                     // throws error in case of linting errors
                     this._lintExtModel(extModel, model)
-                } catch(error) {
+                } catch (error) {
                     // cleanup existing files in case of an error
                     await fs.promises.rm(this.task.dest, { recursive: true })
                     throw error
@@ -108,7 +109,7 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
             return
         }
         const env = cds.env.for('cds', path.join(this.task.src, this._getAppPackageFolder()))
-        this.logger._debug && this.logger.debug(`Saas extension point restrictions:\n${env.requires?.['cds.xt.ExtensibilityService']}`)
+        DEBUG?.(`Saas extension point restrictions:\n${env.requires?.['cds.xt.ExtensibilityService']}`)
 
         const messages = linter.lint(extModel, model, env)
         if (messages.length) {

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

@@ -6,6 +6,7 @@ const NodejsBuildPlugin = require('../nodejs')
 const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
 const { ERROR } = NodejsBuildPlugin
 const { relativePaths, BuildError, resolveRequiredSapModels, getI18nDefaultFolder } = require('../../util')
+const DEBUG = cds.debug('cli|build')
 
 const DEFAULT_MAIN_FOLDER = "_main"
 
@@ -114,7 +115,7 @@ class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
             if (!modelFilePaths || modelFilePaths.length === 0) {
                 throw new BuildError("No CDS models found in MTX sidecar. Make sure up-to-date versions of the required npm modules are installed.")
             }
-            this._logger._debug && this._logger.debug(`sidecar model: ${relativePaths(cds.root, modelFilePaths).join(", ")}`)
+            DEBUG?.(`sidecar model: ${relativePaths(cds.root, modelFilePaths).join(", ")}`)
 
             // check whether all models belonging to the @sap namespace can be resolved
             const unresolved = resolveRequiredSapModels(modelPaths)

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

@@ -7,6 +7,7 @@ const { BuildError } = 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 } = require('../../constants')
 const { WARNING } = EdmxBuildPlugin
+const DEBUG = cds.debug('cli|build')
 
 class NodejsBuildPlugin extends EdmxBuildPlugin {
     init() {
@@ -67,7 +68,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         if (cds.env.build.target === '.') {
             // delete the entire 'task.dest' folder otherwise, for details see #constructor
             // - the value of the folder 'src' has been appended to the origin 'task.dest' dir
-            this.logger._debug && this.logger.debug(`Deleting build target folder ${this.destSrv}`)
+            DEBUG?.(`Deleting build target folder ${this.destSrv}`)
             await fs.promises.rm(this.isStagingBuild() ? this.task.dest : this.destSrv, { force: true, recursive: true })
         }
     }
@@ -186,7 +187,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
             try {
                 pkgDescriptors = await this._execNpmPack(dest, wsRoot, workspaces)
             } catch (e) {
-                this.logger.debug(e)
+                DEBUG?.(e)
                 throw new BuildError(`Failed to package npm workspace dependencies\n${e.message}`)
             }
             if (pkgDescriptors?.length) {
@@ -229,9 +230,9 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         const args = ['pack', '-ws', '--json', `--pack-destination=${dest}`]
         workspaces.forEach(w => args.push(`-w=${w}`))
 
-        this.logger._debug && this.logger.debug(`execute command: npm ${args}`)
-        const result = await cmd.spawnCommand( 'npm', args, { cwd: wsRoot }, true, !!this.logger._debug)
-        this.logger._debug && this.logger.debug(result)
+        DEBUG?.(`execute command: npm ${args}`)
+        const result = await cmd.spawnCommand( 'npm', args, { cwd: wsRoot }, true, !!DEBUG)
+        DEBUG?.(result)
         return JSON.parse(result)
     }
 }

package/lib/compile/openapi/csdl2openapi.js

@@ -77,8 +77,18 @@ module.exports.csdl2openapi = function (
     preProcess(csdl, boundOverloads, derivedTypes, alias, namespace, namespaceUrl, voc);
 
     const entityContainer = csdl.$EntityContainer ? modelElement(csdl.$EntityContainer) : {};
+    if (csdl.$EntityContainer) {
+        let serviceName = nameParts(csdl.$EntityContainer).qualifier;
+        Object.keys(entityContainer).forEach(element => {
+            if (entityContainer[element].$Type) {
+                let type = nameParts(entityContainer[element].$Type).name;
+                if (csdl[serviceName]?.[type]?.['@cds.autoexpose'] || csdl[serviceName]?.[type]?.['@cds.autoexposed']) 
+                    entityContainer[element]['$cds.autoexpose'] = true;
+                }
+        });
+    }
+
     const keyAsSegment = entityContainer ? entityContainer[voc.Capabilities.KeyAsSegmentSupported] : {};
-    const deepUpdate = entityContainer ? entityContainer[voc.Capabilities.DeepUpdateSupport] && entityContainer[voc.Capabilities.DeepUpdateSupport].Supported : {};
 
     const openapi = {
         openapi: '3.0.2',
@@ -534,7 +544,7 @@ module.exports.csdl2openapi = function (
         if (prefixParameters.length > 0) pathItem.parameters = prefixParameters;
 
         operationRead(pathItem, element, name, sourceName, targetName, target, level, restrictions, false, nonExpandable);
-        if (element.$Collection && (element.$ContainsTarget || level < 2 && target)) {
+        if (!root['$cds.autoexpose'] && element.$Collection && (element.$ContainsTarget || level < 2 && target)) {
             operationCreate(pathItem, element, name, sourceName, targetName, target, level, restrictions);
         }
         pathItemsForBoundOperations(paths, prefix, prefixParameters, element, sourceName);
@@ -544,9 +554,11 @@ module.exports.csdl2openapi = function (
                 if (level < maxLevels)
                     pathItemsWithKey(paths, prefix, prefixParameters, element, root, sourceName, targetName, target, level, navigationPath, restrictions, nonExpandable);
             } else {
-                operationUpdate(pathItem, element, name, sourceName, target, level, restrictions);
-                if (element.$Nullable) {
-                    operationDelete(pathItem, element, name, sourceName, target, level, restrictions);
+                if (!root['$cds.autoexpose']) {
+                    operationUpdate(pathItem, element, name, sourceName, target, level, restrictions);
+                    if (element.$Nullable) {
+                        operationDelete(pathItem, element, name, sourceName, target, level, restrictions);
+                    }
                 }
                 pathItemsForBoundOperations(paths, prefix, prefixParameters, element, sourceName);
                 pathItemsWithNavigation(paths, prefix, prefixParameters, type, root, sourceName, level, navigationPath);
@@ -616,8 +628,10 @@ module.exports.csdl2openapi = function (
                 paths[path] = pathItem;
 
                 operationRead(pathItem, element, name, sourceName, targetName, target, level, restrictions, true, nonExpandable);
-                operationUpdate(pathItem, element, name, sourceName, target, level, restrictions, true);
-                operationDelete(pathItem, element, name, sourceName, target, level, restrictions, true);
+                if (!root['$cds.autoexpose']) {
+                    operationUpdate(pathItem, element, name, sourceName, target, level, restrictions, true);
+                    operationDelete(pathItem, element, name, sourceName, target, level, restrictions, true);
+                }
                 if (Object.keys(pathItem).filter((i) => i !== "parameters").length === 0)
                     delete paths[path];
 
@@ -1773,7 +1787,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
             title: name,
             enum: members
         };
-        const description = type[voc.Core.Description];
+        const description = type[voc.Core.LongDescription];
         if (description) s.description = description;
         schemas[qualifier + '.' + name] = s;
     }
@@ -1789,7 +1803,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
     function schemaForTypeDefinition(schemas, qualifier, name, type) {
         const s = getSchema(Object.assign({ $Type: type.$UnderlyingType }, type));
         s.title = name;
-        const description = type[voc.Core.Description];
+        const description = type[voc.Core.LongDescription];
         if (description) s.description = description;
         schemas[qualifier + '.' + name] = s;
     }
@@ -1825,10 +1839,10 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
                 if (property.$Collection && suffix === "" && isCount === true) {
                     schemaProperties[`${iName}@${csdl.$Version === '4.0' ? 'odata.' : ''}count`] = ref('count');
                 }
-                if (property[voc.Core.Permissions] != "Read" && !property[voc.Core.Computed] && property.$ContainsTarget) {
+                if (property[voc.Core.Permissions] != "Read" && !property[voc.Core.Computed] && ( property.$ContainsTarget || property.$OnDelete === 'Cascade') ) {
                     if (suffix === SUFFIX.create)
                         schemaProperties[iName] = getSchema(property, SUFFIX.create);
-                    if (suffix === SUFFIX.update && deepUpdate)
+                    if (suffix === SUFFIX.update)
                         schemaProperties[iName] = getSchema(property, SUFFIX.create);
                 }
             } else {
@@ -1858,7 +1872,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         if (suffix === SUFFIX.create && required.length > 0)
             schemas[schemaName].required = [...new Set(required)];
 
-        const description = type[voc.Core.Description];
+        const description = type[voc.Core.LongDescription];
         if (description) {
             schemas[schemaName].description = description;
         }
@@ -2248,9 +2262,9 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
             };
         }
 
-        if (!forParameter && element[voc.Core.Description]) {
+        if (!forParameter && element[voc.Core.LongDescription]) {
             if (s.$ref) s = { allOf: [s] };
-            s.description = element[voc.Core.Description];
+            s.description = element[voc.Core.LongDescription];
         }
 
         return s;

package/lib/compile/openapi/index.js

@@ -2,9 +2,13 @@ const csdl2openapi = require('./csdl2openapi')
 const cds = require('../../cds')
 
 module.exports = function processor(csn, options = {}) {
+    const edmOptions = Object.assign({
+        odataOpenapiHints: true, // hint to compiler
+        to: 'openapi' // hint to cds.compile.to.edm (usually set by CLI, but also do this in programmatic usages)
+    }, options)
 
     // must not be part of function* otherwise thrown errors are swallowed
-    const csdl = cds.compile.to.edm(csn, options);
+    const csdl = cds.compile.to.edm(csn, edmOptions);
 
     if (csdl[Symbol.iterator]) { // generator function means multiple services
         return _iterate(csdl, csn, options)
@@ -12,10 +16,6 @@ module.exports = function processor(csn, options = {}) {
         const openApiOptions = toOpenApiOptions(csdl, csn, options)
         return _getOpenApi(csdl, openApiOptions);
     }
-
-    // const file = csdl.$EntityContainer.replace(/\.[^.]+$/, '');
-    // yield [openapi, { file }]; // add file to avoid relative path in filename
-    // return openapi;
 }
 
 function* _iterate(csdl, csn, options) {
@@ -57,6 +57,6 @@ function servicePath(csdl, csn) {
     if (csdl.$EntityContainer) {
         const serviceName = csdl.$EntityContainer.replace(/\.[^.]+$/, '')
         const service = csn.definitions[serviceName]
-        return cds.service.path4 ? cds.service.path4(service) : cds.serve.path4(service)
+        return cds.service.path4?.(service) || cds.serve.path4(service)
     }
 }

package/lib/deploy/to-hana/hana.js

@@ -10,8 +10,8 @@ const { build } = require('../../build');
 const buildConstants = require('../../build/constants');
 
 const hdiDeployUtil = require('./hdiDeployUtil');
-const cfUtil = require('../../util/cfUtil');
-const gitUtil = require('../../util/gitUtil');
+const cfUtil = require('../../util/cf');
+const gitUtil = require('../../util/git');
 const mtaUtil = require('./mtaUtil');
 
 const { bold, info } = require('../../util/term');

package/lib/env/schema.js

@@ -1,5 +1,4 @@
-const { join } = require('path')
-const { mergeJSON } = require('../init/util/merge')
+const { merge } = require('../init/merge')
 const { readJSON } = require('../util/fs')
 
 module.exports = async function overlay4(schemaName, cwd = process.cwd()) {
@@ -26,7 +25,7 @@ module.exports = async function overlay4(schemaName, cwd = process.cwd()) {
 
     // optional, don't throw if file not found
     try {
-        await mergeJSON(result, join(__dirname, 'schemas', schemaName))
+        await merge(__dirname, 'schemas', schemaName).into(result)
         result.description = result.description + ' - overlaid'
     } catch (err) {
         if (err.code !== 'ENOENT') throw err

package/lib/index.js

@@ -1,33 +1,73 @@
+/** @type { import('./cds') & CdsDk & CdsDkAdd & CdsDkBuild} */
 const cds = module.exports = require('./cds')
-cds.extend (cds.constructor) .with (class {
-  get import() { return super.import = require('./import/importapi') }
-})
-
-cds.extend (cds.compile.to.constructor) .with (class {
-  get asyncapi() { return super.asyncapi = require('./compile/asyncapi') }
-  get openapi() { return super.openapi = require('./compile/openapi') }
-  get xsuaa(){ return super.xsuaa = require('./compile/to-xsuaa') }
-  'edmx-v2'(csn,o) { return cds.compile.to.edmx(csn,{...o,flavor:'v2'}) }
-  'edmx-v4'(csn,o) { return cds.compile.to.edmx(csn,{...o,flavor:'v4'}) }
-  'edmx-w4'(csn,o) { return cds.compile.to.edmx(csn,{...o,flavor:'w4'}) }
-  'edmx-x4'(csn,o) { return cds.compile.to.edmx(csn,{...o,flavor:'x4'}) }
-})
-
-// Compat to cds <=6. Esp. BAS tools need it, see cap/issues#13918
-// TODO remove compat w/ cds-dk 8
-if (cds.compile.to.constructor.name === 'Object') { // not a class as in cds 7
-  cds.compile.to.xsuaa = require('./compile/to-xsuaa')
+
+class CdsDk {
+
+  get import() {
+    return super.import = require('./import/importapi')
+  }
+
+  get compile() {
+    let compile = require(_local('@sap/cds/lib/compile/cds-compile'))
+    cds.extend (compile.to.constructor) .with (class {
+      get asyncapi() { return super.asyncapi = require('./compile/asyncapi') }
+      get openapi() { return super.openapi = require('./compile/openapi') }
+      get xsuaa(){ return super.xsuaa = require('./compile/to-xsuaa') }
+      'edmx-v2'(csn,o) { return cds.compile.to.edmx(csn,{...o,flavor:'v2'}) }
+      'edmx-v4'(csn,o) { return cds.compile.to.edmx(csn,{...o,flavor:'v4'}) }
+      'edmx-w4'(csn,o) { return cds.compile.to.edmx(csn,{...o,flavor:'w4'}) }
+      'edmx-x4'(csn,o) { return cds.compile.to.edmx(csn,{...o,flavor:'x4'}) }
+    })
+    // Compat to cds <=6. Esp. BAS tools need it, see cap/issues#13918
+    // TODO remove compat w/ cds-dk 8
+    if (compile.to.constructor.name === 'Object') { // not a class as in cds 7
+      compile.to.xsuaa = require('./compile/to-xsuaa')
+    }
+    return super.compile = compile
+  }
+
+  // add overlay4 method to cds.schema to retrieve schema with cds-dk features
+  // schema is cds version specific; add cds-dk parts not present in cds, e.g. build
+  // failsafe for legacy cds without schema.constructor
+  get schema() {
+    let schema = require(_local('@sap/cds/lib/env/schemas'))
+    cds.extend(schema.constructor) .with (class {
+      get overlay4() { return super.overlay4 = require('./env/schema') }
+    })
+    return super.schema = schema
+  }
 }
 
-// add overlay4 method to cds.schema to retrieve schema with cds-dk features
-// schema is cds version specific; add cds-dk parts not present in cds, e.g. build
-// failsafe for legacy cds without schema.constructor
-cds.extend(cds.schema?.constructor || {}).with(class {
-  get overlay4() { return super.overlay4 = require('./env/schema') }
-})
+cds.extend (cds.constructor) .with (CdsDk)
 
-// set build API, potentially removing the old API facade from sap/cds 7
-// delete cds.__proto__?.build //> not required, as its overriden below anyways
-cds.extend (cds.constructor) .with (class {
+class CdsDkAdd {
+  get add() { return super.add = require('./init/add') }
+}
+class CdsDkBuild {
   get build() { return super.build = require('./build') }
-})
+}
+if (process.argv[2] in { 'add':1, 'init':1 }) {
+  cds.extend (cds.constructor) .with (CdsDkAdd)
+} else if (process.argv[2] in { 'build':1, 'deploy':1, 'push':1 }) {
+  cds.extend (cds.constructor) .with (CdsDkBuild)
+}
+
+const MIN_SUPPORTED_CDS_VERSION = 6
+const [cdsVersion] = cds.version.split('.')
+if (parseInt(cdsVersion) < MIN_SUPPORTED_CDS_VERSION) {
+  const [dkVersion] = require('../package.json').version.split('.')
+  console.error(`
+  This application uses '@sap/cds' version ${cdsVersion}, which is not compatible with the installed '@sap/cds-dk' version ${dkVersion}.
+  You can either:
+  - update '@sap/cds' to the latest version (recommended)
+  - downgrade '@sap/cds-dk' to version ${MIN_SUPPORTED_CDS_VERSION}
+`)
+  process.exit(1)
+}
+
+function _local (id) {
+  return require.resolve (id, {paths:[
+    process.cwd(), // project-local module is preferred
+    __dirname      // otherwise from our own dependencies
+  ]})
+}

package/lib/init/add.js

@@ -0,0 +1,17 @@
+const registered = new Map
+
+module.exports = {
+  Plugin: require('./plugin'),
+  merge: require('./merge').merge, // fluent API
+  readProject: require('./projectReader').readProject,
+  mvn: {
+    add: require('./mvn').add
+  },
+  registries: {
+    mta: require('./registries/mta')
+  },
+  register: (name, plugin) => {
+    registered.set(name, plugin)
+  },
+  registered
+}

package/lib/init/constants.js

@@ -4,7 +4,7 @@ module.exports = {
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION: '2.4.0',
+    MAVEN_ARCHETYPE_VERSION: '2.4.1',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -15,6 +15,8 @@ module.exports = {
         TINY_SAMPLE: 'tiny-sample',
         SAMPLE: 'sample',
         PIPELINE: 'pipeline',
+        HELM_UNIFIED_RUNTIME: 'helm-unified-runtime',
+        HELM: 'helm',
         MTA: 'mta',
         CONNECTIVITY: 'connectivity',
         CF_MANIFEST: 'cf-manifest',
@@ -27,6 +29,7 @@ module.exports = {
         POSTGRES: 'postgres',
         SQLITE: 'sqlite',
         H2: 'h2',
+        LIQUIBASE: 'liquibase',
         LOCAL_MESSAGING: 'local-messaging',
         FILE_BASED_MESSAGING: 'file-based-messaging',
         ENTERPRISE_MESSAGING: 'enterprise-messaging',
@@ -35,11 +38,10 @@ module.exports = {
         APPROUTER: 'approuter',
         DESTINATION: 'destination',
         DATA: 'data',
-        KIBANA: 'kibana',
+        APPLICATION_LOGGING: 'application-logging',
         LINT: 'lint',
         LINT_GLOBAL: 'lint:global',
         LINT_DEV: 'lint:dev',
-        HELM: 'helm',
         TYPER: 'typer',
         HTML5_REPO: 'html5-repo',
         NOTIFICATIONS: 'notifications'

package/lib/init/index.js

@@ -5,17 +5,17 @@ const term = require('../util/term');
 const { OPTIONS, COMMAND_INIT, PROJECT_FILES, REGEX_PROJECT_NAME } = require('./constants')
 const {
     NODEJS, JAVA,
-    HANA, APPROUTER, XSUAA, KIBANA, ENTERPRISE_MESSAGING,
+    HANA, APPROUTER, XSUAA, APPLICATION_LOGGING, ENTERPRISE_MESSAGING,
     MTA, MULTITENANCY, PIPELINE,
     TINY_SAMPLE, SAMPLE
  } = OPTIONS
 
-const cds = require('../cds'), { exists, readdir } = cds.utils
+const cds = require('..'), { exists, readdir } = cds.utils
 const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG) ? console.debug : undefined
 
 module.exports = class CDSGenerator {
     constructor() {
-        this.cwd = process.cwd();
+        this.cwd = process.cwd()
 
         this.uiConfig = [{
             title: 'Project Name',
@@ -60,7 +60,7 @@ module.exports = class CDSGenerator {
                 { name: 'SAP HANA Cloud', value: HANA },
                 { name: 'SAP Application Router', value: APPROUTER },
                 { name: 'User Authentication via XSUAA', value: XSUAA },
-                { name: 'Kibana Logging Dashboard', value: KIBANA },
+                { name: 'Application Logging', value: APPLICATION_LOGGING },
                 { name: 'SAP BTP Event Mesh', value: ENTERPRISE_MESSAGING }
             ],
             multiple: true,
@@ -133,9 +133,12 @@ module.exports = class CDSGenerator {
                 // keep caller independent from internal names
                 options: {
                     cwd: options.cwd,
-                    add: options.add
+                    add: new Set(options.add)
                 }
             }
+
+            // must be called after above code to ensure cds.cli.options.add is set
+            cds.add = require('./add')
         }
 
         this._initialize(projectName);
@@ -176,8 +179,8 @@ module.exports = class CDSGenerator {
         for (const template of this.templateList) {
             console.log(`Adding feature '${template.name}'...`);
             await template.run();
-            await template.runDependentMerging();
-            await template.runRelatedMerging();
+            await template.combine();
+            await template.combineSupported();
         }
 
         if (cds.cli.command === COMMAND_INIT) {
@@ -192,10 +195,10 @@ module.exports = class CDSGenerator {
         }
     }
 
-    async _createTemplate(filename) {
+    async _createTemplate(plugin) {
         try {
-            const TemplateClass = require(`./template/${filename}`);
-            return new TemplateClass(this);
+            const Plugin = cds.add.registered.get(plugin) ?? require(`./template/${plugin}`)
+            return new Plugin(this)
         } catch (err) {
             if (err.code === 'MODULE_NOT_FOUND') {
                 const entries = (await readdir(path.join(__dirname, 'template')))
@@ -205,11 +208,11 @@ module.exports = class CDSGenerator {
                         entry !== 'nodejs' &&
                         entry !== 'java'
                     );
-                const fuzzySearch = require('../../bin/util/fuzzySearch');
-                const [bestMatch] = fuzzySearch(filename, entries);
-                throw `Unknown facet '${term.bold(filename)}'. Did you mean ${term.bold(`cds add ${bestMatch}`)}?\n\nHaven't found the proper facet yet? Here are all supported facets:\n\n  ${term.bold(entries.join('\n  '))}\n`
+                const fuzzySearch = require('../../bin/util/fuzzySearch')
+                const [bestMatch] = fuzzySearch(plugin, entries)
+                throw `Unknown facet '${term.bold(plugin)}'. Did you mean ${term.bold(`cds add ${bestMatch}`)}?\n\nHaven't found the proper facet yet? Here are all supported facets:\n\n  ${term.bold(entries.join('\n  '))}\n`
             }
-            throw err;
+            throw err
         }
     }
 
@@ -217,28 +220,39 @@ module.exports = class CDSGenerator {
         const templates = new Map
         const { command, options, argv } = cds.cli
 
-        const facets = command === COMMAND_INIT ? options.add : new Set(argv[0].split(','))
+        const plugins = command === COMMAND_INIT ? options.add : new Set(argv[0].split(','))
 
-        for (let facet of facets) {
+        for (let plugin of plugins) {
             // Compat
-            if (facet === 'sample-tiny') facet = 'tiny-sample'
-            if (facet === 'kibana-logging') facet = 'kibana'
-            if (facet === 'postgresql') facet = 'postgres'
+            if (plugin === 'helm' && cds.cli.options['internal-unified-runtime-charts']) {
+                plugin = 'helm-unified-runtime'
+                cds.cli.options.add.delete('helm')
+                cds.cli.options.add.add('helm-unified-runtime')
+            }
+            if (plugin === 'sample-tiny') plugin = 'tiny-sample'
+            if (plugin in { 'kibana-logging':1, 'kibana':1 }) plugin = 'application-logging'
+            if (plugin === 'postgresql') plugin = 'postgres'
 
-            if (!templates.has(facet)) {
-                const template = await this._createTemplate(facet)
+            if (!templates.has(plugin)) {
+                const template = await this._createTemplate(plugin)
                 if (await template.canRun()) {
                     DEBUG?.(`Adding feature '${template.name}'`)
-                    templates.set(facet, template)
-                    const dependencies = await template.getDependencies()
-                    dependencies?.forEach(d => facets.add(d))
+                    templates.set(plugin, template)
+                    const dependencies = await template.requires()
+                    dependencies?.forEach(d => plugins.add(d))
                 }
             }
         }
 
         const cmds = Object.values(OPTIONS)
         this.templateList = Array.from(templates.entries())
-            .sort(([a], [b]) => cmds.indexOf(a) - cmds.indexOf(b))
+            .sort(([lhs], [rhs]) => {
+                const a = cmds.indexOf(lhs), b = cmds.indexOf(rhs)
+                if (a === -1 && b === -1) return 0
+                if (a === -1) return 1
+                if (b === -1) return -1
+                return a - b
+            })
             .map((entry) => entry[1])
 
         // check debug to avoid lengthy computation when not in debug mode