@sap/cds-dk 9.7.0 → 9.7.1

package/CHANGELOG.md

@@ -6,6 +6,17 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 9.7.1 - 2026-02-05
+
+### Fixed
+
+- `cds add completion` now works without specifying the project runtime.
+
+- `cds add xsuaa` correctly adds the the binding for the `html5-apps-deployer` on Kyma.
+- `cds version` prints an older format in a legacy situation.
+- `cds add nodejs` is automatically added in BAS scenarios for compatibility if no other runtime is specified.
+- `cds add data -n` works correctly for `Composition of one` scenarios.
+
 ## Version 9.7.0 - 2026-02-02
 
 ### Added

package/bin/version.js

@@ -203,9 +203,10 @@ function print_versions (rows, o, cwd = o.root+'/') {
   if (!rows || rows.length === 0) return console.error (YELLOW, '  No CAP packages found.', RESET)
   const local = o.abs ? p => p : p => !p ? '' : p.startsWith(cwd) ? p.replace(cwd,'./') : p.replace(home,'~')
 
-  if (cds.env['project-nature'] === 'java') { // cds10: remove
-      console.log(rows.map(([name,version,location]) => `${GREEN}${name}:${RESET} ${version??location}`).join('\n'))
-      return
+  // cds10: remove and offer --json option instead
+  if (cds.env['project-nature'] === 'java' || process.env.WS_BASE_URL) {
+    console.log(rows.map(([name,version,location]) => `${GREEN}${name === 'cds.home'?'home':name}:${RESET} ${version??location}`).join('\n'))
+    return
   }
 
   // compute column widths for tabular printing

package/lib/build/buildTaskFactory.js

@@ -1,7 +1,7 @@
 // @ts-check
 const cds = require('../cds')
 const BuildTaskProviderFactory = require('./buildTaskProviderFactory')
-const { hasJavaNature, getProperty, getDefaultModelPaths, hasOptionValue, BuildError } = require('./util')
+const { hasJavaNature, getDefaultModelPaths, hasOptionValue, BuildError } = require('./util')
 const { OPTION_WS, IGNORE_DEFAULT_MODELS, NODEJS_MODEL_EXCLUDE_LIST, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF } = require("./constants")
 const DEBUG = cds.debug('cli|build')
 
@@ -74,7 +74,7 @@ module.exports = class BuildTaskFactory {
     }
 
     static _getExistingTasks() {
-        return Array.isArray(getProperty(cds.env, 'build.tasks')) ? JSON.parse(JSON.stringify(cds.env.build.tasks)) : []
+        return Array.isArray(cds.env.build?.tasks) ? structuredClone(cds.env.build.tasks) : []
     }
 
     static async _applyCommonTaskDefaults(tasks) {

package/lib/build/plugin.js

@@ -7,7 +7,7 @@ const IS_WIN = os.platform() === 'win32';
 const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, SEVERITY_INFO, SEVERITY_WARNING, SEVERITY_ERROR } = require('./constants')
 
 const { find } = require('../util/fs')
-const { hasOptionValue, getProperty, relativePaths, BuildMessage, filterFeaturePaths } = require('./util')
+const { hasOptionValue, relativePaths, BuildMessage, filterFeaturePaths } = require('./util')
 
 const DEBUG = cds.debug('cli|build')
 
@@ -286,9 +286,9 @@ class Plugin {
     // Returns the value of the given build option defined for this build task.
     _getBuildOption(qualifiedName) {
         // build task options overwriting other settings
-        let value = getProperty(this.context.options, qualifiedName) // command line
+        let value = this.context.options[qualifiedName] // command line
         if (value === undefined) {
-            value = getProperty(this.task.options, qualifiedName) // task options
+            value = this.task.options[qualifiedName] // task options
         }
         return value
     }

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

@@ -1,7 +1,7 @@
 const path = require('path')
 const cds = require('../../../cds')
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
-const { getProperty, relativePaths } = require('../../util')
+const { relativePaths } = require('../../util')
 const { OUTPUT_MODE, OUTPUT_MODE_RESULT, BUILD_TASK_FIORI, CDS_CONFIG_PATH_SEP, OUTPUT_MODE_FILESYSTEM } = require('../../constants')
 const DEBUG = cds.debug('cli|build')
 
@@ -105,14 +105,14 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
             return
         }
 
-        const mainService = getProperty(manifest, ['sap.app', 'dataSources', 'mainService'])
+        const mainService = manifest?.['sap.app']?.dataSources?.mainService
         if (!mainService) {
             // no mainService defined - not supported
             DEBUG?.(`UI module does not have a datasource [mainService], [${relativePaths(cds.root, manifestPath)}], skipping build`)
             return
         }
 
-        const localUri = getProperty(mainService, ['settings', 'localUri'])
+        const localUri = mainService?.settings?.localUri
         const uri = mainService.uri
 
         if (!localUri || !uri) {

package/lib/build/util.js

@@ -21,32 +21,6 @@ const FLATTEN_MAX_DEPTH = 20 // should suffice, was infinite in earlier versions
 /** @typedef {object[] | object} Credentials */
 /** @typedef {(string | NestedStringArray)[]} NestedStringArray */
 
-/**
- * @param {object} src - object to get property from
- * @param {string | string[]} segments - property path
- */
-function getProperty(src, segments) {
-    segments = Array.isArray(segments) ? segments : segments.split('.')
-    return segments.reduce((p, n) => p && p[n], src)
-}
-
-/**
- * @param {object} src - object to set property on
- * @param {string | string[]} segments - property path
- * @param {unknown} value - value to set
- */
-function setProperty(src, segments, value) {
-    segments = Array.isArray(segments) ? segments : segments.split('.')
-    segments.reduce((p, n, idx) => {
-        if (segments.length === idx + 1) {
-            p[n] = value
-        } else if (p[n] === undefined) {
-            p[n] = {}
-        }
-        return p[n]
-    }, src)
-}
-
 /**
  * Returns whether this project is a java project or not.
 */
@@ -510,8 +484,6 @@ class BuildError extends Error {
 }
 
 module.exports = {
-    getProperty,
-    setProperty,
     hasJavaNature,
     hasOptionValue,
     relativePaths,

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '4.6.2',
+    MAVEN_ARCHETYPE_VERSION: '4.7.0',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',

package/lib/init/index.js

@@ -1,7 +1,7 @@
 
 const { readdirSync } = require('node:fs')
 const { basename, join, relative, resolve } = require('node:path')
-const { OPTIONS, COMMAND_INIT } = require('./constants'), { JAVA } = OPTIONS
+const { OPTIONS, COMMAND_INIT } = require('./constants'), { JAVA, COMPLETION } = OPTIONS
 const validate = require('./validate')
 const cmd = require('../util/command')
 
@@ -91,7 +91,7 @@ module.exports = class CDSGenerator {
                 command: COMMAND_INIT,
                 // keep caller independent from internal names
                 options: {
-                    cwd: options.cwd,
+                    ...options,
                     add: new Set(options.add)
                 },
                 argv:[]
@@ -143,8 +143,9 @@ module.exports = class CDSGenerator {
         const cmds = Object.values(OPTIONS)
         const byPriority = (a, b) => cmds.indexOf(a) - cmds.indexOf(b)
         const sorted = Array.from(plugins).sort(byPriority)
+        const skipLogFacets = ['initial', COMPLETION]
         for (const [i, facet] of Object.entries(sorted)) {
-            if (!cds.cli.options.dry && facet !== 'initial')
+            if (!cds.cli.options.dry && !skipLogFacets.includes(facet))
                 console.log(`Adding facet: ${BOLD + facet + RESET}`)
             const template = this.templateList[i]
             await template.run()
@@ -243,7 +244,7 @@ module.exports = class CDSGenerator {
             _alias('kibana', 'application-logging')
             _alias('kibana-logging', 'application-logging')
 
-            const runtimeAgnostic = { initial:1, 'tiny-sample':1, data:1 }
+            const runtimeAgnostic = { initial:1, 'tiny-sample':1, data:1, completion: 1 }
             if (!(plugin in runtimeAgnostic)) {
                 const creating = ['java', 'nodejs', 'typescript', 'esm', 'extension']
                 const { command, options, argv } = cds.cli
@@ -324,6 +325,10 @@ module.exports = class CDSGenerator {
 
         if (cds.cli.command === COMMAND_INIT && !options.add.has(JAVA)) {
             options.add.add('initial')
+
+            // cds10: remove
+            const { isBas } = require('./projectReader').readProject()
+            if (isBas) options.add.add('nodejs')
         }
     }
 }

package/lib/init/projectReader.js

@@ -331,4 +331,5 @@ function _normalizeSpringBootCfg(obj) {
  * @property {String} githubSlug GitHub org/repo.
  * @property {boolean} isMonorepoMicroservice Indicates if the project is a monorepo microservice.
  * @property {String} npmWorkspaceRoot The root path of the monorepo workspace.
+ * @property {String} isBas Indicates if the project is running in Business Application Studio (BAS).
  */

package/lib/init/template/completion/completionSetup.js

@@ -90,7 +90,7 @@ module.exports = new class CompletionSetup {
                 profileFile = '.config/fish/config.fish';
                 break;
             default:
-                throw `Completion is only supported for ${SUPPORTED_LINUX_SHELLS.join(', ')}.`;
+                throw `Current shell is '${shell}'. Completion is only supported for ${SUPPORTED_LINUX_SHELLS.join(', ')}.`;
         }
 
         profileFile = path.join(os.homedir(), profileFile);

package/lib/init/template/data/as-csv.js

@@ -28,7 +28,10 @@ module.exports = async (data={}, csn, { headerOnly=false, separator=',' }={}) =>
           if (value === undefined)
             continue
           if (element._type === 'cds.Composition') {
-            data[element.target] = value // Add object for a new entity. Next pass will process it.
+            const t = element.target
+            if (data[t] === undefined) {
+              data[t] = value // Add object for a new entity. Next pass will process it.
+            }
           }
           else if (element._type === 'cds.Association') {
             if (element.on) {

package/lib/init/template/html5-repo/index.js

@@ -37,8 +37,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         const project = readProject()
         const {
             isJava, srvPath, appPath, apps,
-            hasApprouter, addApprouter, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime,  addMultitenancy, addWorkzoneStandard, addXsuaa,
-            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, hasUI5
+            hasApprouter, hasMta, addMta, hasKyma, hasXsuaa, hasMultitenancy, hasUI5,
+            addSample, addApprouter, addContainerize, addKyma, addHelm, addHelmUnifiedRuntime,  addMultitenancy, addWorkzoneStandard, addXsuaa, addIas
         } = project
 
         await Promise.all(apps.map(async ({ app }) => {
@@ -65,7 +65,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge({ cds: { requires: { 'html5-repo': true } } }).into('mtx/sidecar/package.json')
         }
 
-        if (addMta || (addXsuaa || addApprouter || addWorkzoneStandard || addMultitenancy || addSample) && hasMta) {
+        const affected = addXsuaa || addApprouter || addWorkzoneStandard || addMultitenancy || addSample || addIas
+        if (addMta || affected && hasMta) {
             const srv = srv4(srvPath)
             project.apps = apps
             const relationships = [{
@@ -109,7 +110,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             })
         }
 
-        // cds10
+        // cds10: change to if (addKyma)
         // needed because of adding kyma to cli options in case of helm
         if (addContainerize || (addKyma && !addHelm && !addHelmUnifiedRuntime)) {
             const additions = [{
@@ -119,7 +120,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
 
-        if (addKyma) {
+        if (addKyma || affected && hasKyma) {
             await renderAndCopy(join(__dirname, 'files/html5-deployer.package.json.hbs'), 'app/html5-deployer/package.json', project)
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }

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

@@ -83,7 +83,7 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites, relationships })
         }
 
-        if (addKyma || (addMultitenancy && hasKyma)) {
+        if (addKyma || addMultitenancy && hasKyma) {
             const overwrites = addMultitenancy ? [{ item: 'xsuaa.parameters.tenant-mode', withValue: 'shared' }] : []
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project, overwrites })
             await merge({

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.7.0",
+  "version": "9.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "9.7.0",
+      "version": "9.7.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -41,8 +41,8 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "2.8.1",
-      "integrity": "sha512-p2MHv97d+yiUBJYSAI/qusZzdEtOVfv6GZH51mkfxNXLeOGpV1wjr6UhLDmZrt6h7gTfqJA6cR1WUrrVOq38Ag==",
+      "version": "2.8.2",
+      "integrity": "sha512-5BUWnoRX7LQBEWvEZmq0urEkxWPIIUnV9v2uFYop19W10jtmK6bxKqk+oUGD/7o6C9GNiFcZoLpja7SFohfKOg==",
       "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -64,12 +64,12 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "2.1.2",
-      "integrity": "sha512-q8fQuIzwCfUF+l36BoL3LP32JYw389cmsZzE0Ec3JVz7k1sL+WzZ1XIbL1Ua/we3cHrDV+U3E9iAd0FOlcFumw==",
+      "version": "2.1.3",
+      "integrity": "sha512-JkIAR8khPEW0jgw440JrtOzsj+TacZmACJsifGnCWpgrC17f2q8r15pzrCnvvCmkLXTqUW1kRg5/B3nLbaO86Q==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "@cap-js/db-service": "^2.8.1",
+        "@cap-js/db-service": "^2.8.2",
         "better-sqlite3": "^12.0.0"
       },
       "peerDependencies": {
@@ -116,8 +116,8 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "6.7.1",
-      "integrity": "sha512-vfPhfLoT5sy73LBo8fGwYJ030tXY/ZY+1PSnVxLsghycg3/eMt06HrnI8Pt6vc7ia57x3/QGcHYXa+06SF3pZA==",
+      "version": "6.7.2",
+      "integrity": "sha512-5UpDA7boOmwtTBWjhEDbpXKgxjqz+0zObBr12P3g5D7QIMF+hPrPG+J0Bm2AQRPE/lv8VcnzFEaMdibRgmGtUw==",
       "license": "SEE LICENSE IN LICENSE",
       "bin": {
         "cdsc": "bin/cdsc.js",
@@ -935,8 +935,8 @@
       }
     },
     "node_modules/hdb": {
-      "version": "2.26.4",
-      "integrity": "sha512-v0uIr9mD9iw2Ws+H6+iLNO6W+uIqeXwt8Mwe1c0CZQOn1Sk631Uy4zgdz1wOz4IY3WgxdVjBAYWZ9AS8A/dLIQ==",
+      "version": "2.27.1",
+      "integrity": "sha512-xYL/W+fq2TyGHyzm8muolQnw8tdh4+2NQ8mQP2FpLSuhfJ8l0jQNSUZoAXic7NfMEan1Jvf8V1L4blwkgTc6+A==",
       "license": "Apache-2.0",
       "dependencies": {
         "iconv-lite": "0.7.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.7.0",
+  "version": "9.7.1",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [