@sap/cds-dk 8.4.0 → 8.4.2

package/CHANGELOG.md

@@ -7,10 +7,44 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 8.4.2 - 2024-11-19
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 3.4.1 for creating Java projects.
+
+### Fixed
+
+- `cds add -p/--package` correctly parse plugin-contributed options.
+- `cds add side-by-side-extensibility` does not throw an error.
+- fix method name in `cds bind` credential handling.
+- `cds add --help` no longer has missing line breaks in help text.
+- `cds` commands no longer fail with an error `cds.extend is not a function` with very old versions of `@sap/cds`.
+- `cds add hana` adds the `requires.db` entry to `.cdsrc.json` for Java projects.
+- `cds add data` creates decimal values with correct scale `0` if only precision is given, like in `Decimal(15)`.
+
+
+## Version 8.4.1 - 2024-11-08
+
+### Added
+
+- `cds deploy --no-build` lets you skip the implicit `cds build`.
+- `cds add data/http` supports new type `cds.Map`.
+
+### Fixed
+
+- `cds compile --to <unknown>` shows a cleaner error message.
+- `cds add data` handles composition of one correctly.
+- `cds add http` creates payloads for unbound actions in services.
+- `cds compile --to xsuaa` can now handle annotation expressions in `where` clauses.
+- `cds add http` produces requests for all expected data and no longer relies on existing data on the side.
+- `cds add typer` creates `tsconfig.json` that works with `cds-tsx`.
+
 ## Version 8.4.0 - 2024-10-29
 
 ### Added
 
+- `cds add application-logging` for Java also executes the `cds:add` goal with feature `APPLICATION_LOGGING`.
 - Added support for `import` and `export` for auto-completion in `package.json` and `.cdsrc.json`.
 - `cds add side-by-side-extensibility` adds configuration for logic extensibility via extension points (Java).
 - `cds init --java` can be used as an alias to `cds init --add java`.

package/bin/add.js

@@ -1,7 +1,6 @@
 const cds = require('../lib/cds'), { fs } = cds.utils
 const DEBUG = cds.debug('add')
 const { join } = require('path')
-const cmd = require('../lib/util/command')
 
 const fromDk = fs.readdirSync(join(__dirname, '../lib/init/template'))
 const fromPlugins = require('../lib/init/add').registered
@@ -60,7 +59,7 @@ ${Object.entries(conf).sort(([a], [b]) => a.localeCompare(b)).flatMap(([pluginNa
     const text4 = arr => arr.map(({ key, help, short }) => help && `      ${key}${short ? ' | '+short : ''}\n\n        ${help}`).join('\n\n')
     const optionsText = text4(options), flagsText = text4(flags)
     if (!optionsText && !flagsText) return []
-    return `    *cds add ${pluginName}*\n\n${optionsText}${flagsText}`
+    return `    *cds add ${pluginName}*${optionsText?`\n\n${optionsText}`:''}${flagsText?`\n\n${flagsText}`:''}`
   }).join('\n\n\n')}
 
 
@@ -100,17 +99,8 @@ async function handleCompletion(currentWord, previousWord, argv, util) {
 }
 
 async function add(args) {
-  // await cds.plugins
   const CDSGenerator = require('../lib/init')
   const generator = new CDSGenerator()
   const features = args.map(f => f.split(/[,\s]/)).flat()
-  if (cds.cli.options?.package) {
-    console.log(`running with --package, adding dependency ${cds.cli.options.package}`)
-    await cmd.spawnCommand(`npm`, ['add', cds.cli.options.package], { cwd: cds.root })
-    await cmd.spawnCommand(`cds`, ['add', ...features], { cwd: cds.root }) // plugins need to reload
-    // await cds.plugins
-    // await generator.add(features)
-  } else {
-    await generator.add(features)
-  }
+  await generator.add(features)
 }

package/bin/cds.js

@@ -62,6 +62,11 @@ const cli = {
         // REVISIT: Have to load plugins to allow for plugin-contributed flags!
         if (cmd === 'add') {
           cds.cli = { command: 'add' }
+          if (argv.includes('-p') || argv.includes('--package')) {
+            const p = argv[argv.indexOf('-p') + 1] || argv[argv.indexOf('--package') + 1]
+            console.log(`running with --package, adding dependency ${p}`)
+            await require('../lib/util/command').spawnCommand(`npm`, ['add', p], { cwd: cds.root })
+          }
           await cds.plugins
           for (const [, Plugin] of cds.add.registered) {
             const all = Object.entries((new Plugin).options())

package/bin/compile/index.js

@@ -238,6 +238,12 @@ async function compile (models, options={}) {
     if (/mta.*\.ya?ml/.test(models[0])) {
       model = Promise.resolve(models[0])
     } else {
+      for (const kind of ['to', 'for']) {
+        const tail = options[kind]
+        if (typeof tail === 'string' && !cds.compile[kind][tail]) {
+          throw `Unknown model processor: cds.compile.${kind}.${tail}`
+        }
+      }
       model = cds.load (models, options)
       src = models[0] .replace (/\.[^.]+$/,'')       //> excluding source file extension, e.g. .cds
     }
@@ -305,7 +311,6 @@ async function compile (models, options={}) {
     let p = cds.compile[kind]
     for (let each of tail.split('.')) {
       p = p[each]
-      if (!p) throw `Unknown model processor: cds.compile.${kind}.${tail}`
     }
     return p
   }

package/bin/deploy/index.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(deploy, {
   options: ['--to', '--for', '--out', '--tunnel-address', '--vcap-file', '--delta-from' ],
-  flags: ['--no-save', '--auto-undeploy', '--dry', '--xdry', '--with-mocks', '--store-credentials', '--model-only', '--script', '--with-auto-schema-evolution' ],
+  flags: ['--no-save', '--auto-undeploy', '--dry', '--xdry', '--with-mocks', '--store-credentials', '--no-build', '--model-only', '--script', '--with-auto-schema-evolution' ],
   shortcuts: ['-2', '-4', '-o'],
   help: `
 # SYNOPSIS
@@ -37,6 +37,10 @@ module.exports = Object.assign(deploy, {
 
       Just print the SQL statements without executing them.
 
+    *--no-build*  (only in combination with *--to hana*)
+
+      Skip running *cds build*.
+
     *--out* | *-o* <file>
 
       Write the DDL statements to the given file.
@@ -97,6 +101,7 @@ module.exports = Object.assign(deploy, {
     cds deploy --to sqlite:db
     cds deploy --to hana
     cds deploy --to hana:myService --auto-undeploy
+    cds deploy --to hana --no-build
 
 `})
 

package/lib/bind/index.js

@@ -118,7 +118,7 @@ function mergeCredentials(credentials, customCredentials) {
             if (!credentials[key]) {
                 credentials[key] = {};
             }
-            credentials[key] = this._mergeCredentials(credentials[key], customCredentials[key]);
+            credentials[key] = this.mergeCredentials(credentials[key], customCredentials[key]);
         } else {
             credentials[key] = customCredentials[key];
         }

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

@@ -56,7 +56,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             }
             // copy native hana artifacts from workspaces
             if (workspaceFiles) {
-                const dest = path.join(this.task.dest, 'src/gen')
+                const dest = path.join(this.task.dest, this.isStagingBuild() ? 'src' : 'src/gen')
                 await Promise.all(
                     workspaceFiles.map((src) => {
                         const { dir, filePath } = src

package/lib/compile/to-xsuaa.js

@@ -7,44 +7,57 @@ const hardcoded = {
   Attributes: ['id', 'tenant', 'ext_attr']
 }
 
-
 module.exports = function compile_to_xsuaa (model, options) {
 
   const base = getBaseModel(options)
   const scopes = {}
   const attributes = {}
 
+  const findUserAttrInExpression = (expr, attributes = []) => {
+    // find `$user` ref, but not e.g. `$self.$user`
+    if (typeof expr === 'object' && expr.ref?.length && expr.ref[0] === '$user') {
+      if (expr.ref.length === 2) {
+        const attr = expr.ref[1]
+        if (!/^[a-zA-Z0-9_]*$/.test(attr)) {
+          // see https://help.sap.com/docs/CP_AUTHORIZ_TRUST_MNG/ae8e8427ecdf407790d96dad93b5f723/517895a9612241259d6941dbf9ad81cb.html#attributes
+          throw new Error(`Illegal attribute name '${attr}' in '${expr}'. Only characters a-z, A-Z, 0-9, _ are allowed.`)
+        }
+        if (!hardcoded.Attributes.includes(attr)) attributes.push(attr)
+      }
+      // Reject expressions like `$user.foo.bar`, as xsuaa attributes are primitive, not structured
+      else if (expr.ref.length > 2) {
+        throw new Error (`Structured attributes like '${expr.ref.join('.')}' are not supported`)
+      }
+    }
+    else if (typeof expr === 'object') { // descend sub expressions etc.
+      Object.values(expr).forEach(e => findUserAttrInExpression(e, attributes))
+    }
+    else if (Array.isArray(expr)) { // descend arrays
+      expr.forEach(e => findUserAttrInExpression(e, attributes))
+    }
+    return attributes
+  }
+
+  /**
+   * @param {string|object} condition - the condition object or string
+   * @returns string[] - the attributes found in the condition
+   */
   const parseAttributes = (condition) => { // e.g. 'foo = $user.bar or baz = $user.boo'
     if (!condition) return []
 
-    // first validate basic syntax of expression by parsing it
     let expr
-    try {
-      expr = cds.parse.expr(condition).xpr
-    } catch (err) {
-      throw new Error(`Invalid expression': ${err.message}`)
-    }
-
-    // Reject expressions like `$user.foo.bar`, as xsuaa attributes are primitive, not structured
-    expr.forEach(expr => {
-      const userIdx = expr.ref?.indexOf('$user')
-      if (userIdx >= 0 && expr.ref.length > userIdx+2) {
-        throw new Error (`Structured attributes like '${expr.ref.join('.')}' are not supported`)
+    if (typeof condition === 'object') {
+      if (!condition.xpr && !condition['=']) throw new Error(`Invalid expression: ${JSON.stringify(condition)}`)
+      expr = condition.xpr
+    } else  {
+      try {
+        expr = cds.parse.expr(condition).xpr
+      } catch (err) {
+        throw new Error(`Invalid expression': ${err.message}`, { cause: err })
       }
-    })
+    }
 
-    // Reject expressions like `$user.foo-bar`
-    // Impl. note: use the expression string rather than the parsed expression as the above example would be
-    // `[ { ref: [ '$user', 'foo' ] }, '-', { ref: [ 'bar' ] } ]`
-    // making it ambiguous to tell if it was `$user.foo-bar` or `$user.foo - bar`
-    return Array.from(condition.matchAll(/\$user\s*\.\s*(\S*)/g))
-      .map(m => m[1])
-      .filter(m => !hardcoded.Attributes.includes(m))
-      .map(m => {
-        // see https://help.sap.com/docs/CP_AUTHORIZ_TRUST_MNG/ae8e8427ecdf407790d96dad93b5f723/517895a9612241259d6941dbf9ad81cb.html#attributes
-        if (!/^[a-zA-Z0-9_]*$/.test(m))  throw new Error(`Illegal attribute name '${m}' in '${condition}'. Only characters a-z, A-Z, 0-9, _ are allowed.`)
-        return m
-      })
+    return findUserAttrInExpression(expr)
   }
 
   cds.reflect(model).foreach(def => {

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

@@ -3,7 +3,7 @@ const path = require('path');
 const fs = require('fs').promises;
 
 const cds = require('../../../lib/cds');
-const { exists, read } = cds.utils;
+const { exists, read, write, mkdirp } = cds.utils;
 
 const { build } = require('../../build');
 
@@ -67,68 +67,73 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
       }
     }
 
-    const buildResults = await this._build();
+    let buildResult
+    if (cds.cli.options?.['no-build']) {
+      console.log(`Provided flag '--no-build', skipping cds build`)
+    } else {
+      buildResult = await this._build();
+    }
 
     if (process.env.TARGET_CONTAINER) {
       vcapEnv.TARGET_CONTAINER = process.env.TARGET_CONTAINER;
     }
 
-    for (const { task, result } of buildResults) {
-      if (dry) {
-        const sortedResult = Array.from(result.hana).sort();
-        for (const file of sortedResult) {
-          const srcPath = path.join(result.dest, file);
-          console.log(`-- ${path.relative(cds.root, srcPath)}`);
-          console.log(await read(srcPath));
-          console.log();
-        }
+    if (dry) {
+      const sortedResult = Array.from(buildResult.hana).sort();
+      for (const file of sortedResult) {
+        const srcPath = path.join(buildResult.dest, file);
+        console.log(`-- ${path.relative(cds.root, srcPath)}`);
+        console.log(await read(srcPath));
+        console.log();
+      }
+    } else {
+      // the primary database is always built and deployed 
+      const dest = path.join(cds.env.build.target, cds.env.folders.db);
+
+      let serviceName = pServiceName;
+      let serviceKeyName;
+      const { instance, key } = cds.requires.db?.binding ?? {};
+      if (!serviceName && instance) {
+        serviceName = instance;
+        serviceKeyName = key;
+      }
+
+      if (undeployWhitelist) {
+        console.log('Writing undeploy.json');
+        await write(undeployWhitelist).to(dest, 'undeploy.json')
+      }
+
+      const hasVCAPEnv = Object.keys(vcapEnv).length > 0;
+      if (!serviceName && hasVCAPEnv) {
+        await mkdirp(dest);
       } else {
-        const dest = task.dest;
+        const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =
+          await this._getOrCreateCFService(dest, serviceName, serviceKeyName, tunnelAddress);
 
-        let serviceName = pServiceName;
-        let serviceKeyName;
-        if (!serviceName && cds.env.requires.db?.binding?.instance) {
-          serviceName = cds.env.requires.db.binding.instance;
-          serviceKeyName = cds.env.requires.db.binding.key;
+        serviceName ??= cfServiceInstanceName;
+        serviceKeyName ??= cfServiceInstanceKeyName
+        if (!vcapEnv.VCAP_SERVICES || serviceName) {
+          vcapEnv.VCAP_SERVICES = this._getVCAPServicesEntry(cfServiceInstanceName, serviceKey);
         }
 
-        if (undeployWhitelist) {
-          console.log('Writing undeploy.json');
-          await fs.write(path.join(dest, 'undeploy.json'), JSON.stringify(undeployWhitelist, null, 2));
+        if (storeCredentials) {
+          await this._addInstanceToDefaultEnvJson([dest, cds.root], cfServiceInstanceName, serviceKey);
         }
+      }
 
-        const hasVCAPEnv = Object.keys(vcapEnv).length > 0;
-        if (!serviceName && hasVCAPEnv) {
-          await fs.mkdir(dest, { recursive: true });
-        } else {
-          const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =
-            await this._getOrCreateCFService(dest, serviceName, serviceKeyName, tunnelAddress);
-
-          serviceName ??= cfServiceInstanceName;
-          serviceKeyName ??= cfServiceInstanceKeyName
-          if (!vcapEnv.VCAP_SERVICES || serviceName) {
-            vcapEnv.VCAP_SERVICES = this._getVCAPServicesEntry(cfServiceInstanceName, serviceKey);
-          }
-
-          if (storeCredentials) {
-            await this._addInstanceToDefaultEnvJson([dest, cds.root], cfServiceInstanceName, serviceKey);
-          }
-        }
+      console.log(`${bold('Starting deployment to SAP HANA ...')}`);
+      DEBUG?.({ dest, vcapEnv, hdiOptions })
+      await hdi.deploy(dest, vcapEnv, hdiOptions);
 
-        console.log(`${bold('Starting deployment to SAP HANA ...')}`);
-        DEBUG?.({ dest, vcapEnv, hdiOptions })
-        await hdi.deploy(dest, vcapEnv, hdiOptions);
-
-        if (!hasVCAPEnv) {
-          const bindOptions = {
-            ...options,
-            to: `${serviceName}:${serviceKeyName}`,
-            for: options.for,
-            kind: task.for
-          }
-          const services = await bind(bindOptions);
-          await storeBindings(services, bindOptions);
+      if (!hasVCAPEnv) {
+        const bindOptions = {
+          ...options,
+          to: `${serviceName}:${serviceKeyName}`,
+          for: options.for,
+          kind: BUILD_TASK_HANA
         }
+        const services = await bind(bindOptions);
+        await storeBindings(services, bindOptions);
       }
 
       if (storeCredentials) {
@@ -145,7 +150,7 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
       console.warn(warn(warnings.join('\n')));
     }
 
-    return { buildResults };
+    return buildResult;
   }
 
 
@@ -206,9 +211,11 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
       src: cds.env.folders.db,
       [OUTPUT_MODE]: OUTPUT_MODE_FILESYSTEM | OUTPUT_MODE_RESULT
     }
-
     console.log(`Running build`);
-    return build(buildTaskOptions);
+    
+    // cds build throws an error if the src folder does not exist
+    const buildResult = await build(buildTaskOptions);
+    return buildResult[0].result;
   }
 
   async _addInstanceToDefaultEnvJson(currentFolders, serviceInstanceName, serviceKey) {

package/lib/index.js

@@ -35,6 +35,20 @@ class CdsDk {
   }
 }
 
+const REQUIRED_CDS_MAJOR = 7, REQUIRED_CDS_MINOR = 2
+const [major, minor] = cds.version.split('.').map(Number)
+if (major < REQUIRED_CDS_MAJOR || major === REQUIRED_CDS_MAJOR && minor < REQUIRED_CDS_MINOR) {
+  const [dkVersion] = require('../package.json').version.split('.')
+
+  console.error(`
+  This application uses '@sap/cds' version ${major}.${minor}, which is not compatible with the installed '@sap/cds-dk' version ${dkVersion}.
+  You can either:
+  - update '@sap/cds' to the latest version (recommended)
+  - downgrade '@sap/cds-dk' to version ${REQUIRED_CDS_MAJOR}
+`)
+  process.exit(1)
+}
+
 cds.extend (cds.constructor) .with (CdsDk)
 
 class CdsDkAdd {
@@ -49,20 +63,6 @@ if (process.argv[2] in { add:1, init:1, help:1 }) {
   cds.extend (cds.constructor) .with (CdsDkBuild)
 }
 
-const REQUIRED_CDS_MAJOR = 7, REQUIRED_CDS_MINOR = 2
-const [major, minor] = cds.version.split('.').map(Number)
-if (major < REQUIRED_CDS_MAJOR || major === REQUIRED_CDS_MAJOR && minor < REQUIRED_CDS_MINOR) {
-  const [dkVersion] = require('../package.json').version.split('.')
-   
-  console.error(`
-  This application uses '@sap/cds' version ${major}.${minor}, which is not compatible with the installed '@sap/cds-dk' version ${dkVersion}.
-  You can either:
-  - update '@sap/cds' to the latest version (recommended)
-  - downgrade '@sap/cds-dk' to version ${REQUIRED_CDS_MAJOR}
-`)
-  process.exit(1)
-}
-
 function _local (id) {
   return require.resolve (id, {paths:[
     process.cwd(), // project-local module is preferred

package/lib/init/constants.js

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

package/lib/init/template/application-logging/files/package.json.hbs

@@ -1,7 +1,11 @@
 {
+  {{#isNodejs}}
   "cds": {
+  {{/isNodejs}}
     "requires": {
-      "application-logging": true
-    }
+        "application-logging": true
+      }
+  {{#isNodejs}}
   }
+  {{/isNodejs}}
 }

package/lib/init/template/application-logging/index.js

@@ -1,6 +1,7 @@
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, mtxSidecar4, applicationLogging, approuter } = require('../../registries/mta')
+const mvn = require('../../mvn')
 
 module.exports = class ApplicationLoggingTemplate extends require('../../plugin') {
 
@@ -20,10 +21,9 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
 
     async run() {
         const project = readProject()
-        const { isNodejs } = project
-        if (isNodejs) {
-            await merge(__dirname, 'files/package.json.hbs').into('package.json')
-        }
+        const { isJava, configFile } = project
+        await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
+        if (isJava) await mvn.add('APPLICATION_LOGGING')
     }
 
     async combine() {

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

@@ -4,7 +4,7 @@
     "@sap/approuter": "^17.0.0"
   },
   "engines": {
-    "node": "^20.0.0"
+    "node": "^22.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/approuter/approuter.js"

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

@@ -39,7 +39,7 @@ module.exports = async (data={}, csn, { headerOnly=false, separator=',' }={}) =>
             }
             record.push(...Object.values(value))
           }
-          else if (element.is_struct) {
+          else if (element.is_struct && element.type !== 'cds.Map') {
             if (i === 0) {
               header.push(...Object.keys(value).map(structField => name + '_' + structField))
             }
@@ -47,7 +47,7 @@ module.exports = async (data={}, csn, { headerOnly=false, separator=',' }={}) =>
           }
           else {
             if (i === 0)  header.push(name)
-            if (Array.isArray(value)) { // `array of` / `many`
+            if (Array.isArray(value) || typeof value === 'object') { // `array of`/`many` and `cds.Map`
               value = JSON.stringify(value)
             }
             value = escape(value)

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

@@ -10,35 +10,37 @@ const MAX_ASSOC_DEPTH = 5
  *
  * @param {Record<string, object[]>|undefined} data the data with entities and their records to be created
  * @param {object} csn the model
- * @param {Number} numRecords the number of records to be created for each entity
+ * @param {Number} numRecords the number of records to be created for each artifact
  * @param {{referenceData? : Record<string, string}} options misc. options
  * @returns {Record<string, object[]>} the filled data
  */
 const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
-  let { referenceData, contentType } = options
+  let { referenceData, contentType, artifact='entity' } = options
 
-  // if no entity restrictions are given, use all entities
-  if (!data)  data = csn.all('entity').reduce((all, e) => { all[e.name] = []; return all }, {})
+  // if no data is given, use all data
+  if (!data) {
+    data = csn.all(artifact).reduce((all, e) => { all[e.name] = []; return all }, {})
+  }
 
   // if no reference data is given, scan for it using cds.deploy.resources
   if (!referenceData)  referenceData = await cds.deploy.resources(csn)
 
   // sort all entities first that are referenced by others, so that dependant entities can be created after them
   const { definitions: defs } = csn
-  const entityNames = Object.keys(data).sort((n1, n2) => {
-    const n1HasComp = Object.values(defs[n1].elements).some(el => el.type === 'cds.Composition')
-    const n2HasComp = Object.values(defs[n2].elements).some(el => el.type === 'cds.Composition')
+  const names = Object.keys(data).sort((n1, n2) => {
+    const n1HasComp = Object.values(defs[n1].elements??[]).some(el => el.type === 'cds.Composition')
+    const n2HasComp = Object.values(defs[n2].elements??[]).some(el => el.type === 'cds.Composition')
     if (n1HasComp && !n2HasComp)  return -1
     if (!n1HasComp && n2HasComp)  return 1
     return 0
   })
 
   // requested entities shall always be created, so remove it from reference data
-  Object.entries(referenceData).filter(([, name]) => entityNames.includes(name)).forEach(([file]) => delete referenceData[file])
+  Object.entries(referenceData).filter(([, name]) => names.includes(name)).forEach(([file]) => delete referenceData[file])
 
   addSemantics(csn)
 
-  for (const name of entityNames) {
+  for (const name of names) {
     if (!data[name] // removed on purpose because records are created inline through compositions
       || data[name].length >= numRecords) { // numRecords already created by following associations
       continue
@@ -47,26 +49,26 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
     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 
+      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 artifact = defs[name]
 
     const idNum = randomNumber()
     for (let i = 0; i < numRecordsToGenerate; i++) {
-      fillRecord(records[i], idNum+i, entity, csn, data, null, 0, referenceData)
+      fillRecord(records[i], idNum+i, artifact, csn, data, null, 0, referenceData)
     }
-    data[name] = data[name].concat(records) // append the new records to the possibly existingand referenced records
+    data[name] = data[name].concat(records) // append the new records to the possibly existing and 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)
+    data[name] = uniqRecords(data[name], artifact)
   }
   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])
@@ -74,13 +76,13 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
   return data
 }
 
-function fillRecord(record, recordID, entity, csn, data, parentEntity, depth, referenceData) {
+function fillRecord(record, recordID, artifact, csn, data, parent, 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
+  if (data[artifact.name]) data[artifact.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 => {
-    record[el.name] = dataForField(el, entity, csn, record, data, parentEntity, depth, referenceData)
+  const elems = Object.values(artifact.elements ?? artifact.params).sort(asJson.elementsSorter(csn))
+  elems.forEach(el => {
+    record[el.name] = dataForField(el, artifact, csn, record, data, parent, depth, referenceData)
   })
   return record
 }
@@ -110,7 +112,7 @@ asJson.elementsSorter = function (csn) {
 }
 
 
-function dataForField(element, entity, csn, record, data, parentEntity, depth, referenceData) {
+function dataForField(element, artifact, csn, record, data, parent, depth, referenceData) {
   if (element.virtual || (element['@Core.Computed'] && element.value))
     return
   if (record[element.name] !== undefined)
@@ -119,12 +121,12 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
   if (element.items?.elements)  // `array of` / `many` with complex type
     return [ fillRecord({}, record['$id'], element.items, csn, data, null, depth+1, referenceData) ]
   else if (element.items?.type) // `array of` / `many` with simple type
-    return [ dataForField(element.items, entity, csn, record, data, null, depth+1, referenceData) ]
+    return [ dataForField(element.items, artifact, csn, record, data, null, depth+1, referenceData) ]
 
   if (element.is_struct) {
     let struct = {}
     for (const el of element.elements) {
-      struct[el.name] = dataForField(el, entity, csn, record, data, null, depth+1, referenceData)
+      struct[el.name] = dataForField(el, artifact, csn, record, data, null, depth+1, referenceData)
     }
     return struct
   }
@@ -166,11 +168,11 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
         const enumName = randomFromList(Object.keys(element.enum))
         const value = element.enum[enumName].val ?? element.enum[enumName].value ?? enumName
         // key of common.CodeList, also fill name and descr with enum name
-        if (element.key && entity.elements.name && entity.elements.descr)
+        if (element.key && artifact.elements.name && artifact.elements.descr)
           record.name = record.descr = enumName
         return value
       }
-      if (entity['@Communication.Contact.email']?.some(mail => mail.address?.['='] === element.name)
+      if (artifact['@Communication.Contact.email']?.some(mail => mail.address?.['='] === element.name)
         || element['@Communication.IsEmailAddress']
         || element['@cds.on.insert']?.['='] === '$user'
         || element['@cds.on.update']?.['='] === '$user') {
@@ -180,9 +182,9 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
       let str = `${element.name}-${record['$id']}`
 
       if (element.key) {
-        str = `${entity.name.split('.').pop()}-${record['$id']}`
-        if (element.name === 'locale' && entity.name.endsWith('texts')) {
-          const record = randomFromReferenceData(entity, csn, referenceData)
+        str = `${artifact.name.split('.').pop()}-${record['$id']}`
+        if (element.name === 'locale' && artifact.name.endsWith('texts')) {
+          const record = randomFromReferenceData(artifact, csn, referenceData)
           if (record)  return record.locale
           return randomLanguage()
         }
@@ -227,9 +229,11 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
     }
     case 'cds.hana.REAL':
     case 'cds.Decimal': {
-      const range = {from: 0, to: 100}
+      const prec  = element.precision ? Math.min(Math.pow(10, element.precision), Number.MAX_SAFE_INTEGER) : 100
+      const range = { from: 0, to: prec }
+      const scale = element.scale ?? (element.precision ? 0 : 2) // scale is 0 if only precision is given
       annotatedIntRange(element, range)
-      return +(randomDecimalInRange(range).toFixed(element.scale ?? 2))
+      return +(randomDecimalInRange(range).toFixed(scale))
     }
     case 'cds.Double': {
       const range = {from: 0, to: 100}
@@ -237,15 +241,15 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
     }
     case 'cds.Composition': {
       const target = csn.definitions[element.target]
-      if (!target || entity.name === target.name || depth > MAX_ASSOC_DEPTH) return
-      
+      if (!target || artifact.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++) {
-        const newRecord = fillRecord({}, targetRecordID+i, target, csn, data, entity, depth+1, referenceData)
+        const newRecord = fillRecord({}, targetRecordID+i, target, csn, data, artifact, depth+1, referenceData)
         if (newRecord) targetRecords.push(newRecord)
       }
 
@@ -259,8 +263,8 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
       }
       uniqRecords(targetRecords, target)
 
-      // set the entire target record inline
-      return element.is2many ? targetRecords : targetRecords[0]
+      // consistent return data type: array
+      return element.is2many ? targetRecords : [targetRecords[0]]
     }
     case 'cds.Association': {
       if (element.is2many)
@@ -280,16 +284,16 @@ 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
-        
+
         if (targetRecords.length > 0) { // use record generated by following asociation
           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)
+          targetRecord = fillRecord({}, randomNumber(), target, csn, data, artifact, depth+1, referenceData)
           if (targetRecord) {
             targetRecords.push(targetRecord)
             uniqRecords(targetRecords, target)
           }
-          if (parentEntity && (parentEntity.name != entity.name)) data[target.name].keepReferece = true
+          if (parent && (parent.name != artifact.name)) data[target.name].keepReferece = true
         }
       }
 
@@ -308,7 +312,7 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
     case 'cds.Vector': // TODO add Vector
       return
     default: {
-      console.error(`Unknown type ${element._type} (${element.type}) in '${entity.name}:${element.name}'`)
+      console.error(`Unknown type ${element._type} (${element.type}) in '${artifact.name}:${element.name}'`)
       return
     }
   }
@@ -393,14 +397,14 @@ function findKeysInOnCondition(assocElement, target) {
   return [ownKey, ownKeyStructured, targetKey]
 }
 
-function uniqRecords(records, entity) {
-  const keys = Object.keys(entity.keys||{})
-  if (keys.length === 0)  return records
+function uniqRecords(records, artifact) {
+  const keys = Object.keys(artifact.keys||{})
+  if (keys.length === 0)  keys.push('$id') // no keys (e.g. in actions) -> use record's $id
   const keySet = new Set()
   for (let i = 0; i < records.length; i++) {
     const key = keys.map(k => records[i][k]).join('|')
     if (keySet.has(key)) {
-      // console.debug('Removing', keys, key, 'from', entity.name)
+      // console.debug('Removing', keys, key, 'from', artifact.name)
       records.splice(i, 1)
       i--
     }

package/lib/init/template/hana/files/db/package.json

@@ -5,7 +5,7 @@
     "@sap/hdi-deploy": "^5"
   },
   "engines": {
-    "node": "^20.0.0"
+    "node": "^22.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js --use-hdb",

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

@@ -3,10 +3,7 @@
   "dependencies": {
     "@cap-js/hana": "^1"
   },
-  {{/isNodejs}}
-  {{#isNodejs}}
   "cds": {
-  {{/isNodejs}}
     "sql": {
       "native_hana_associations": false
     }{{#profile}},
@@ -22,7 +19,24 @@
       {{/shortcut}}
       }
     }{{/profile}}
-  {{#isNodejs}}
   }
   {{/isNodejs}}
+  {{#isJava}}
+  "requires": {
+    {{#profile}}
+    "[{{profile}}]": {
+    {{/profile}}
+    {{#shortcut}}
+      "db": "hana"
+    {{/shortcut}}
+    {{^shortcut}}
+      "db": {
+        "kind": "hana"
+      }
+    {{/shortcut}}
+    {{#profile}}
+    }
+    {{/profile}}
+  }
+  {{/isJava}}
 }

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

@@ -29,12 +29,14 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       'for-app': {
         type: 'string',
         short: 'a',
-        help: 'Specify the name of the app to generate requests for. If not specified, localhost and default auth will be used.'
+        help: `Specify the name of the app to generate requests for.
+        If not specified, localhost and default auth will be used.`
       },
       'out': {
         type: 'string',
         short: 'o',
-        help: 'The output directory. By default, an `http` dir will be created in one of the following: test/tests/__tests__, whichever already exists. If none exists, an `http` dir will be created at the root level.'
+        help: `The output directory.
+        By default, an \`http\` dir is created in either \`test/\`, \`tests/\`, \`__tests__/\`, or at the root level.`
       },
       'dry': {
         type: 'boolean',
@@ -130,9 +132,12 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       for (const e of service.entities) {
         payload[e.name] = []
       }
+      for (const a of service.actions) {
+        payload[a.name] = []
+      }
     }
     // csn.all('entity').reduce((all, e) => { all[e.name] = []; return all }, {})
-    await asJson(payload, csn, 1)
+    await asJson(payload, csn, 1, {referenceData: []})
     for (const p in payload) {
       delete payload[p][0].texts
       delete payload[p][0].localized
@@ -176,11 +181,11 @@ module.exports = class HttpTemplate extends require('../../plugin') {
           else {
             const postBody = JSON.stringify(entityData, null, 2)
             let id
-            const compositeKey = Object.keys(e.keys).length > 1
+            const compositeKey = Object.keys(e.keys||{}).length > 1
             if (compositeKey) {
               id = [...e.keys].map(k => k.type === 'cds.String' ? `${k.name}='${entityData[k.name]}'` : `${k.name}=${entityData[k.name]}`).join(',')
             } else {
-              id = entityData[Object.keys(e.keys)[0]]
+              id = entityData[Object.keys(e.keys||{})[0]]
             }
             compositeKey ? id = `(${id})` : id = `/${id}`
             requests.push(`${requestTitle}\n# @name ${nameSlug}_POST\nPOST ${url}\n${headers}\n\n${postBody}\n`)
@@ -195,12 +200,8 @@ module.exports = class HttpTemplate extends require('../../plugin') {
 
           let actionPayload = {}
           if (a.params) {
-            for (const [key, value] of Object.entries(a.params)) {
-              actionPayload[key] = value.type === 'cds.Integer' ? 1
-                : value.type === 'string' ? 'sample string'
-                  // TODO reference an object that has been generated
-                  : typeof value.type === 'object' && value.type.ref ? payload[value.type.ref[0]][0][value.type.ref[1]]
-                    : null
+            for (const pName of Object.keys(a.params)) {
+              actionPayload[pName] = payload[a.name]?.[0]?.[pName] ?? null
             }
           }
           requests.push(`\n### ${simpleNameAction}\n# @name ${simpleNameAction}_POST\nPOST ${url}\n${headers}\n\n${JSON.stringify(actionPayload, null, 2)}\n`)

package/lib/init/template/side-by-side-extensibility/index.js

@@ -19,6 +19,7 @@ module.exports = class extends require('../../plugin') {
     canRun() {
       const { isNodejs } = readProject()
       if (isNodejs) throw 'Side-by-side extensibility is not supported for Node.js yet.'
+      return true
     }
 
     async run() {

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

@@ -24,7 +24,6 @@ module.exports = class TyperTemplate extends require('../../plugin') {
     let target = 'jsconfig.json'
 
     if (exists('tsconfig.json')) {
-      source.compilerOptions.paths["#cds-models/*"][0] += '/index.ts'
       target = 'tsconfig.json'
     }
     await merge(template('package.json')).into('package.json')

package/lib/mtx/push.js

@@ -26,7 +26,6 @@ module.exports = class Push {
         const extensionName = this.getExtensionName(projectFolder);
 
         if (!('extArchive' in pushOptions)) {
-            console.log(`Building project`);
             await buildSystem.build();
         }
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.4.0",
+  "version": "8.4.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.4.0",
+      "version": "8.4.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -43,7 +43,7 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.14.1",
+      "version": "1.15.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -64,11 +64,11 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "1.7.5",
+      "version": "1.7.7",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
-        "@cap-js/db-service": "^1.9.0",
+        "@cap-js/db-service": "^1.14.1",
         "better-sqlite3": "^11.0.0"
       },
       "peerDependencies": {
@@ -149,7 +149,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.13.0",
+      "version": "9.14.0",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -190,6 +190,17 @@
         "node": ">=18.18.0"
       }
     },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "license": "Apache-2.0",
@@ -202,7 +213,7 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.3.1",
+      "version": "0.4.1",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18"
@@ -213,7 +224,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.4.0",
+      "version": "8.4.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -239,7 +250,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.4.0",
+      "version": "5.4.4",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -287,7 +298,7 @@
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "3.1.1",
+      "version": "3.1.2",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/cds": ">=7",
@@ -717,7 +728,7 @@
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
+      "version": "7.0.5",
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -875,19 +886,19 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.13.0",
+      "version": "9.14.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.11.0",
+        "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.18.0",
         "@eslint/core": "^0.7.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.13.0",
+        "@eslint/js": "9.14.0",
         "@eslint/plugin-kit": "^0.2.0",
-        "@humanfs/node": "^0.16.5",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.3.1",
+        "@humanwhocodes/retry": "^0.4.0",
         "@types/estree": "^1.0.6",
         "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
@@ -895,9 +906,9 @@
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.1.0",
-        "eslint-visitor-keys": "^4.1.0",
-        "espree": "^10.2.0",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -933,7 +944,7 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.1.0",
+      "version": "8.2.0",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -947,7 +958,7 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.1.0",
+      "version": "4.2.0",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -957,12 +968,12 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.2.0",
+      "version": "10.3.0",
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.12.0",
+        "acorn": "^8.14.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.1.0"
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1690,7 +1701,7 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.2",
+      "version": "1.13.3",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"

package/package.json

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