@sap/cds 5.5.3 → 5.6.1

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/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()

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

@@ -1,10 +1,7 @@
-const cds = require('../../../../cds')
-
 const {
   Components: { DATA_DELETE_HANDLER, DATA_READ_HANDLER, DATA_CREATE_HANDLER, DATA_UPDATE_HANDLER }
 } = require('../okra/odata-server')
 
-const { getOnCond } = require('../../../../common/utils/generateOnCond')
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
 const { isStreaming } = require('./stream')
 const { deepCopyObject, deepCopyArray } = require('../../../../common/utils/copy')
@@ -106,27 +103,6 @@ function _entityOrTypeName(navSourceSegment) {
     .getFullQualifiedName()
 }
 
-const _getNavigationInfoX4 = (navProperty, navSourceSegment, csn) => {
-  const { name, namespace } = _entityOrTypeName(navSourceSegment)
-  const def = findCsnTargetFor(name, csn, namespace)
-
-  const navigationName = navProperty.getName()
-  const navigationDefinition = def.elements[navigationName]
-  return { navigationName, navigationDefinition }
-}
-
-const _getNavigationInfo = (navProperty, navSourceSegment, csn) => {
-  if (cds.env.effective.odata.proxies) {
-    return _getNavigationInfoX4(navProperty, navSourceSegment, csn)
-  }
-
-  const { name, namespace } = _entityOrTypeName(navSourceSegment)
-  const def = findCsnTargetFor(name, csn, namespace)
-  const navigationName = navProperty.getName()
-  const navigationDefinition = def.elements[navigationName]
-  return { navigationName, navigationDefinition }
-}
-
 const _addForeignKeys = (service, req, data) => {
   const pathSegments = req.getUriInfo().getPathSegments()
   // retrieve keys/values from the path segment representing the navigation source
@@ -149,16 +125,9 @@ const _addForeignKeys = (service, req, data) => {
       }
     }
   } else {
-    const { navigationName, navigationDefinition } = _getNavigationInfo(navProperty, navSourceSegment, service.model)
-    const onConditionOptions = {
-      associationNames: navigationName,
-      csn: service.model,
-      aliases: {
-        select: 'target',
-        join: 'source'
-      }
-    }
-    const onCondition = getOnCond(navigationDefinition, onConditionOptions)
+    const { name, namespace } = _entityOrTypeName(navSourceSegment)
+    const def = findCsnTargetFor(name, service.model, namespace)
+    const onCondition = def._relations[navProperty.getName()].join('target', 'source')
     _addKeysToData(navSourceKeyValues, onCondition, data)
   }
 }

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

@@ -23,14 +23,14 @@ const _selectForFunction = (selectColumns, result, opReturnType) => {
 
 const { ensureDraftsSuffix, isDraftActivateAction } = require('../../../../fiori/utils/handler')
 
-const _expand = (model, uriInfo) => {
+const _expand = (model, uriInfo, options) => {
   const expand = uriInfo.getQueryOption(QueryOptions.EXPAND)
 
   if (!expand || expand.length === 0) {
     return []
   }
 
-  return expandToCQN(model, expand, uriInfo.getFinalEdmType())
+  return expandToCQN(model, expand, uriInfo.getFinalEdmType(), options)
 }
 
 const _expandForFunction = async (uriInfo, result, req, srv, opReturnType) => {
@@ -52,7 +52,7 @@ const _expandForFunction = async (uriInfo, result, req, srv, opReturnType) => {
       selectQuery.where(key, '=', row[key])
     }
 
-    const expandCqn = _expand(srv.model, uriInfo)
+    const expandCqn = _expand(srv.model, uriInfo, { rewriteAsterisks: true })
     selectQuery.columns(expandCqn)
 
     const res = await cds.tx(req).run(selectQuery)

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

@@ -2,7 +2,6 @@ const cds = require('../../../../cds')
 const getTemplate = require('../../../../common/utils/template')
 const templateProcessor = require('../../../../common/utils/templateProcessor')
 const { big } = require('@sap/cds-foss')
-const { isBacklink } = require('../../../../common/utils/backlinks')
 const { omitValue, applyOmitValuesPreference } = require('./omitValues')
 
 const METADATA = {
@@ -157,30 +156,28 @@ const _getParent = (model, name) => {
   if (target && target.elements) {
     for (const elementName in target.elements) {
       const element = target.elements[elementName]
-      const assoc = element.target && model.definitions[element.target]
-      if (assoc && element._isAssociationStrict && isBacklink(element, assoc, true)) return assoc
+      if (element._anchor && element._anchor._isContained) return element._anchor
     }
   }
 
   return null
 }
 
-const _isUpAssoc = (element, parent) =>
-  element &&
-  cds.env.effective.odata.containment &&
-  /^up_(_up_)*$/.test(element.name) &&
-  _isContainedOrBackLink(element, parent)
+const _isUpAssoc = element => element && /^up_(_up_)*$/.test(element.name) && _isContainedOrBackLink(element)
 
-const _isContainedOrBackLink = (element, parent) =>
-  element && element.isAssociation && element.keys && (element._isContained || isBacklink(element, parent, true))
+const _isContainedOrBackLink = element =>
+  element &&
+  element.isAssociation &&
+  element.keys &&
+  (element._isContained || (element._anchor && element._anchor._isContained))
 
-const _assocs = (element, target, parent) => {
+const _assocs = (element, target) => {
   const assocName = element['@odata.foreignKey4']
   const assoc = assocName && target.elements[assocName]
 
   if (cds.env.effective.odata.refs) {
     // expand assoc keys except of up_ backlinks
-    if (element['@odata.foreignKey4'] && !_isUpAssoc(assoc, parent)) {
+    if (element['@odata.foreignKey4'] && !_isUpAssoc(assoc)) {
       return ['@odata.foreignKey4']
     }
 
@@ -189,7 +186,7 @@ const _assocs = (element, target, parent) => {
     }
   }
 
-  if (_isContainedOrBackLink(assoc, parent)) {
+  if (_isContainedOrBackLink(assoc)) {
     return ['@cleanup']
   }
 
@@ -201,12 +198,12 @@ const _pick = options => (element, target, parent) => {
 
   if (element['@odata.etag']) categories.push('@odata.etag')
   if (element.type === 'cds.Decimal') categories.push('@cds.Decimal')
-  categories.push(..._assocs(element, target, parent))
+  categories.push(..._assocs(element, target))
   if (options.omitValuesPreference) categories.push('@odata.omitValues')
   if (categories.length) return { categories }
 }
 
-const _getPostProcessOptions = headers => {
+const _getOptions = headers => {
   const options = {
     decimals: null,
     omitValuesPreference: null
@@ -231,14 +228,23 @@ const _getPostProcessOptions = headers => {
   return options
 }
 
+const _generateCacheKey = (headers, options) => {
+  let key = 'postProcess' // default template cache key for post processing
+  if (headers.prefer) key += `:${headers.prefer}`
+  if (options.decimals) key += `:exponentialDecimals=true`
+  return key
+}
+
 const postProcess = (req, res, service, result, previousResult) => {
   const { model } = service
   const { headers, target } = req
 
   if (!target || !result || !model || !model.definitions[target.name]) return
 
-  const options = _getPostProcessOptions(headers)
-  const template = getTemplate('postProcess', service, target, { pick: _pick(options) }, _getParent(model, target.name))
+  const options = _getOptions(headers)
+  const cacheKey = _generateCacheKey(headers, options)
+  const parent = _getParent(model, target.name)
+  const template = getTemplate(cacheKey, service, target, { pick: _pick(options) }, parent)
 
   if (template.elements.size === 0) return
 
@@ -265,7 +271,31 @@ const postProcess = (req, res, service, result, previousResult) => {
   applyOmitValuesPreference(res, options.omitValuesPreference)
 }
 
+const postProcessMinimal = (req, result) => {
+  const { target } = req
+
+  if (!target || !result) return
+
+  const etagElement = Object.values(target.elements).find(el => el['@odata.etag'])
+
+  if (!etagElement) return
+
+  const etag = etagElement.name
+
+  // normalize result to rows
+  result = result.value && Object.keys(result).filter(k => !k.match(/^\W/)).length === 1 ? result.value : result
+  const rows = Array.isArray(result) ? result : [result]
+
+  // process each row
+  for (const row of rows) {
+    if (typeof row !== 'object' || !Object.prototype.hasOwnProperty.call(row, etag)) return
+
+    addEtags(row, etag)
+  }
+}
+
 module.exports = {
   toODataResult,
-  postProcess
+  postProcess,
+  postProcessMinimal
 }

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

@@ -1,7 +1,8 @@
 const cds = require('../../../../cds')
 const { SELECT } = cds.ql
-const { adaptStreamCQN } = require('../../../../fiori/utils/handler')
-const cqn2cqn4sql = require('../../../../common/utils/cqn2cqn4sql')
+const { isActiveEntityRequested } = require('../../../../fiori/utils/where')
+const { ensureDraftsSuffix } = require('../../../../fiori/utils/handler')
+const { cqn2cqn4sql } = require('../../../../common/utils/cqn2cqn4sql')
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
 
 const isStreaming = segments => {
@@ -14,6 +15,8 @@ const isStreaming = segments => {
 }
 
 const _getProperties = async (properties, req) => {
+  const isActiveRequested = isActiveEntityRequested(req.query.SELECT.from.ref[0].where)
+
   // REVISIT DRAFT HANDLING: cqn2cqn4sql should not happen here, but adaptStreamCQN relies on exists clause
   const cqn = cqn2cqn4sql(SELECT.one(req.query.SELECT.from), req._model).columns(properties)
 
@@ -22,7 +25,9 @@ const _getProperties = async (properties, req) => {
     cqn.SELECT.from.ref[0] = req.target.query._target.name
   }
 
-  adaptStreamCQN(cqn)
+  if (!isActiveRequested) {
+    cqn.SELECT.from.ref[0] = ensureDraftsSuffix(cqn.SELECT.from.ref[0])
+  }
 
   try {
     return await cds.tx(req).run(cqn)
@@ -44,7 +49,7 @@ const _getDynamicProperties = (contentType, contentDisposition) => {
 }
 
 const getStreamProperties = async (segments, srv, req) => {
-  // REVISIT: we need to read direcly from db, which might not be there!
+  // REVISIT: we need to read directly from db, which might not be there!
   if (!cds.db) return {}
 
   let contentType, entityName, namespace, contentDisposition
@@ -52,7 +57,7 @@ const getStreamProperties = async (segments, srv, req) => {
   if (previous.getKind() === 'ENTITY') {
     entityName = previous.getEntitySet().getName()
     namespace = previous.getEdmType().getFullQualifiedName().namespace
-  } else if (previous.getKind() === 'NAVIGATION.TO.ONE') {
+  } else if (previous.getKind() === 'NAVIGATION.TO.ONE' && previous.getTarget()) {
     entityName = previous.getTarget().getName()
     namespace = previous.getTarget().getEntityType().getFullQualifiedName().namespace
   }

package/libx/_runtime/cds-services/adapter/rest/handlers/operation.js

@@ -39,7 +39,7 @@ module.exports = service => {
       if (!operation.returns) {
         status = 204
       } else {
-        validateReturnType(req, operation, result)
+        validateReturnType(operation, result)
         bufferToBase64(result, segments[0])
         body = _convertCustomOperationReturnValue(operation.returns, result)
       }

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

@@ -23,7 +23,7 @@ const _updateThenCreate = async (parsed, restReq, restRes, tx) => {
     req = new RestRequest(parsed, _getData(parsed, restReq), restReq, restRes, tx)
     result = await tx.dispatch(req)
   } catch (e) {
-    if (e.code === 404 && UPSERT_ALLOWED) {
+    if ((e.code === 404 || e.status === 404 || e.statusCode === 404) && UPSERT_ALLOWED) {
       // REVISIT: remove error (and child?) from tx.context? -> would require a unique req.id
 
       parsed.event = 'CREATE'

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

@@ -1,7 +1,5 @@
 const cds = require('../../../../cds')
 
-const { _newReadToCQN } = require('../../../../odata/readToCqn')
-
 const { INSERT, SELECT, UPDATE, DELETE } = cds.ql
 
 const { createCqlString } = require('./utils')
@@ -47,7 +45,7 @@ module.exports = (parsed, data, restReq, service) => {
     case 'CREATE':
       return INSERT.into(target).entries(data)
     case 'READ':
-      return odata2cqn ? _newReadToCQN(service, target, restReq) : _readToCQN(parsed, target, restReq)
+      return odata2cqn ? cds.odata.parse(restReq, { service }) : _readToCQN(parsed, target, restReq)
     case 'UPDATE':
       return UPDATE(createCqlString(target, key, value)).data(data)
     case 'DELETE':

package/libx/_runtime/cds-services/adapter/rest/utils/parse-url.js

@@ -105,7 +105,10 @@ const _validateAndConvertParamValues = (csnElement, params = {}) => {
 const _getLastEntity = segments => {
   let last
   for (let i = segments.length - 1; i >= 0; i--) {
-    if (segments[i].kind === 'entity') {
+    if (segments[i].target) {
+      last = segments[i].target
+      break
+    } else if (segments[i].kind === 'entity') {
       last = segments[i]
       break
     }
@@ -187,6 +190,7 @@ const parseCreateOrReadUrl = (event, service, req) => {
   }
 
   _setConvenienceProperties(parsed)
+  if (typeof parsed.target === 'string') parsed.target = service.model.definitions[parsed.target]
 
   return parsed
 }
@@ -212,7 +216,10 @@ const parseUpdateOrDeleteUrl = (event, service, req) => {
     segments.push(parts[1])
   }
 
-  return { event, segments, target: _getLastEntity(segments) }
+  let target = _getLastEntity(segments)
+  if (typeof target === 'string') target = service.model.definitions[target]
+
+  return { event, segments, target }
 }
 
 module.exports = {