@sap/cds-dk 9.4.1 → 9.4.3

package/CHANGELOG.md

@@ -6,6 +6,41 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 9.4.3 - 2025-10-29
+
+### Changed
+
+- `cds add containerize` omits the Unix-based `before_all` scripts in `containerize.yaml` in favor of a cross-platform compatible `cds up --to k8s` integration.
+- `cds up --to k8s` now uses built-in containerization, eliminating the hard dependency on the `ctz` library.
+- `cds up --to k8s` will interactively ask for a domain if it can't be determined from the current Kubernetes configuration.
+- `cds build --for hana` no longer requires `.hdbgrants` and `.hdbrevokes` to be specified as a plugin in the `.hdiconfig` file.
+
+### Fixed
+
+- `cds add pipeline` does not add UI5 template files in some cases.
+- `cds add ias` does not write to the `mta.yaml` for non-MTA projects.
+- `cds add ias` automatically adds the `authenticationType` to `xs-app.json` if required.
+- `cds add ias` adds a binding to the approuter component if required.
+- `cds import --from ...` yields a better error message for unknown import kinds.
+
+## Version 9.4.2 - 2025-10-23
+
+### Changed
+
+- `cds add containerize` does not add app module installations scripts to its `containerize.yaml`. Use `cds up --to k8s` instead.
+- `cds add` is less eager with respect to changing unaffected configuration.
+- `cds add ias` adds less unnecessary configuration in combination with the HTML5 repository.
+- `cds add test` includes the service name in the test suite description.
+
+### Fixed
+
+- `cds add ams` followed by `cds add mta` correctly generates the AMS deployer module.
+- `cds add hana` does not fail if there's no `.cdsrc.json`.
+- `cds up` doesn't try to create a symlink to the monorepo _package-lock.json_ if a submodule-local one already exists.
+- `cds add test` creates correct OData URLs with unqualified entity names in service paths.
+- `cds add http` skips contained composition targets.
+- `cds add sample` no longer comes with an error when creating a Book through Fiori.
+
 ## Version 9.4.1 - 2025-10-09
 
 ### Added

package/bin/data-products/index.js

@@ -6,8 +6,16 @@ const path = require ('node:path')
 
 exports.load_data_product  = async function (sources, o) {
   let service = /\/([^/]+)\//.exec(o.services)?.[1].replaceAll('\\.','.')
-  if (!service.includes(':apiResource:')) {
-    const [,namespace,name,version] = /^(.+)-([^-]+)-(v[0-9]+)\.json$/ .exec (path.basename(String(sources)))
+  if (service != 'all') {
+    // ORD ID has been provided as parameter "-s", valid example: "sap.s4com:apiResource:Product:v1"
+    if (!service.match(/^([^:]+):apiResource:([^:]+):(v[0-9]+)$/))
+      throw new Error(`"${service}" is not a valid output port ORD ID`)
+  }
+  else {
+    // try to deduce ORD ID from file name, valid example: "sap-s4com-Product-v1.json"
+    const m = /^(.+)-([^-]+)-(v[0-9]+)\.(json|csn)$/ .exec (path.basename(String(sources)))
+    if (m?.length != 5) throw new Error(`Output port ORD ID cannot be deduced from file name`)
+    const [,namespace,name,version] = m
     service = namespace.replace(/-/g,'.') + ':apiResource:' + name + ':' + version
   }
 

package/bin/data-products/prepare-csn.js

@@ -180,38 +180,75 @@ exports.prepareCsn = function (csn, srvName, ordId) {
   //
   // ---------- step 5: wrap everyting into service if not yet done -------------------------------
   //
-  // Prefix all entity names with service name. Adapt association targets.
-  // Add CAP specific annotations for DP handling.
+  // This function must be called with a service name "srvName" as argument.
+  if (!srvName) throw new Error('No service name has been provided.')
 
-  if (srvName) {
-    if (!csn.definitions[srvName] || csn.definitions[srvName].kind !== 'service') {
-      // add the service
-      csn.definitions[srvName] = {kind: 'service'}
-      // loop over all entities and prefix names with service name
-      for (let n in csn.definitions) {
-        let entity = csn.definitions[n]
-        if (entity.kind === 'entity') {
-          // find association elements and rename the targets
-          for (let en in entity.elements || {} ) {
-            let element = entity.elements[en]
-            if (element?.type == 'cds.Association' || element?.type == 'cds.Composition') {
-              element.target = srvName + '.' + element.target
-            }
-          }
-          csn.definitions[srvName + '.' + n] = entity
-          delete csn.definitions[n]
+  // Assumptions (based on the rules for DP CSNs):
+  // 1) there is no or one context or service in the CSN
+  // 2) if there is a context or service, all objects in the CSN belong to it
+  //
+  // If there is no context/service (this is a DP CSN coming from BAH):
+  //   put all entities into a new service "srvName", i.e.
+  //   - prefix all object and association target names with "srvName"
+  //   - add a service "srvName" with CAP specific annotations for DP handling
+  // If there is a context/service (DP CSN comes from UCL, context/service name is the schema name in the HDLFS share):
+  //   move all entities out of the context/service and put them into a new service "srvName", i.e.
+  //   - remove the context/service
+  //   - change the prefix for all entity and association target names from
+  //     the old context/service name to "srvName"
+  //   - add a service "srvName" with CAP specific annotations for DP handling
+  //
+  // Note: Currently an existing context/service doesn't contain further info (e.g. annos),
+  //       so deleting it is ok.
+
+  let ctxName = null;
+  const ctxs = Object.entries(csn.definitions).filter(([,o]) => o.kind === 'context' || o.kind === 'service')
+  if (ctxs.length > 0) {
+    // check assumption 1
+    if (ctxs.length > 1) throw new Error('Data Product CSN is invalid: it has more than one context or service.')
+    ctxName = ctxs[0][0]
+    delete csn.definitions[ctxName]
+    // check assumption 2
+    const bad = Object.keys(csn.definitions).filter((n) => !n.startsWith(ctxName + '.'))
+    if (bad.length > 0)
+      throw new Error(`Unexpected entity name "${bad[0]}" without prefix in Data product CSN with context "${ctxName}"`)
+  }
+
+  function changePrefix(name) {
+    if (ctxName) {
+      name = name.substring(ctxName.length + 1) // remove prefix incl. '.'
+    }
+    return srvName + '.' + name
+  }
+
+  // loop over all definitions and prefix names with service name
+  // if ctxName accidentially equals srvName, do nothing
+  if (ctxName != srvName) {
+    for (let n in csn.definitions) {
+      let def = csn.definitions[n]
+      // adapt assoc targets
+      for (let en in def.elements || {} ) {
+        let element = def.elements[en]
+        if (element?.type === 'cds.Association' || element?.type === 'cds.Composition') {
+          element.target = changePrefix(element.target)
         }
       }
+      csn.definitions[changePrefix(n)] = def
+      delete csn.definitions[n]
     }
-    // add service annotations
-    Object.assign(csn.definitions[srvName], {
-      '@cds.dp.ordId': ordId,
-      '@cds.external': true,
-      '@data.product': true,
-      '@protocol'    : 'none'  // don't serve via OData
-    })
   }
 
+   // add the service
+  csn.definitions[srvName] = {
+     kind          : 'service',
+    '@cds.dp.ordId': ordId,
+    '@cds.external': true,
+    '@data.product': true,
+    '@protocol'    : 'none'  // don't serve via OData
+  };
+  if (ctxName) csn.definitions[srvName]['@data.product.schema'] = ctxName;
+
+
   //
   // ---------- step 6: move entity/element annotations into extensions section -------------------
   //

package/bin/help.js

@@ -32,10 +32,10 @@ module.exports = exports = Object.assign (help, {formatHelp, handleCompletion, h
     * * | *logout*      logout from extensible multitenant SaaS app
     * * | *pull*        pull base model of extensible SaaS app
     * * | *push*        push extension to extensible SaaS app
-    *t* | *lint*        run linter for env or model checks
+    * * | *lint*        run linter for env or model checks
     *v* | *version*     get detailed version information
     * * | *completion*  add/remove cli completion for cds commands
-    *?* | *help*        get detailed usage information
+    *h* | *help*        get detailed usage information
 
   Learn more about each command using:
   *cds help* <command> or

package/bin/import.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(_import, {
     _name: 'import',
-    options:   [ '--services', '--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group' ],
+    options:   [ '--services', '--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group', '--data-product' ],
     shortcuts: [ '-s', '-4',    '-o',    '-as',  '-n',     '-ns',                    '-d',            undefined,  '-c',       undefined,       undefined, '-', '-f'],
     flags: [ '--dry', '--force', '--no-copy', '--no-save', '--keep-namespace', '--data-product', '--edmx', '--rfc', '--odata', '--openapi', '--asyncapi' ],
     help: `
@@ -55,6 +55,11 @@ module.exports = Object.assign(_import, {
         Destination name under which the remote service can be reached.
         Not supported by import types "edmx", "openapi" or "asyncapi".
 
+    *--data-product*
+        Tells cds import to import a data product. The source must be a valid 
+        data product CSN file, e.g. as found on http://api.sap.com/dataproducts.
+        (Not released with general availability yet)
+
     *Below options are valid for OData only*
 
     *--keep-namespace*
@@ -153,7 +158,7 @@ async function _import(args, options = {}) {
     if (options.from) {
         if (!cds.import.from[options.from]) {
             // the required plugin might not be installed, e.g. rfc importer
-            throw messages.UNSUPPORTED_FROM_OPTION;
+            throw messages.UNSUPPORTED_FROM_OPTION.replace('{0}', options.from).replace('{1}', Object.keys(cds.import.from).join(', '));
         }
         csn = await cds.import.from[options.from](input, apiOptions);
     } else {

package/bin/up.js

@@ -32,6 +32,8 @@ const cds = require('../lib/cds')
 const { highlight } = require('../lib/util/term')
 const { exists, fs, path, path: { join } } = cds.utils
 const { readProject } = require('../lib/init/projectReader')
+const { mkdirp, copy } = cds.utils
+const { containerize } = require('../bin/util/containerize')
 
 const run = cmd => {
   console.log(highlight(cmd))
@@ -49,10 +51,16 @@ async function up() {
   const project = readProject()
   const { apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice } = project
 
+  const html5DeployerPath = join(cds.root, cds.env.folders.app, 'html5-deployer', 'resources')
+
   for (const { app } of apps) {
     const appPath = path.join(cds.root, cds.env.folders.app, app)
-    if (exists(path.join(appPath, 'package.json')) && !exists(path.join(appPath, 'package-lock.json'))) {
-      run(`npm i --package-lock-only --prefix ${appPath}`)
+    if (exists(path.join(appPath, 'package.json'))) {
+      if (!exists(path.join(appPath, 'package-lock.json'))) {
+        run(`npm i --prefix ${appPath}`)
+      } else if (process.env.CI) {
+        run(`npm ci --prefix ${appPath}`)
+      }
     }
   }
 
@@ -75,6 +83,16 @@ async function up() {
 
   if (cds.cli.options.to === 'k8s') {
     if (!exists('chart')) run('cds add helm')
+    if (apps.length > 0) {
+      await mkdirp(html5DeployerPath)
+    }
+
+    for (const { app } of apps) {
+      const appPath = path.join(cds.root, cds.env.folders.app, app)
+      run(`npm run build --prefix ${appPath}`)
+      await copy(path.join(appPath, `dist/${app}.zip`)).to(html5DeployerPath, `${app}.zip`)
+    }
+
     if (!exists('containerize.yaml')) run('cds add containerize')
   } else {
     if (!exists('mta.yaml')) {
@@ -91,7 +109,7 @@ async function up() {
     const target = path.join(process.cwd(), 'package-lock.json')
     if (exists(target) && fs.lstatSync(target).isSymbolicLink()) fs.unlinkSync(target)
     const relative = path.relative(process.cwd(), source)
-    fs.symlinkSync(relative, target, 'junction')
+    if (!exists(target)) fs.symlinkSync(relative, target, 'junction')
   }
 
   if (cds.cli.options.to === 'k8s') {
@@ -100,7 +118,10 @@ async function up() {
     const nsKubectl = ns ? `-n ${ns}` : ''
 
     run('npm i --package-lock')
-    run('ctz containerize.yaml --log --push')
+    run('cds build --production')
+    await containerize('containerize.yaml', { push: true, clearCache: !!process.env.CLEAR_CACHE })
+    console.log('Containerization completed')
+
     let helmUpgrade = `helm upgrade --install ${appName} ./gen/chart ${nsHelm} --wait --wait-for-jobs --timeout=10m`
     if (hasXsuaa) helmUpgrade += ' --set-file xsuaa.jsonParameters=xs-security.json'
     run(helmUpgrade)

package/bin/util/containerize.js

@@ -0,0 +1,142 @@
+const cds = require('../../lib/cds')
+const { path } = cds.utils
+const { join } = path
+const { execSync } = require('node:child_process')
+const { highlight } = require('../../lib/util/term')
+
+const buildpacks = new Set([
+  'java', 'nodejs', 'sap-machine', 'executable-jar', 'spring-boot', 'syft'
+])
+const builders = new Set([
+  'builder-jammy-base', 'builder-jammy-buildpackless-base', 'builder-jammy-full', 'builder-jammy-buildpackless-full'
+])
+
+const keyProcessorMap = {
+  dockerfile: processDockerfile,
+  commands: processCommands,
+  buildpack: processBuildpack
+}
+
+const run = cmd => {
+  cmd = Array.isArray(cmd) ? cmd.join(' ') : cmd
+  console.log(highlight(cmd))
+  try {
+    return execSync(cmd, {
+      stdio: 'inherit',
+      env: { ...process.env, FORCE_COLOR: cds.utils.colors.enabled }
+    })
+  } catch (error) {
+    throw error.message
+  }
+}
+
+function appendSubcommand(param, subcommand) {
+  if (!param) return []
+  if (subcommand === '--env') {
+    return Object.entries(param).flatMap(([k, v]) =>
+      String(v).split(',').map(env => [subcommand, `${k}=${env.trim() || '""'}`])
+    ).flat()
+  }
+  return param.split(',').map(e => [subcommand, e.trim()]).flat()
+}
+
+function processDockerfile(bp, name, tag) {
+  if (!bp.dockerfile) return []
+  return [['docker', 'build',
+    ...appendSubcommand(`${name}:${tag ?? 'latest'}`, '-t'),
+    ...appendSubcommand(bp.dockerfile, '-f'),
+    '.']]
+}
+
+function processCommands(bp) {
+  return bp.commands ? bp.commands.map(c => c.trim().split(' ')) : []
+}
+function processBuildpack(bp, name, tag, clearCache = false) {
+  let { type, path, env, builder } = bp.buildpack
+  type = type ? type.split(',').map(t => buildpacks.has(t.trim()) ? `paketo-buildpacks/${t.trim()}` : t.trim()) : []
+  if (builders.has(builder)) builder = `paketobuildpacks/${builder}`
+  const cacheArgs = clearCache ? ['--clear-cache'] : []
+  return [['pack',
+    ...appendSubcommand(`${name}:${tag}`, 'build'),
+    ...appendSubcommand(path, '--path'),
+    ...type.flatMap(t => appendSubcommand(t, '--buildpack')),
+    ...appendSubcommand(builder, '--builder'),
+    ...appendSubcommand(env, '--env'),
+    ...cacheArgs
+  ]]
+}
+
+/**
+ * Parses a YAML configuration file to extract Docker build and push commands for modules.
+ *
+ * @param {string} filename - The path to the YAML file to parse.
+ * @param {string} [repoOpt=''] - Optional repository override. If not provided, uses the repository defined in the YAML file.
+ * @param {boolean} [clearCache=false] - Whether to clear cache for buildpack builds.
+ * @returns {{
+ *   commands: Array<{
+ *     name: string,
+ *     tag: string,
+ *     buildCmd: Array<string>,
+ *     tagCmd: Array<string>,
+ *     pushCmd: Array<string>
+ *   }>,
+ *   before_all: Array<Array<string>>,
+ *   repository: string
+ * }} An object containing the commands for each module, any global pre-commands, and the repository name.
+ * @throws {Error} If modules are not defined in the YAML file or if build-parameters are invalid.
+ */
+function parseYAML(filename, repoOpt = '', options) {
+  const file = cds.load.yaml(join(cds.root, filename))
+  const { repository: repoFile, modules, tag: globalTag = 'latest' } = file
+  const repository = repoOpt || repoFile
+  const before_all = file['before-all'] ? file['before-all'].map(c => c.trim().split(' ')) : []
+  if (!modules) throw new Error('Modules not defined')
+  console.log(`Using repository: ${repository}`)
+  const commands = modules.map(m => {
+    const name = m.name, tag = m.tag || globalTag, bp = m['build-parameters']
+    const source = `${name}:${tag}`, repoImg = `${repository}/${source}`
+    const key = Object.keys(bp)[0]
+    const buildType = keyProcessorMap[key]
+    if (!buildType) throw new Error(`build-parameters ${Object.keys(bp)} is invalid.`)
+    return {
+      name, tag,
+      buildCmd: key === 'buildpack'
+        ? buildType(bp, name, tag, options.clearCache)
+        : buildType(bp, name, tag),
+      tagCmd: ['docker', 'tag', source, repoImg],
+      pushCmd: ['docker', 'push', repoImg]
+    }
+  })
+  return { commands, before_all, repository }
+}
+
+/**
+ * Executes the containerization commands for each module.
+ * @param {*} modules - The list of modules with their respective build, tag, and push commands.
+ * @param {*} options - Options object, e.g., { push: true } to push images after building.
+ */
+async function executeModules(modules, options) {
+  for (const m of modules) {
+    console.log(`Containerising module ${m.name}`)
+    for (const cmd of m.buildCmd) run(cmd)
+    if (options.push) {
+      run(m.tagCmd)
+      run(m.pushCmd)
+    }
+  }
+}
+
+/**
+ * Main function to containerize modules based on a YAML configuration file.
+ * @param {string} filename - The path to the YAML configuration file.
+ * @param {{ push: boolean, clearCache: boolean }} options - Options object, e.g., { push: true } to push images after building.
+ * @returns {Promise<void>}
+ */
+async function containerize(filename, options = { push: false, clearCache: false }) {
+  const { repository, before_all, commands: modules } = parseYAML(filename, '', options)
+  if (!repository || !modules) return
+  for (const cmd of before_all) await run(cmd)
+  await executeModules(modules, options)
+}
+
+module.exports = { containerize }

package/lib/build/buildTaskEngine.js

@@ -179,7 +179,7 @@ class BuildTaskEngine {
 
     /** @private */
     _resolveHandlerResponse(results, pluginMessages = []) {
-        /** @type {BuildError[]}*/
+        /** @type {(BuildError | Error)[]}*/
         const errors = []
         const resolvedResults = results.reduce((acc, r) => {
             if (r.status === 'fulfilled') {
@@ -195,7 +195,10 @@ class BuildTaskEngine {
             const error = errors.find(e => e.constructor.name !== COMPILATION_ERROR)
             if (error) {
                 // throw original BuildError including existing BuildMessages
-                error.messages = error.messages.map(m => typeof m === 'string' ? new BuildMessage(m, SEVERITY_ERROR) : m)
+                if (!(error instanceof BuildError)) {
+                    throw error
+                }
+                error.messages = error.messages?.map(m => typeof m === 'string' ? new BuildMessage(m, SEVERITY_ERROR) : m)
                 error.messages = this._sortMessagesUnique(pluginMessages.filter(m => m instanceof BuildMessage), error.messages)
                 throw error
             }

package/lib/build/plugin.js

@@ -126,7 +126,7 @@ class Plugin {
      * @abstract
      * Called by the framework to create the artifacts of this build plugin.
      */
-    async build() { /* abstract */}
+    async build() { /* abstract */ }
 
     /**
      * Called by the framework immediately before 'build' to delete any output created by this build plugin.

package/lib/build/plugins/helm/index.js

@@ -1,6 +1,5 @@
 const cds = require('../../../cds')
-const yaml = require('yaml')
-const { exists, path, readFileSync } = cds.utils
+const { exists, path, readFileSync, yaml } = cds.utils
 const { Plugin, BuildError } = require('../..')
 const { join } = path
 const { readProject } = require('../../../init/projectReader')
@@ -11,7 +10,7 @@ module.exports = class HelmBuildPlugin extends Plugin {
   static hasTask() {
     if (exists('chart/Chart.yaml')) {
       const chartFile = readFileSync(join(cds.root, 'chart', 'Chart.yaml'), 'utf8')
-      const chartYaml = yaml.parseDocument(chartFile).toJS()
+      const chartYaml = yaml.parse(chartFile)
       return chartYaml.annotations?.["app.kubernetes.io/managed-by"] === 'cds-dk/helm'
     }
     return false
@@ -27,15 +26,16 @@ module.exports = class HelmBuildPlugin extends Plugin {
   }
 
   async build() {
-    if(!HelmBuildPlugin.hasTask()) {
+    if (!HelmBuildPlugin.hasTask()) {
       this.pushMessage("Helm Chart not found. Execute `cds add helm` to add the helm chart.", Plugin.WARNING)
       return
     }
 
-    const { hasApprouter, hasConnectivity, hasHtml5Repo } = readProject()
+    const project = readProject()
+    const { hasApprouter, hasConnectivity, hasHtml5Repo } = project
 
     const chartFile = readFileSync(join(cds.root, 'chart', 'Chart.yaml'), 'utf8')
-    const chartYaml = yaml.parseDocument(chartFile).toJS()
+    const chartYaml = yaml.parse(chartFile)
     const isInternal = chartYaml.dependencies?.find(dep => dep.name === 'web-application')?.repository !== undefined
 
     if (!isInternal) {
@@ -66,7 +66,6 @@ module.exports = class HelmBuildPlugin extends Plugin {
       await this.copy(join(pluginResourcePath, 'connectivity/connectivity-proxy-info.yaml')).to('templates/connectivity-proxy-info.yaml')
     }
 
-
     if (hasHtml5Repo) {
       await this.copy(join(pluginResourcePath, 'html5-repo/html5-apps-deployer-configmap.yaml')).to('templates/html5-apps-deployer-configmap.yaml')
     }

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

@@ -21,6 +21,10 @@ const FILE_NAME_UNDEPLOY_JSON = "undeploy.json"
 const DEPLOY_FORMAT = "deploy-format"
 const DEBUG = cds.debug('cli|build')
 
+// Some HDI artifacts do not require explicit plugin specification in _.hdiconfig_.
+// This list contains exceptions which will be ignored during the consistency check.
+const PLUGINLESS_HDB_FILES = new Set([".hdbgrants", ".hdbrevokes"])
+
 class HanaBuildPlugin extends InternalBuildPlugin {
     init() {
         if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
@@ -473,8 +477,12 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             }
         }
         if (Object.keys(content['file_suffixes']).length < hdiPlugins.size) {
-            const missingPlugins = Array.from(hdiPlugins).filter(key => !content['file_suffixes'][key.slice(1)])
-            this.pushMessage(`'HANA database plugin not found for following file suffix [${missingPlugins.join(', ')}]`)
+            const missingPlugins = Array.from(hdiPlugins)
+                .filter(key => !content['file_suffixes'][key.slice(1)])
+                .filter(key => !PLUGINLESS_HDB_FILES.has(key))
+            if (missingPlugins.length) {
+                this.pushMessage(`'HANA database plugin not found for following file suffix [${missingPlugins.join(', ')}]`)
+            }
         }
         await this.write(content).to(hdiConfigPath)
     }

package/lib/import/common.js

@@ -336,12 +336,12 @@ function _printUsageHint(dest, service, cwd) {
     dest = dest.replace(extension, '');
     let using
     if (service.length > 1){
-        using = `using { ${service.join(', ')}} from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}'`;
+        using = `using { ${service.join(', ')}} from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}';`;
     } else {
-        using = `using { ${service} as external } from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}'`;
+        using = `using { ${service} as external } from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}';`;
     }
     const message = `\n[cds] - imported API to ${path.relative(cwd, dest)}
-> use it in your CDS models through the like of:
+> use it in your CDS models through the likes of:
 
 ${require('../util/term').info(using)}
 `;

package/lib/import/message.js

@@ -12,7 +12,7 @@ const messages = {
 	FILE_MODIFIED: 'The file with the same name exists and is been modified. Use --force flag to forcefully overwrite the file.',
 	OUTPUT_FILE_MISMATCH: 'Specify the file extension that --as option supports.',
 	INVALID_AS_OPTION: 'For --as option, please specify one of these output file format [cds, csn, json].',
-	UNSUPPORTED_FROM_OPTION: 'For --from option, please specify one of these types [edmx, openapi, asyncapi, rfc]. Make sure the required importer plugin is installed.',
+	UNSUPPORTED_FROM_OPTION: `No importer is installed for type '{0}'. Known import kinds are: {1}. Make sure the required importer plugin is installed.`,
 	INCORRECT_EXTENSION: 'If --as option is not provided, then please provide either .json or .csn output file extension.',
 	INCORRECT_INPUT_NAMESPACES: 'Invalid value for --include-namespaces option. Specify namespaces as comma-separated list or "*"',
 	MISSING_ASSOCIATION: 'Association is missing in the input file provided. Please check the edmx file.',

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '4.4.0',
+    MAVEN_ARCHETYPE_VERSION: '4.4.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -57,6 +57,8 @@ module.exports = {
         APP_FRONTEND: 'app-frontend',
         PORTAL: 'portal',
         APPLICATION_LOGGING: 'application-logging',
+        CLOUD_LOGGING: 'cloud-logging',
+        TELEMETRY: 'telemetry',
         AUDIT_LOGGING: 'audit-logging',
         NOTIFICATIONS: 'notifications',
         WORKZONE: 'workzone',

package/lib/init/index.js

@@ -161,9 +161,7 @@ module.exports = class CDSGenerator {
             if (!cds.cli.options.dry) console.log(`adding ${term.bold(facet)}`)
             const template = this.templateList[i]
             await template.run()
-            await template.combine()
         }
-
         DEBUG && console.log()
         DEBUG && console.log('plugins active for production:')
         const fromDk = readdirSync(join(__dirname, './template'))
@@ -176,7 +174,7 @@ module.exports = class CDSGenerator {
             for (const plugin of sorted) {
                 const Plugin = registered.get(plugin) ?? require('./template/' + plugin)
                 const template = new Plugin()
-                const inProduction = Plugin.hasInProduction(env4('production')) || cds.cli.argv.includes(plugin) || cds.cli.options.add?.has(plugin)
+                const inProduction = Plugin.hasInProduction(env4('production')) || cds.cli.argv[0]?.includes(plugin) || cds.cli.options.add?.has(plugin)
                 DEBUG && console.log(inProduction ? '✅' : '❌', plugin)
                 if (inProduction) await template.combine()
             }
@@ -236,8 +234,8 @@ module.exports = class CDSGenerator {
             if (plugin === 'appfront') plugin = 'app-front'
             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')
+                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'
@@ -250,6 +248,7 @@ module.exports = class CDSGenerator {
                 if (await template.canRun()) {
                     templates.set(plugin, template)
                     const dependencies = await template.requires()
+                    dependencies?.forEach(d => cds.cli.options.add?.add(d))
                     dependencies?.forEach(d => plugins.add(d))
                 } else {
                     throw 'cannot run plugin \'' + plugin + '\'' + (DEBUG ? 'Does not satisfy the canRun() function:\n    ' + template.canRun : '')