@sap/cds 5.9.2 → 5.9.5

package/libx/_runtime/remote/Service.js

@@ -41,7 +41,7 @@ const _buildPartialUrlFunctions = (url, data, params, kind = 'odata-v4') => {
   const funcParams = []
   const queryOptions = []
   // REVISIT: take params from params after importer fix (the keys should not be part of params)
-  for (const param in data) {
+  for (const param in _extractParamsFromData(data, params)) {
     if (kind === 'odata-v2') {
       funcParams.push(`${param}=${_setCorrectValue(param, data, params, kind)}`)
     } else {
@@ -54,7 +54,7 @@ const _buildPartialUrlFunctions = (url, data, params, kind = 'odata-v4') => {
     : `${url}(${funcParams.join(',')})?${queryOptions.join('&')}`
 }
 
-const _extractParamsFromData = (data, params) => {
+const _extractParamsFromData = (data, params = {}) => {
   return Object.keys(data).reduce((res, el) => {
     if (params[el]) Object.assign(res, { [el]: data[el] })
     return res
@@ -118,7 +118,7 @@ const _handleV2BoundActionFunction = (srv, def, req, event, kind) => {
   const params = []
   const data = req.data
   // REVISIT: take params from def.params, after importer fix (the keys should not be part of params)
-  for (const param in req.data) {
+  for (const param in _extractParamsFromData(req.data, def.params)) {
     params.push(`${param}=${formatVal(data[param], param, { elements: def.params }, kind)}`)
   }
   const keys = _buildKeys(req, this.kind)

package/libx/_runtime/sqlite/convertAssocToOneManaged.js

@@ -17,29 +17,36 @@ const _getConvertibleEntries = req => {
   return [...orders, ...groups, ...filters, ...havings]
 }
 
-// REVISIT once sql can handle structured keys properly, this handler should not be required anymore
-const _handler = function (req) {
-  // do simple checks upfront and exit early
-  if (!req.query || typeof req.query === 'string') return
-  if (!req.query.SELECT.orderBy && !req.query.SELECT.groupBy && !req.query.SELECT.where && !req.query.SELECT.having) {
-    return
-  }
-
-  if (!req.target || !req.target.elements) return
+const _convert = (refEntries, req) => {
+  for (const refEntry of refEntries) {
+    if (refEntry.xpr) {
+      _convert(refEntry.xpr, req)
+      continue
+    }
 
-  for (const refEntry of _getConvertibleEntries(req)) {
     if (!refEntry.ref || refEntry.ref.length < 2) {
       // only check refs in format {ref: ['assoc', 'id']}
       continue
     }
-
     const element = req.target.elements[refEntry.ref[0]]
     if (!element || !element.is2one) return
-
     _convertRefForAssocToOneManaged(element, refEntry)
   }
 }
 
+// REVISIT once sql can handle structured keys properly, this handler should not be required anymore
+const _handler = function (req) {
+  // do simple checks upfront and exit early
+  if (!(req.query && req.query.SELECT) || typeof req.query === 'string') return
+  if (!req.query.SELECT.orderBy && !req.query.SELECT.groupBy && !req.query.SELECT.where && !req.query.SELECT.having) {
+    return
+  }
+
+  if (!req.target || !req.target.elements) return
+
+  _convert(_getConvertibleEntries(req), req)
+}
+
 _handler._initial = true
 
 module.exports = _handler

package/package.json

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