@sap/cds-dk 8.8.0 → 8.8.2

package/CHANGELOG.md

@@ -7,6 +7,21 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 8.8.2 - 2025-03-21
+
+### Fixed
+
+- Bump axios to 1.8.4, fixing CVE-2025-27152
+
+## Version 8.8.1 - 2025-03-11
+
+### Fixed
+
+- `cds init` uses latest Maven Java archetype version 3.8.0 for creating Java projects.
+- `cds import` json schema now contains correct references.
+- `cds init --add lint` writes complete eslint.config.mjs.
+- `cds import` no longer fails with an `EXDEV` error in `docker` containers.
+
 ## Version 8.8.0 - 2025-03-03
 
 ### Added

package/lib/env/schemas/cds-rc.js

@@ -139,12 +139,12 @@ module.exports = {
                         as: {
                             type: "string",
                             description: "Converts the input file into one of these supported formats: cds, csn or json.",
-                            $ref: "#/$defs/import-options/as"
+                            $ref: "#/$defs/importOptions/as"
                         },
                         from: {
                             type: "string",
                             description: "Imports the model from the one of the given options: edmx, openapi or asyncapi.",
-                            $ref: "#/$defs/import-options/from"
+                            $ref: "#/$defs/importOptions/from"
                         },
                         force: {
                             type: "boolean",
@@ -173,7 +173,7 @@ module.exports = {
                         }
                     }
                 },
-                
+
                 export: {
                     type: "object",
                     description: "Customize cds compile settings",
@@ -191,7 +191,7 @@ module.exports = {
                                 merged: {
                                     type: "object",
                                     description: "properties that needs to be there when merged option is used",
-                                    additionalProperties: false, 
+                                    additionalProperties: false,
                                     properties: {
                                         title: {
                                             type: "string",
@@ -224,37 +224,24 @@ module.exports = {
                                     type: "object",
                                     description: "Parameters related to the source of event",
                                     default: {
+                                        region: "the region",
+                                        applicationNamespace: "the namespace",
+                                        instanceId: "the instance id"
+                                    },
+                                    additionalProperties: false,
+                                    properties: {
                                         region: {
-                                        "description": "The regional context of the application.",
-                                        "schema": {
-                                            "type": "string"
-                                        }
+                                            type: "string",
+                                            description: "The regional context of the application"
                                         },
                                         applicationNamespace: {
-                                        "description": "The registered namespace of the application.",
-                                        "schema": {
-                                            "type": "string"
-                                        }
+                                            type: "string",
+                                            description: "The registered namespace of the application"
                                         },
                                         instanceId: {
-                                        "description": "The instance id (tenant, installation, ...) of the application.",
-                                        "schema": {
-                                            "type": "string"
-                                        }
+                                            type: "string",
+                                            description: "The instance id (tenant, installation, ...) of the application."
                                         }
-                                    },
-                                    additionalProperties: false,
-                                    region: {
-                                        type: "string",
-                                        description: "The regional context of the application"
-                                    },
-                                    applicationNamespace: {
-                                        type: "string",
-                                        description: "The registered namespace of the application"
-                                    },
-                                    instanceId: {
-                                        type: "string",
-                                        description: "The instance id (tenant, installation, ...) of the application."
                                     }
                                 },
                                 event_characteristics: {
@@ -332,7 +319,7 @@ module.exports = {
             ]
         },
 
-        import_options: {
+        importOptions: {
             from: {
                 oneOf: [
                     {

package/lib/import/common.js

@@ -141,11 +141,22 @@ async function isValidInputFile(inputFileLoc) {
 }
 
 async function _copyToSrvExternal(file, dst, cwd) {
-    const dstDir = path.dirname(dst), srcDir = path.dirname(file);
+    const dstDir = path.dirname(dst), srcDir = path.resolve(path.dirname(file));
     if (!file.startsWith(dstDir + path.sep)) {
         await mkdirp(dstDir);
-        const copyOrMove = srcDir === cwd || srcDir == process.cwd() ? fs.renameSync : fs.copyFileSync;
-        await copyOrMove(file, dst);
+        const copyOrMove = srcDir === cwd || srcDir === process.cwd() ? fs.renameSync : fs.copyFileSync;
+        try {
+            copyOrMove(file, dst);
+        } catch (err) {
+            // cross-device link error (might happen in docker containers), fall back to copy and delete
+            // see cap/issues#18004
+            if (err.code === 'EXDEV') {
+                fs.copyFileSync(file, dst);
+                fs.unlinkSync(file);
+            } else {
+                throw err;
+            }
+        }
         return dst;
     }
     return file;

package/lib/init/constants.js

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

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

@@ -7,6 +7,7 @@ const io = require("../../../lint/io");
 const readline = require("readline");
 const { renderAndCopy } = require('../../template')
 const { LINT_DEV, LINT_GLOBAL } = require("../../constants").OPTIONS;
+const { COMMAND_INIT } = require("../../constants");
 const cds = require("../../../cds");
 const { mkdirp, exists } = cds.utils;
 const IS_WIN = os.platform() === "win32";
@@ -101,6 +102,11 @@ module.exports = class LintTemplate extends require('../../plugin') {
           "names"
         ].join(" ")}`;
 
+        if (cds.cli.command === COMMAND_INIT) {
+          this._runTask(task + ' --package-lock-only');
+          return;
+        }
+
         if (cds.cli.options.force) {
           console.log(
             `\n\nAlmost done - installing ${this.missingNpmDependencies["names"].length} npm dependencies:\n${task}`
@@ -118,11 +124,11 @@ module.exports = class LintTemplate extends require('../../plugin') {
               console.log("\n");
             }
           });
+
           await this._promptInstallDependencies(task);
         }
       }
     }
-
   }
 
   _checkEslint() {

package/lib/lint/io.js

@@ -1,9 +1,13 @@
 const { read, write, exists, yaml } = require('../cds').utils;
+const cds = require("../cds");
+
 const { readJSONC } = require("../util/fs");
 const path = require("path");
 const term = require("../util/term");
 const JSONC = require('../util/jsonc');
 
+const { COMMAND_INIT } = require("../init/constants");
+
 module.exports = {
   /**
    * Reads ESLint config contents from file
@@ -90,7 +94,7 @@ module.exports = {
       }
     }
     if (isFilePath) {
-      await this.writeEslintConfig(configIn, logger);
+      await this.writeEslintConfig(configIn, cds.cli?.command === COMMAND_INIT, logger);
     }
     return configContents;
   },
@@ -215,12 +219,12 @@ module.exports = {
    * @param {*} configPath config file path to write to
    * @returns {Promise<void>}
    */
-  async writeEslintConfig(configPath, logger = console) {
+  async writeEslintConfig(configPath, force = false, logger = console) {
     let configFile = path.basename(configPath);
     switch (configFile) {
       case "eslint.config.js":
       case "eslint.config.cjs":
-        if (exists(configPath)) {
+        if (!force && exists(configPath)) {
           logger.log(
             `${term.warn(
               `\n\nPlease add the following to your "${configFile}":` +
@@ -252,7 +256,7 @@ module.exports = [
         }
         break;
       case "eslint.config.mjs":
-        if (exists(configPath)) {
+        if (!force && exists(configPath)) {
           logger.log(
             `${term.warn(
               `\n\nPlease add the following to your "${configFile}":` +

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.8.0",
+  "version": "8.8.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.8.0",
+      "version": "8.8.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -36,14 +36,14 @@
       }
     },
     "node_modules/@cap-js/asyncapi": {
-      "version": "1.0.2",
+      "version": "1.0.3",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7.6"
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.17.2",
+      "version": "1.18.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -54,7 +54,7 @@
       }
     },
     "node_modules/@cap-js/openapi": {
-      "version": "1.2.0",
+      "version": "1.2.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "pluralize": "^8.0.0"
@@ -64,11 +64,11 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "1.8.0",
+      "version": "1.9.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
-        "@cap-js/db-service": "^1.17.0",
+        "@cap-js/db-service": "^1.18.0",
         "better-sqlite3": "^11.0.0"
       },
       "peerDependencies": {
@@ -76,7 +76,7 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.1",
+      "version": "4.5.1",
       "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^3.4.3"
@@ -120,6 +120,13 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.1.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/core": {
       "version": "0.12.0",
       "license": "Apache-2.0",
@@ -152,7 +159,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.21.0",
+      "version": "9.22.0",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -228,7 +235,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.8.0",
+      "version": "8.8.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -258,7 +265,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.8.0",
+      "version": "5.8.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -294,7 +301,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.6.0",
+      "version": "2.6.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -369,10 +376,10 @@
       }
     },
     "node_modules/@sap/xsenv": {
-      "version": "5.4.0",
+      "version": "5.5.0",
       "license": "SEE LICENSE IN LICENSE file",
       "dependencies": {
-        "debug": "4.3.7",
+        "debug": "4.4.0",
         "node-cache": "^5.1.2",
         "verror": "1.10.1"
       },
@@ -400,7 +407,7 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
+      "version": "8.14.1",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -474,7 +481,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.8.1",
+      "version": "1.8.4",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -506,7 +513,7 @@
       "optional": true
     },
     "node_modules/better-sqlite3": {
-      "version": "11.8.1",
+      "version": "11.9.1",
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -637,11 +644,11 @@
       }
     },
     "node_modules/call-bound": {
-      "version": "1.0.3",
+      "version": "1.0.4",
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "get-intrinsic": "^1.2.6"
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -756,7 +763,7 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.7",
+      "version": "4.4.0",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -919,15 +926,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.21.0",
+      "version": "9.22.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.19.2",
+        "@eslint/config-helpers": "^0.1.0",
         "@eslint/core": "^0.12.0",
         "@eslint/eslintrc": "^3.3.0",
-        "@eslint/js": "9.21.0",
+        "@eslint/js": "9.22.0",
         "@eslint/plugin-kit": "^0.2.7",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -939,7 +947,7 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.2.0",
+        "eslint-scope": "^8.3.0",
         "eslint-visitor-keys": "^4.2.0",
         "espree": "^10.3.0",
         "esquery": "^1.5.0",
@@ -976,7 +984,7 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.2.0",
+      "version": "8.3.0",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",

package/package.json

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