@sap/cds 5.5.4 → 5.6.2

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/update.js

@@ -9,12 +9,18 @@ const {
 const { getSapMessages } = require('../../../../common/error/frontend')
 const { validateResourcePath } = require('../utils/request')
 const { isReturnMinimal } = require('../utils/handlerUtils')
-const { foreignKeyPropagations } = require('../../../../common/utils/foreignKeyPropagations')
 const readAfterWrite = require('../utils/readAfterWrite')
-const { toODataResult, postProcess } = require('../utils/result')
+const { toODataResult, postProcess, postProcessMinimal } = require('../utils/result')
 const { hasOmitValuesPreference } = require('../utils/omitValues')
 const { mergeJson } = require('../../../services/utils/compareJson')
 
+/*
+const { isStreaming } = require('../utils/stream')
+const { findCsnTargetFor } = require('../../../../common/utils/csn')
+const { isActiveEntityRequested, removeIsActiveEntityRecursively } = require('../../../../fiori/utils/where')
+const { ensureDraftsSuffix } = require('../../../../fiori/utils/handler')
+*/
+
 const _isUpsertAllowed = target => {
   return !(cds.env.runtime && cds.env.runtime.allow_upsert === false) && !(target && target._isDraftEnabled)
 }
@@ -36,53 +42,41 @@ const _infoForeignKeyInParent = (req, odataReq, odataRes, tx) => {
   }
 
   const navID = typeof nav === 'string' ? nav : nav.id
-  const elementNav = tx.model.definitions[parent].elements[navID]
+  const navElement = tx.model.definitions[parent].elements[navID]
 
   // not a containment
-  if (!elementNav['@odata.contained']) {
+  if (!navElement['@odata.contained']) {
     return info
   }
 
   const where = req.query.INSERT.into.ref[0].where
-  return { parent, nav, where }
-}
-
-const _getParentKey = (parentKeyObj, parentKey, childKey, req) => {
-  let parentKeyVal, parentUpdateRequired
-
-  if (parentKeyObj.length !== 0 && parentKeyObj[0][parentKey] !== null) {
-    parentKeyVal = parentKeyObj[0][parentKey]
-  } else if (req.target.keys[childKey].type === 'cds.UUID') {
-    parentUpdateRequired = true
-    parentKeyVal = cds.utils.uuid()
-  } else {
-    throw new Error('Only keys of type UUID can be generated: ' + childKey)
-  }
-
-  return { parentKeyVal, parentUpdateRequired }
+  return { parent, navElement, where }
 }
 
 const _create = async (req, odataReq, odataRes, tx) => {
   let result
 
-  const { parent, nav, where } = _infoForeignKeyInParent(req, odataReq, odataRes, tx)
-  if (parent && nav && where) {
-    const onKeys = foreignKeyPropagations(tx.model.definitions[parent].elements[nav])
-    const parentKeys = onKeys.map(key => key.parentFieldName)
+  const { parent, navElement, where } = _infoForeignKeyInParent(req, odataReq, odataRes, tx)
+  if (parent && navElement && where) {
+    const onKeys = navElement._foreignKeys
+    const parentKeys = onKeys.filter(key => key.parentElement).map(key => key.parentElement.name)
     const parentKeyObj = await tx.run(SELECT.from(parent).columns(parentKeys).where(where))
 
     const parentUpdateObj = {}
     onKeys.forEach(key => {
-      const { parentKeyVal, parentUpdateRequired } = _getParentKey(
-        parentKeyObj,
-        key.parentFieldName,
-        key.childFieldName,
-        req
-      )
-      odataReq.getBody()[key.childFieldName] = parentKeyVal
+      let parentKeyVal, parentUpdateRequired
+      if (parentKeyObj.length !== 0 && parentKeyObj[0][key.parentElement.name] !== null) {
+        parentKeyVal = parentKeyObj[0][key.parentElement.name]
+      } else if (key.childElement.type === 'cds.UUID' && key.childElement.key) {
+        parentUpdateRequired = true
+        parentKeyVal = cds.utils.uuid()
+      } else {
+        throw new Error('Only keys of type UUID can be generated: ' + key.childFieldName)
+      }
+      odataReq.getBody()[key.childElement.name] = parentKeyVal
 
       if (parentUpdateRequired) {
-        parentUpdateObj[key.parentFieldName] = parentKeyVal
+        parentUpdateObj[key.parentElement.name] = parentKeyVal
       }
     })
 
@@ -107,7 +101,7 @@ const _updateThenCreate = async (req, odataReq, odataRes, tx) => {
   try {
     result = await tx.dispatch(req)
   } catch (e) {
-    if (e.code === 404 && _isUpsertAllowed(req.target)) {
+    if ((e.code === 404 || e.status === 404 || e.statusCode === 404) && _isUpsertAllowed(req.target)) {
       // REVISIT: remove error (and child?) from tx.context? -> would require a unique req.id
       ;[result, req] = await _create(req, odataReq, odataRes, tx)
     } else {
@@ -127,6 +121,58 @@ const _readAfterWriteAndVirtuals = async (req, service, result) => {
 const _shouldReadPreviousResult = req =>
   req.event === 'UPDATE' && !isReturnMinimal(req) && hasOmitValuesPreference(req.headers.prefer, 'defaults')
 
+/*
+const _getEntity = (segments, model) => {
+  let entityName, namespace
+  const previous = segments[segments.length - 2]
+  if (previous.getKind() === 'ENTITY') {
+    entityName = previous.getEntitySet().getName()
+    namespace = previous.getEdmType().getFullQualifiedName().namespace
+  } else if (previous.getKind() === 'NAVIGATION.TO.ONE') {
+    entityName = previous.getTarget().getName()
+    namespace = previous.getTarget().getEntityType().getFullQualifiedName().namespace
+  }
+
+  if (entityName) {
+    return findCsnTargetFor(entityName, model, namespace)
+  }
+}
+
+const _getMediaType = entity => {
+  if (entity._hasPersistenceSkip) return
+
+  return Object.values(entity.elements).find(ele => ele['@Core.IsMediaType'])
+}
+
+const _getMediaTypeCQN = (mediaType, contentType, entity, req) => {
+  const where = req.query.UPDATE.entity.ref[0].where
+  const isActive = isActiveEntityRequested(where)
+  const data = {}
+  data[mediaType.name] = contentType
+  const cqn = UPDATE(entity).set(data)
+  cqn.UPDATE.where = removeIsActiveEntityRecursively(where)
+  if (!isActive) {
+    cqn.UPDATE.entity = ensureDraftsSuffix(entity.name)
+  }
+
+  return cqn
+}
+
+const _handleMediaType = async (odataReq, model, tx, req) => {
+  const segments = odataReq.getUriInfo().getPathSegments()
+  const contentType = odataReq._inRequest.headers['content-type']
+  if (isStreaming(segments) && contentType) {
+    const entity = _getEntity(segments, model)
+    if (entity && !entity['@cds.persistence.skip']) {
+      const mediaType = _getMediaType(entity)
+      if (mediaType) {
+        await tx.run(_getMediaTypeCQN(mediaType, contentType, entity, req))
+      }
+    }
+  }
+}
+*/
+
 /**
  * The handler that will be registered with odata-v4.
  *
@@ -155,8 +201,10 @@ const update = service => {
 
     let result, err, commit
     try {
-      let previousResult
+      // // REVISIT: should be handled somewhere else
+      // await _handleMediaType(odataReq, service.model, tx, req)
 
+      let previousResult
       if (_shouldReadPreviousResult(req)) {
         previousResult = await _readAfterWriteAndVirtuals(req, service, result)
       }
@@ -171,6 +219,8 @@ const update = service => {
         }
 
         postProcess(req, odataRes, service, result, previousResult)
+      } else {
+        postProcessMinimal(req, result)
       }
 
       if (changeset) {

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/ExpressionToCQN.js

@@ -42,10 +42,16 @@ class ExpressionToCQN {
       case EdmPrimitiveTypeKind.Double:
         return { val: parseFloat(value) }
       case EdmPrimitiveTypeKind.DateTimeOffset: {
-        let val = new Date(value).toISOString()
-        // cut off ms if cds.DateTime
-        if (expression._cdsType === 'cds.DateTime') val = val.replace(/\.\d\d\dZ$/, 'Z')
-        return { val }
+        try {
+          let val = new Date(value).toISOString()
+          // cut off ms if cds.DateTime
+          if (expression._cdsType === 'cds.DateTime') val = val.replace(/\.\d\d\dZ$/, 'Z')
+          return { val }
+        } catch (e) {
+          throw Object.assign(new Error(`The type 'Edm.DateTimeOffset' is not compatible with '${value}'`), {
+            status: 400
+          })
+        }
       }
       default:
         return { val: value }

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/applyToCQN.js

@@ -195,17 +195,23 @@ const applyToCQN = (transformations, entity, model) => {
           _handleTransformation(transformation, entity, res)
         }
         for (const item of transformation.getGroupByItems()) {
-          if (item.getPathSegments()[0].getKind() === 'COMPLEX.PROPERTY') {
+          const pathSegment = item.getPathSegments().length > 0 && item.getPathSegments()[0]
+          if (!pathSegment) {
+            throw getFeatureNotSupportedError(
+              'Transformation "groupby" with query option $apply does not support this request'
+            )
+          }
+          if (pathSegment.getKind() === 'COMPLEX.PROPERTY') {
             throw getFeatureNotSupportedError(
               'Transformation "groupby" with query option $apply does not support complex properties'
             )
             // TODO support annotations Groupable
             // Odata spec: http://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/cs01/odata-data-aggregation-ext-v4.0-cs01.html#_Toc378326318
             // res.groupBy.push(_complexProperty(item.getPathSegments()))
-          } else if (item.getPathSegments()[0].getProperty()) {
+          } else if (pathSegment.getProperty()) {
             const name = item.getPathSegments()[0].getProperty().getName()
             res.groupBy.push(name)
-          } else if (item.getPathSegments()[0].getNavigationProperty()) {
+          } else if (pathSegment.getNavigationProperty()) {
             res.groupBy.push(_createNavGroupBy(item.getPathSegments()))
           }
         }

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/expandToCQN.js

@@ -98,7 +98,7 @@ const _getInnerSelect = expandItem => {
  * @returns {Array}
  * @private
  */
-const _getSelectedElements = (expandItem, targetType, relatedEntity) => {
+const _getSelectedElements = (expandItem, targetType, relatedEntity, options) => {
   if (cds.env.effective.odata.proxies || cds.env.effective.odata.xrefs) {
     // proxy target?
     let proxy = true
@@ -113,7 +113,9 @@ const _getSelectedElements = (expandItem, targetType, relatedEntity) => {
   let innerSelectItems = _getInnerSelect(expandItem)
 
   if (innerSelectItems.length === 0 || innerSelectItems.some(item => item.isAll())) {
-    return _getColumnsFromTargetType(targetType, relatedEntity, true)
+    // REVISIT: Remove once we clean up our draft handling
+    if (options && options.rewriteAsterisks) return _getColumnsFromTargetType(targetType, relatedEntity, true)
+    return ['*']
   }
 
   // remove navigations from select clause
@@ -166,7 +168,7 @@ const _filter = (item, expression) => {
   item.where = SELECT.from('a').where(expressionToCQN.parse(expression)).SELECT.where
 }
 
-const _getItemCQN = (model, name, navigationProperty, expandItem) => {
+const _getItemCQN = (model, name, navigationProperty, expandItem, options) => {
   _notSupported(expandItem)
 
   const targetType = navigationProperty.getEntityType()
@@ -176,7 +178,7 @@ const _getItemCQN = (model, name, navigationProperty, expandItem) => {
   const relatedEntity = findCsnTargetFor(entityName, model, namespace)
   const item = {
     ref: name, // ['structured', 'nested_', nestedAssocToOne] if expand on structured
-    expand: _getSelectedElements(expandItem, targetType, relatedEntity)
+    expand: _getSelectedElements(expandItem, targetType, relatedEntity, options)
   }
 
   item.expand.push(..._getInnerExpandItems(model, expandItem, targetType))
@@ -222,7 +224,7 @@ const _name = expandItem =>
  * @param type
  * @returns {Array}
  */
-const expandToCQN = (model, expandItems, type) => {
+const expandToCQN = (model, expandItems, type, options) => {
   const allElements = []
   const isAll = expandItems.some(item => item.isAll())
 
@@ -230,7 +232,7 @@ const expandToCQN = (model, expandItems, type) => {
     const expandItem = _getExpandItem(isAll, expandItems, name)
 
     if (isAll || expandItem) {
-      allElements.push(_getItemCQN(model, [name], navigationProperty, expandItem))
+      allElements.push(_getItemCQN(model, [name], navigationProperty, expandItem, options))
     }
   }
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/index.js

@@ -1,7 +1,5 @@
 const cds = require('../../../../cds')
 
-const { _newReadToCQN } = require('../../../../odata/readToCqn')
-
 const {
   Components: { DATA_CREATE_HANDLER, DATA_DELETE_HANDLER, DATA_READ_HANDLER, DATA_UPDATE_HANDLER }
 } = require('../okra/odata-server')
@@ -32,7 +30,7 @@ module.exports = (component, service, target, data, odataReq, upsert) => {
     case DATA_DELETE_HANDLER:
       return deleteToCQN(service, odataReq)
     case DATA_READ_HANDLER:
-      return odata2cqn ? _newReadToCQN(service, target, odataReq) : readToCQN(service, target, odataReq)
+      return odata2cqn ? cds.odata.parse(odataReq, { service }) : readToCQN(service, target, odataReq)
     case DATA_UPDATE_HANDLER:
       return updateToCQN(service, data, odataReq)
     case 'BOUND.ACTION':

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/readToCQN.js

@@ -2,9 +2,8 @@ const cds = require('../../../../cds')
 const { SELECT } = cds.ql
 
 const QueryOptions = require('../okra/odata-server').QueryOptions
-const { getColumns } = require('../../../services/utils/columns')
 const { isNavigation, isPathSupported } = require('./selectHelper')
-const { isViewWithParams, validationQuery } = require('./selectHelper')
+const { isViewWithParams, getValidationQuery } = require('./selectHelper')
 const { ensureUnlocalized } = require('../../../../fiori/utils/handler')
 const ExpressionToCQN = require('./ExpressionToCQN')
 const orderByToCQN = require('./orderByToCQN')
@@ -16,6 +15,7 @@ const { resolveStructuredName } = require('../utils/handlerUtils')
 const { isStreaming } = require('../utils/stream')
 const { convertUrlPathToCqn, getAllKeys } = require('./utils')
 const { getMaxPageSize } = require('../../../../common/utils/page')
+const { isAsteriskColumn } = require('../../../../common/utils/rewriteAsterisks')
 
 const {
   COUNT,
@@ -200,8 +200,10 @@ const _cleanupForApply = (apply, cqn) => {
     const selectColumns = cqn.SELECT.columns.map(c => c.as || (c.ref && c.ref[c.ref.length - 1]))
     if (cqn.SELECT.orderBy) {
       // include path expressions
-      const newOrderBy = cqn.SELECT.orderBy.filter(o => _containsSelectedColumn(o, selectColumns))
-      cqn.SELECT.orderBy = newOrderBy
+      if (!cqn.SELECT.columns.some(c => isAsteriskColumn(c))) {
+        const newOrderBy = cqn.SELECT.orderBy.filter(o => _containsSelectedColumn(o, selectColumns))
+        cqn.SELECT.orderBy = newOrderBy
+      }
     }
 
     if (!cqn.SELECT.orderBy || !cqn.SELECT.orderBy.length) {
@@ -229,16 +231,16 @@ const _checkViewWithParamCall = (isView, segments, kind, name) => {
   }
 }
 
-const enhanceCqnForNavigation = (segments, isView, cqn, service, SELECT, kind) => {
+const addValidationQueryIfRequired = (segments, isView, cqn, service, kind) => {
   if (isNavigation(segments) && !isView && (kind === NAVIGATION_TO_MANY || kind === NAVIGATION_TO_ONE)) {
-    cqn._validationQuery = validationQuery(segments, service.model, SELECT)
+    cqn._validationQuery = getValidationQuery(cqn.SELECT.from.ref, service.model)
     cqn._validationQuery.__navToManyWithKeys =
       kind === NAVIGATION_TO_ONE && segments[segments.length - 1].getKeyPredicates().length !== 0
   }
 }
 
 const _addKeysToSelectIfNoStreaming = (entity, select, streaming) => {
-  // might also be signleton w/o keys
+  // might also be singleton w/o keys
   if (!streaming && entity.keys) {
     for (const k of Object.values(entity.keys)) {
       // REVISIT: !select.includes(k.name) needed?
@@ -370,9 +372,7 @@ const readToCQN = (service, target, odataReq) => {
   }
 
   if (select.length === 0) {
-    select.push(
-      ...getColumns(entity, { onlyNames: true, removeIgnore: true, filterDraft: false }).map(col => ({ ref: [col] }))
-    )
+    select.push('*')
   }
 
   if (expand.length) {
@@ -388,7 +388,7 @@ const readToCQN = (service, target, odataReq) => {
 
   // keep target as input because of localized view
   const cqn = SELECT.from(isView ? _convertUrlPathToViewCqn(segments) : convertUrlPathToCqn(segments, service), select)
-  enhanceCqnForNavigation(segments, isView, cqn, service, SELECT, kind)
+  addValidationQueryIfRequired(segments, isView, cqn, service, kind)
 
   if (Object.keys(apply).length) {
     _extendCqnWithApply(cqn, apply, entity)
@@ -409,6 +409,8 @@ const readToCQN = (service, target, odataReq) => {
   }
 
   _cleanupForApply(apply, cqn)
+  // just like in new parser
+  if (cqn.SELECT.columns.length === 1 && cqn.SELECT.columns[0] === '*') delete cqn.SELECT.columns
   return cqn
 }
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/selectHelper.js

@@ -1,5 +1,7 @@
 const { getFeatureNotSupportedError } = require('../../../util/errors')
-const { getOnCond } = require('../../../../common/utils/generateOnCond')
+const { deepCopyArray } = require('../../../../common/utils/copy')
+const cds = require('../../../../cds')
+const { cqn2cqn4sql } = require('../../../../common/utils/cqn2cqn4sql')
 
 const isNavigation = pathSegments => {
   return pathSegments.length > 1 && pathSegments[1].getKind().startsWith('NAVIGATION')
@@ -9,99 +11,14 @@ const isViewWithParams = target => {
   return target.params && Object.keys(target.params).length > 0
 }
 
-const _entityNameFromSegment = segment => {
-  if (segment.getKind() === 'SINGLETON') {
-    return segment.getSingleton().getEntityType().getFullQualifiedName().toString()
-  }
-
-  if (segment.getKind() === 'ENTITY') {
-    return segment.getEntitySet().getEntityType().getFullQualifiedName().toString()
-  }
-
-  return segment.getNavigationProperty().getEntityType().getFullQualifiedName().toString()
-}
-
-const _keysFromSegment = segment => {
-  if (segment.getKeyPredicates().length > 0) {
-    const keys = {}
-
-    for (const keyPredicate of segment.getKeyPredicates()) {
-      const key = keyPredicate.getEdmRef().getName().replace(/\//g, '.')
-      keys[key] = keyPredicate.getText()
-    }
-
-    return keys
-  }
-}
-
-const _addKeysToWhereIfNeeded = (cqn, keys, tableAlias) => {
-  if (keys) {
-    for (const key in keys) {
-      cqn.where([{ ref: [`${tableAlias}`, `${key}`] }, '=', { val: keys[key] }])
-    }
-  }
-}
-
-const _addOnCondToWhere = (cqn, entity, tableAlias, identifier, csn) => {
-  const onConditionOptions = {
-    associationNames: entity.current,
-    csn: csn,
-    aliases: {
-      select: tableAlias,
-      join: identifier
-    }
-  }
-
-  const onCond = getOnCond(csn.definitions[entity.previous].elements[entity.current], onConditionOptions)
-  cqn.where(onCond)
-}
-
-const enhanceCqnWithSubSelects = (cqn, pathSegments, csn, SELECT) => {
-  let previousCqn, previousEntityName
-
-  // if .../property or .../$count requested, must be ignored when building query
-  const segments = pathSegments.filter(s => s.getProperty() === null && s.getKind() !== 'COUNT')
-
-  for (let i = 0; i < segments.length; i++) {
-    const isLastElement = i === segments.length - 1
-    const tableAlias = `T${i}`
-    const entityName = _entityNameFromSegment(segments[i])
-    const keys = _keysFromSegment(segments[i])
-    let currentCqn
-
-    if (isLastElement) {
-      cqn.SELECT.from = { ref: [entityName], as: tableAlias }
-      _addKeysToWhereIfNeeded(cqn, keys, tableAlias)
-    } else {
-      currentCqn = SELECT.from(`${entityName} as ${tableAlias}`, [1])
-      _addKeysToWhereIfNeeded(currentCqn, keys, tableAlias)
-    }
-
-    if (previousCqn) {
-      _addOnCondToWhere(
-        previousCqn,
-        { current: segments[i].getNavigationProperty().getName(), previous: previousEntityName },
-        tableAlias,
-        `T${i - 1}`,
-        csn
-      )
-
-      if (isLastElement) {
-        cqn.where(['exists', previousCqn])
-      } else {
-        currentCqn.where(['exists', previousCqn])
-      }
-    }
-
-    previousCqn = currentCqn
-    previousEntityName = entityName
-  }
-}
+const getValidationQuery = (ref, model) => {
+  const refQuery = deepCopyArray(ref.slice(0, ref.length - 1))
+  const cqn = cds.ql.SELECT.from({ ref: refQuery }).columns({
+    val: 1,
+    as: 'validationQuery'
+  })
 
-const validationQuery = (pathSegments, csn, SELECT) => {
-  const cqn = SELECT.from('placeholder')
-  enhanceCqnWithSubSelects(cqn, pathSegments.slice(0, pathSegments.length - 1), csn, SELECT)
-  return cqn
+  return cqn2cqn4sql(cqn, model)
 }
 
 const isPathSupported = (supported, pathSegments) => {
@@ -113,9 +30,8 @@ const isPathSupported = (supported, pathSegments) => {
 }
 
 module.exports = {
-  enhanceCqnWithSubSelects,
   isNavigation,
   isViewWithParams,
   isPathSupported,
-  validationQuery
+  getValidationQuery
 }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/ResourcePathParser.js

@@ -41,11 +41,11 @@ class ResourcePathParser {
     let tokenizer = new UriTokenizer(uriPathSegments[0])
 
     tokenizer.requireNext(TokenKind.ODataIdentifier)
-    const currentToken = tokenizer.getText()
 
+    const currentToken = tokenizer.getText()
     let currentResource = new UriResource()
-
     let edmResult = this._edmContainer.getEntitySet(currentToken)
+
     if (edmResult) {
       currentResource
         .setKind(UriResource.ResourceKind.ENTITY_COLLECTION)
@@ -53,11 +53,12 @@ class ResourcePathParser {
         .setEntitySet(edmResult)
 
       this._target = edmResult
-
-      return result.concat(this._parseCollectionNavigation(uriPathSegments, currentResource, tokenizer))
+      const uriResources = this._parseCollectionNavigation(uriPathSegments, currentResource, tokenizer)
+      return result.concat(uriResources)
     }
 
     edmResult = this._edmContainer.getSingleton(currentToken)
+
     if (edmResult) {
       currentResource
         .setKind(UriResource.ResourceKind.SINGLETON)
@@ -65,14 +66,13 @@ class ResourcePathParser {
         .setIsCollection(false)
 
       this._target = edmResult
-
       tokenizer.requireNext(TokenKind.EOF)
       uriPathSegments.shift()
-
       return result.concat(this._parseSingleNavigation(uriPathSegments, currentResource))
     }
 
     edmResult = this._edmContainer.getActionImport(currentToken)
+
     if (edmResult) {
       const unboundAction = edmResult.getUnboundAction()
 
@@ -91,6 +91,7 @@ class ResourcePathParser {
     }
 
     edmResult = this._edmContainer.getFunctionImport(currentToken)
+
     if (edmResult) {
       const functions = edmResult.getUnboundFunctions()
       const returnType = functions[0].getReturnType()
@@ -123,9 +124,9 @@ class ResourcePathParser {
         if (tokenizer.next(TokenKind.OPEN)) {
           throw new UriSyntaxError(UriSyntaxError.Message.FUNCTION_IMPORT_EOF, edmResult.getName())
         }
+
         tokenizer.requireNext(TokenKind.EOF)
         uriPathSegments.shift()
-
         return result.concat(this._parseSingleNavigation(uriPathSegments, currentResource))
       }
 
@@ -133,6 +134,7 @@ class ResourcePathParser {
       if (tokenizer.next(TokenKind.OPEN)) {
         throw new UriSyntaxError(UriSyntaxError.Message.FUNCTION_IMPORT_EOF, edmResult.getName())
       }
+
       tokenizer.requireNext(TokenKind.EOF)
       uriPathSegments.shift()
 
@@ -148,6 +150,7 @@ class ResourcePathParser {
             ? this._parseComplexPath(uriPathSegments, currentResource)
             : this._parsePrimitivePath(uriPathSegments, currentResource)
       }
+
       return functionRest ? result.concat(currentResource, functionRest) : result.concat(currentResource)
     }
 
@@ -211,7 +214,8 @@ class ResourcePathParser {
       }
     }
 
-    return result.concat(this._parseCollectionNavPath(uriPathSegments, currentResource, tokenizer))
+    const uriResources = this._parseCollectionNavPath(uriPathSegments, currentResource, tokenizer)
+    return result.concat(uriResources)
   }
 
   /**
@@ -259,11 +263,9 @@ class ResourcePathParser {
       if (tokenizer.next(TokenKind.CLOSE)) throw new UriSyntaxError(UriSyntaxError.Message.KEY_EXPECTED)
 
       const edmType = currentResource.getEdmType()
-
       const keyPredicates = new KeyPredicateParser(this._edm, this._aliases).parse(currentResource, edmType, tokenizer)
 
       tokenizer.requireNext(TokenKind.CLOSE)
-
       currentResource.setKeyPredicates(keyPredicates).setIsCollection(false)
 
       if (currentResource.getKind() === UriResource.ResourceKind.ENTITY_COLLECTION) {
@@ -383,15 +385,19 @@ class ResourcePathParser {
       TokenKind.VALUE,
       UriResource.ResourceKind.VALUE
     )
+
     if (valueResource) {
       const currentType = currentResource.getEdmType()
+
       if (currentType.hasStream()) {
         return result.concat(valueResource)
       }
+
       throw new UriSyntaxError(UriSyntaxError.Message.PREVIOUS_TYPE_HAS_NO_MEDIA, currentType.getName())
     }
 
-    return result.concat(this._parsePropertyPath(uriPathSegments, currentResource, tokenizer))
+    const uriResources = this._parsePropertyPath(uriPathSegments, currentResource, tokenizer)
+    return result.concat(uriResources)
   }
 
   /**

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriParser.js

@@ -138,7 +138,8 @@ class UriParser {
       }
     }
 
-    uriInfo.setPathSegments(this._parseRelativeUri(uriPathSegments, uriInfo.getAliases()))
+    const uriResources = this._parseRelativeUri(uriPathSegments, uriInfo.getAliases())
+    uriInfo.setPathSegments(uriResources)
 
     let currentUriSegment = uriPathSegments.shift()
     if (currentUriSegment || currentUriSegment === '') {

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/invocation/SetResponseHeadersCommand.js

@@ -75,6 +75,7 @@ class SetResponseHeadersCommand extends Command {
           ? lastSegment.getTarget() && lastSegment.getTarget().isConcurrent()
           : this._request.getConcurrentResource()) &&
         representationKind !== RepresentationKinds.ENTITY_COLLECTION &&
+        representationKind !== RepresentationKinds.COUNT &&
         representationKind !== RepresentationKinds.REFERENCE &&
         representationKind !== RepresentationKinds.REFERENCE_COLLECTION
       ) {

package/libx/_runtime/cds-services/adapter/odata-v4/to.js

@@ -1,11 +1,15 @@
+const cds = require('../../../cds')
+
 const OData = require('./OData')
 const Dispatcher = require('./Dispatcher')
-const cds = require('../../../cds')
+
+const { alias2ref } = require('../../../common/utils/csn')
 
 const to = service => {
   const edm = cds.compile.to.edm(service.model, { service: service.definition.name })
-  const odata = new OData(edm, service.model, service.options)
+  alias2ref(service, edm)
 
+  const odata = new OData(edm, service.model, service.options)
   odata.addCDSServiceToChannel(service)
 
   return new Dispatcher(odata).getService()