@sap/cds-dk 8.9.0 → 8.9.2

package/CHANGELOG.md

@@ -7,6 +7,27 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 8.9.2 - 2025-04-16
+
+### Fixed
+
+- `cds bind` gives better error messages if the Cloud Foundry org or space are not found.
+- `cds add html5-repo` works in combination with multitenancy when no app router or Work Zone is set up.
+
+### Changed
+
+- The Node version in `gen/db/package.json` file generated by `cds build` is now `>=18`, matching to what `@sap/hdi-deploy` specifies.
+- `cds` commands now fail if used in combination with the upcoming `@sap/cds` version 9.
+
+## Version 8.9.1 - 2025-04-04
+
+### Fixed
+
+- `cds build` restores compatibility with `@sap/cds` 7, no more crashing there with `TypeError: Cannot read properties of undefined (reading 'enabled')`.
+- `cds add containerize` works if run before `cds add helm`.
+- `cds add http` no longer writes headers starting with a placeholder (IntelliJ compatibility)
+- `cds init --force` overwrites existing files.
+
 ## Version 8.9.0 - 2025-03-31
 
 ### Added

package/lib/bind/cf.js

@@ -41,7 +41,9 @@ module.exports = new class CFBind extends require('./plugin') {
         if (org && space) {
             // org and space can be overwritten by currently logged in org and space
             const orgObj = await cf.org(org);
+            if (!orgObj) throw `org ${bold(org)} not found when resolving service instance ${bold(instance)} in ${bold(this.target.apiEndpoint)}`;
             const spaceObj = await cf.space(orgObj.guid, space);
+            if (!spaceObj) throw `space ${bold(space)} not found in org ${bold(org)} when resolving service instance ${bold(instance)} in ${bold(this.target.apiEndpoint)}`;
             spaceGuid = spaceObj.guid;
             orgGuid = orgObj.guid;
         } else {

package/lib/build/buildTaskEngine.js

@@ -11,6 +11,8 @@ const COMPILATION_ERROR = 'CompilationError'
 const COMPILE_MESSAGE = 'CompileMessage'
 const DEBUG = cds.debug('cli|build')
 const LOG_LIMIT = 30
+// TODO replace with cds.utils.clors.colors.enabled in cds-dk 9
+const colors = process.stdout.isTTY && !process.env.NO_COLOR || process.env.FORCE_COLOR
 
 class BuildTaskEngine {
     constructor(options) {
@@ -32,7 +34,7 @@ class BuildTaskEngine {
             target: cds.env.build.target,
             tasks: tasks.map(({ _uses, ...task }) => task),
             ...(!this.options.clean && { clean: this.options.clean }),
-        }, { depth: 11, colors: cds.utils.colors.enabled, compact: 3, breakLength: 250 }))
+        }, { depth: 11, colors, compact: 3, breakLength: 250 }))
 
         DEBUG?.("cds configuration settings:")
         DEBUG?.(redactCredentials(cds.env))

package/lib/build/provider/hana/template/package.json

@@ -5,7 +5,7 @@
     "@sap/hdi-deploy": "^5"
   },
   "engines": {
-    "node": "^18 || ^20"
+    "node": ">=18"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js --use-hdb"

package/lib/index.js

@@ -39,7 +39,6 @@ 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:
@@ -49,6 +48,16 @@ if (major < REQUIRED_CDS_MAJOR || major === REQUIRED_CDS_MAJOR && minor < REQUIR
   process.exit(1)
 }
 
+const EXCLUDED_CDS_MAJOR = 9
+if (major >= EXCLUDED_CDS_MAJOR) {
+  const [dkVersion] = require('../package.json').version.split('.')
+  console.error(`
+  This application uses '@sap/cds' version ${major}, which is not compatible with the installed '@sap/cds-dk' version ${dkVersion}.
+  Update '@sap/cds-dk' to the latest version.
+`)
+  process.exit(1)
+}
+
 cds.extend (cds.constructor) .with (CdsDk)
 
 class CdsDkAdd {

package/lib/init/constants.js

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

package/lib/init/projectReader.js

@@ -194,7 +194,7 @@ module.exports = new class ProjectReader {
             hasUI5: _ui5,
             hasMTXRoute: () => _inProd('extensibility') || (_inProd('multitenancy') && !_isJava()),
             hasMTXRouteJava: () => (_inProd('helm-unified-runtime') || _inProd('helm')) && _isJava() && _inProd('multitenancy'),
-            imageRegistry: () => exists('chart/values.yaml') ? cds.load.yaml('chart/values.yaml').global?.image?.registry ?? '<your-container-registry>' : '<your-container-registry>',
+            imageRegistry: () => exists('chart/values.yaml') ? cds.load.yaml(join(cds.root, 'chart/values.yaml')).global?.image?.registry ?? '<your-container-registry>' : '<your-container-registry>',
             extendsApp: _extends,
         }
 

package/lib/init/template/html5-repo/index.js

@@ -76,7 +76,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                 insert: [html5RepoHost, 'name'],
                 into: [appDeployer, 'requires', 'name'],
             }]
-            if (hasApprouter || hasWorkzoneStandard) {
+            if (hasApprouter || hasWorkzoneStandard || hasMultitenancy) {
                 additions.push(html5Runtime)
             }
             if (hasApprouter) {

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

@@ -133,14 +133,15 @@ module.exports = class HttpTemplate extends require('../../plugin') {
   async #generateRequests(services, payload, csn) {
     let varsDefined = false  // when writing requests for multiple services to stdout, define vars only once
     for (const [serviceName, service] of services) {
-      let [hostname, auth] = await this.#getHostnameAndAuth(service, csn)
+      let [hostname, username, password] = await this.#getHostnameAndAuth(service, csn)
       let requests = []
       if (!cds.cli.options.dry || !varsDefined) {
-        requests.push(auth ? `@server = ${hostname}\n@auth = ${auth}\n` : `@server = ${hostname}\n`)
+        const auth = username ? `@username=${username}\n@password=${password}\n` : ''
+        requests.push(`@server=${hostname}\n${auth}`)
       }
       varsDefined = true
-      const headers = auth ? `Content-Type: application/json\n{{auth}}` : `Content-Type: application/json`
-      const headerAuth = auth ? '{{auth}}' : ''
+      const headerAuth = username ? `Authorization: Basic {{username}}:{{password}}` : ''
+      const headers = headerAuth ? `Content-Type: application/json\n${headerAuth}` : `Content-Type: application/json`
 
       service.urlPaths.forEach((urlPath) => {
         if (service.urlPaths.length > 1) {
@@ -201,7 +202,7 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       const nameDraftsCreate = slug(title+'_Draft_POST')
       requests.push(`${title} Drafts GET\n# @name ${slug(title+'_Drafts_GET')}\nGET ${url}?$filter=(IsActiveEntity eq false)\n${headerAuth}\n`) // unencoded URL for better readability (client can handle this)
       requests.push(`${title} Draft POST\n# @name ${nameDraftsCreate}\nPOST ${url}\n${headers}\n\n${postBody}\n`)
-      requests.push(`\n### Result from POST request above\n@draftID = {{${nameDraftsCreate}.response.body.$.${key}}}\n`)
+      requests.push(`\n### Result from POST request above\n@draftID={{${nameDraftsCreate}.response.body.$.${key}}}\n`)
       requests.push(`${title} Draft PATCH\n# @name ${slug(title+'_Draft_Patch')}\nPATCH ${url}(${key}={{draftID}},IsActiveEntity=false)\n${headers}\n\n${postBody}\n`)
       requests.push(`${title} Draft Prepare\n# @name ${slug(title+'_Draft_Prepare')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/AdminService.draftPrepare\n${headers}\n\n{}\n`)
       requests.push(`${title} Draft Activate\n# @name ${slug(title+'_Draft_Activate')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/AdminService.draftActivate\n${headers}\n\n{}\n`)
@@ -216,8 +217,10 @@ module.exports = class HttpTemplate extends require('../../plugin') {
     if (!cds.cli.options['for-app']) {
       const host = service.isJava ? this.#javaHost : this.#nodeHost
       const users = Object.values(await this.#mockUsersForService(service, csn))
-      const authStr = users.length ? `Authorization: Basic ${users[0].name}:${users[0].password||''}` : null
-      return [host, authStr]
+      if (users.length) {
+        return [host, users[0].name, users[0].password || '']
+      }
+      return [host]
     }
 
     if (!this.approuterAuth) {

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

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@cap-js/sqlite": "^1",
-    "@cap-js/cds-types": "^0.9.0"
+    "@cap-js/cds-types": "^0.10.0"
   },
   "scripts": {
     "start": "cds-serve"

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

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-types": "^0.9.0",
+    "@cap-js/cds-types": "^0.10.0",
     "@types/node": "^22.0.0",
     "typescript": "^5"
   },

package/lib/init/validate.js

@@ -14,6 +14,7 @@ Specify a different project name by replacing characters with '_' or '-', for ex
 }
 
 module.exports.projectFolder = cwd => {
+  if (cds.cli.options.force) return
   const existingProjectFile = PROJECT_FILES.find(exists)
   if (existingProjectFile) {
     if (cwd === cds.root) {

package/lib/lint/Linter.js

@@ -9,6 +9,7 @@ const { exit } = require("process");
 const LOG = cds.debug("lint");
 const LOG_CONFIG = cds.debug("lint:config");
 const GENERAL_ERROR = 1;
+const FATAL_ERROR = 2;
 
 /**
  * Safely require a module, return empty object if module not found
@@ -325,6 +326,12 @@ class Linter {
 
         if (results?.length > 0) {
           console.log(formatter.format(results));
+          const { errorCount, fatalErrorCount } = this.#countErrors(results);
+          if (fatalErrorCount > 0) {
+            exit(FATAL_ERROR);
+          } else if (errorCount > 0) {
+            exit(GENERAL_ERROR);
+          }
         }
       }
     } catch (err) {
@@ -343,6 +350,18 @@ class Linter {
     }
   }
 
+  #countErrors(results) {
+    let errorCount = 0;
+    let fatalErrorCount = 0;
+
+    for (const result of results) {
+      errorCount += result.errorCount;
+      fatalErrorCount += result.fatalErrorCount;
+    }
+
+    return { errorCount, fatalErrorCount };
+  }
+
   async #getConfigFileAndSetProjectPath(args) {
     // Get config path
     if (args.length > 0) {

package/npm-shrinkwrap.json

@@ -1,20 +1,20 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.9.0",
+  "version": "8.9.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.9.0",
+      "version": "8.9.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
         "@cap-js/openapi": "^1.0.0",
-        "@sap/cds": ">=7",
+        "@sap/cds": "^7 || ^8",
         "@sap/cds-foss": "^5.0.0",
-        "@sap/cds-mtxs": ">=1.9.0",
-        "@sap/eslint-plugin-cds": ">=3.0.1",
+        "@sap/cds-mtxs": "^1.9.0 || ^2",
+        "@sap/eslint-plugin-cds": "^3.0.1",
         "@sap/hdi-deploy": "^5",
         "axios": "^1",
         "eslint": "^9",
@@ -43,7 +43,7 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.18.0",
+      "version": "1.19.1",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -64,11 +64,11 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "1.9.0",
+      "version": "1.10.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
-        "@cap-js/db-service": "^1.18.0",
+        "@cap-js/db-service": "^1.19.0",
         "better-sqlite3": "^11.0.0"
       },
       "peerDependencies": {
@@ -76,7 +76,7 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.5.1",
+      "version": "4.6.0",
       "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^3.4.3"
@@ -109,7 +109,7 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.19.2",
+      "version": "0.20.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@eslint/object-schema": "^2.1.6",
@@ -121,7 +121,7 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.2.0",
+      "version": "0.2.1",
       "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -159,7 +159,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.23.0",
+      "version": "9.24.0",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -173,16 +173,26 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.7",
+      "version": "0.2.8",
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.12.0",
+        "@eslint/core": "^0.13.0",
         "levn": "^0.4.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+      "version": "0.13.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "license": "Apache-2.0",
@@ -235,7 +245,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.9.0",
+      "version": "8.9.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -265,7 +275,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.9.0",
+      "version": "5.9.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -280,7 +290,7 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.4.0",
+      "version": "1.4.1",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7.6",
@@ -301,7 +311,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.7.0",
+      "version": "2.7.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -834,7 +844,7 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.4.7",
+      "version": "16.5.0",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -926,16 +936,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.23.0",
+      "version": "9.24.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-array": "^0.20.0",
         "@eslint/config-helpers": "^0.2.0",
         "@eslint/core": "^0.12.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.23.0",
+        "@eslint/js": "9.24.0",
         "@eslint/plugin-kit": "^0.2.7",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.9.0",
+  "version": "8.9.2",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -19,10 +19,10 @@
   "dependencies": {
     "@cap-js/asyncapi": "^1.0.0",
     "@cap-js/openapi": "^1.0.0",
-    "@sap/cds": ">=7",
+    "@sap/cds": "^7 || ^8",
     "@sap/cds-foss": "^5.0.0",
-    "@sap/cds-mtxs": ">=1.9.0",
-    "@sap/eslint-plugin-cds": ">=3.0.1",
+    "@sap/cds-mtxs": "^1.9.0 || ^2",
+    "@sap/eslint-plugin-cds": "^3.0.1",
     "@sap/hdi-deploy": "^5",
     "axios": "^1",
     "eslint": "^9",