@sap/cds 9.7.1 → 9.8.1

package/libx/odata/middleware/create.js

@@ -92,11 +92,6 @@ module.exports = (adapter, isUpsert) => {
       .catch(err => {
         handleSapMessages(cdsReq, req, res)
 
-        // REVISIT: invoke service.on('error') for failed batch subrequests
-        if (cdsReq.http.req.path.startsWith('/$batch') && service.handlers._error.length) {
-          for (const each of service.handlers._error) each.handler.call(service, err, cdsReq)
-        }
-
         next(err)
       })
   }

package/libx/odata/middleware/delete.js

@@ -63,11 +63,6 @@ module.exports = adapter => {
       .catch(err => {
         handleSapMessages(cdsReq, req, res)
 
-        // REVISIT: invoke service.on('error') for failed batch subrequests
-        if (cdsReq.http.req.path.startsWith('/$batch') && service.handlers._error.length) {
-          for (const each of service.handlers._error) each.handler.call(service, err, cdsReq)
-        }
-
         next(err)
       })
   }

package/libx/odata/middleware/operation.js

@@ -15,6 +15,7 @@ const {
   getReadable,
   validateMimetypeIsAcceptedOrThrow
 } = require('../../common/utils/streaming')
+const odataBind = require('../utils/odataBind')
 
 const _findEdmNameFor = (definition, namespace, fullyQualified = false) => {
   let name
@@ -62,6 +63,9 @@ module.exports = adapter => {
 
     const model = cds.context.model ?? service.model
 
+    // payload & params
+    const data = args || req.body
+
     // unbound vs. bound
     let entity, params
     if (model.definitions[operation]) {
@@ -77,6 +81,12 @@ module.exports = adapter => {
       entity = cur
       const keysAndParams = getKeysAndParamsFromPath(req._query.SELECT.from, { model })
       params = keysAndParams.params
+
+      const onCollection = !!(
+        operation['@cds.odata.bindingparameter.collection'] ||
+        (operation.params && [...operation.params].some(p => p?.items?.type === '$self'))
+      )
+      if (operation.kind === 'action' && onCollection) odataBind(data, entity)
     }
 
     // validate method
@@ -87,9 +97,6 @@ module.exports = adapter => {
       return next({ code: 405 })
     }
 
-    // payload & params
-    const data = args || req.body
-
     // event
     // REVISIT: when is operation.name actually prefixed with the service name?
     const event = operation.name.replace(`${service.definition.name}.`, '')
@@ -175,11 +182,6 @@ module.exports = adapter => {
       .catch(err => {
         handleSapMessages(cdsReq, req, res)
 
-        // REVISIT: invoke service.on('error') for failed batch subrequests
-        if (cdsReq.http.req.path.startsWith('/$batch') && service.handlers._error.length) {
-          for (const each of service.handlers._error) each.handler.call(service, err, cdsReq)
-        }
-
         next(err)
       })
   }

package/libx/odata/middleware/read.js

@@ -165,11 +165,6 @@ const _handleArrayOfQueriesFactory = adapter => {
       .catch(err => {
         handleSapMessages(cdsReq, req, res)
 
-        // REVISIT: invoke service.on('error') for failed batch subrequests
-        if (cdsReq.http.req.path.startsWith('/$batch') && service.handlers._error.length) {
-          for (const each of service.handlers._error) each.handler.call(service, err, cdsReq)
-        }
-
         next(err)
       })
   }
@@ -274,11 +269,6 @@ module.exports = adapter => {
       .catch(err => {
         handleSapMessages(cdsReq, req, res)
 
-        // REVISIT: invoke service.on('error') for failed batch subrequests
-        if (cdsReq.http.req.path.startsWith('/$batch') && service.handlers._error.length) {
-          for (const each of service.handlers._error) each.handler.call(service, err, cdsReq)
-        }
-
         next(err)
       })
   }

package/libx/odata/middleware/stream.js

@@ -101,6 +101,7 @@ module.exports = adapter => {
           break
         }
       }
+      if (!query._propertyAccess) return next(new cds.error(400))
     }
 
     const pdfMimeType = !!req.headers.accept?.match(/application\/pdf/)

package/libx/odata/middleware/update.js

@@ -159,12 +159,6 @@ module.exports = adapter => {
           return next()
         }
 
-        // REVISIT: invoke service.on('error') for failed batch subrequests
-        if (cdsReq.http.req.path.startsWith('/$batch') && service.handlers._error.length) {
-          for (const each of service.handlers._error) each.handler.call(service, err, cdsReq)
-        }
-
-        // continue with caught error
         next(err)
       })
   }

package/libx/odata/parse/afterburner.js

@@ -1,4 +1,5 @@
 const cds = require('../../../lib')
+const DEBUG = cds.debug('odata|rest')
 
 const { keysOf, addRefToWhereIfNecessary } = require('../utils')
 
@@ -20,6 +21,9 @@ function _getDefinition(definition, name, namespace) {
     definition.actions?.[name] ??
     definition.actions?.[name.replace(namespace + '.', '')]
 
+  if (DEBUG && def && def['@cds.api.ignore']) {
+    DEBUG(`${name} is not served because it is annotated with @cds.api.ignore`)
+  }
   if (def && !def['@cds.api.ignore']) return def
 }
 
@@ -452,7 +456,7 @@ function _processSegments(from, model, namespace, cqn, protocol) {
           target = current.returns.items ?? current.returns
         }
       } else if (current.isAssociation) {
-        if (current._target._service !== _get_service_of(target)) {
+        if (current._target._service !== target._service) {
           // not exposed target
           _doesNotExistError(false, current.name, target.name.replace(namespace + '.', ''), current.kind)
         }
@@ -569,27 +573,56 @@ function _addKeys(columns, target) {
 }
 
 /**
- * Recursively, for each depth, remove all other select columns if a select star is present
- * (including duplicates) and remove duplicate expand stars.
+ * Recursively, for each depth, remove all other select columns if a select star is present (including duplicates) and
+ * remove duplicate expand stars. In case of an expand star, also remove all navigations from the select columns, as
+ * they would cause duplicate columns to be selected.
  *
  * @param {*} columns CQN `SELECT` columns array.
+ * @param {*} target CSN target definition of the current depth.
  */
-function _removeUnneededColumnsIfHasAsterisk(columns) {
+function _removeUnneededColumnsIfHasAsterisk(columns, target) {
+  if (!target) return
   // We need to know if column contains a select * before we can remove other selected columns below
   const hasSelectStar = columns.some(column => column === '*')
   let hasExpandStar = false
+  let navigationProps
+
+  const toRemove = []
 
-  columns.forEach((column, i) => {
+  for (let i = 0; i < columns.length; i++) {
+    const column = columns[i]
     // Remove other select columns if we have a select star
-    if (hasSelectStar && column.ref && !column.expand) columns.splice(i, 1)
-    // Remove duplicate expand stars
+    if (hasSelectStar && column.ref && !column.expand) toRemove.push(i)
+
     if (!column.ref && column.expand?.[0] === '*') {
-      if (hasExpandStar) columns.splice(i, 1)
-      hasExpandStar = true
+      if (hasExpandStar) {
+        toRemove.push(i) // Remove duplicate expand stars
+      } else {
+        hasExpandStar = true
+        navigationProps = Object.values(target.elements)
+          .filter(element => element.isAssociation || element.isComposition)
+          .map(element => element.name)
+      }
     }
     // Recursively remove unneeded columns in expand
-    if (column.expand) _removeUnneededColumnsIfHasAsterisk(column.expand)
-  })
+    if (column.expand && column.ref)
+      _removeUnneededColumnsIfHasAsterisk(column.expand, target.elements?.[column.ref[0]]?._target)
+  }
+
+  if (hasExpandStar && navigationProps?.length) {
+    for (let i = 0; i < columns.length; i++) {
+      const column = columns[i]
+      if (column.ref && !column.expand && column.ref.length === 1 && navigationProps.includes(column.ref[0])) {
+        toRemove.push(i)
+      }
+    }
+  }
+
+  if (!toRemove.length) return
+
+  // Descending order to avoid issues with splicing while iterating
+  const uniqueIndexes = [...new Set(toRemove)].sort((a, b) => b - a)
+  for (const index of uniqueIndexes) columns.splice(index, 1)
 }
 
 const _structProperty = (ref, target) => {
@@ -621,7 +654,7 @@ function _processColumns(cqn, target, protocol) {
     else if (target.kind === 'action' && target.returns?.kind === 'entity') entity = target.returns
     if (!entity) return
 
-    _removeUnneededColumnsIfHasAsterisk(columns)
+    _removeUnneededColumnsIfHasAsterisk(columns, target)
     rewriteExpandAsterisk(columns, entity)
 
     // For OData, add missing key fields to columns
@@ -767,12 +800,6 @@ const _doesNotExistError = (isExpand, refName, targetName, targetKind) => {
   cds.error({ status: 400, message: msg })
 }
 
-const _get_service_of = element => {
-  if (element._service) return element._service
-  if (element.parent) return _get_service_of(element.parent)
-  return null
-}
-
 function _validateXpr(xpr, target, isOne, model, aliases = []) {
   if (!xpr) return []
 
@@ -834,10 +861,8 @@ function _validateXpr(xpr, target, isOne, model, aliases = []) {
           element = _structProperty(x.ref.slice(1), element)
         }
 
-        const target_service = _get_service_of(target)
-
-        if (!element._target || element._target._service !== target_service) {
-          const targetName = target_service ? target.name.replace(target_service.name + '.', '') : target.name
+        if (!element._target || element._target._service !== target._service) {
+          const targetName = target._service ? target.name.replace(target._service.name + '.', '') : target.name
           _doesNotExistError(true, refName, targetName)
         }
 

package/libx/odata/parse/cqn2odata.js

@@ -12,6 +12,11 @@ const OPERATORS = {
   '>=': 'ge'
 }
 
+const KNOWN_OPERATORS = {
+  ...Object.keys(OPERATORS).reduce((acc, cur) => ((acc[cur] = 1), acc), {}),
+  ...{ eq: 1, ne: 1, lt: 1, gt: 1, le: 1, ge: 1 }
+}
+
 const LAMBDA_VARIABLE = 'd'
 
 const needArrayProps = Object.fromEntries(
@@ -210,7 +215,7 @@ function _xpr(expr, target, kind, isLambda, navPrefix = []) {
         res.push(OPERATORS[cur] || cur.toLowerCase())
       }
     } else {
-      const ref = expr[i - 1] in OPERATORS ? expr[i - 2] : expr[i + 1] in OPERATORS ? expr[i + 2] : null
+      const ref = expr[i - 1] in KNOWN_OPERATORS ? expr[i - 2] : expr[i + 1] in KNOWN_OPERATORS ? expr[i + 2] : null
       const formatted = _format(
         cur,
         ref?.ref && (ref.ref.length ? ref.ref : ref.ref[0]),

package/libx/odata/parse/grammar.peggy

@@ -944,7 +944,19 @@
         
         const toXprElement = (operand) => {
           if (typeof operand === 'number') return { val: operand }
-          if (typeof operand === 'string') return { ref: [operand] }
+          if (typeof operand === 'string') {
+            const safed = safeNumber(operand)
+            if (safed !== operand) {              
+              return { val: safed }
+            } else {              
+              const parsed = parseFloat(operand)
+              if (!isNaN(parsed)) {                
+                return { val: operand, literal: 'number' }
+              } else {                
+                return { ref: [operand] }
+              }
+            }
+          }
           return operand // xpr
         }
         
@@ -957,7 +969,7 @@
       }
 
   mathOperand
-    = integer / negativeIdentifier / identifier / parenthesizedMath
+    = number / negativeIdentifier / identifier / parenthesizedMath
 
   negativeIdentifier
     = "-" id:identifier { return { xpr: ['-', { ref: [id] }] } }

package/libx/odata/parse/multipartToJson.js

@@ -69,7 +69,8 @@ const _parseStream = async function* (body, boundary) {
         body: streamConsumers.json(wrapper).catch(() => {})
       }
 
-      const dependencies = [...req.url.matchAll(/^\/?\$([\d.\-_~a-zA-Z]+)/g)]
+      // Ignore /$metadata URLs -> they are not dependencies
+      const dependencies = [...req.url.matchAll(/^\/?\$(?!metadata$)([\d.\-_~a-zA-Z]+)/g)]
       if (dependencies.length) {
         request.dependsOn = []
         for (const dependency of dependencies) {