@sap/cds-dk 8.2.0 → 8.2.1

package/CHANGELOG.md

@@ -7,6 +7,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 8.2.1 - 2024-09-05
+
+### Fixed
+
+- Update `@sap/hdi-deploy` to fix CVE-2024-4067 with `micromatch` 4.0.7
+- `cds add` plugins now correctly parse flags (options with `type: 'boolean'`) if not used as the last argument.
+
 ## Version 8.2.0 - 2024-09-02
 
 ### Added

package/bin/cds.js

@@ -60,7 +60,11 @@ const cli = {
           cds.cli = { command: 'add' }
           await cds.plugins
           for (const [, Plugin] of cds.add.registered) {
-            task.options.push(...Object.keys((new Plugin).options()).map(key => '--'+key))
+            const all = Object.entries((new Plugin).options())
+            const flags   = all.filter(([,f]) => f.type === 'boolean')
+            const options = all.filter(([,o]) => o.type !== 'boolean')
+            task.options.push(...options.map(([key]) => '--'+key))
+            task.flags.push(...flags.map(([key]) => '--'+key))
           }
         }
         const args = this.args(task, argv)

package/lib/import/common.js

@@ -322,18 +322,21 @@ async function _updatePackageJson(dest, services, kind, cwd, config) {
     const package_json = path.resolve(cwd, 'package.json');
     const conf = await exists(package_json) ? require(package_json) : {};
     const requires = ['cds', 'requires'].reduce((p, n) => p[n] || (p[n] = {}), conf);
-    if (kind !== 'rest') {
+    if (kind !== 'rest' && kind !== 'rfc') {
         kind = (kind === "V2") ? 'odata-v2' : 'odata';
     }
     let package_json_updated = false;
     for (let service of services) {
-        // always update from given config data - e.g. delta imports may want to add service configuration data
+        // existing service configuration data can be updated, e.g. in case of delta imports
         const model = path.relative(cwd, dest).replace(/\\/g, '/'); // cds env must not be platform specific
-        cds.env.requires[service] = requires[service] = { kind: kind, model, ...config };
-        await write(package_json, JSON.stringify(conf, null, '  '));
-        package_json_updated = true;
+        const serviceConfig = { kind, model, ...config }
+        if (!requires[service] || JSON.stringify(serviceConfig) !== JSON.stringify(requires[service])) {
+            cds.env.requires[service] = requires[service] = serviceConfig;
+            package_json_updated = true;
+        }
     }
     if (package_json_updated) {
+        await write(package_json, JSON.stringify(conf, null, '  '));
         console.log(`[cds] - updated ./package.json`);
     }
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.2.0",
+      "version": "8.2.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -43,7 +43,7 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.12.0",
+      "version": "1.12.1",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -204,7 +204,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.2.0",
+      "version": "8.2.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -314,16 +314,16 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "5.2.1",
+      "version": "5.2.2",
       "hasInstallScript": true,
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/hdi": "4.5.2",
         "@sap/xsenv": "5.2.0",
-        "async": "3.2.5",
+        "async": "3.2.6",
         "dotenv": "16.4.5",
         "handlebars": "4.7.8",
-        "micromatch": "4.0.7"
+        "micromatch": "4.0.8"
       },
       "engines": {
         "node": "^18.0.0 || ^20.0.0"
@@ -442,7 +442,7 @@
       }
     },
     "node_modules/async": {
-      "version": "3.2.5",
+      "version": "3.2.6",
       "license": "MIT"
     },
     "node_modules/asynckit": {
@@ -1173,7 +1173,7 @@
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
+      "version": "1.15.8",
       "funding": [
         {
           "type": "individual",
@@ -1565,7 +1565,7 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
+      "version": "4.0.8",
       "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
@@ -2434,7 +2434,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.5.0",
+      "version": "2.5.1",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

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