@sap/cds 7.7.3 → 7.8.1

package/lib/srv/protocols/odata-v4.js

@@ -1,73 +1,94 @@
 const cds = require('../../index'),
   { User } = cds,
   { decodeURI } = cds.utils
-const libx = require('../../../libx/_runtime')
-const LOG = cds.log('odata')
 const express = require('express') // eslint-disable-line cds/no-missing-dependencies
-const { isStream, stream } = require('../../../libx/odata/middleware/stream')
 
-module.exports = function ODataAdapter(srv) {
-  const router = express.Router()
+if (cds.env.features.odata_new_adapter) {
+  const { isStream, stream } = require('../../../libx/odata/middleware/stream')
+  const BaseProtocolAdapter = require('./http')
+  // REVISIT: odata_new_adapter shouldn't influence odata_new_parser and cds_assert, but we'd need to set marker in cds.context or so to remove this
+  cds.env.features.odata_new_parser = true
+  cds.env.features.cds_assert = true
 
-  router.use((req, _, next) => {
-    let u = req.user
-    req.user = u instanceof User ? u : new User(u)
+  module.exports = class ODataAdapter extends BaseProtocolAdapter {
+    log(req) {
+      let u = req.user
+      req.user = u instanceof User ? u : new User(u)
 
-    let url = decodeURI(req.originalUrl)
-    LOG && LOG(req.method, url, req.body || '')
-    if (/\$batch/.test(req.url))
-      req.on('dispatch', req => {
-        let path = decodeURI(req._path)
-        LOG && LOG('>', req.event, path, req._query || '')
-        if (LOG._debug && req.query) LOG.debug(req.query)
-      })
+      // REVISIT: how to handle logging of batch subrequests? (note: service is missing from path)
+      let url = decodeURI(req.originalUrl)
+      this.logger.info(req.method, url, req.body || '')
+      if (/\$batch/.test(req.url))
+        req.on('dispatch', req => {
+          let path = decodeURI(req._path)
+          this.logger.info('>', req.event, path, req._query || '')
+          if (this.logger._debug && req.query) this.logger.debug(req.query)
+        })
+    }
 
-    next()
-  })
+    router4(srv) {
+      const router = super.router4(srv)
+      const jsonBodyParser = express.json()
 
-  if (cds.env.features.odata_new_adapter) {
-    // REVISIT: odata_new_adapter shouldn't influence odata_new_parser and cds_assert, but we'd need to set marker in cds.context or so to remove this
-    cds.env.features.odata_new_parser = true
-    cds.env.features.cds_assert = true
-    // REVISIT: add middleware for negative cases?
-    // service root
-    router.use(/^\/$/, require('../../../libx/odata/middleware/service-document')(srv))
-    router.use('/\\$metadata', require('../../../libx/odata/middleware/metadata')(srv))
-    // parse
-    router.use(require('../../../libx/odata/middleware/parse')(srv))
-    // REVISIT do we want to build our own body parser logic?
-    router.use((req, res, next) => {
-      const method = req.method
-      if (method !== 'PUT') {
-        return express.json()(req, res, next)
-      }
+      return (
+        router
+          // REVISIT: add middleware for negative cases?
+          // service root
+          .use(/^\/$/, require('../../../libx/odata/middleware/service-document')(srv))
+          .use('/\\$metadata', require('../../../libx/odata/middleware/metadata')(srv))
+          // parse
+          .use(require('../../../libx/odata/middleware/parse')(srv))
+          // REVISIT do we want to build our own body parser logic?
+          .use((req, res, next) => {
+            // REVISIT: body of batch subrequests are already deserialized
+            if (typeof req.body === 'object') return next()
+            if (req.method === 'PUT' && isStream(req._query)) {
+              req.body = { value: req }
+              return next(null, req, res)
+            }
+            // TODO: check if the raw body still exists, then we can remove deepCopy() in the handlers
+            return jsonBodyParser(req, res, next)
+          })
+          // batch
+          .post('/\\$batch', require('../../../libx/odata/middleware/batch')(srv, router))
+          // handle
+          // REVISIT: with old adapter, we return 405 for HEAD requests -> check OData spec
+          .head('*', (_, res) => res.sendStatus(405))
+          .post('*', require('../../../libx/odata/middleware/operation')(srv)) //> action
+          .get('*', require('../../../libx/odata/middleware/operation')(srv)) //> function
+          .post('*', require('../../../libx/odata/middleware/create')(srv))
+          .get('*', stream(srv))
+          .get('*', require('../../../libx/odata/middleware/read')(srv))
+          .put('*', require('../../../libx/odata/middleware/update')(srv))
+          .patch('*', require('../../../libx/odata/middleware/update')(srv))
+          .delete('*', require('../../../libx/odata/middleware/delete')(srv))
+          // error
+          .use(require('../../../libx/odata/middleware/error')(srv))
+      )
+    }
+  }
+} else {
+  const libx = require('../../../libx/_runtime')
+  const LOG = cds.log('odata')
+  module.exports = function ODataAdapter(srv) {
+    const router = express.Router()
 
-      const { _query: query } = req
-      if (isStream(query)) {
-        req.body = { value: req }
-        return next(null, req, res)
-      }
+    router.use((req, _, next) => {
+      let u = req.user
+      req.user = u instanceof User ? u : new User(u)
 
-      // TODO: check if the raw body still exists, then we can remove deepCopy() in the handlers
-      return express.json()(req, res, next)
-    })
+      let url = decodeURI(req.originalUrl)
+      LOG && LOG(req.method, url, req.body || '')
+      if (/\$batch/.test(req.url))
+        req.on('dispatch', req => {
+          let path = decodeURI(req._path)
+          LOG && LOG('>', req.event, path, req._query || '')
+          if (LOG._debug && req.query) LOG.debug(req.query)
+        })
 
-    // handle
-    // REVISIT: with old adapter, we return 405 for HEAD requests -> check OData spec
-    router.head('*', (_, res) => res.sendStatus(405))
-    router.post('*', require('../../../libx/odata/middleware/operation')(srv)) //> action
-    router.get('*', require('../../../libx/odata/middleware/operation')(srv)) //> function
-    router.post('*', require('../../../libx/odata/middleware/create')(srv))
-    router.get('*', stream(srv))
-    router.get('*', require('../../../libx/odata/middleware/read')(srv))
-    router.put('*', require('../../../libx/odata/middleware/update')(srv))
-    router.patch('*', require('../../../libx/odata/middleware/update')(srv))
-    router.delete('*', require('../../../libx/odata/middleware/delete')(srv))
-    // error
-    router.use(require('../../../libx/odata/middleware/error')(srv))
-  } else {
+      next()
+    })
     router.use(libx.to.odata_v4(srv))
+    return router
   }
-
-  return router
 }

package/lib/srv/srv-api.js

@@ -66,11 +66,11 @@ class Service extends require('./srv-handlers') {
    */
   run (query, data) {
     if (typeof query === 'function') {
-      const ctx = cds.context, fn = query
-      if (!ctx?.tx) return this.tx(fn)             // run fn with root tx
-      if (!ctx.tx._done) return fn(this.tx(ctx))   // run fn with nested tx
-      if (ctx.tx._done === 'rolled back') ctx.tx._throw_closed_error()
-      else return this.tx(fn)                      // run fn with detached root tx
+      const fn = query; if (this.context) return fn(this)     // if this is a tx -> run fn with this
+      const ctx = cds.context, tx = ctx?.tx                   // is there an (open) outer tx? ...
+      if (!tx || tx._done === 'committed') return this.tx(fn) // no -> run fn with root tx
+      if (tx._done !== 'rolled back') return fn(this.tx(ctx)) // yes -> run fn with nested tx
+      else throw this.tx._is_done (tx._done)                  // throw if outer tx was rolled back
     }
     const req = new Request ({ query, data })
     return this.dispatch (req)
@@ -101,10 +101,11 @@ class Service extends require('./srv-handlers') {
     || !this.isDatabaseService && !/\W/.test(this.name) && this.name
     || undefined
   }
-  get operations() { return super.operations = _reflect (this, d => d.kind === 'action' || d.kind === 'function') }
   get entities()   { return super.entities   = _reflect (this, d => d.kind === 'entity') }
   get events()     { return super.events     = _reflect (this, d => d.kind === 'event') }
   get types()      { return super.types      = _reflect (this, d => !d.kind || d.kind === 'type') }
+  get actions()    { return super.actions    = _reflect (this, d => d.kind === 'action' || d.kind === 'function') }
+  get operations() { return super.operations = _reflect (this, d => d.kind === 'action' || d.kind === 'function') }
 
   /**
    * Flag to control whether this service is extensible.

package/lib/srv/srv-dispatch.js

@@ -12,18 +12,7 @@ const cds = require ('../index')
 exports.dispatch = async function dispatch (req) { //NOSONAR
 
   // Ensure we are in a proper transaction
-  if (!this.context) {
-    const ctx = cds.context
-
-    if (!ctx?.tx) return this.tx(tx => tx.dispatch(req))     // with root tx
-    else {
-      if (!ctx.tx._done) return this.tx(ctx).dispatch(req)   // with nested tx
-      else if (ctx.tx._done === 'rolled back')               // > reject
-        ctx.tx._throw_closed_error()
-      else return this.tx(tx => tx.dispatch(req))            // with detached root tx
-    }
-  }
-
+  if (!this.context) return this.run (tx => tx.dispatch(req))
   if (!req.tx) req.tx = this // `this` is a tx from now on...
 
   // Inform potential listeners // REVISIT: -> this should move into protocol adapters

package/lib/srv/srv-tx.js

@@ -20,7 +20,7 @@ class NestedContext extends EventContext {
  * @returns { Promise<Transaction & import('./srv-api')> }
  * @param { EventContext } ctx
  */
-function srv_tx (ctx,fn) { const srv = this
+module.exports = exports = function srv_tx (ctx,fn) { const srv = this
 
   if (srv.context) return srv // srv.tx().tx() -> idempotent
   if (!ctx) return RootTransaction.for (srv)
@@ -64,7 +64,6 @@ class Transaction {
     const proto = new.target.prototype
     tx.commit   = proto.commit.bind(tx)
     tx.rollback = proto.rollback.bind(tx)
-    tx._throw_closed_error = proto._throw_closed_error.bind(tx)
     if (srv.isExtensible) {
       const m = cds.context?.model
       if (m) tx.model = m
@@ -107,13 +106,6 @@ class Transaction {
     if (err) throw err
   }
 
-  _throw_closed_error () {
-    throw cds.error (
-      `Transaction is ${this._done}, no subsequent .run allowed, without prior .begin`,
-      { code: 'TRANSACTION_CLOSED' }
-    )
-  }
-
 }
 
 
@@ -200,12 +192,16 @@ const _begin = async function (req) {
   if (!req.query && req.method === 'BEGIN') // IMPORTANT: !req.query is to exclude batch requests
     return this.ready = this.__proto__.dispatch.call (this,req)
   // Protection against unintended tx.run() after root tx.commit/rollback()
-  if (typeof this.ready === 'string' || !this.ready && this.context.tx._done)
-    this.context.tx._throw_closed_error()
-  else if (!this.ready) this.ready = this.begin()
+  if (this.ready === 'rolled back') throw exports._is_done (this.ready)
+  if (this.ready === 'committed') throw exports._is_done (this.ready)
+  if (!this.ready && this.context.tx._done) throw exports._is_done (this.context.tx._done)
+  if (!this.ready) this.ready = this.begin().then(()=>true)
   await this.ready
   delete this.dispatch
   return this.dispatch (req)
 }
 
-module.exports = srv_tx
+exports._is_done = done => new cds.error (
+  `Transaction is ${done}, no subsequent .run allowed, without prior .begin`,
+  { code: 'TRANSACTION_CLOSED' }
+)

package/lib/utils/cds-utils.js

@@ -183,15 +183,16 @@ exports.find = function find (base, patterns='*', filter=()=>true) {
 exports.deprecated = (fn, { kind = 'Method', old = fn.name+'()', use } = {}) => {
   const yellow = '\x1b[33m'
   const reset = '\x1b[0m'
+  // use cds.log in production for custom logger
+  const log = cds.env.production ? cds.log().warn: console.log
   if(typeof fn !== 'function') {
     if (cds.env.features.deprecated === 'off') return
-
     [kind,old,use] = [fn.kind || 'Configuration',fn.old,fn.use]
-    console.log (
+    log (
       yellow,
       '\n------------------------------------------------------------------------------',
       '\nDEPRECATED:', old, '\n',
-      '\n  ', kind, old, 'is deprecated and will be removed in upcoming releases!',
+      '\n  ', (kind ? `${kind} ${old}` : old), 'is deprecated and will be removed in upcoming releases!',
       use ? `\n   => Please use ${use} instead.` : '', '\n',
       '\n------------------------------------------------------------------------------\n',
       reset
@@ -199,11 +200,11 @@ exports.deprecated = (fn, { kind = 'Method', old = fn.name+'()', use } = {}) =>
   } else return function() {
     if (cds.env.features.deprecated !== 'off' && !fn.warned) {
       let o={}; Error.captureStackTrace(o)
-      console.warn (
+      log (
         yellow,
         '\n------------------------------------------------------------------------------',
         '\nDEPRECATED:', old, '\n',
-        '\n  ', kind, old, 'is deprecated and will be removed in upcoming releases!',
+        '\n  ', (kind ? `${kind} ${old}` : old), 'is deprecated and will be removed in upcoming releases!',
         use ? `\n   => Please use ${use} instead.` : '', '\n',
         o.stack.replace(/^Error\n\s*at.*\n/,'\n'), '\n',
         '\n------------------------------------------------------------------------------\n',

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

@@ -17,6 +17,15 @@ const { isCustomOperation } = require('./utils/request')
 const { isStreaming } = require('./utils/stream')
 const { handleStreamProperties } = require('../../../common/utils/streamProp')
 
+// getter functions extracted to show deprecation warning only once
+const _getAttr = attr => attr
+const _getShared = (oReq, req, res) => {
+  if (oReq.context) oReq._shared = oReq.context._shared = oReq.context._shared || { req, res }
+  else oReq._shared = oReq._shared || { req, res }
+
+  return oReq._shared
+}
+
 function _isCorrectCallToViewWithParams(csdlStructuredType) {
   return (
     csdlStructuredType.navigationProperties &&
@@ -215,12 +224,7 @@ class ODataRequest extends cds.Request {
     const that = this
     Object.defineProperty(this._, 'shared', {
       get() {
-        cds._logDeprecation('req._.shared is deprecated and will be removed.')
-
-        if (that.context) that._shared = that.context._shared = that.context._shared || { req, res }
-        else that._shared = that._shared || { req, res }
-
-        return that._shared
+        return cds.utils.deprecated(_getShared, { kind: 'Property', old: 'req._.shared' })(that, req, res)
       }
     })
 
@@ -228,8 +232,7 @@ class ODataRequest extends cds.Request {
     const attr = { identityZone: this.tenant }
     Object.defineProperty(this, 'attr', {
       get() {
-        cds._logDeprecation('req.attr is deprecated and will be removed.')
-        return attr
+        return cds.utils.deprecated(_getAttr, { kind: 'Property', old: 'req.attr' })(attr)
       }
     })
 

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

@@ -21,8 +21,7 @@ const { isStreaming } = require('../utils/stream')
 const { resolveStructuredName } = require('../utils/handlerUtils')
 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 { getPageSize } = require('../../../../common/generic/paging')
 const { getTransition } = require('../../../../common/utils/resolveView')
 const { Readable } = require('stream')
 
@@ -244,9 +243,6 @@ const _reliablePagingPossible = req => {
  */
 // eslint-disable-next-line complexity
 const _readCollection = async (tx, req, odataReq) => {
-  commonGenericPaging(req)
-  commonGenericSorting(req)
-
   const result = (await tx.dispatch(req)) || []
 
   if (req.http?.req?.headers?.accept?.match(/application\/pdf/)) {
@@ -271,9 +267,7 @@ const _readCollection = async (tx, req, odataReq) => {
     if (req.query[0].SELECT.count) result.$count = adjustedResult.$count || 0
   } else if (req.query.SELECT.count && !('$count' in result)) result.$count = 0
 
-  const limit = Array.isArray(req.query)
-    ? getPageSize(req.query[0]._target).max
-    : req.query.SELECT.limit && req.query.SELECT.limit.rows && req.query.SELECT.limit.rows.val
+  const limit = Array.isArray(req.query) ? getPageSize(req.query[0]._target).max : req.query.SELECT.limit?.rows?.val
   const top = odataReq.getUriInfo().getQueryOption(QueryOptions.TOP) || parseInt(odataReq._queryOptions?.$top)
 
   if (limit && limit === result.length && limit !== top && !('$nextLink' in result)) {
@@ -554,10 +548,25 @@ const read = service => {
         // for passing into commit
         odataReq.getBatchApplicationData().results[changeset].push({ result, req })
       } else if (result.value && isStreaming(odataReq.getUriInfo().getPathSegments())) {
-        // REVISIT: temp workaround for url streaming
-        if (!(result.value instanceof Readable)) _ensureStream(result)
-        result.value.on('end', () => tx.commit(result).catch(() => {}))
-        result.value.once('error', err => tx.rollback(err).catch(() => {}))
+        if (odataRes._response.destroyed) {
+          err = new Error('Response is closed while streaming')
+          tx.rollback(err).catch(() => {})
+        } else {
+          // REVISIT: temp workaround for url streaming
+          if (!(result.value instanceof Readable)) _ensureStream(result)
+          result.value.on('end', () => tx.commit(result).catch(() => {}))
+          result.value.once('error', err => tx.rollback(err).catch(() => {}))
+          let finished = false
+          odataRes._response.on('finish', () => {
+            finished = true
+          })
+          odataRes._response.on('close', () => {
+            if (!finished) {
+              err = new Error('Response is closed while streaming')
+              tx.rollback(err).catch(() => {})
+            }
+          })
+        }
       } else {
         await tx.commit(result)
       }

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

@@ -1,5 +1,4 @@
 const cds = require('../../../cds')
-const OData = require('./OData')
 
 /**
  * This is the express handler for a specific OData endpoint.
@@ -10,8 +9,10 @@ module.exports = srv => {
   return okra.process.bind(okra)
 }
 
+let OData
 function OkraAdapter(srv, model = srv.model) {
   const edm = cds.compile.to.edm(model, { service: srv.definition?.name || srv.name })
+  OData ??= require('./OData')
   return new OData(edm, model, srv.options).addCDSServiceToChannel(srv)
 }
 
@@ -19,7 +20,8 @@ function OkraAdapter(srv, model = srv.model) {
 //
 //  REVISIT: Move to ExtensibilityService
 //
-if (cds.requires.extensibility || cds.requires.toggles)
+if (cds.requires.extensibility || cds.requires.toggles) {
+  let unique = 0
   module.exports = srv => {
     const id = `${++unique} - ${srv.path}` // REVISIT: this is to allow running multiple express apps serving same endpoints, as done by some questionable tests
     return function ODataAdapter(req, res) {
@@ -36,4 +38,4 @@ if (cds.requires.extensibility || cds.requires.toggles)
       return okra.process(req, res)
     }
   }
-let unique = 0
+}

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

@@ -1,12 +1,8 @@
 const cds = require('../../../../cds')
 const { isCustomOperation } = require('./request')
-const {
-  uri: {
-    UriResource: {
-      ResourceKind: { COMPLEX_PROPERTY, PRIMITIVE_PROPERTY }
-    }
-  }
-} = require('../okra/odata-server')
+// don't require okra when using new adapter -> define constants here
+const COMPLEX_PROPERTY = 'COMPLEX.PROPERTY'
+const PRIMITIVE_PROPERTY = 'PRIMITIVE.PROPERTY'
 const { DRAFT_COLUMNS_MAP } = require('../../../../common/constants/draft')
 const { SELECT } = cds.ql
 

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

@@ -262,6 +262,11 @@ const _isStructuredProperty = ({ returnType }) => {
 const _getContextUrl = options => {
   if (!options.returnType) return ''
   const contextUrlPrefix = _getContextUrlPrefix(options)
+
+  if (options.returnType.kind === 'service') {
+    return `${contextUrlPrefix}$metadata`
+  }
+
   const returnTypeUrl = _getReturnTypeUrl(options)
   const columnsStringified = options.propertyName || _isStructuredProperty(options) ? '' : _listColumns(options)
   const $entity = _isSingleEntity(options) ? '/$entity' : ''

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

@@ -51,13 +51,14 @@ const _ensureKeysAreSelected = query => {
   }
 }
 
-const readAfterWrite = async (req, srv, { operation, isBefore } = { isBefore: false }) => {
+const readAfterWrite = async (req, srv, { operation, isBefore, columns } = { isBefore: false }) => {
   let query
 
   if (_isActionOrFunction(req)) {
     const { result, returnType } = operation
     query = getSimpleSelectCQN(returnType, result, _getOperationQueryColumns(req._queryOptions))
     if (_isDraftAction(req)) query.where({ IsActiveEntity: req.event === 'draftActivate' })
+    if (columns) query.SELECT.columns = columns
   } else if (req.event === 'NEW' || req.event === 'PATCH') {
     const { result } = operation
     if (req.query.UPDATE?.entity?.ref[0]?.where) {

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

@@ -1,10 +1,6 @@
-const {
-  uri: {
-    UriResource: {
-      ResourceKind: { ENTITY, ENTITY_COLLECTION }
-    }
-  }
-} = require('../okra/odata-server')
+// don't require okra when using new adapter -> define constants here
+const ENTITY = 'ENTITY'
+const ENTITY_COLLECTION = 'ENTITY.COLLECTION'
 
 const getError = require('../../../../common/error')
 

package/libx/_runtime/cds-services/services/utils/columns.js

@@ -113,9 +113,12 @@ const _getSearchableColumns = entity => {
   const defaultSearchFilteredColumns = searchableColumns.filter(column => column[defaultSearchElementTerm])
 
   if (defaultSearchFilteredColumns.length > 0) {
-    cds._logDeprecation(
-      'Annotation "@Search.defaultSearchElement" is deprecated and will be removed. Use "@cds.search" instead.'
-    )
+    // Remove with cds 8
+    cds.utils.deprecated({
+      kind: 'Annotation',
+      old: '@Search.defaultSearchElement in entity ' + entity.name,
+      use: '@cds.search'
+    })
     return defaultSearchFilteredColumns.map(column => column.name)
   }
 

package/libx/_runtime/cds.js

@@ -14,16 +14,3 @@ cds.extend(entity).with(require('./common/aspects/entity'))
  * cds.assert(data, definition, options?)
  */
 Object.defineProperty(cds, 'assert', { get: () => require('../common/assert') })
-
-/**
- * Logs a deprecation warning once per process
- *
- * @param {string} msg the deprecation warning to be logged
- */
-cds._logDeprecation = function (msg) {
-  if (!cds._deprecations.has(msg)) {
-    cds._deprecations.add(msg)
-    cds.log().warn(msg)
-  }
-}
-Object.defineProperty(cds, '_deprecations', { value: new Set() })

package/libx/_runtime/common/generic/input.js

@@ -113,6 +113,7 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
     const managed = `@cds.on.${event === 'CREATE' ? 'insert' : 'update'}`
     if (cds.env.features.preserve_computed !== false && req._?.event === 'draftActivate' && !element[managed]) return
 
+    // FIXME: req.context?.event not available with new odata adapter
     // Always take over the values from active entities
     if (cds.env.fiori?.lean_draft && req.context?.event === 'EDIT') return
 
@@ -126,6 +127,7 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
 
   // remove immutable (can also be complex, so do first)
   if (category === 'immutable' && event === 'UPDATE') {
+    // FIXME: req.context?.event not available with new odata adapter
     // Always take over the values from active entities
     if (cds.env.fiori?.lean_draft && req.context?.event === 'EDIT') return
 
@@ -228,6 +230,7 @@ const _callError = (req, errors) => {
   for (const error of errors) req.error(error)
 }
 
+// FIXME: req.context?.event not available with new odata adapter
 const _getBoundAction = req => req.target.actions?.[req._?.event || req.context?.event]
 const _getBoundActionBindingParameter = action => action['@cds.odata.bindingparameter.name'] || 'in'
 

package/libx/_runtime/common/generic/sorting.js

@@ -1,21 +1,23 @@
 const cds = require('../../cds')
-const { getAllKeys } = require('../../cds-services/adapter/odata-v4/odata-to-cqn/utils')
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _getStaticOrders = req => {
   const { target: entity, query } = req
   const defaultOrders = entity['@cds.default.order'] || entity['@odata.default.order'] || []
 
-  if (defaultOrders.length > 0) {
-    cds._logDeprecation(
-      'Annotations "@cds.default.order" and "@odata.default.order" are deprecated and will be removed.'
-    )
+  if (entity['@cds.default.order']) {
+    // Remove with cds 8
+    cds.utils.deprecated({ kind: 'Annotation', old: '@cds.default.order of entity ' + entity.name })
+  }
+  if (entity['@odata.default.order']) {
+    // Remove with cds 8
+    cds.utils.deprecated({ kind: 'Annotation', old: '@odata.default.order of entity ' + entity.name })
   }
 
   const ordersFromKeys = []
 
   if (req.target._isSingleton || query.SELECT.limit) {
-    const keys = getAllKeys(entity, true)
+    const keys = [...(entity.keys || [])].filter(k => !k.isAssociation).map(k => k.name)
     for (const key of keys) {
       if (!(key in DRAFT_COLUMNS_MAP) && !defaultOrders.some(o => o.by['='] === key)) {
         ordersFromKeys.push({ by: { '=': key } })

package/libx/_runtime/common/i18n/messages.properties

@@ -15,6 +15,7 @@
 415=Unsupported Media Type
 416=Range Not Satisfiable
 417=Expectation Failed
+422=Unprocessable Content
 424=Failed Dependency
 428=Precondition Required
 429=Too Many Requests

package/libx/_runtime/common/utils/cqn.js

@@ -47,6 +47,9 @@ function where2obj(where, target = null, data = {}) {
 }
 
 function targetFromPath(from, model) {
+  if (from.SELECT) {
+    return targetFromPath(from.SELECT.from, model)
+  }
   const fromRef = from ? from.ref || [from] : []
   let last = fromRef.length ? model.definitions : {}
   const path = []
@@ -71,6 +74,8 @@ function targetFromPath(from, model) {
     if (last.kind === 'entity') {
       target = last
       setEntityContained(target, model, isContained)
+    } else if (last.kind === 'service') {
+      target = last
     }
   }
   return { last, path, target, isTargetComposition: isContained }

package/libx/_runtime/common/utils/foreignKeyPropagations.js

@@ -227,7 +227,13 @@ const _createForeignKey = (name, el, parent, foreignKeySource) => {
   const navigationCsn = parent.elements[foreignKeySource]
   const key = navigationCsn.key
 
-  const foreignKeyCsn = Object.assign(Object.create(tk || el), { parent, name, foreignKeySource, key })
+  // IMPORTANT: Object.create is used to override inherited non-enumerable properties. Object.assign would not work.
+  const foreignKeyCsn = Object.create(tk || el, {
+    parent: { value: parent },
+    name: { value: name },
+    key: { value: key },
+    foreignKeySource: { value: foreignKeySource }
+  })
   // REVISIT: Overwrite previously defined annotations, maybe there's a better way.
   //          We might need to be careful with cached information (__xxx)
   for (const prop in tk || el) {

package/libx/_runtime/common/utils/keys.js

@@ -5,8 +5,8 @@ const { getOnCond } = require('./generateOnCond')
 function _getOnCondElements(onCond, onCondElements = []) {
   const andIndex = onCond.indexOf('and')
 
-  const ref0 = onCond[0].ref
-  const ref1 = onCond[2].ref
+  const ref0 = onCond[0].xpr ? onCond[0].xpr[0].ref : onCond[0].ref
+  const ref1 = onCond[0].xpr ? onCond[0].xpr[2].ref : onCond[2].ref
 
   let entityRef, targetRef
   if (ref0 && ref0[0] === 'target') {