@sap/cds-dk 8.0.2 → 8.0.3

package/CHANGELOG.md

@@ -7,6 +7,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 8.0.3 - 2024-07-20
+
+### Fixed
+
+- `cds build --ws` no longer creates migration tables in shared db if already existing in a workspace.
+- `cds add destination` adds the destination service as an MTX SaaS dependency.
+- `cds add html5-repo` adds the HTML5 repo runtime as an MTX SaaS dependency.
+- `cds add html5-repo` does not add a destination service any more if not required by other services.
+- `cds add workzone` runs `cds add destination` as a dependent facet.
+- `cds add` plugins don't fail if custom options are provided via the `options` API.
+- `cds add data` can now correctly handle circular associations. The maximum depth of associations is increased to 5.
+- `cds add redis` is separated from `cds add redis-messaging` to allow for separate consumption.
+- `cds add redis` uses the `standard` service plan by default.
+- `cds watch` no longer leads to a warning `'@sap/cds' was loaded from different installations` when local project dependencies are installed.
+- `cds init` uses latest Maven Java archetype version 3.0.0 for creating Java projects.
+
+
 ## Version 8.0.2 - 2024-07-12
 
 ### Added
@@ -20,9 +37,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `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.
 
-### Fixed
-
-
 ## Version 8.0.1 - 2024-07-09
 
 ### Added
@@ -129,6 +143,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds add notebook` is removed.  CAP Jupyter Notebooks have been replaced by custom CAP Notebooks for VS Code which are now part of the CDS Editor.  See https://cap.cloud.sap/docs/tools/#add-cds-editor for more.
 
 
+## Version 7.9.6 - 2024-07-19
+
+### Fixed
+
+- `cds add data` can now correctly handle circular associations. The maximum depth of associations is increased to 5.
+
 ## Version 7.9.5 - 2024-07-12
 
 ### Added

package/bin/cds.js

@@ -55,7 +55,8 @@ const cli = {
           argv = argv.slice(0, endOfOptions)
         }
 
-        const args = this.args(task, argv)
+        const unknown = new Set
+        const args = this.args(task, argv, unknown)
         args[0].push(...appendArgs)
         cds.cli = {
           command: cmd,
@@ -63,13 +64,17 @@ const cli = {
           options: args[1],
         }
 
-        // REVISIT: Have to do it here to allow custom flags for plugins!
-        if (cmd === 'add') {
+        if (cmd === 'add') { // cds add plugins allow additional custom options
           await cds.plugins
           for (const [, Plugin] of cds.add.registered) {
-            task.options.push(...Object.keys((new Plugin).options()).map(key => '--'+key))
+            const options = Object.keys((new Plugin).options()).map(key => '--'+key)
+            task.options.push(options)
+            options.forEach(o => unknown.delete(o))
           }
         }
+        if (unknown.size === 1) throw 'Invalid option: ' + Array.from(unknown)[0]
+        if (unknown.size > 1) throw 'Invalid options: ' + Array.from(unknown).join(', ')
+
         if (args[1]?.['resolve-bindings']) await _resolveBindings({ silent: cmd === 'env' })
 
         // cds.root may for some subcommands not point to the correct directory (e.g. cds w where users can pass a project directory)
@@ -101,7 +106,7 @@ const cli = {
   },
 
   // TODO replace w/ common arg parser from node
-  args (task, argv) {
+  args (task, argv, unknown) {
 
     const { options:o=[], flags:f=[], shortcuts:s=[] } = task
     const _global = /^--(profile|production|sql|odata|add-.*|build-.*|cdsc-.*|odata-.*|folders-.*)$/
@@ -115,7 +120,7 @@ const cli = {
       else if ((k = o.indexOf(a)) >= 0) add(o[k],argv[++i])
       else if ((k = f.indexOf(a)) >= 0) add(f[k])
       else if (_global.test(a)) add_global(a, _flags[a] || argv[++i])
-      else throw 'Invalid option: '+ a
+      else unknown.add(a)
     }
     // consistent production setting for NODE_ENV and CDS_ENV
     // if (process.env.NODE_ENV !== 'production') process.env.NODE_ENV = process.env.CDS_ENV?.split(',').find(p => p === 'production') || process.env.NODE_ENV

package/bin/watch.js

@@ -76,6 +76,7 @@ async function watch ([cwd], {
   } catch (err) {
     throw `Error: No such folder or package: '${cwd}'`
   }
+  const _cwd = cwd || process.cwd()
 
   if (!Object.keys(options).includes('with-mocks'))               args.push ('--with-mocks')
   if (!Object.keys(options).find(a => /^in-memory\??$/.test(a)))  args.push ('--in-memory?')
@@ -91,18 +92,20 @@ async function watch ([cwd], {
   })
   if (process.env.CDS_TYPESCRIPT) {
     // Needed by ts-node/tsc to find the tsconfig.json. Same as `--project`.
-    env.TS_NODE_PROJECT = env.TS_NODE_PROJECT ?? cwd ?? process.cwd()
+    env.TS_NODE_PROJECT = env.TS_NODE_PROJECT ?? _cwd
   }
 
-  // allow running w/o or partial local node_modules, also add cds-dk for its sqlite
-  env.NODE_PATH = [...paths(cwd||process.cwd()), ...paths(__dirname)].join(delimiter)
+  // if sap/cds is not installed locally, run with cds-dk's deps. (sap/cds, sqlite etc)
+  if (!installed('@sap/cds', _cwd)) {
+    env.NODE_PATH = [...paths(_cwd), ...paths(__dirname)].join(delimiter)
+  }
 
   if (typeof ext !== 'string')  ext = extDefaults
   const delay = parseInt(process.env.CDS_WATCH_DELAY) || 200
 
   let liveReload //= ...
   let firstTime = true
-  if (!/false|no/.test(options['livereload']) && cds.env.for('cds', cwd||process.cwd()).livereload !== false) {
+  if (!/false|no/.test(options['livereload']) && cds.env.for('cds', _cwd).livereload !== false) {
     liveReload = new (require ('../lib/watch/livereload-server'))
     env.CDS_LIVERELOAD_PATH = require.resolve ('../lib/watch/livereload-connect')
     env.CDS_LIVERELOAD_URL = await liveReload.start (options['livereload'], cwd, delay)
@@ -199,3 +202,8 @@ function paths (dir) {
   const parts = resolve(dir).split(sep), n = parts.length, nm = sep+'node_modules'
   return parts.map ((_,i,a)=> a.slice(0,n-i).join(sep)+nm).filter(p => fs.existsSync(p))
 }
+
+function installed(id, ...paths) {
+  try { return require.resolve (id, { paths }) }
+  catch(e) { if (e.code !== 'MODULE_NOT_FOUND')  throw e }
+}

package/lib/build/constants.js

@@ -35,6 +35,7 @@ exports.CONTENT_ENV = "contentEnv"                              // copy .env fil
 exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-env.json file into deployment folder - DISABLED by default
 
 exports.OPTION_WS = "ws"                                        // run a workspace build, e.g. including model folders of configured npm workspaces
+exports.OPTION_WS_PACK = "ws-pack"                              // enable tarball based packaging of workspace dependencies
 exports.CSV_FILE_TARGET = "csvFileTarget"                       // target folder when copying CSV files to the deployment target folder ./db/src/gen/*, default is 'data'
 exports.CSV_FILE_DETECTION = "csvFileDetection"                 // detect CSV files based on CDS model location - ENABLED by default
 exports.EXTENSION_POINT_VALIDATION = "extensionPointValidation" // validate extension point restrictions defined by the extended SaaS app - ENABLED by default

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

@@ -6,7 +6,7 @@ const InternalBuildPlugin = require('../internalBuildPlugin')
 const { BuildError, relativePaths, BuildMessage, getWorkspaces, hasOptionValue, getFiles } = require('../../util')
 const { OUTPUT_MODE_NONE, OUTPUT_MODE, CONTENT_PACKAGE_JSON, CONTENT_HDBTABLEDATA, CSV_FILE_DETECTION,
     CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, CONTENT_NODE_MODULES, OUTPUT_MODE_RESULT, CONTINUE_UNRESOLVED_SCHEMA_CHANGES,
-    CSV_FILE_TARGET, OPTION_WS} = require('../../constants')
+    CSV_FILE_TARGET, OPTION_WS } = require('../../constants')
 const { WARNING } = InternalBuildPlugin
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize("src/gen")
 const FILE_EXT_CSV = ".csv"
@@ -38,9 +38,14 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         if (!model) {
             return
         }
+        let workspaceFiles
+        if (cds.cli.options?.[OPTION_WS] || hasOptionValue(this.task.options[OPTION_WS], true)) {
+            workspaceFiles = await this._getWorkspaceFiles()
+        }
+
         // the order of 1 and 2 is important
         // 1. compile
-        const hdiPlugins = await this._compileToHana(model)
+        const hdiPlugins = await this._compileToHana(model, workspaceFiles)
 
         if (!this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_NONE)) {
             // 2. copy resources
@@ -49,9 +54,15 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             } else {
                 await this._copyResourcesExt(src, dest, model)
             }
-            // copy native hana artifacts from workspace dependencies
-            if (cds.cli.options?.[OPTION_WS] || hasOptionValue(this.task.options?.[OPTION_WS], true)) {
-                await this._addWorkspaceContent()
+            // copy native hana artifacts from workspaces
+            if (workspaceFiles) {
+                const dest = path.join(this.task.dest, 'src/gen')
+                await Promise.all(
+                    workspaceFiles.map((src) => {
+                        const { dir, filePath } = src
+                        return this.copy(path.join(dir, filePath)).to(path.join(dest, filePath))
+                    })
+                )
             }
 
             // create additional stuff in dest
@@ -254,7 +265,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
      *
      * @param {object} model The compiled csn model
      */
-    async _compileToHana(model) {
+    async _compileToHana(model, workspaceFiles) {
         // compile to old format (.hdbcds) or new format (.hdbtable / .hdbview)
         const format = this.getBuildOption(DEPLOY_FORMAT) || cds.env.requires.db?.[DEPLOY_FORMAT] || cds.env.hana?.[DEPLOY_FORMAT]
         if (!cds.compile.to[format]) {
@@ -267,7 +278,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             // compatibility with existing cds.compile.to.hdbtable plugins cds < 8.0.0
             return await this._compileToHdb(model, format)
         } else {
-            return await this._compileToHdbmigration(model, format)
+            return await this._compileToHdbmigration(model, format, workspaceFiles)
         }
     }
 
@@ -303,7 +314,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         return hdiPlugins
     }
 
-    async _compileToHdbmigration(model, format) {
+    async _compileToHdbmigration(model, format, workspaceFiles) {
         const hdiPlugins = new Set()
         const relDestDir = path.relative(this.task.dest, this.task.options.compileDest)
         const relDbDestDir = path.relative(cds.root, this.task.options.compileDest)
@@ -326,33 +337,37 @@ class HanaBuildPlugin extends InternalBuildPlugin {
 
         for (const { name, suffix, content, changed } of definitions) {
             hdiPlugins.add(suffix)
-            const file = name + suffix
+            const fileName = name + suffix
             if (suffix === FILE_EXT_HDBMIGRATIONTABLE) {
-                migrationTableFiles.push(path.join(relDbSrcDir, file))
-                if (changed) {
-                    if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                        this._result.hana.push(path.join("src", file))
+                // Skip the .hdbmigrationtable file if its origin is a different workspace.
+                // The workspace build copies artifacts located in 'db/src/**' workspace folders.
+                if (!workspaceFiles?.find(wsFile => wsFile.fileName === fileName)) {
+                    migrationTableFiles.push(path.join(relDbSrcDir, fileName))
+                    if (changed) {
+                        if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
+                            this._result.hana.push(path.join("src", fileName))
+                        }
+                        promises.push(this.write(content).to(path.join(dbSrcDir, fileName)))
+                    } else {
+                        DEBUG?.(`no change, keep existing ${fileName}`)
                     }
-                    promises.push(this.write(content).to(path.join(dbSrcDir, file)))
-                } else {
-                    DEBUG?.(`no change, keep existing ${file}`)
                 }
             } else {
                 if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                    this._result.hana.push(path.join(relDestDir, file))
+                    this._result.hana.push(path.join(relDestDir, fileName))
                 }
-                promises.push(this.write(content).to(path.join(this.task.options.compileDest, file)))
+                promises.push(this.write(content).to(path.join(this.task.options.compileDest, fileName)))
                 if (suffix === FILE_EXT_HDBTABLE) {
                     // issue an error in case a .hdbmigrationtable file already exists
                     if (fs.existsSync(path.join(dbSrcDir, name + FILE_EXT_HDBMIGRATIONTABLE))) {
-                        validationError = new BuildError(`Multiple files exist defining the same HANA artifact - [${path.join(relDbSrcDir, name + FILE_EXT_HDBMIGRATIONTABLE)}, ${path.join(relDbDestDir, file)}].\nEither annotate the model entity using @cds.persistence.journal or undeploy the file [${path.join('src', name + FILE_EXT_HDBMIGRATIONTABLE)}] using an undeploy.json file.`)
+                        validationError = new BuildError(`Multiple files exist defining the same HANA artifact - [${path.join(relDbSrcDir, name + FILE_EXT_HDBMIGRATIONTABLE)}, ${path.join(relDbDestDir, fileName)}].\nEither annotate the model entity using @cds.persistence.journal or undeploy the file [${path.join('src', name + FILE_EXT_HDBMIGRATIONTABLE)}] using an undeploy.json file.`)
                     }
                 }
             }
         }
-        // the last-dev CSN shall only be updated, if all .hdbmigrationtable files could be successfully updated
-        // of course, .hdbmigrationtable files already written would need to be manually reverted before the 
-        // cds build command is again executed
+        // The last-dev CSN shall only be updated, if all .hdbmigrationtable files could be successfully updated.
+        // Of course, .hdbmigrationtable files already written would need to be manually reverted before the 
+        // cds build command is again executed.
         await Promise.all(promises)
 
         try {
@@ -531,35 +546,38 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         }
     }
 
-
     /**
-     * Copy native hana content from workspaces.
+     * Returns all hana native artifacts located in db/src/** workspace folders.
+     * @returns {Array} Array of workspace files, each entry contains the db src directory, 
+     * the relative file path and the file name.
      */
-    async _addWorkspaceContent() {
-        const srcPaths = new Set()
+    async _getWorkspaceFiles() {
+        const dbPaths = new Set()
         const workspaces = await getWorkspaces()
 
         workspaces.forEach(workspace => {
             const dbSrc = path.join(cds.root, workspace, 'db/src')
             const dbCfg = path.join(cds.root, workspace, 'db/cfg')
             if (fs.existsSync(dbSrc)) {
-                srcPaths.add(dbSrc)
+                dbPaths.add(dbSrc)
             }
             if (fs.existsSync(dbCfg)) {
-                srcPaths.add(dbCfg)
+                dbPaths.add(dbCfg)
             }
         })
-        DEBUG?.(`Copying hana native artifacts from folders '${[...srcPaths].map(f => path.relative(cds.root, f)).join(', ')}'`)
-        const dest = path.join(this.task.dest, 'src/gen')
-        for (const src of srcPaths) {
-            await this.copyNativeContent(src, dest, (entry) => {
+        const workspaceFiles = [...dbPaths].reduce((acc, src) => {
+            const files = getFiles(src, (entry) => {
                 if (entry.match(/(\/|\\)gen(\/|\\)?$/)) {
                     // skip gen folder content
                     return false
                 }
                 return true
             })
-        }
+            files.forEach(file => acc.add({ dir: src, filePath: path.relative(src, file), fileName: path.basename(file) }))
+            return acc
+        }, new Set())
+
+        return [...workspaceFiles]
     }
 
     static async _readTemplateAsJson(template) {

package/lib/build/provider/internalBuildTaskProvider.js

@@ -5,7 +5,7 @@ const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, norma
 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, CONTENT_WS } = require("../constants")
+    IGNORE_DEFAULT_MODELS, OPTION_WS } = require("../constants")
 const ResourcesTarBuilder = require('./mtx/resourcesTarBuilder')
 const DEBUG = cds.debug('cli|build')
 
@@ -285,7 +285,7 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
     }
 
     static async _setDefaultModel(task) {
-        const ws = hasOptionValue(task.options?.[CONTENT_WS], true) || cds.cli.options?.ws
+        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

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

@@ -5,7 +5,8 @@ const cmd = require('../../../util/command');
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
 const { BuildError, getWorkspaces } = 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')
+    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX, 
+    OPTION_WS_PACK} = require('../../constants')
 const { WARNING } = EdmxBuildPlugin
 const DEBUG = cds.debug('cli|build')
 
@@ -36,7 +37,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         }
         // by default model contains all features
         const model = await this.model()
-        if (!model && !this.context.options['ws-pack']) {
+        if (!model && !this.context.options[OPTION_WS_PACK]) {
             return
         }
         if (model) {
@@ -55,7 +56,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         if (this.isStagingBuild() && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
             const srcSrv = this.task.src === cds.root ? path.resolve(this.task.src, cds.env.folders.srv) : this.task.src
             await this._copyNativeContent(cds.root, srcSrv, destRoot, destSrv)
-            if (this.context.options['ws-pack']) {
+            if (this.context.options[OPTION_WS_PACK]) {
                 await this._packWorkspaceDependencies(destRoot)
             }
         }

package/lib/init/constants.js

@@ -5,9 +5,10 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '2.10.1',
+    MAVEN_ARCHETYPE_VERSION: '3.0.0',
 
     OPTIONS: Object.freeze({
+        COMPLETION: 'completion',
         JAVA: 'java',
         JAVA_MVN: 'java:mvn',
         JAVA_PACKAGE: 'java:package',
@@ -30,6 +31,9 @@ module.exports = {
         SQLITE: 'sqlite',
         H2: 'h2',
         LIQUIBASE: 'liquibase',
+        REDIS: 'redis',
+        ATTACHMENTS: 'attachments',
+        MALWARE_SCANNER: 'malware-scanner',
         LOCAL_MESSAGING: 'local-messaging',
         FILE_BASED_MESSAGING: 'file-based-messaging',
         ENTERPRISE_MESSAGING: 'enterprise-messaging',

package/lib/init/projectReader.js

@@ -41,7 +41,6 @@ module.exports = new class ProjectReader {
         }
     }
 
-    // REVISIT: There should an API provided by cds.env
     /**
      * Returns cds.env using 'production' profile by default as mta deployment is executed with having production profile set.
      */

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

@@ -3,7 +3,7 @@ const { dirname } = require('node:path')
 const cds = require('../../../cds')
 
 let counter = Math.round(Math.random() * 10000) // Default random seed // Non-deterministic behaviour
-const MAX_ASSOC_DEPTH = 1
+const MAX_ASSOC_DEPTH = 5
 
 /**
  * Creates JSON test data for the given entities
@@ -40,25 +40,35 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
 
   for (const name of entityNames) {
     if (!data[name] // removed on purpose because records are created inline through compositions
-      || data[name].length >= numRecords) { // already created by following associations
+      || data[name].length >= numRecords) { // numRecords already created by following associations
       continue
     }
 
-    const records = data[name] = Array(numRecords).fill({}).map(() => ({}))
+    let numRecordsToGenerate // numRecords might be reduced if some records were created by following associations
+    let records = []
+    if (data[name].length > 0) {
+      numRecordsToGenerate = numRecords - data[name].length 
+      records = Array(numRecordsToGenerate).fill({}).map(() => ({}))
+    } else {
+      numRecordsToGenerate = numRecords
+      records = data[name] = Array(numRecordsToGenerate).fill({}).map(() => ({}))
+    }
     const entity = defs[name]
 
     const idNum = randomNumber()
-    for (let i = 0; i < numRecords; i++) {
+    for (let i = 0; i < numRecordsToGenerate; i++) {
       fillRecord(records[i], idNum+i, entity, csn, data, null, 0, referenceData)
     }
-    // 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(records, entity)
+    data[name] = data[name].concat(records) // append the new records to the possibly existingand referenced records
+    // 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)
   }
   return data
 }
 
 function fillRecord(record, recordID, entity, csn, data, parentEntity, depth, referenceData) {
   Object.defineProperty(record, '$id', {value: recordID, enumerable: false})
+  if (data[entity.name]) data[entity.name].push(record) // add id to data, to be referenced by associations to prevent circular dependencies
 
   const { elements } = entity
   Object.values(elements).sort(asJson.elementsSorter(csn)).forEach(el => {
@@ -242,7 +252,7 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
       if (element.is2many)
         return
       const target = csn.definitions[element.target]
-      if (!target || target === parentEntity || depth > MAX_ASSOC_DEPTH)
+      if (!target || depth > MAX_ASSOC_DEPTH)
         return
 
       let targetRecord = randomFromReferenceData(target, csn, referenceData)
@@ -256,10 +266,14 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
           targetRecords = data[target.name] = []
         else if (!targetRecords) // target entity is not in the list of entities to be created
           return
-
-        targetRecord = fillRecord({}, randomNumber(), target, csn, data, entity, depth, referenceData)
-        targetRecords.push(targetRecord)
-        uniqRecords(targetRecords, target)
+        
+        if (targetRecords.length > 0) { // use record generated by following asociation
+          targetRecord = targetRecords[0]
+        } else {
+          targetRecord = fillRecord({}, randomNumber(), target, csn, data, entity, depth+1, referenceData)
+          targetRecords.push(targetRecord)
+          uniqRecords(targetRecords, target)
+        }
       }
 
       // TODO: handle foreign keys correctly

package/lib/init/template/destination/files/mta.yaml.hbs

@@ -11,6 +11,12 @@ modules:
     requires:
       - name: {{appName}}-destination
 
+  - name: {{appName}}-mtx
+    type: nodejs
+    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
+    requires:
+      - name: {{appName}}-destination
+
 resources:
   - name: {{appName}}-destination
     type: org.cloudfoundry.managed-service

package/lib/init/template/destination/files/package.sidecar.json

@@ -0,0 +1,7 @@
+{
+  "cds": {
+    "requires": {
+      "destinations": true
+    }
+  }
+}

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

@@ -1,6 +1,6 @@
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
-const { srv4, approuter, destination } = require('../../registries/mta')
+const { srv4, approuter, destination, mtxSidecar4 } = require('../../registries/mta')
 
 module.exports = class DestinationTemplate extends require('../../plugin') {
 
@@ -24,7 +24,11 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { hasHelm, hasApprouter, hasHelmUnifiedRuntime, hasMta, srvPath } = project
+        const { hasHelm, hasApprouter, hasMultitenancy, hasHelmUnifiedRuntime, hasMta, srvPath, isJava } = project
+
+        if (hasMultitenancy) {
+            await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
+        }
 
         if (hasMta) {
             const srv = srv4(srvPath)
@@ -39,6 +43,12 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
                     into: [approuter, 'requires', 'name']
                 })
             }
+            if (hasMultitenancy) {
+                relationships.push({
+                    insert: [destination, 'name'],
+                    into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
+                })
+            }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions, relationships })
         }
 

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -12,6 +12,12 @@ modules:
     requires:
       - name: {{appName}}-html5-runtime
 
+  - name: {{appName}}-mtx
+    type: nodejs
+    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
+    requires:
+      - name: {{appName}}-html5-runtime
+
   - name: {{appName}}-app-deployer
     type: com.sap.application.content
     path: {{#isNodejs}}gen{{/isNodejs}}{{#isJava}}.{{/isJava}}
@@ -42,38 +48,6 @@ modules:
       supported-platforms: []
   {{/apps}}
 
-  - name: {{appName}}-destinations
-    type: com.sap.application.content
-    requires:
-      - name: {{appName}}-auth
-        parameters:
-          service-key:
-            name: {{appName}}-auth-key
-      - name: {{appName}}-html5-repo-host
-        parameters:
-          service-key:
-            name: {{appName}}-html5-repo-host-key
-      - name: srv-api
-      - name: {{appName}}-destination
-        parameters:
-          content-target: true
-    build-parameters:
-      no-source: true
-    parameters:
-      content:
-        instance:
-          existing_destinations_policy: update
-          destinations:
-            - Name: {{appName}}-html5-repository
-              ServiceInstanceName: {{appName}}-html5-repo-host
-              ServiceKeyName: {{appName}}-html5-repo-host-key
-              sap.cloud.service: {{appName}}.service
-            - Name: {{appName}}-auth
-              Authentication: OAuth2UserTokenExchange
-              ServiceInstanceName: {{appName}}-auth
-              ServiceKeyName: {{appName}}-auth-key
-              sap.cloud.service: {{appName}}.service
-
 resources:
   {{#hasApprouter}}
   - name: {{appName}}-html5-runtime
@@ -88,29 +62,3 @@ resources:
     parameters:
       service: html5-apps-repo
       service-plan: app-host
-
-  - name: {{appName}}-destination
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: destination
-      service-plan: lite
-      config:
-        HTML5Runtime_enabled: true
-        init_data:
-          instance:
-            existing_destinations_policy: update
-            destinations:
-              - Name: {{appName}}-srv-api
-                URL: ~{srv-api/srv-url}
-                Authentication: NoAuthentication
-                Type: HTTP
-                ProxyType: Internet
-                HTML5.ForwardAuthToken: true
-                HTML5.DynamicDestination: true
-    requires:
-      - name: srv-api
-        group: destinations
-        properties:
-          name: srv-api # must be used in xs-app.json as well
-          url: ~{srv-url}
-          forwardAuthToken: true

package/lib/init/template/html5-repo/files/package.sidecar.json

@@ -0,0 +1,7 @@
+{
+  "cds": {
+    "requires": {
+      "html5-repo": true
+    }
+  }
+}

package/lib/init/template/html5-repo/files/xs-app.json.hbs

@@ -4,24 +4,10 @@
     {
       "source": "^/?odata/(.*)$",
       "target": "/odata/$1",
-      "destination": "{{appName}}-srv-api",
+      "destination": "srv-api",
       {{#hasXsuaa}}"authenticationType": "xsuaa",{{/hasXsuaa}}
       "csrfProtection": true
     },
-    {{#hasUI5}}
-    {
-      "source": "^/resources/(.*)$",
-      "target": "/resources/$1",
-      "authenticationType": "none",
-      "destination": "ui5"
-    },
-    {
-      "source": "^/test-resources/(.*)$",
-      "target": "/test-resources/$1",
-      "authenticationType": "none",
-      "destination": "ui5"
-    },
-    {{/hasUI5}}
     {
       "source": "^(.*)$",
       "target": "$1",

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

@@ -1,7 +1,7 @@
 const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
-const { srv4, destination, destinations, html5RepoHost, html5Runtime, appDeployer, approuter } = require('../../registries/mta')
+const { srv4, html5RepoHost, html5Runtime, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
 
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
@@ -9,10 +9,6 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         return 'SAP BTP HTML5 Application Repository'
     }
 
-    requires() {
-        return ['destination']
-    }
-
     static hasInProduction(env) {
         return !!env.requires['html5-repo']
     }
@@ -47,13 +43,17 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { srvPath, appPath, hasMta, hasHelm, hasHelmUnifiedRuntime, hasApprouter, apps } = project
+        const { isJava, srvPath, appPath, hasMta, hasMultitenancy, hasHelm, hasHelmUnifiedRuntime, hasApprouter, apps } = project
 
         await Promise.all(apps.map(async ({app}) => {
             project.app = app
             await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { project })
         }))
 
+        if (hasMultitenancy) {
+            await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
+          }
+
         if (hasMta) {
             const srv = srv4(srvPath)
             project.apps = apps
@@ -61,11 +61,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                 in: 'modules',
                 where: { type: 'html5', path: `${appPath}${app.app}` }
             }))
-            const additions = [srv, appDeployer, destinations, destination, html5RepoHost, ...appModules]
+            const additions = [srv, appDeployer, html5RepoHost, ...appModules]
             const relationships = [{
-                insert: [destination, 'name'],
-                into: [appDeployer, 'requires', 'name'],
-            }, {
                 insert: [html5RepoHost, 'name'],
                 into: [appDeployer, 'requires', 'name'],
             }]
@@ -76,6 +73,12 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                     into: [approuter, 'requires', 'name'],
                 })
             }
+            if (hasMultitenancy) {
+                relationships.push({
+                    insert: [html5Runtime, 'name'],
+                    into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
+                })
+            }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project,
                 additions,
                 relationships

package/lib/init/template/malware-scanner/index.js

@@ -5,7 +5,7 @@ const { srv4, malwareScanner } = require('../../registries/mta')
 module.exports = class MalwareScannerTemplate extends require('../../plugin') {
 
     static help() {
-        return 'SAP Malware Scanning service'
+        return 'SAP Malware Scanning Service'
     }
 
     static hasInProduction(env) {

package/lib/init/template/mta/files/package.json

@@ -1,5 +1,5 @@
 {
   "devDependencies": {
-    "@sap/cds-dk": ">=7"
+    "@sap/cds-dk": "^8"
   }
 }

package/lib/init/template/redis/files/mta.yaml.hbs

@@ -0,0 +1,25 @@
+---
+modules:
+ - name: {{appName}}-srv
+   type: {{language}}
+   path: {{& srvPath}}
+   requires:
+    - name: {{appName}}-redis
+
+resources:
+  - name: {{appName}}-redis
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: redis-cache
+      service-plan: standard
+      # config:
+        # memory: 2 # GB, can be 2 or 4
+        # multi_az: true
+        # cluster_mode: true
+        # shard_count: 1
+        # node_count: 3 # per shard minimum is 3 (for standard plan)
+        # engine_version: "6.0" # can be "4.0" or "6.0"
+        # maintenance_window:
+          # day_of_week: Friday
+          # start_hour_utc: 0
+          # duration: 5 # hours

package/lib/init/template/redis/files/package.json.hbs

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "redis": "^4"
+  }
+}

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

@@ -0,0 +1,44 @@
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+const { srv4, redis } = require('../../registries/mta')
+
+module.exports = class extends require('../../plugin') {
+
+  static help() {
+    return 'SAP BTP Redis, Hyperscaler Option'
+  }
+
+  async canRun() {
+    const { hasMta, hasHelm, hasHelmUnifiedRuntime, isJava } = readProject()
+    const onlyHelm = !hasMta && (hasHelmUnifiedRuntime || hasHelm)
+    if (isJava)   throw `'cds add redis' is not available for Java yet`
+    if (onlyHelm) throw `'cds add redis' is not available for Kyma yet`
+    return true
+  }
+
+  static hasInProduction() {
+    const { dependencies } = readProject()
+    return !!dependencies?.['redis']
+  }
+
+  async run() {
+    await merge(__dirname, 'files/package.json.hbs').into('package.json')
+  }
+
+  async combine() {
+    const project = readProject()
+    const { hasMta, srvPath } = project
+
+    if (hasMta) {
+      const srv = srv4(srvPath)
+      await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
+        project,
+        additions: [srv, redis],
+        relationships: [{
+          insert: [redis, 'name'],
+          into: [srv, 'requires', 'name']
+        }]
+      })
+    }
+  }
+}

package/lib/init/template/redis-messaging/files/package.json.hbs

@@ -1,8 +1,5 @@
 {
   {{#isNodejs}}
-  "dependencies": {
-    "redis": "^4"
-  },
   "cds": {
   {{/isNodejs}}
     "requires": {

package/lib/init/template/redis-messaging/index.js

@@ -2,7 +2,6 @@ const cds = require('../../../cds')
 const { read } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
-const { srv4, redis } = require('../../registries/mta')
 
 module.exports = class RedisMessagingTemplate extends require('../../plugin') {
 
@@ -10,6 +9,10 @@ module.exports = class RedisMessagingTemplate extends require('../../plugin') {
     return 'messaging via Redis'
   }
 
+  requires() {
+    return ['redis']
+  }
+
   async canRun() {
     const { hasMta, hasHelm, hasHelmUnifiedRuntime, isJava } = readProject()
     const onlyHelm = !hasMta && (hasHelmUnifiedRuntime || hasHelm)
@@ -28,21 +31,4 @@ module.exports = class RedisMessagingTemplate extends require('../../plugin') {
     project.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
   }
-
-  async combine() {
-    const project = readProject()
-    const { hasMta, srvPath } = project
-
-    if (hasMta) {
-      const srv = srv4(srvPath)
-      await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
-        project,
-        additions: [srv, redis],
-        relationships: [{
-          insert: [redis, 'name'],
-          into: [srv, 'requires', 'name']
-        }]
-      })
-    }
-  }
 }

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

@@ -1,4 +1,8 @@
 module.exports = class extends require('../../plugin') {
+    help() {
+      return 'SAP BTP Work Zone'
+    }
+
     requires() {
       return ['workzone-standard']
     }

package/lib/init/template/workzone-standard/files/mta.yaml.hbs

@@ -0,0 +1,59 @@
+---
+modules:
+  - name: {{appName}}-destinations
+    type: com.sap.application.content
+    requires:
+      - name: {{appName}}-auth
+        parameters:
+          service-key:
+            name: {{appName}}-auth-key
+      - name: {{appName}}-html5-repo-host
+        parameters:
+          service-key:
+            name: {{appName}}-html5-repo-host-key
+      - name: srv-api
+      - name: {{appName}}-destination
+        parameters:
+          content-target: true
+    build-parameters:
+      no-source: true
+    parameters:
+      content:
+        instance:
+          existing_destinations_policy: update
+          destinations:
+            - Name: {{appName}}-html5-repository
+              ServiceInstanceName: {{appName}}-html5-repo-host
+              ServiceKeyName: {{appName}}-html5-repo-host-key
+              sap.cloud.service: {{appName}}.service
+            - Name: {{appName}}-auth
+              Authentication: OAuth2UserTokenExchange
+              ServiceInstanceName: {{appName}}-auth
+              ServiceKeyName: {{appName}}-auth-key
+              sap.cloud.service: {{appName}}.service
+
+  - name: {{appName}}-destination
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: destination
+      service-plan: lite
+      config:
+        HTML5Runtime_enabled: true
+        init_data:
+          instance:
+            existing_destinations_policy: update
+            destinations:
+              - Name: {{appName}}-srv-api
+                URL: ~{srv-api/srv-url}
+                Authentication: NoAuthentication
+                Type: HTTP
+                ProxyType: Internet
+                HTML5.ForwardAuthToken: true
+                HTML5.DynamicDestination: true
+    requires:
+      - name: srv-api
+        group: destinations
+        properties:
+          name: srv-api # must be used in xs-app.json as well
+          url: ~{srv-url}
+          forwardAuthToken: true

package/lib/init/template/workzone-standard/index.js

@@ -2,22 +2,27 @@ const cds = require('../../../cds')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { join } = require('path')
+const { destination, destinations } = require('../../registries/mta')
 
 module.exports = class extends require('../../plugin') {
 
-    canRun() {
-      if (cds.requires.multitenancy) {
-        throw `SAP BTP Work Zone, Standard Edition does not support multitenancy yet.`
-      }
-      return true
+    static help() {
+      return 'SAP BTP Work Zone, Standard Edition'
     }
 
     requires() {
-      return ['html5-repo']
+      return ['html5-repo', 'destination']
     }
 
-    static help() {
-      return 'SAP BTP Work Zone, Standard Edition'
+    static hasInProduction(env) {
+      return !!env.requires?.workzone
+    }
+
+    canRun() {
+      if (cds.requires.multitenancy) {
+        throw `SAP BTP Work Zone, Standard Edition does not support multitenancy yet.`
+      }
+      return true
     }
 
     async run() {
@@ -26,5 +31,16 @@ module.exports = class extends require('../../plugin') {
       await Promise.all(appUIPaths.map(p =>
         merge(__dirname, 'files/manifest.json.hbs').into(join(appPath, p, 'webapp/manifest.json'), { project })
       ))
+      await merge({ cds: { requires: { workzone: true } } }).into('package.json')
     }
+
+    async combine() {
+      const project = readProject()
+      const { hasMta } = project
+
+      if (hasMta) {
+          const additions = [destinations, destination]
+          await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions })
+      }
+  }
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.0.2",
+      "version": "8.0.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -35,10 +35,10 @@
       }
     },
     "node_modules/@cap-js/asyncapi": {
-      "version": "1.0.1",
+      "version": "1.0.2",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
-        "@sap/cds": ">=7.3"
+        "@sap/cds": ">=7.6"
       }
     },
     "node_modules/@cap-js/db-service": {
@@ -135,7 +135,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.6.0",
+      "version": "9.7.0",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -200,7 +200,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.0.3",
+      "version": "8.0.4",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5",
@@ -262,7 +262,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.0.2",
+      "version": "2.0.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -866,14 +866,14 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.6.0",
+      "version": "9.7.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint-community/regexpp": "^4.11.0",
         "@eslint/config-array": "^0.17.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.6.0",
+        "@eslint/js": "9.7.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
@@ -882,7 +882,7 @@
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.0.1",
+        "eslint-scope": "^8.0.2",
         "eslint-visitor-keys": "^4.0.0",
         "espree": "^10.1.0",
         "esquery": "^1.5.0",
@@ -915,7 +915,7 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.0.1",
+      "version": "8.0.2",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -2015,7 +2015,7 @@
       "license": "ISC"
     },
     "node_modules/semver": {
-      "version": "7.6.2",
+      "version": "7.6.3",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -2301,7 +2301,7 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.18.0",
+      "version": "3.19.0",
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {

package/package.json

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

package/lib/init/template/redis-messaging/files/mta.yaml.hbs

@@ -1,14 +0,0 @@
----
-modules:
- - name: {{appName}}-srv
-   type: {{language}}
-   path: {{& srvPath}}
-   requires:
-    - name: {{appName}}-redis
-
-resources:
-  - name: {{appName}}-redis
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: redis-cache
-      service-plan: default