@sap/cds 9.8.1 → 9.8.3

package/CHANGELOG.md

@@ -4,6 +4,18 @@
 - The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Version 9.8.3 - 2026-03-12
+
+### Fixed
+
+- OData batch parallel processing: Drain remaining queue when aborting
+
+## Version 9.8.2 - 2026-03-10
+
+### Fixed
+
+- Compatibility with `@eslint/js^10`
+
 ## Version 9.8.1 - 2026-03-09
 
 ### Fixed

package/eslint.config.mjs

@@ -14,9 +14,6 @@ export const defaults = {
   rules: {
     'no-unused-vars': 'warn',
     'no-console': 'warn',
-    'preserve-caught-error': 'off',
-    'no-useless-assignment': 'off',
-    'no-unassigned-vars': 'off'
   },
 
   languageOptions: {

package/lib/compile/etc/properties.js

@@ -9,6 +9,7 @@ exports.read = function read (res, ext = '.properties', options) {
     const src = fs.readFileSync(path.resolve(res),'utf-8')
     return Object.defineProperty (exports.parse(src,options), '_source', {value:res})
   } catch (e) {
+    // eslint-disable-next-line preserve-caught-error
     if (e.code !== 'ENOENT') throw new Error (`Corrupt ${ext} file: ${res+ext}`)
   }
 }

package/lib/env/cds-env.js

@@ -295,7 +295,7 @@ class Config {
       const any = this._add_vcap_services_to (vcaps)
       if (any)  this._sources.push ('process.env.VCAP_SERVICES')
     } catch(e) {
-      throw new Error ('[cds.env] - failed to parse VCAP_SERVICES:\n  '+ e.message)
+      throw new Error ('[cds.env] - failed to parse VCAP_SERVICES:\n  '+ e.message, {cause: e})
     }
   }
 

package/lib/i18n/index.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-useless-assignment */
+
 const I18nBundle = require ('./bundles')
 const I18nFiles = require ('./files')
 const cds = require('../index')

package/lib/ql/cds.ql-infer.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-useless-assignment */
+
 const cds = require('../index')
 const infer = exports = module.exports = (..._) => infer.target(..._)
 

package/lib/req/response.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-useless-assignment */
+
 const cds = require ('../index')
 const placeholders = [...'x'.repeat(9)].map((x,i) => `{${i+1}}`)
 

package/lib/srv/middlewares/auth/mocked-users.js

@@ -39,7 +39,7 @@ const _configured = (u,x) => {
     u.attr = { ...u.attr, ...x }
   }
   if (u.jwt) {
-    if ((x = _deprecated (u.jwt.zid, 'jwt.zid','tenant'))) {
+    if ((    _deprecated (u.jwt.zid, 'jwt.zid','tenant'))) {
       u.tenant = u.jwt.zid
     }
     if ((x = _deprecated (u.jwt.attributes, 'jwt.attributes','attr'))) {

package/lib/srv/protocols/hcql.js

@@ -47,7 +47,7 @@ class HCQLAdapter extends require('./http') {
 
     // Error formatting
     router.use ((err, req, res, next) => {
-      err.$response = e => ({ errors: [ { ...e, message: e.message } ] })
+      if (typeof err === 'object') err.$response = e => ({ errors: [ { ...e, message: e.message } ] })
       next(err)
     })
 

package/lib/utils/cds-utils.js

@@ -189,7 +189,7 @@ exports.read = async function read (file, _encoding) {
   if (_encoding === 'json' || !_encoding && f.endsWith('.json')) try {
     return JSON.parse(src)
   } catch(e) {
-    throw new Error (`Failed to parse JSON in ${f}: ${e.message}`)
+    throw new Error (`Failed to parse JSON in ${f}: ${e.message}`, { cause: e })
   }
   else return process.platform === 'win32' ? src?.replace(/\r\n/g, '\n') : src
 }

package/libx/_runtime/messaging/redis-messaging.js

@@ -36,7 +36,7 @@ class RedisMessaging extends cds.MessagingService {
     try {
       await this.client.connect()
     } catch (e) {
-      throw new Error('Connection to Redis could not be established: ' + e)
+      throw new Error('Connection to Redis could not be established: ' + e, { cause: e })
     }
 
     this._ready = true

package/libx/odata/middleware/batch.js

@@ -487,42 +487,43 @@ const _processBatch = async (srv, router, req, res, next, body, ct, boundary) =>
 
             // ensure all subrequests run in this tx
             // (if first subrequest fails without really opening the tx, the rest are executed in a "dangling tx")
-            return Promise.allSettled(subrequests)
-              .then(ress => {
-                // wait for all previous atomicity groups (ignoring errors via allSettled) for odata v2
-                const prevs = []
-                for (let i = 0; i < agIndex; i++) prevs.push(promises[i])
-                return Promise.allSettled(prevs).then(() => ress)
-              })
-              .then(ress => {
-                const failed = ress.filter(({ status }) => status === 'rejected')
-                if (!failed.length) return
-                // throw first error and call srv.on('error') for the others
-                const first = failed.shift()
-                if (srv.handlers._error?.length)
-                  for (const other of failed)
-                    for (const each of srv.handlers._error) each.handler.call(srv, other.reason, cds.context)
-                throw first.reason
-              })
+            return Promise.allSettled(subrequests).then(ress => {
+              const failed = ress.filter(({ status }) => status === 'rejected')
+              if (!failed.length) return
+              // throw first error and call srv.on('error') for the others
+              const first = failed.shift()
+              if (srv.handlers._error?.length)
+                for (const other of failed)
+                  for (const each of srv.handlers._error) each.handler.call(srv, other.reason, cds.context)
+              throw first.reason
+            })
           })
           .catch(err => {
             responses._has_failure = true
 
             // abort batch on first failure with odata.continue-on-error: false
-            if (!continue_on_error) _continue = false
+            if (!continue_on_error) {
+              _continue = false
+              while (queue.length) queue.shift()()
+            }
 
             if (!responses.some(r => r.status === 'fail')) {
               // here, the commit was rejected even though all requests were successful (e.g., by custom handler or db consistency check)
               _replaceResponsesWithCommitErrors(err, responses, ids)
             }
           })
-          .finally(() => {
+          .finally(async () => {
             // trigger next in queue
             if (queue.length) queue.shift()()
 
             // late error serialization
             if (responses._has_failure) _serializeErrors(responses)
 
+            // wait for all previous atomicity groups (ignoring errors via allSettled) for odata v2
+            const prevs = []
+            for (let i = 0; i < agIndex; i++) prevs.push(promises[i])
+            await Promise.allSettled(prevs)
+
             if (isJson) _writeResponseJson(responses, res)
             else _writeResponseMultipart(responses, res, boundary)
           })
@@ -540,7 +541,7 @@ const _processBatch = async (srv, router, req, res, next, body, ct, boundary) =>
     // trigger first max_parallel in queue
     for (let i = 0; i < max_parallel; i++) if (queue.length) queue.shift()()
 
-    await Promise.all(promises)
+    await Promise.allSettled(promises)
 
     res.write(isJson ? ']}' : `--${boundary}--${CRLF}`)
     res.end()

package/libx/odata/parse/afterburner.js

@@ -463,7 +463,6 @@ function _processSegments(from, model, namespace, cqn, protocol) {
 
         // > navigation
         one = !!(current.is2one || ref[i].where)
-        incompleteKeys = one || i === ref.length - 1 ? false : true
         current = model.definitions[current.target]
         target = current
 

package/libx/queue/index.js

@@ -259,7 +259,7 @@ const _processTasks = (target, tenant, _opts = {}) => {
               LOG.error(`${service.name}: Programming error detected:`, e)
               task.updateData = { attempts: opts.maxAttempts }
               toBeUpdated.push(task)
-              throw new Error(`${service.name}: Programming error detected.`)
+              throw new Error(`${service.name}: Programming error detected.`, { cause: e })
             }
             if (e.unrecoverable) {
               LOG.error(`${service.name}: Unrecoverable error:`, e)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "9.8.1",
+  "version": "9.8.3",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [