@sap/cds-dk 8.1.0 → 8.1.1

package/CHANGELOG.md

@@ -7,6 +7,29 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 8.1.1 - 2024-08-07
+
+### Added
+
+- Add more features to CAP project creation wizard in SAP Business Application Studio.
+- `cds.add.merge` now you specify a `key` in its `deletions` semantics.
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 3.1.0 for creating Java projects.
+
+### Fixed
+
+- `cds import` now gives proper error message for OData import in case of invalid OData version or invalid encoding.
+- `cds import` now able to ignore invalid escape sequence in the description of properties for OData V2.
+- `cds add mta` does not error when the `app/router` folder was deleted.
+- `cds version -i` does not show a globally installed version when none is installed or linked.
+- `cds compile --to openapi` no longer fails with `Error: Unknown protocol: graphql`.
+- `cds add data` can now correctly handle circular dependencies in entities that point to themselves via associations and compositions.
+- `cds add` returns correct suggestions for shell completion.
+- `cds version` reports correct `@sap/cds-compiler` version.
+- `cds deploy` falls back correctly to `@sap/hana-client` when `HDI_DEPLOY_OPTIONS='{"use_hdb":false}'` is set.
+
 ## Version 8.1.0 - 2024-07-26
 
 ### Added
@@ -63,6 +86,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds add helm` removed `saasRegistryParameters` key and moved parameters to `saas-registry`.
 - `cds init` no longer creates a `.cdsrc.json` for Node.js projects.
 - `cds build` configuration cleanup for `data.model` and `service.model` to only support configuration of a single model folder.
+- `cds build` now fully supports default model definitions for custom build plugins.
 
 ## Version 8.0.1 - 2024-07-09
 

package/bin/version.js

@@ -71,13 +71,12 @@ function info({ root:cwd=process.cwd() }) {
 
   const npmRoot = execSync('npm root -g').toString().trim()
   let versions = {
-    ..._versions_from(_pkg_path('@sap/cds-dk', __dirname), '@sap/cds-dk (global)'), // ... linked in cap/dev setup
-    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // ... or installed globally
+    ..._versions_from(_pkg_path('@sap/cds-dk', npmRoot), '@sap/cds-dk (global)'), // linked in cap/dev or installed globally
     ..._versions_from(_pkg_path('@sap/cds-dk', cwd)), // local dk, important for Java projects
     ..._versions_from(_pkg_path('@sap/cds', __dirname)), // @sap/cds from here
     ..._versions_from(_pkg_path('@sap/cds', cds.home)),  // ... or local @sap/cds
     ..._versions_from(cwd), // ... more from local app dependencies
-    ..._versions_from(_pkg_path('@sap/cds-compiler', cwd, __dirname)), // compiler is no direct dependency, so list it explicitly
+    '@sap/cds-compiler': cds.compiler.version(),
     'Node.js': process.version,
     'home': cds.home, // effective cds home
   }

package/lib/build/buildTaskFactory.js

@@ -3,7 +3,7 @@ const path = require('path')
 const cds = require('../cds')
 const BuildTaskProviderFactory = require('./buildTaskProviderFactory')
 const { hasJavaNature, getProperty, getDefaultModelOptions, hasOptionValue, BuildError } = require('./util')
-const { FILE_EXT_CDS, OPTION_WS } = require("./constants")
+const { FILE_EXT_CDS, OPTION_WS, IGNORE_DEFAULT_MODELS, NODEJS_MODEL_EXCLUDE_LIST, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF } = require("./constants")
 const term = require('../util/term')
 const DEBUG = cds.debug('cli|build')
 
@@ -95,11 +95,7 @@ class BuildTaskFactory {
                 task.options.model = [task.options.model]
             }
         })
-        // there must be at least one task without model options
-        if (!tasks.some(task => !task.options?.model?.length > 0)) {
-            return
-        }
-        const modelPaths = await getDefaultModelOptions()
+        const modelPaths = await getDefaultModelOptions(false)
         let wsModelPaths
         // calculate only once
         if (cds.cli.options?.[OPTION_WS] || tasks.some(task => hasOptionValue(task.options?.[OPTION_WS], true))) {
@@ -107,10 +103,12 @@ class BuildTaskFactory {
         }
         // set default model options
         tasks.forEach(task => {
-            this._setTaskModelOptions(task, cds.cli.options?.[OPTION_WS] || hasOptionValue(task.options?.[OPTION_WS], true) ? wsModelPaths : modelPaths)
             if (!task.src) {
                 throw new BuildError(`Mandatory property 'src' not defined for build task '${task.for}'.`)
             }
+            const optionWs = cds.cli.options?.[OPTION_WS] || hasOptionValue(task.options?.[OPTION_WS], true)
+            // shallow copy model paths
+            this._setTaskModelOptions(task, optionWs ? [...wsModelPaths] : [...modelPaths])
         })
     }
 
@@ -180,14 +178,33 @@ class BuildTaskFactory {
     }
 
     static _setTaskModelOptions(task, defaultModelPaths) {
+        // bootstrap service model is only required for Nodejs build task - issues/12770#issuecomment-1805719
+        if (task.for !== BUILD_TASK_NODEJS && task.for !== BUILD_TASK_NODE_CF) {
+            defaultModelPaths = defaultModelPaths.filter(p => !NODEJS_MODEL_EXCLUDE_LIST.includes(p))
+        }
+
+        let taskModelPaths = task.options?.model
+        if (taskModelPaths && !Array.isArray(taskModelPaths)) {
+            taskModelPaths = [taskModelPaths]
+        }
+        const allowList = new RegExp(`^@sap/cds${cds.env.requires.toggles ? '|^' + cds.env.features.folders.replace('*', '') : ''}`)
         task.options = task.options || {}
-        if (!task.options.model?.length > 0) {
-            defaultModelPaths = new Set(defaultModelPaths)
-            if (task.src) {
-                defaultModelPaths.add(task.src)
+        let modelPaths = []
+        if (taskModelPaths?.length) {
+            if (!hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
+                modelPaths = defaultModelPaths.filter(p => p.match(allowList))
+            }
+        } else {
+            modelPaths = [...defaultModelPaths]
+            if (!modelPaths.includes(task.src)) {
+                modelPaths.push(task.src)
+            }
+            if (hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
+                // all default models except the built-in models
+                modelPaths = modelPaths.filter(p => !p.match(allowList))
             }
-            task.options.model = [...defaultModelPaths]
         }
+        task.options.model = [...new Set(taskModelPaths?.length ? taskModelPaths.concat(modelPaths) : modelPaths)]
     }
 
     static _stringifyTask(task) {

package/lib/build/constants.js

@@ -48,7 +48,7 @@ exports.FILE_EXT_CDS = ".cds"
 exports.MTX_SIDECAR_FOLDER = "mtx/sidecar"                      // default name of the mtx sidecar folder
 exports.DEFAULT_CSN_FILE_NAME = "csn.json"
 // REVISIT: the models are not required if a custom server.js file is used for MTX bootstrap
-exports.NODEJS_MODEL_EXCLUDE_LIST = ['@sap/cds/srv/mtx', '@sap/cds-mtxs/srv/bootstrap']
+exports.NODEJS_MODEL_EXCLUDE_LIST = ['@sap/cds-mtxs/srv/bootstrap']
 
 exports.CDS_CONFIG_PATH_SEP = "/"
 exports.SEVERITY_ERROR = "Error"

package/lib/build/provider/internalBuildTaskProvider.js

@@ -1,11 +1,10 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../cds')
-const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, normalizePath } = require('../util')
+const { hasJavaNature, BuildError, normalizePath } = require('../util')
 const BuildTaskProvider = require('../buildTaskProvider')
 const { FILE_EXT_CDS, BUILD_TASK_HANA, BUILD_TASK_FIORI, BUILD_TASK_JAVA, BUILD_TASK_JAVA_CF, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF, BUILD_TASK_MTX,
-    BUILD_TASKS, BUILD_TASK_MTX_SIDECAR, MTX_SIDECAR_FOLDER, BUILD_TASK_MTX_EXTENSION, NODEJS_MODEL_EXCLUDE_LIST,
-    IGNORE_DEFAULT_MODELS, OPTION_WS } = require("../constants")
+    BUILD_TASKS, BUILD_TASK_MTX_SIDECAR, MTX_SIDECAR_FOLDER, BUILD_TASK_MTX_EXTENSION } = require("../constants")
 const ResourcesTarBuilder = require('./mtx/resourcesTarBuilder')
 const DEBUG = cds.debug('cli|build')
 
@@ -19,10 +18,7 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
     }
 
     async applyTaskDefaults(task) {
-        // src folder needs to be initialized first
         InternalBuildTaskProvider._setDefaultSrcFolder(task)
-
-        await InternalBuildTaskProvider._setDefaultModel(task)
     }
 
     getPlugin(task) {
@@ -284,35 +280,6 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
         }
     }
 
-    static async _setDefaultModel(task) {
-        const ws = hasOptionValue(task.options?.[OPTION_WS], true) || cds.cli.options?.[OPTION_WS]
-        // REVISIT: filter nodejs bootstrap service models for Java - issues/12770#issuecomment-1805719
-        const filter = hasJavaNature() ? (m) => !NODEJS_MODEL_EXCLUDE_LIST.includes(m) : null
-        let taskModelPaths = task.options?.model
-        if (taskModelPaths && !Array.isArray(taskModelPaths)) {
-            taskModelPaths = [taskModelPaths]
-        }
-        const allowList = new RegExp(`^@sap/cds${cds.env.requires.toggles ? '|^' + cds.env.features.folders.replace('*', '') : ''}`)
-        task.options = task.options || {}
-        let defaultModelPaths = []
-        if (taskModelPaths?.length) {
-            if (!hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
-                defaultModelPaths = await getDefaultModelOptions(ws, filter)
-                defaultModelPaths = defaultModelPaths.filter(p => p.match(allowList))
-            }
-        } else {
-            defaultModelPaths = await getDefaultModelOptions(ws, filter)
-            defaultModelPaths.push(task.src)
-            if (hasOptionValue(task.options?.[IGNORE_DEFAULT_MODELS], true)) {
-                // all default models except the built-in models
-                defaultModelPaths = defaultModelPaths.filter(p => !p.match(allowList))
-            }
-        }
-        if (defaultModelPaths.length) {
-            task.options.model = [...new Set(taskModelPaths?.length ? taskModelPaths.concat(defaultModelPaths) : defaultModelPaths)]
-        }
-    }
-
     /**
      * Determines the module folder from the given list that may represent files or folders w or w/o .cds file extension.
      * @param {Array} filesOrFolders

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

@@ -92,10 +92,10 @@ class ResourcesTarBuilder {
         
         return hanaTasks.find(hanaTask => {
             // if called from internalBuildTaskProvider, the src folder for the tenant db task might still not set
-            // while an existing second shared db always requires src to be configured using a relative path
+            // while an existing second shared db always requires src to be set
             if (!hanaTask.src) return true
             const srcFolder = path.isAbsolute(hanaTask.src) ? path.relative(cds.root, hanaTask.src) : hanaTask.src
-            return mtxTask.options?.model?.includes(srcFolder)
+            return mtxTask.options?.model?.includes(srcFolder) || srcFolder === cds.env.folders.db.replace('/', '')
         })
     }
 }

package/lib/cds.js

@@ -1,6 +1,7 @@
 /** @type { import('@sap/cds/lib') } */
 const cds = _local ('@sap/cds')
 
+/** @type { import('@sap/cds/lib') & {_local: (id: string) => any} } */
 module.exports = Object.defineProperties (cds, {
   // for internal use in cds-dk only
   _log: { value: _local ('../bin/util/log'), configurable: true },

package/lib/compile/to_openapi.js

@@ -1,4 +1,5 @@
-const { compile } = require('@cap-js/openapi')
+const cds = require('../cds')
+const { compile } = cds._local('@cap-js/openapi') // load a local cap-js/openapi (fallback to our own)
 
 function cds_compile_to_openapi (csn, options) {
   return compile(csn, options)

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

@@ -37,6 +37,7 @@ module.exports = new class HdiDeployUtil {
           else throw e
         }
         if (options.use_hdb !== false) options.use_hdb = true
+        if (options.use_hdb === false) options.use_hdb = undefined
         deployerEnv.HDI_DEPLOY_OPTIONS = JSON.stringify(options)
 
         const asyncDeploy = util.promisify(deploy);

package/lib/import/common.js

@@ -67,7 +67,7 @@ async function getVersion(fileInputStream){
         oDataVersion = 'V4';
     }
     else {
-        throw new Error(messages.INVALID_EDMX_METADATA_VERSION);
+        throw new Error(messages.INVALID_ODATA_VERSION_OR_UNSUPPORTED_ENCODING);
     }
 
     return oDataVersion;

package/lib/import/message.js

@@ -2,7 +2,7 @@
 
 const messages = {
 	INVALID_EDMX_METADATA: 'The OData model is not valid. Specify the correct OData model.',
-	INVALID_EDMX_METADATA_VERSION: 'The OData version is not valid. Specify the correct OData version.',
+	INVALID_ODATA_VERSION_OR_UNSUPPORTED_ENCODING: 'Either the OData version is not valid, or the encoding of the file is not utf-8. Please specify the supported OData version and file encoding. OData version is expected one of [1.0, 2.0, 4.0, 4.01] and the input file encoding is expected UTF-8.',
 	INVALID_OUTPUT_FILE: 'Please provide an output file with one of these [cds, csn, json] file extension.',
 	SPECIFY_INPUT_FILE: 'Specify an input file that exists.',
 	SPECIFY_OUTPUT_FILE: 'Specify an output file or correct the output file path provided.',
@@ -45,4 +45,4 @@ function getMessages() {
 
 module.exports = {
 	getMessages
-};
+};

package/lib/import/odata/v2parser.js

@@ -355,7 +355,7 @@ function _extractAllFunctionImports(functionImports, parserContext) {
 }
 
 function _replaceSpecialCharacters(text) {
-	return text.replace(/(?:\\[rn]|[\r\n]+)+/gm, "\\n").replace(/\s+/g, ' ').replace(/"/g, """).trim();
+	return text.replace(/\\/g, "\\\\").replace(/(?:\\[rn]|[\r\n]+)+/gm, "\\n").replace(/\s+/g, ' ').replace(/"/g, """).trim();
 }
 
 // to parse the documentation tag
@@ -972,7 +972,7 @@ function _parseEntityProperty(properties, parserContext) {
 		// Has more than one entities
 		for (let i = 0; i < properties.length; i++) {
 			propAttributes = properties[i]._attributes;
-			// if the property contains documentatin tag
+			// if the property contains documentation tag
 			if (properties[i] && properties[i].Documentation)
 				propAttributes.doc = _parseDocumentationTag(properties[i].Documentation);
 			retProperties[propAttributes.Name] = _getPropertyAttributes(propAttributes, parserContext);

package/lib/init/bas.js

@@ -5,8 +5,10 @@ const { bold } = require('../util/term')
 const { OPTIONS } = require('./constants')
 const {
   NODEJS, JAVA,
-  HANA, APPROUTER, XSUAA, APPLICATION_LOGGING, ENTERPRISE_MESSAGING,
-  MTA, MULTITENANCY, PIPELINE,
+  XSUAA, APPROUTER, CONNECTIVITY, DESTINATION, HTML5_REPO, PORTAL, APPLICATION_LOGGING, AUDIT_LOGGING, NOTIFICATIONS,
+  ENTERPRISE_MESSAGING, KAFKA, REDIS_MESSAGING,
+  HANA, POSTGRES,
+  MTA, HELM, CONTAINERIZE, MULTITENANCY, PIPELINE,
   TINY_SAMPLE, SAMPLE
 } = OPTIONS
 const cwd = process.cwd()
@@ -17,75 +19,114 @@ module.exports = [{
   default: '',
   target: 'projectName',
   validate: async projectName => {
-      try {
-          cds.root = path.resolve(cwd, projectName || '.')
-          validate.projectName(projectName)
-          validate.projectFolder(path.join(cwd, projectName), cwd)
-      } catch (e) {
-          return e //  BAS Yeoman generator requires error to be returned
-      }
-      return true
+    try {
+      cds.root = path.resolve(cwd, projectName || '.')
+      validate.projectName(projectName)
+      validate.projectFolder(path.join(cwd, projectName), cwd)
+    } catch (e) {
+      return e //  BAS Yeoman generator requires error to be returned
+    }
+    return true
   },
   guiOptions: {
-      hint: 'This name is restricted to certain characters. A valid project name is compatible across platforms.',
-      mandatory: true
+    breadcrumb: 'Project Name',
+    hint: 'This name is restricted to certain characters. A valid project name is compatible across platforms.',
+    mandatory: true
   }
 }, {
   title: 'Type',
   description: `Select your runtime.`,
   default: NODEJS,
   choices: [
-      { name: 'Node.js', value: NODEJS },
-      { name: 'Java', value: JAVA }
+    { name: 'Node.js', value: NODEJS },
+    { name: 'Java', value: JAVA }
   ],
   multiple: false,
   target: 'add',
   guiOptions: {
-      hint: `The preferred runtime can't be changed afterwards. To use a different runtime, create a new project.`,
-      mandatory: true
+    breadcrumb: 'Runtime',
+    hint: `The preferred runtime can't be changed afterwards. To use a different runtime, create a new project.`,
+    mandatory: true
   }
 }, {
-  title: 'Features',
-  description: 'Choose productive runtime capabilities for your application.',
+  title: 'Databases',
+  description: 'Choose a database for your application.',
   default: '',
   choices: [
-      { name: 'SAP HANA Cloud', value: HANA },
-      { name: 'SAP Application Router', value: APPROUTER },
-      { name: 'User Authentication via XSUAA', value: XSUAA },
-      { name: 'Application Logging', value: APPLICATION_LOGGING },
-      { name: 'SAP BTP Event Mesh', value: ENTERPRISE_MESSAGING }
+    { name: 'SAP HANA Cloud', value: HANA },
+    { name: 'PostgreSQL', value: POSTGRES }
   ],
   multiple: true,
   target: 'add',
   guiOptions: {
-      hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
+    breadcrumb: 'Databases',
+    hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
   }
 }, {
   title: 'Deployment',
   description: 'Choose which way to deploy your project.',
   default: '',
   choices: [
-      { name: 'Cloud Foundry: MTA Deployment', value: MTA },
-      // { name: 'Kyma: Helm Deployment', value: HELM },
-      { name: 'Multitenancy', value: MULTITENANCY },
-      { name: 'CI/CD Pipeline Integration', value: PIPELINE },
+    { name: 'Cloud Foundry: MTA Deployment', value: MTA },
+    { name: 'Kyma: Helm Deployment', value: HELM },
+    { name: 'Kyma: Containerization using ctz CLI', value: CONTAINERIZE },
+    { name: 'Multitenancy', value: MULTITENANCY },
+    { name: 'CI/CD Pipeline Integration', value: PIPELINE }
+  ],
+  multiple: true,
+  target: 'add',
+  guiOptions: {
+    breadcrumb: 'Deployment',
+    hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
+  }
+}, {
+  title: 'Runtime Features',
+  description: 'Choose productive runtime capabilities for your application.',
+  default: '',
+  choices: [
+    { name: 'SAP BTP Authorization and Trust Management Service (XSUAA)', value: XSUAA },
+    { name: 'SAP BTP Application Router', value: APPROUTER },
+    { name: 'SAP BTP Connectivity Service', value: CONNECTIVITY },
+    { name: 'SAP BTP Destination Service', value: DESTINATION },
+    { name: 'SAP BTP HTML5 Application Repository', value: HTML5_REPO },
+    { name: 'SAP BTP Portal Service', value: PORTAL },
+    { name: 'SAP BTP Application Logging Service', value: APPLICATION_LOGGING },
+    { name: 'SAP BTP Audit Logging Service', value: AUDIT_LOGGING },
+    { name: 'SAP BTP Notification Service', value: NOTIFICATIONS }
+  ],
+  multiple: true,
+  target: 'add',
+  guiOptions: {
+    breadcrumb: 'Runtime Features',
+    hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
+  }
+}, {
+  title: 'Messaging',
+  description: 'Choose messaging capabilities for your application.',
+  default: '',
+  choices: [
+    { name: 'SAP BTP Event Mesh', value: ENTERPRISE_MESSAGING },
+    { name: 'Apache Kafka', value: KAFKA },
+    { name: 'Redis', value: REDIS_MESSAGING }
   ],
   multiple: true,
   target: 'add',
   guiOptions: {
-      hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
+    breadcrumb: 'Messaging',
+    hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
   }
 }, {
   title: 'Samples',
   description: `Add sample content to your project.`,
   default: '',
   choices: [
-      { name: 'Minimal Sample', value: TINY_SAMPLE },
-      { name: 'Extended Sample with UI', value: SAMPLE }
+    { name: 'Minimal Sample', value: TINY_SAMPLE },
+    { name: 'Extended Sample with UI', value: SAMPLE }
   ],
   multiple: true,
   target: 'add',
   guiOptions: {
-      hint: 'Speed up your ramp-up phase with sample files in your project.'
+    breadcrumb: 'Samples',
+    hint: 'Speed up your ramp-up phase with sample files in your project.'
   }
 }]

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '3.0.1',
+    MAVEN_ARCHETYPE_VERSION: '3.1.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -57,10 +57,7 @@ module.exports = {
         LINT_DEV: 'lint:dev',
         PIPELINE: 'pipeline',
         TYPER: 'typer',
-        TYPESCRIPT: 'typescript',
-        EVENT_QUEUE: 'event-queue',
-        COV2AP: 'cov2ap',
-        WEBSOCKET: 'websocket'
+        TYPESCRIPT: 'typescript'
     }),
 
     REGEX_JAVA_PACKAGE: /^[a-z_][a-z0-9_]*(\.[a-z_][a-z0-9_]*)*$/g,

package/lib/init/merge.js

@@ -70,7 +70,8 @@ module.exports.mergeGitignore = async function(into, from) {
 /**
  * @typedef {Object} Deletion
  * @property {MatchedNode} item - matched node to delete
- * @property {Object[]} relationships - list of relationships to delete
+ * @property {MatchedNode} [key] - key path to property to delete in node (optional)
+ * @property {Object[]} [relationships] - list of relationships to delete
  * @property {string} relationships[].removeProperty - key path to to-be-removed property
  * @property {string[]} relationships[].allWithin - key path to relationship
  */
@@ -285,10 +286,11 @@ async function _mergeYAML(into, from, project, semantics = {}) {
     })
 
     // 4. Delete entries from the project (e.g. separate deployer module when adding mtx)
-    deletions?.forEach(({ item, relationships }) => {
+    deletions?.forEach(({ item, relationships, key }) => {
         const entry = entryMap.get(item)
         if (!entry) return
-        entry.collection.delete(entry.index)
+        if (key) entry.collection.deleteIn([entry.index, ...key.split('.')])
+        else entry.collection.delete(entry.index)
 
         relationships?.forEach(relationship => {
             const [allWithinKeyPath, inKeyPath, into] = relationship.allWithin

package/lib/init/projectReader.js

@@ -3,7 +3,6 @@ const { join, resolve, basename } = require('path')
 const { fs, exists, isdir, path } = cds.utils
 const { parseXml } = require('./xml')
 const { REGEX_JAVA_VERSION, JAVA_LTS_VERSIONS } = require('./constants')
-const DEBUG = cds.debug('cli')
 const TRACE = cds.debug('trace')
 
 module.exports = new class ProjectReader {

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

@@ -15,7 +15,7 @@ const MAX_ASSOC_DEPTH = 5
  * @returns {Record<string, object[]>} the filled data
  */
 const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
-  let { referenceData } = options
+  let { referenceData, contentType } = options
 
   // if no entity restrictions are given, use all entities
   if (!data)  data = csn.all('entity').reduce((all, e) => { all[e.name] = []; return all }, {})
@@ -63,6 +63,14 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
     // remove records w/ duplicate keys. This can happen if the key is an enum (and we have less enum values than requested records).
     data[name] = uniqRecords(data[name], entity)
   }
+  for (let [key, d] of Object.entries(data)) {
+    if (contentType === 'json' && d.deleteReference && !d.keepReferece) {
+      delete data[key]
+    } 
+    delete d.keepReferece
+    delete d.deleteReference
+    uniqRecords(d, csn.definitions[key])
+  }
   return data
 }
 
@@ -222,17 +230,16 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
     }
     case 'cds.Composition': {
       const target = csn.definitions[element.target]
-      if (!target)
-        return
-      delete data[target.name] // as data for the target is created inline below, no need to have it separately
-      if (target === parentEntity || depth > MAX_ASSOC_DEPTH)
-        return
-
-      const targetRecords = []
+      if (!target || entity.name === target.name || depth > MAX_ASSOC_DEPTH) return
+      
+      let targetRecords = [] // in findKeysInOnCondition target records are linked to the entity, we don't want to overwrite any existing data
+      if (data[target.name]) data[target.name].deleteReference = true // for json composites references are nested and will be deleted when writing to file
+    
       const targetRecordCount = element.is2many ? 2 : 1 // TODO: make this configurable
       const targetRecordID = randomNumber()
       for (let i = 0; i < targetRecordCount; i++) {
-        targetRecords.push(fillRecord({}, targetRecordID+i, target, csn, data, entity, depth+1, referenceData))
+        const newRecord = fillRecord({}, targetRecordID+i, target, csn, data, entity, depth+1, referenceData)
+        if (newRecord) targetRecords.push(newRecord)
       }
 
       const [ownKey, ownKeyStructured, targetKey] = findKeysInOnCondition(element, target)
@@ -268,11 +275,14 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
           return
         
         if (targetRecords.length > 0) { // use record generated by following asociation
-          targetRecord = targetRecords[0]
+          targetRecord = targetRecords.at(-1)  // make sure the localized record references the newly generated texts
         } else {
           targetRecord = fillRecord({}, randomNumber(), target, csn, data, entity, depth+1, referenceData)
-          targetRecords.push(targetRecord)
-          uniqRecords(targetRecords, target)
+          if (targetRecord) {
+            targetRecords.push(targetRecord)
+            uniqRecords(targetRecords, target)
+          }
+          if (parentEntity && (parentEntity.name != entity.name)) data[target.name].keepReferece = true
         }
       }
 

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

@@ -77,7 +77,7 @@ module.exports = class DataTemplate extends require('../../plugin') {
       .filter (e => queries || !e.query) // remove all projection-like entities unless specified differently
       .reduce((all, e) => { all[e.name] = []; return all }, {})
 
-    await asJson(data, csn, records)
+    await asJson(data, csn, records, {contentType})
 
     if (contentType === 'csv') {
       const headerOnly = !cds.cli.options['records'] // compat to old behavior which only creates headers

package/lib/init/template/helm-unified-runtime/index.js

@@ -1,7 +1,9 @@
 const cds = require('../../..')
 const { rimraf, exists, readFileSync, yaml } = cds.utils
 const { join } = require('path')
-const { merge, readProject } = cds.add ?? {}
+
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
 
 module.exports = class HelmUnifiedRuntimeTemplate extends require('../helm') {
 

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

@@ -8,7 +8,7 @@ const { copyRenderedJSON } = require('../../../util/fs')
 const {
   srv4, // Server
   mtxSidecar4, // Additional Modules
-  saasRegistry, serviceManager, xsuaa, // BTP Services
+  saasRegistry, // BTP Services
   srvApi4, providedMtxApiSidecar4, requiredMtxSidecarApi4 // APIs
 } = require('../../registries/mta')
 
@@ -47,13 +47,9 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
       const modules = [srv, mtxSidecar]
       const services = [saasRegistry]
-      if (hasXsuaa) services.push(xsuaa)
       const apis = [srvApi4(srv), providedMtxApiSidecar4(mtxSidecar)]
       if (isJava) apis.push(requiredMtxSidecarApi4(srv))
       const additions = [...modules, ...services, ...apis]
-
-      const overwrites = hasXsuaa ? [{ item: [xsuaa, 'parameters.config.tenant-mode'], withValue: 'shared' }] : []
-
       const relationships =  [{
         insert: [saasRegistry, 'name'],
         into: [isJava ? srv : mtxSidecar, 'requires', 'name']
@@ -64,34 +60,16 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
           into: [mtxSidecar, 'build-parameters.requires', 'name']
         })
       }
-      if (hasXsuaa) {
-        relationships.push({
-          insert: [xsuaa, 'name'],
-          into: [mtxSidecar, 'requires', 'name']
-        })
-      }
-      if (hasHana) {
-        relationships.push({
-          insert: [serviceManager, 'name'],
-          into: [mtxSidecar, 'requires', 'name'],
-        })
-      }
 
-      const templateMtaPath = join(__dirname, 'files', 'mta.yaml.hbs')
-      await merge(templateMtaPath).into('mta.yaml', { with: project, additions, overwrites, relationships })
+      const templateMtaPath = join(__dirname, 'files/mta.yaml.hbs')
+      await merge(templateMtaPath).into('mta.yaml', { with: project, additions, relationships })
     }
 
     if (hasHelm || hasHelmUnifiedRuntime) {
-      const overwrites = hasXsuaa ? [{
-        item: [{
-          in: 'xsuaa',
-          where: { serviceOfferingName: 'xsuaa' }
-        }, 'parameters.tenant-mode'], withValue: 'shared'
-      }] : []
 
-      await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project, overwrites })
+      await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
 
-      const domain = hasApprouter ? 'svc.cluster.local:8080' : '{{ .Values.global.domain }}' 
+      const domain = hasApprouter ? 'svc.cluster.local:8080' : '{{ .Values.global.domain }}'
       const applicationWorkload = hasApprouter ? 'approuter' : 'srv'
       const serviceCommunicatingWithSaasReg = hasApprouter ? 'approuter' : isNodejs ? 'sidecar' : 'srv';
       await merge({
@@ -102,7 +80,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
             appUrls: {
               getDependencies: `https://{{ .Release.Name }}-${serviceCommunicatingWithSaasReg}-{{ .Release.Namespace }}.{{ .Values.global.domain }}${isNodejs ? '/-/cds/saas-provisioning' : '/mt/v1.0/subscriptions'}/dependencies`,
               onSubscription: `https://{{ .Release.Name }}-${serviceCommunicatingWithSaasReg}-{{ .Release.Namespace }}.{{ .Values.global.domain }}${isNodejs ? '/-/cds/saas-provisioning/tenant/{tenantId}' : '/mt/v1.0/subscriptions/tenants/{tenantId}'}`,
-            } 
+            }
           }
         },
         ...(isNodejs) && { sidecar: {
@@ -110,12 +88,12 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
             SUBSCRIPTION_URL: `https://\${tenant_subdomain}-{{ .Release.Name }}-${applicationWorkload}-{{ .Release.Namespace }}.{{ .Values.global.domain }}`
           }
         }},
-        ...(isJava) && { srv: { 
+        ...(isJava) && { srv: {
           env: {
             CDS_MULTITENANCY_APPUI_URL: `https://{{ .Release.Name }}-${applicationWorkload}-{{ .Release.Namespace }}.{{ .Values.global.domain }}`,
             CDS_MULTITENANCY_SIDECAR_URL: `http${hasApprouter ? '' : 's'}://{{ .Release.Name }}-sidecar${hasApprouter ? '.' : '-'}{{ .Release.Namespace }}.${domain}`
-          }          
-        }}       
+          }
+        }}
       }).into('chart/values.yaml',{ forceOverwrite: true })
     }
 

package/lib/init/template/sample/files/nodejs/cat-service.js

@@ -13,12 +13,12 @@ class CatalogService extends cds.ApplicationService { init() {
   // Reduce stock of ordered books if available stock suffices
   this.on('submitOrder', async req => {
     let { book:id, quantity } = req.data
-    let book = await SELECT.from (Books, id, b => b.stock)
+    let book = await SELECT.one.from (Books, id, b => b.stock)
 
     // Validate input data
     if (!book) return req.error (404, `Book #${id} doesn't exist`)
     if (quantity < 1) return req.error (400, `quantity has to be 1 or more`)
-    if (quantity > book.stock) return req.error (409, `${quantity} exceeds stock for book #${id}`)
+    if (!book.stock || quantity > book.stock) return req.error (409, `${quantity} exceeds stock for book #${id}`)
 
     // Reduce stock in database and return updated stock value
     await UPDATE (Books, id) .with ({ stock: book.stock -= quantity })

package/lib/init/template/sample/files/srv/cat-service.cds

@@ -11,6 +11,10 @@ service CatalogService {
   } excluding { createdBy, modifiedBy };
 
   @requires: 'authenticated-user'
-  action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
+  action submitOrder (
+    book    : Books:ID @mandatory,
+    quantity: Integer  @mandatory
+  ) returns { stock: Integer };
+
   event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
 }

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

@@ -39,7 +39,7 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             const additions = [srv, xsuaa]
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
             if (hasMultitenancy && isJava) additions.push(mtxSidecar)
-
+            const overwrites = hasMultitenancy ? [{ item: [xsuaa, 'parameters.config.tenant-mode'], withValue: 'shared' }] : []
             const relationships = [{
                 insert: [xsuaa, 'name'],
                 into: [srv, 'requires', 'name']
@@ -48,11 +48,18 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
                 insert: [xsuaa, 'name'],
                 into: [mtxSidecar, 'requires', 'name']
             })
-            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, relationships })
+
+            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites, relationships })
         }
 
         if (hasHelm || hasHelmUnifiedRuntime) {
-            await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
+            const overwrites = hasMultitenancy ? [{
+                item: [{
+                  in: 'xsuaa',
+                  where: { serviceOfferingName: 'xsuaa' }
+                }, 'parameters.tenant-mode'], withValue: 'shared'
+              }] : []
+            await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project, overwrites })
 
             await merge({
                 xsuaa: {

package/lib/mtx/push.js

@@ -95,7 +95,9 @@ module.exports = class Push {
           }, 5 * 60 * 1000);
 
           const interval = setInterval(async () => {
-            const { status, error = 'cds push failed' } = (await axios.get(jobUrl, options)).data;
+            const jobResult = await axios.get(jobUrl, options);
+            const { status, tasks } = jobResult.data;
+            const error = tasks[0]?.error ?? 'cds push failed'
             if (status === JOB_STATUS.FINISHED || status === JOB_STATUS.FAILED) {
               clearInterval(interval);
               clearTimeout(timeout);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.1.0",
+  "version": "8.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.1.0",
+      "version": "8.1.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -53,13 +53,13 @@
       }
     },
     "node_modules/@cap-js/openapi": {
-      "version": "1.0.4",
+      "version": "1.0.5",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "pluralize": "^8.0.0"
       },
       "peerDependencies": {
-        "@sap/cds": ">=7.3"
+        "@sap/cds": ">=7.6"
       }
     },
     "node_modules/@cap-js/sqlite": {
@@ -229,7 +229,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.1.0",
+      "version": "5.1.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -265,7 +265,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.0.3",
+      "version": "2.0.5",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -449,7 +449,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.7.2",
+      "version": "1.7.3",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -2304,7 +2304,7 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.19.0",
+      "version": "3.19.1",
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {

package/package.json

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

package/lib/init/template/cov2ap/files/dependencies.package.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "@cap-js-community/odata-v2-adapter": "^1"
-  }
-}

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

@@ -1,31 +0,0 @@
-const { readProject } = require('../../projectReader')
-const { merge, sort } = require('../../merge')
-const { link } = require('../../../util/term')
-const { CAP_JS_COMMUNITY_ODATA_V2 } = require('../../constants').URLS
-
-module.exports = class Cov2apTemplate extends require('../../plugin') {
-
-  static help() {
-    return 'cap-js-community: expose CDS services via the OData V2 protocol'
-  }
-
-  static hasInProduction() {
-    const { dependencies } = readProject()
-    return !!dependencies?.['@cap-js-community/odata-v2-adapter']
-  }
-
-  async canRun() {
-    const { isJava } = readProject()
-    if (isJava) throw `'cds add cov2ap' is not available for Java`
-    return true
-  }
-
-  async run() {
-    await merge(__dirname, 'files/dependencies.package.json').into('package.json')
-    await sort('package.json', 'dependencies')
-  }
-
-  async finalize() {
-    console.log(`Find plugin documentation on ${link(CAP_JS_COMMUNITY_ODATA_V2)}`)
-  }
-}

package/lib/init/template/event-queue/files/dependencies.package.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "@cap-js-community/event-queue": "^1"
-  }
-}

package/lib/init/template/event-queue/index.js

@@ -1,35 +0,0 @@
-const { readProject } = require('../../projectReader')
-const { merge, sort } = require('../../merge')
-const { link } = require('../../../util/term')
-const { CAP_JS_COMMUNITY_EVENT_QUEUE } = require('../../constants').URLS
-
-module.exports = class EventQueueTemplate extends require('../../plugin') {
-
-  static help() {
-    return 'cap-js-community: transactional event processing with automatic load distribution'
-  }
-
-  async canRun() {
-    const { isJava } = readProject()
-    if (isJava) throw `'cds add event-queue' is not available for Java`
-    return true
-  }
-
-  static hasInProduction() {
-    const { dependencies } = readProject()
-    return !!dependencies?.['@cap-js-community/event-queue']
-  }
-
-  requires() {
-    return ['redis']
-  }
-
-  async run() {
-    await merge(__dirname, 'files/dependencies.package.json').into('package.json')
-    await sort('package.json', 'dependencies')
-  }
-
-  async finalize() {
-    console.log(`Find plugin documentation on ${link(CAP_JS_COMMUNITY_EVENT_QUEUE)}`)
-  }
-}

package/lib/init/template/websocket/files/dependencies.package.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "@cap-js-community/websocket": "^1"
-  }
-}

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

@@ -1,35 +0,0 @@
-const { readProject } = require('../../projectReader')
-const { merge, sort } = require('../../merge')
-const { link } = require('../../../util/term')
-const { CAP_JS_COMMUNITY_WEBSOCKET } = require('../../constants').URLS
-
-module.exports = class WebsocketTemplate extends require('../../plugin') {
-
-  static help() {
-    return 'cap-js-community: expose CDS services via the Websocket protocol'
-  }
-
-  async canRun() {
-    const { isJava } = readProject()
-    if (isJava) throw `'cds add websocket' is not available for Java`
-    return true
-  }
-
-  requires() {
-    return ['redis']
-  }
-
-  static hasInProduction() {
-    const { dependencies } = readProject()
-    return !!dependencies?.['@cap-js-community/websocket']
-  }
-
-  async run() {
-    await merge(__dirname, 'files/dependencies.package.json').into('package.json')
-    await sort('package.json', 'dependencies')
-  }
-
-  async finalize() {
-    console.log(`Find plugin documentation on ${link(CAP_JS_COMMUNITY_WEBSOCKET)}`)
-  }
-}