@sap/cds 7.9.3 → 7.9.4

package/CHANGELOG.md

@@ -5,6 +5,16 @@
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## Version 7.9.4 - 2024-07-18
+
+### Fixed
+
+- View resolving for `cds.features.lean_draft`
+- Error in `enterprise-messaging` deploy script
+- Properly forward path expression infront of lamda functions for `odata-v2` remote services
+- OData queries selecting the same column with `$count=true`
+- Closed higher end of version range for dependency on `cds-types`
+
 ## Version 7.9.3 - 2024-06-27
 
 ### Fixed

package/libx/_runtime/common/composition/insert.js

@@ -4,7 +4,7 @@ const { getCompositionTree } = require('./tree')
 const ctUtils = require('./utils')
 
 const { ensureNoDraftsSuffix } = require('../utils/draft')
-const { deepCopyArray } = require('../utils/copy')
+const { deepCopy } = require('../utils/copy')
 
 /*
  * own utils
@@ -82,8 +82,8 @@ const hasDeepInsert = (model, cqn) => {
 const getDeepInsertCQNs = (model, cqn) => {
   const into = (cqn.INSERT.into.ref && cqn.INSERT.into.ref[0]) || cqn.INSERT.into.name || cqn.INSERT.into
   const entityName = ensureNoDraftsSuffix(into)
-  const draft = entityName !== into
-  const dataEntries = cqn.INSERT.entries ? deepCopyArray(cqn.INSERT.entries) : []
+  const draft = entityName !== into || into.endsWith('.drafts') //lean draft
+  const dataEntries = cqn.INSERT.entries ? deepCopy(cqn.INSERT.entries) : []
   const entity = model.definitions[entityName]
   const compositionTree = getCompositionTree({
     definitions: model.definitions,

package/libx/_runtime/db/query/read.js

@@ -60,17 +60,26 @@ const read = (executeSelectCQN, executeStreamCQN, convertStreams) => (model, dbc
 
   if (query.SELECT.count) {
     if (query.SELECT.limit) {
+      // IMPORTANT: do not change order!
+      // 1. create the count query synchronously, because it works on a copy
+      // 2. run the result query, duplicate names ( SELECT ID, ID ...) throw an error synchronously
+      // 3. run the count query
+      // reason is that executeSelectCQN modifies the query
       const countQuery = _createCountQuery(query)
-      const countResultPromise = executeSelectCQN(model, dbc, countQuery, user, locale, isoTs)
-      if (query.SELECT.limit?.rows?.val === 0) {
-        // We don't need to perform our result query
-        return countResultPromise.then(countResults => _arrayWithCount([], countValue(countResults)))
-      }
+      const resultPromise =
+        query.SELECT.limit?.rows?.val === 0
+          ? Promise.resolve([])
+          : executeSelectCQN(model, dbc, query, user, locale, isoTs)
+      const countPromise = executeSelectCQN(model, dbc, countQuery, user, locale, isoTs)
 
-      const resultPromise = executeSelectCQN(model, dbc, query, user, locale, isoTs)
-      return Promise.all([countResultPromise, resultPromise]).then(([countResults, result]) =>
-        _arrayWithCount(result, countValue(countResults))
-      )
+      // use allSettled here, so all executions are awaited before we rollback
+      return Promise.allSettled([countPromise, resultPromise]).then(results => {
+        const rejection = results.find(p => p.status === 'rejected')
+        if (rejection) throw rejection.reason
+
+        const [{ value: countResult }, { value: result }] = results
+        return _arrayWithCount(result, countValue(countResult))
+      })
     }
 
     return executeSelectCQN(model, dbc, query, user, locale, isoTs).then(result =>

package/libx/_runtime/fiori/lean-draft.js

@@ -771,7 +771,7 @@ const Read = {
       else ownNewDrafts.push(draft)
     }
 
-    const $count = ownDrafts.length + (isCount ? actives[0]?.$count : actives.$count ?? 0)
+    const $count = ownDrafts.length + (isCount ? actives[0]?.$count : (actives.$count ?? 0))
     if (isCount) return { $count }
 
     Read.merge(query._target, ownDrafts, [], row => {

package/libx/_runtime/messaging/event-broker.js

@@ -195,10 +195,9 @@ class EventBroker extends cds.MessagingService {
         data: req.body ? req.body : undefined,
         headers: req.headers
       }
-      cds.context = { user: cds.User.privileged }
-      if (tenant) cds.context.tenant = tenant // TODO: In single tenant case, we don't need a tenant
-      const tx = await this.tx()
-      await tx.emit(msg)
+      const context = { user: cds.User.privileged }
+      if (tenant) context.tenant = tenant // TODO: In single tenant case, we don't need a tenant
+      await this.tx(context, tx => tx.emit(msg))
       this.LOG.debug('Event processed successfully.')
       return res.status(200).json({ message: 'OK' })
     } catch (e) {

package/libx/odata/middleware/read.js

@@ -104,7 +104,7 @@ const _count = result => {
     ? result.reduce((acc, val) => {
         return acc + (val?.$count ?? val?._counted_ ?? (Array.isArray(val) && _count(val))) || 0
       }, 0)
-    : result.$count ?? result._counted_ ?? 0
+    : (result.$count ?? result._counted_ ?? 0)
 }
 
 // basically stolen from old read handler without understanding it ^^

package/libx/odata/parse/cqn2odata.js

@@ -177,13 +177,13 @@ function _xpr(expr, target, kind, isLambda) {
         if (inExpr) res.push(`(${inExpr})`)
         i += 1
       } else if (_isLambda(cur, expr[i + 1])) {
-        const { where, id } = expr[i + 1].ref.slice(-1)[0]
-        const nav = [...expr[i + 1].ref.slice(0, -1), id].join('/')
+        const { where } = expr[i + 1].ref.at(-1)
+        const nav = expr[i + 1].ref.map(ref => ref?.id ?? ref).join('/')
         // odata-v2 does not support lambda expressions but successfactors allows filter like for to-one assocs
         if (kind === 'odata-v2') {
           cds.log('remote').info(`OData V2 does not support lambda expressions. Using path expression as best effort.`)
           isLambda = false
-          res.push(`${id}%2F${_xpr(where, target, kind)}`)
+          res.push(`${nav}%2F${_xpr(where, target, kind)}`)
         } else if (!where) res.push(`${nav}/any()`)
         else res.push(`${nav}/any(${LAMBDA_VARIABLE}:${_xpr(where, target, kind, true)})`)
         i++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "7.9.3",
+  "version": "7.9.4",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -33,7 +33,7 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@cap-js/cds-types": "<1",
+    "@cap-js/cds-types": "<=0.2.0",
     "@sap/cds-compiler": "^4",
     "@sap/cds-fiori": "^1",
     "@sap/cds-foss": "^5.0.0"

package/tasks/enterprise-messaging-deploy.js

@@ -42,7 +42,7 @@ const main = async () => {
     error.code = 'DEPLOY_FAILED'
     error.target = { kind: 'DEPLOYMENT' }
     error.reason = e
-    this.LOG.error(error)
+    LOG.error(error)
     throw error
   }
 }