@sap/cds-dk 8.7.0 → 8.7.1

package/CHANGELOG.md

@@ -7,6 +7,17 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 8.7.1 - 2024-02-04
+
+### Fixed
+
+- `cds add mta` now sets `parameters.instances` explicitly to `1` in Java projects, same as for Node.js projects.
+- `cds add mta` does not add the `readiness-health-check-type` and `readiness-health-check-http-endpoint` properties to the `mta.yaml` any more.
+- `cds add -p` correctly parses plugin-contributed options.
+- `cds watch` correctly escapes its default ignored directories on Windows.
+- `cds compile` correctly uses `--service=all` as its default.
+- `cds add ias` correctly writes MTX sidecar config in combination with `cds add multitenancy`.
+
 ## Version 8.7.0 - 2025-01-28
 
 ### Added
@@ -15,7 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - `cds import` now updates configuration for Java projects (in `application.yaml` etc.)
 - `cds import --config` now also accepts a string with flat key-value pairs (like `--config "credentials.destination=foo"`), which is easier to write than the current JSON string (`--config "{\"credentials\": {\"destination\": \"foo\"}}"`).
 - `cds debug` now supports Java applications, both local and remote.
-- `cds import` can now import an odata-V4 file with external dependencies(odata-V4 file). Dependencies has to be provided with -d/--dependencies option and must not have any external dependencies. 
+- `cds import` can now import an odata-V4 file with external dependencies(odata-V4 file). Dependencies has to be provided with -d/--dependencies option and must not have any external dependencies.
 
 ### Changed
 

package/bin/cds.js

@@ -63,13 +63,18 @@ const cli = {
         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]
+            const pIndex = argv.indexOf('-p') + 1 || argv.indexOf('--package') + 1
+            const p = argv[pIndex]
             console.log(`running with --package, adding dependency ${p}`)
-            await require('../lib/util/command').spawnCommand(`npm`, ['add', p], { cwd: cds.root })
-            delete require.cache[require.resolve(path.join(cds.root,'./package.json'))]
+            try {
+              const { execSync } = require('child_process')
+              execSync(`npm add ${p}`, { stdio: 'inherit', cwd: cds.root })
+              argv.splice(pIndex - 1, 2)
+              return execSync(`cds add ${argv.join(' ')}`, { stdio: 'inherit', cwd: cds.root })
+            } catch (e) {
+              throw e.message
+            }
           }
-          cds.env.plugins = cds.env.for('cds').plugins // reload plugin env
-          cds.add = require('../lib/init/add')
           await cds.plugins
           for (const [, Plugin] of cds.add.registered) {
             const all = Object.entries((new Plugin).options())

package/bin/compile/index.js

@@ -217,7 +217,7 @@ async function compile_all (root='.') {
 }
 
 async function compile (models, options={}) {
-
+  options.service ??= 'all'
   if (options.all)  return compile_all (models[0])
 
   const { inspect } = require('util')

package/bin/watch.js

@@ -75,19 +75,20 @@ const fs = require ('fs')
 
 const extDefaults = 'cds,csn,csv,ts,mjs,cjs,js,json,properties,edmx,xml,env'
 
+const escapedSep = sep === '\\' ? '\\\\' : sep // escape backslash for windows
 const ignoreDefaults = [
   /\.git/,
   /node_modules/,
   /_out/,
   /@types/,
   /@cds-models/,
-  new RegExp(`app${sep}.+?${sep}webapp${sep}`),
-  new RegExp(`app${sep}.+?${sep}dist${sep}`),
-  new RegExp(`app${sep}.+?${sep}target${sep}`),
-  new RegExp(`app${sep}.+?${sep}tsconfig\\.json$`),
-  new RegExp(`app${sep}.+?${sep}.*\\.tsbuildinfo$`),
+  new RegExp(`app${escapedSep}.+?${escapedSep}webapp${escapedSep}`),
+  new RegExp(`app${escapedSep}.+?${escapedSep}dist${escapedSep}`),
+  new RegExp(`app${escapedSep}.+?${escapedSep}target${escapedSep}`),
+  new RegExp(`app${escapedSep}.+?${escapedSep}tsconfig\\.json$`),
+  new RegExp(`app${escapedSep}.+?${escapedSep}.*\\.tsbuildinfo$`),
   /package-lock\.json$/,
-  new RegExp(`\\${sep}gen\\${sep}`)
+  new RegExp(`${escapedSep}gen${escapedSep}`)
 ]
 
 async function watch ([cwd], {

package/lib/init/constants.js

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

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

@@ -1,5 +1,5 @@
 const { readProject } = require('../../projectReader')
-const { merge } = require('../../merge')
+const { merge, sort } = require('../../merge')
 const { srv4, approuter, mtxSidecar4 } = require('../../registries/mta')
 const cds = require('../../../cds')
 const { read, write } = cds.utils
@@ -20,8 +20,9 @@ module.exports = class IasTemplate extends require('../../plugin') {
 
     async run() {
         const project = readProject()
-        const { configFile } = project
+        const { configFile, isNodejs } = project
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project, forceOverwrite: true })
+        if (isNodejs) await sort('package.json', 'dependencies')
         if (project.hasMultitenancy) {
             await merge(__dirname, 'files/package.json.hbs').into('mtx/sidecar/package.json', { project, forceOverwrite: true })
         }
@@ -33,11 +34,13 @@ module.exports = class IasTemplate extends require('../../plugin') {
         const { isJava, hasMta, hasCfManifest, hasHelm, hasHelmUnifiedRuntime, hasApprouter, hasMultitenancy, srvPath } = project
 
         if (hasMultitenancy) {
-            const conf = (await read('mtx/sidecar/package.json')).cds ?? {}
-            if (conf.profile) delete conf.profile
-            conf.profiles ??= conf.profile ? [conf.profile] : []
-            if (!conf.profiles.includes('subscription-manager')) {
-                conf.profiles.push('subscription-manager')
+            const conf = (await read('mtx/sidecar/package.json')) ?? {}
+            conf.cds ??= {}
+            const profile = conf.cds.profile
+            if (profile) delete conf.cds.profile
+            conf.cds.profiles ??= profile ? [profile] : []
+            if (!conf.cds.profiles.includes('subscription-manager')) {
+                conf.cds.profiles.push('subscription-manager')
             }
             await write('mtx/sidecar/package.json', conf, { spaces: 2 })
         }

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

@@ -21,16 +21,13 @@ modules:
     parameters:
       instances: 1
       buildpack: nodejs_buildpack
-      readiness-health-check-type: http
-      readiness-health-check-http-endpoint: /health
     build-parameters:
       builder: npm-ci
 {{/isNodejs}}
 {{#isJava}}
     parameters:
+      instances: 1
       buildpack: sap_java_buildpack_jakarta
-      readiness-health-check-type: http
-      readiness-health-check-http-endpoint: /actuator/health/readiness
     properties:
       SPRING_PROFILES_ACTIVE: cloud,sandbox
       JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.7.0",
+  "version": "8.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.7.0",
+      "version": "8.7.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -109,10 +109,10 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.19.1",
+      "version": "0.19.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.5",
+        "@eslint/object-schema": "^2.1.6",
         "debug": "^4.3.1",
         "minimatch": "^3.1.2"
       },
@@ -159,7 +159,7 @@
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "2.1.5",
+      "version": "2.1.6",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -258,7 +258,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.7.0",
+      "version": "5.7.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -294,7 +294,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.5.0",
+      "version": "2.5.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -1443,7 +1443,7 @@
       }
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
+      "version": "3.3.1",
       "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -1699,7 +1699,7 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.73.0",
+      "version": "3.74.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2012,7 +2012,7 @@
       "license": "ISC"
     },
     "node_modules/semver": {
-      "version": "7.6.3",
+      "version": "7.7.0",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"

package/package.json

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