@sap/cds 9.8.0 → 9.8.1

package/CHANGELOG.md

@@ -4,6 +4,14 @@
 - The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Version 9.8.1 - 2026-03-09
+
+### Fixed
+
+- OData batch parallel processing: Preserve request sequence for OData v2
+- In inbound messaging, only load the extended model if there is a tenant
+- Ensure `cds.fiori.direct_crud` is considered during `cds build`
+
 ## Version 9.8.0 - 2026-03-06
 
 ### Added

package/eslint.config.mjs

@@ -14,6 +14,9 @@ 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/cds-compile.js

@@ -6,6 +6,7 @@ const compile = module.exports = Object.assign (cds_compile, {
   for: new class {
     get java(){ return super.java = require('./for/java') }
     get nodejs() { return super.nodejs = require('./for/nodejs') }
+    get direct_crud() { return super.direct_crud = require('./for/direct_crud') }
     get lean_drafts() { return super.lean_drafts = require('./for/lean_drafts') }
     get flows() { return super.flows = require('./for/flows') }
     get assert() { return super.assert = require('./for/assert') }

package/lib/compile/for/direct_crud.js

@@ -0,0 +1,23 @@
+const $compiled_for_direct_crud = Symbol('compiled_for_direct_crud')
+const DRAFT_NEW = 'draftNew'
+
+module.exports = function cds_compile_for_direct_crud(csn) {
+  if (csn[$compiled_for_direct_crud]) return csn
+  csn[$compiled_for_direct_crud] = true
+
+  for (const each in csn.definitions) {
+    const def = csn.definitions[each]
+    if (!def['@Common.DraftRoot.NewAction'] && def['@odata.draft.enabled']) {
+      const srvName = Object.keys(csn.definitions)
+        .filter(k => csn.definitions[k].kind === 'service')
+        .find(k => each.startsWith(`${k}.`))
+      def['@Common.DraftRoot.NewAction'] = `${srvName}.${DRAFT_NEW}`
+      const params = { in: { items: { type: '$self' } } }
+      // for UI pop-up asking for values for non-UUID keys
+      Object.keys(def.elements)
+        .filter(k => k !== 'IsActiveEntity' && def.elements[k].key && def.elements[k].type !== 'cds.UUID')
+        .forEach(k => (params[k] = { type: def.elements[k].type }))
+      def.actions[DRAFT_NEW] = { kind: 'action', params, returns: { type: each } }
+    }
+  }
+}

package/lib/compile/for/odata.js

@@ -9,24 +9,7 @@ module.exports = function cds_compile_for_odata (csn,_o) {
   let dsn = compile.for.odata (csn,o)
   if (o.sql_mapping) dsn['@sql_mapping'] = o.sql_mapping //> compat4 old Java stack
 
-  if (cds.env.fiori.direct_crud) {
-    const DRAFT_NEW = 'draftNew'
-    for (const each in dsn.definitions) {
-      const def = dsn.definitions[each]
-      if (!def['@Common.DraftRoot.NewAction'] && def['@Common.DraftRoot.ActivationAction']) {
-        const srvName = Object.keys(dsn.definitions)
-          .filter(k => dsn.definitions[k].kind === 'service')
-          .find(k => each.startsWith(`${k}.`))
-        def['@Common.DraftRoot.NewAction'] = `${srvName}.${DRAFT_NEW}`
-        const params = { in: { items: { type: '$self' } } }
-        // for UI pop-up asking for values for non-UUID keys
-        Object.keys(def.elements)
-          .filter(k => k !== 'IsActiveEntity' && def.elements[k].key && def.elements[k].type !== 'cds.UUID')
-          .forEach(k => (params[k] = { type: def.elements[k].type }))
-        def.actions[DRAFT_NEW] = { kind: 'action', params, returns: { type: each } }
-      }
-    }
-  }
+  if (cds.env.fiori.direct_crud) cds.compile.for.direct_crud(dsn)
 
   Object.defineProperty (csn, '_4odata', {value:dsn})
   Object.defineProperty (dsn, '_4odata', {value:dsn})

package/lib/compile/to/edm.js

@@ -42,6 +42,7 @@ function cds_compile_to_edmx (csn,_o) {
     const next = () => {
       if (!result) {
         if (cds.env.features.annotate_for_flows) enhanceCSNwithFlowAnnotations4FE(csn)
+        if (cds.env.fiori.direct_crud) cds.compile.for.direct_crud(csn)
         result = o.service === 'all' ? _many('.xml', cdsc.to.edmx.all(csn, o)) : cdsc.to.edmx(csn, o)
       }
       return result

package/libx/_runtime/messaging/service.js

@@ -77,9 +77,11 @@ module.exports = class MessagingService extends cds.Service {
     if (!cds.context) cds.context = {}
     if (ctx.tenant) cds.context.tenant = ctx.tenant
     if (!ctx.user) ctx.user = cds.User.privileged
+    // REVISIT: is cds.context.model really needed?
     // this.tx expects cds.context.model
-    if (cds.model && (cds.env.requires.extensibility || cds.env.requires.toggles))
+    if (ctx.tenant && cds.model && (cds.env.requires.extensibility || cds.env.requires.toggles))
       cds.context.model = await ExtendedModels.model4(ctx.tenant, ctx.features || {})
+    else if (cds.model) cds.context.model = cds.model
     const me = this.options.inboxed || this.options.inbox ? cds.queued(this) : this
     return await me.tx(ctx, tx => tx.emit(msg))
   }

package/libx/odata/middleware/batch.js

@@ -441,7 +441,7 @@ const _processBatch = async (srv, router, req, res, next, body, ct, boundary) =>
 
     const queue = []
     let _continue = true
-    const _queued_exec = (atomicityGroup, responses = []) => {
+    const _queued_exec = (atomicityGroup, agIndex, responses = []) => {
       const groupId = atomicityGroup[0].atomicityGroup
 
       return new Promise(resolve => queue.push(resolve)).then(() => {
@@ -487,16 +487,23 @@ 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 => {
-              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 => {
+                // 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
+              })
           })
           .catch(err => {
             responses._has_failure = true
@@ -528,7 +535,7 @@ const _processBatch = async (srv, router, req, res, next, body, ct, boundary) =>
 
     // queue execution of atomicity groups
     const promises = []
-    for (const atomicityGroup of atomicityGroups) promises.push(_queued_exec(atomicityGroup))
+    for (let i = 0; i < atomicityGroups.length; i++) promises.push(_queued_exec(atomicityGroups[i], i))
 
     // trigger first max_parallel in queue
     for (let i = 0; i < max_parallel; i++) if (queue.length) queue.shift()()

package/package.json

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