@sap/cds 7.6.4 → 7.7.1

package/lib/utils/tar.js

@@ -11,7 +11,7 @@ const _resolve = (...x) => path.resolve (cds.root,...x)
 // tar does not work properly on Windows (by npm/jest tests) w/o this change
 const win = path => {
   if (!path) return path
-  if (typeof path === 'string') return path.replace('C:', '//localhost/c$')
+  if (typeof path === 'string') return path.replace('C:', '//localhost/c$').replace(/\\+/g, '/')
   if (Array.isArray(path)) return path.map(el => win(el))
 }
 

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

@@ -31,9 +31,7 @@ const metadata = service => {
         // REVISIT: remove check later
         if (mpSupportsEmptyLocale()) {
           // If no extensibility nor fts, do not provide model to mtxs
-          const modelNeeded =
-            cds.env.requires.extensibility ||
-            (cds.env.requires.toggles && Object.keys(cds.context.features || {}).length)
+          const modelNeeded = cds.env.requires.extensibility || cds.context.features?.given
           edmx = await mps.getEdmx({ tenant, model: modelNeeded && service.model, service: service.definition.name })
           const extBundle = cds.env.requires.extensibility && (await mps.getI18n({ tenant, locale }))
           edmx = cds.localize(service.model, locale, edmx, extBundle)

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

@@ -23,7 +23,6 @@ const getError = require('../../../../common/error')
 const { getSapMessages } = require('../../../../common/error/frontend')
 const { getPageSize, commonGenericPaging } = require('../../../../common/generic/paging')
 const { handler: commonGenericSorting } = require('../../../../common/generic/sorting')
-const { transformRedirectProperties } = require('../../../../common/utils/stream')
 const { getTransition } = require('../../../../common/utils/resolveView')
 const { Readable } = require('stream')
 
@@ -481,7 +480,6 @@ const _readAndTransform = (tx, req, odataReq) => {
 }
 
 const _postProcess = (odataReq, req, odataRes, service, result) => {
-  transformRedirectProperties(req, service, result.value)
   const functionReturnType = getActionOrFunctionReturnType(
     odataReq.getUriInfo().getPathSegments(),
     service.model.definitions

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

@@ -125,6 +125,21 @@ const _hasEtag = target => {
   return target._etag
 }
 
+const _getStructValue = (prop, result, segments) => {
+  const path = [prop]
+  for (let i = segments.length - 2; i >= 0; i--) {
+    const segment = segments[i]
+    if (segment.getKind() === 'COMPLEX.PROPERTY') {
+      path.unshift(segment.getProperty().getName())
+    } else break
+  }
+
+  let res = result
+  path.forEach(p => (res = res[p]))
+
+  return { value: res }
+}
+
 /**
  * The handler that will be registered with odata-v4.
  *
@@ -201,7 +216,9 @@ const update = service => {
       if (err) next(err)
       else if (primitive && result) {
         const prop = odataReq.getUriInfo().getLastSegment().getProperty().getName()
-        const res = { value: result[prop] }
+        const res = cds.env.effective.odata.structs
+          ? _getStructValue(prop, result, odataReq.getUriInfo().getPathSegments())
+          : { value: result[prop] }
         for (const k of Object.keys(result).filter(k => k.match(/^\*/))) res[k] = result[k]
         next(null, res)
       } else next(null, toODataResult(result, req))

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

@@ -9,7 +9,7 @@ const readToCQN = require('./readToCQN')
 const updateToCQN = require('./updateToCQN')
 const createToCQN = require('./createToCQN')
 const deleteToCQN = require('./deleteToCQN')
-const parseToCqn = require('../../../../../odata/parseToCqn')
+const parseToCqn = require('../../../../../odata/parse/parseToCqn')
 
 /**
  * This method transforms an odata request into a CQN object.

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

@@ -187,18 +187,22 @@ const _parsePrimitiveValue = (edmRef, value) => {
 const getSegmentKeyValue = segmentParam => {
   const edmRef = segmentParam.getEdmRef()
   const keyName = edmRef.getName()
+  let val
   if (segmentParam.getAliasValue()) {
     const value = segmentParam.getAliasValue()
     // must be JSON  or a string according to
     // https://docs.oasis-open.org/odata/odata/v4.01/os/part2-url-conventions/odata-v4.01-os-part2-url-conventions.html#sec_ComplexandCollectionLiterals
     try {
-      return { keyName, val: JSON.parse(value) }
+      val = value === 'undefined' ? undefined : JSON.parse(value)
+      return { keyName, val }
     } catch (e) {
       // plain string
     }
-    return { keyName, val: _parsePrimitiveValue(edmRef, value) }
+    val = _parsePrimitiveValue(edmRef, value) //> REVISIT: undefined handling needed here as well?
+    return { keyName, val }
   }
-  return { keyName, val: _parsePrimitiveValue(edmRef, segmentParam.getText()) }
+  val = segmentParam.getText() === undefined ? undefined : _parsePrimitiveValue(edmRef, segmentParam.getText())
+  return { keyName, val }
 }
 
 module.exports = {

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

@@ -17,6 +17,7 @@ const FullQualifiedName = require('../FullQualifiedName')
 const UriResource = require('./UriResource')
 const TransientStructuredType = require('../edm/TransientStructuredType')
 const FeatureSupport = require('../FeatureSupport')
+const cds = require('../../../../../../cds')
 
 const TOKEN = "(?:[-!#$%&'*+.^_`|~A-Za-z0-9]+)"
 const FORMAT_REGEXP = new RegExp(
@@ -176,7 +177,7 @@ class UriParser {
    */
   parseQueryOptions (queryOptions, uriInfo) {
     // EXPERIMENTAL FEATURE FLAGS!
-    const { okra_skip_query_options, odata_new_parser } = global.cds.env.features
+    const { okra_skip_query_options, odata_new_parser } = cds.env.features
     if (okra_skip_query_options && odata_new_parser) return
 
     const lastSegment = uriInfo.getLastSegment()

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

@@ -1,4 +1,7 @@
 'use strict'
+const cds = require('../../../../../cds')
+const TRACE = cds.debug('trace')
+TRACE?.time('require okra'.padEnd(22))
 
 const commons = require('../odata-commons')
 
@@ -30,3 +33,5 @@ module.exports = {
   Components: require('./core/ComponentManager').Components, // eslint-disable-line global-require
   BatchExitHandler: require('./batch/BatchExitHandler') // eslint-disable-line global-require
 }
+
+TRACE?.timeEnd('require okra'.padEnd(22))

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

@@ -1,3 +1,5 @@
+const cds = require('../../../../cds')
+
 const {
   Components: { DATA_DELETE_HANDLER, DATA_READ_HANDLER, DATA_CREATE_HANDLER, DATA_UPDATE_HANDLER }
 } = require('../okra/odata-server')
@@ -158,54 +160,84 @@ const _addForeignKeys = (service, odataReq, data) => {
   }
 }
 
-const _getFunctionParameters = (lastSegment, keyValues, service, target) => {
+const _getFunctionParameters = (lastSegment, keyValues, service, target, odataReq) => {
+  const { cds_assert: CDS_ASSERT } = cds.env.features
+
   const functionParameters = lastSegment.getFunctionParameters()
   const paramValues = _getParamData(functionParameters)
 
   // Working assumption for the case of name collisions: take the entity's key
-  for (const key in keyValues) {
-    paramValues[key] = keyValues[key]
-  }
+  for (const key in keyValues) paramValues[key] = keyValues[key]
+
+  let assertTarget
+
   const errors = []
   if (lastSegment.getKind() === 'BOUND.FUNCTION') {
     const targetFunction = target && target.actions && target.actions[lastSegment.getFunction().getName()]
     if (!targetFunction.params) return {}
-    convertStructured(service, targetFunction, paramValues, { errors })
+    if (!CDS_ASSERT) convertStructured(service, targetFunction, paramValues, { errors })
+    else assertTarget = targetFunction
   } else if (lastSegment.getKind() === 'FUNCTION.IMPORT') {
     const { namespace, name } = lastSegment.getFunctionImport().getFullQualifiedName()
     const targetFunction = service.model && service.model.definitions[`${namespace}.${name}`]
     if (!targetFunction.params) return {}
-    convertStructured(service, targetFunction, paramValues, { errors })
+    if (!CDS_ASSERT) convertStructured(service, targetFunction, paramValues, { errors })
+    else assertTarget = targetFunction
   }
 
   if (errors.length > 1) throw Object.assign(new Error(MULTIPLE_ERRORS), { details: errors })
   if (errors.length === 1) throw errors[0]
 
+  if (CDS_ASSERT) {
+    const assertOptions = { filter: true, http: { req: odataReq.getIncomingRequest() } }
+    const errs = cds.assert(paramValues, assertTarget, assertOptions)
+    if (errs) {
+      if (errs.length === 1) throw errs[0]
+      throw Object.assign(new Error('MULTIPLE_ERRORS'), { statusCode: 400, details: errs })
+    }
+  }
+
   return paramValues
 }
 
-const _getCopiedData = (odataReq, lastSegment, service, target) => {
+const _getCopiedData = (odataReq, segments, service, target) => {
+  const { cds_assert: CDS_ASSERT } = cds.env.features
+
+  const lastSegment = segments[segments.length - 1]
+
   let data = odataReq.getBody() || {}
+  let assertTarget = target
 
   if (lastSegment.getKind() === 'PRIMITIVE.PROPERTY') {
-    return { [lastSegment.getProperty().getName()]: data }
-  }
-
-  data = deepCopy(data)
-
-  if (lastSegment.getKind() === 'BOUND.ACTION') {
-    const targetAction = target.actions && target.actions[lastSegment.getAction().getName()]
-    if (!targetAction || !targetAction.params) return {}
-    convertStructured(service, targetAction, data)
-  } else if (lastSegment.getKind() === 'ACTION.IMPORT') {
-    const { namespace, name } = lastSegment.getActionImport().getFullQualifiedName()
-    const targetAction = service.model && service.model.definitions[`${namespace}.${name}`]
-    if (!targetAction || !targetAction.params) return {}
-    convertStructured(service, targetAction, data)
+    data = { [lastSegment.getProperty().getName()]: data }
+    if (cds.env.effective.odata.structs) {
+      for (let i = segments.length - 2; i >= 0; i--) {
+        const segment = segments[i]
+        if (segment.getKind() === 'COMPLEX.PROPERTY') {
+          const name = segment.getProperty().getName()
+          data = { [name]: data }
+        } else break
+      }
+    }
   } else {
-    convertStructured(service, target, data)
+    data = deepCopy(data)
+    if (lastSegment.getKind() === 'BOUND.ACTION') {
+      const targetAction = target.actions && target.actions[lastSegment.getAction().getName()]
+      if (!targetAction || !targetAction.params) return { data: {} }
+      if (!CDS_ASSERT) convertStructured(service, targetAction, data)
+      else assertTarget = targetAction
+    } else if (lastSegment.getKind() === 'ACTION.IMPORT') {
+      const { namespace, name } = lastSegment.getActionImport().getFullQualifiedName()
+      const targetAction = service.model && service.model.definitions[`${namespace}.${name}`]
+      if (!targetAction || !targetAction.params) return { data: {} }
+      if (!CDS_ASSERT) convertStructured(service, targetAction, data)
+      else assertTarget = targetAction
+    } else {
+      if (!CDS_ASSERT) convertStructured(service, target, data)
+    }
   }
-  return data
+
+  return { data, assertTarget }
 }
 
 /**
@@ -231,7 +263,7 @@ const getData = (component, odataReq, service, target) => {
   const keyValues = _getParamData(keyPredicates)
 
   if (component === DATA_READ_HANDLER && _isFunctionInvocation(odataReq)) {
-    return _getFunctionParameters(lastSegment, keyValues, service, target)
+    return _getFunctionParameters(lastSegment, keyValues, service, target, odataReq)
   }
 
   if (component === DATA_DELETE_HANDLER || component === DATA_READ_HANDLER) {
@@ -242,7 +274,7 @@ const getData = (component, odataReq, service, target) => {
   }
 
   // copy so that original payload is preserved
-  const data = _getCopiedData(odataReq, lastSegment, service, target)
+  const { data, assertTarget } = _getCopiedData(odataReq, segments, service, target)
 
   // Only to be done for post via navigation
   if (
@@ -263,6 +295,20 @@ const getData = (component, odataReq, service, target) => {
     Array.isArray(data) ? Object.assign(data[0], keyValues) : Object.assign(data, keyValues)
   }
 
+  // we need the (foreign) keys from the URL before asserting -> we can't assert in _getCopiedData()
+  if (cds.env.features.cds_assert && assertTarget) {
+    const assertOptions = {
+      filter: true,
+      http: { req: odataReq.getIncomingRequest() },
+      mandatories: component === 'CREATE' || undefined
+    }
+    const errs = cds.assert(data, assertTarget, assertOptions)
+    if (errs) {
+      if (errs.length === 1) throw errs[0]
+      throw Object.assign(new Error('MULTIPLE_ERRORS'), { statusCode: 400, details: errs })
+    }
+  }
+
   return data
 }
 

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

@@ -255,11 +255,15 @@ const _isSingleEntity = options => {
   return isServiceEntity || isTargetComposition
 }
 
+const _isStructuredProperty = ({ returnType }) => {
+  return returnType.elements && returnType.kind === 'element'
+}
+
 const _getContextUrl = options => {
   if (!options.returnType) return ''
   const contextUrlPrefix = _getContextUrlPrefix(options)
   const returnTypeUrl = _getReturnTypeUrl(options)
-  const columnsStringified = _listColumns(options)
+  const columnsStringified = options.propertyName || _isStructuredProperty(options) ? '' : _listColumns(options)
   const $entity = _isSingleEntity(options) ? '/$entity' : ''
   return `${contextUrlPrefix}$metadata#${returnTypeUrl}${columnsStringified}${$entity}`
 }
@@ -299,6 +303,7 @@ const _partialCopyColumns = query => {
   return []
 }
 
+// eslint-disable-next-line complexity
 const _getPathInfo = (query, model) => {
   const queryFrom =
     (query.SELECT && resolveFromSelect(query)) ||
@@ -321,7 +326,10 @@ const _getPathInfo = (query, model) => {
     returnType = target
     isCollection = Array.isArray(query) || (query.SELECT && !query.SELECT.one)
     propertyName = query._propertyAccess && query.SELECT.columns[0].ref[query.SELECT.columns[0].ref.length - 1]
-    if (propertyName) returnType = query.SELECT.columns[0].ref.reduce((r, c) => r.elements[c], target)
+    if (propertyName && path.slice(-1)[0] !== propertyName) {
+      path.push(propertyName)
+      returnType = query.SELECT.columns[0].ref.reduce((r, c) => r.elements[c], target)
+    }
   }
   const isStream = propertyName && target.elements[propertyName]?.['@Core.MediaType']
   return {

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

@@ -14,7 +14,12 @@ const setLocationHeader = (req, { model }) => {
   const { odataRes } = req._
   const cqn = getSimpleSelectCQN(req.target, req.data)
   const { path: location } = cds.odata.urlify(cqn, { kind: 'odata', model, method: 'GET' })
-  odataRes.setHeader('Location', location.replace(/\?.*$/, ''))
+  // REVISIT: needs reworking for new adapter, especially re $batch
+  if (odataRes) {
+    odataRes.setHeader('Location', location.replace(/\?.*$/, ''))
+  } else if (req.http?.res) {
+    req.http.res.set('location', location.replace(/\?.*$/, ''))
+  }
 }
 
 const _isNoAccessError = e => Number(e.code) === 403 || Number(e.code) === 401