@sap/cds-dk 8.4.1 → 8.4.2

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.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
@@ -14,8 +31,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds deploy --no-build` lets you skip the implicit `cds build`.
 - `cds add data/http` supports new type `cds.Map`.
 
-### Changed
-
 ### Fixed
 
 - `cds compile --to <unknown>` shows a cleaner error message.

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/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/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.4.0',
+    MAVEN_ARCHETYPE_VERSION: '3.4.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',

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))
             }

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

@@ -229,9 +229,11 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
     }
     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}
@@ -309,8 +311,6 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
       return
     case 'cds.Vector': // TODO add Vector
       return
-    case 'cds.Map':
-      return {}
     default: {
       console.error(`Unknown type ${element._type} (${element.type}) in '${artifact.name}:${element.name}'`)
       return

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',
@@ -179,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`)

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/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.4.1",
+  "version": "8.4.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.4.1",
+      "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,7 +64,7 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "1.7.6",
+      "version": "1.7.7",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -224,7 +224,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.4.1",
+      "version": "8.4.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -250,7 +250,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.4.2",
+      "version": "5.4.4",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -728,7 +728,7 @@
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.4",
+      "version": "7.0.5",
       "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
@@ -1701,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.1",
+  "version": "8.4.2",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [