@sap/cds 8.8.3 → 8.9.1

package/lib/srv/bindings.js

@@ -1,56 +1,71 @@
 
-const cds = require ('..'), DEBUG = cds.debug('serve|bindings',{label:'cds'})
-const { readFile, readFileSync, writeFile, writeFileSync } = require ('fs')
-const [ read, write ] = [ readFile, writeFile ].map(require('util').promisify)
+const cds = require ('..'), {fs} = cds.utils
+const LOG = cds.log('serve|bindings',{label:'cds'})
 const registry = '~/.cds-services.json'
-const filename = registry.replace(/^~/, require('os').homedir())
 
-/** TODO: Add documentation */
-module.exports = class Bindings {
+class Bindings {
 
-  static get registry(){ return registry }
+  provides = {}
+  servers = {}
+  #bound = {}
 
-  static then(r,e) {
-    const LOG = cds.log('cds.serve', { prefix:'cds' })
-    const bindings = new Bindings
-    cds.prependOnceListener ('connect', ()=> LOG._info && LOG.info ('connect using bindings from:', { registry }))
-    cds.once('listening', ({url})=> bindings.export (cds.service.providers, url))
-    return bindings.import() .then (r,e)
+  then (r,e) {
+    delete Bindings.prototype.then // only once per process
+    cds.prependOnceListener ('connect', ()=> LOG.info ('connect using bindings from:', { registry }))
+    cds.once('listening', server => this.export (cds.service.providers, server.url))
+    return this.import() .then (r,e)
   }
 
-  constructor() {
-    this.provides = {}
-    this.servers = {}
+  bind (service) {
+    let required = cds.requires [service]
+    let binding = this.provides [required?.service || service]
+    if (binding) {
+      // in case of cds.requires.Foo = { ... }
+      if (typeof required === 'object') required.credentials = {
+        ...required.credentials,
+        ...binding.credentials
+      }
+      // in case of cds.requires.Foo = true
+      else required = cds.requires[service] = {
+        ...cds.requires.kinds [binding.kind],
+        ...binding
+      }
+      // REVISIT: temporary fix to inherit kind as well for mocked odata services
+      // otherwise mocking with two services does not work for kind:odata-v2
+      if (required.kind === 'odata-v2' || required.kind === 'odata-v4') required.kind = 'odata'
+    }
+    return required
+  }
+
+  // used by cds.connect
+  at (service) {
+    return this.#bound [service] ??= this.bind (service)
   }
 
-  async load (sync) {
-    DEBUG?.('reading bindings from:', registry)
+  get registry() {
+    return Bindings.registry ??= registry.replace(/^~/, require('os').homedir())
+  }
+
+  async load (read = fs.promises.readFile) {
+    LOG.debug ('reading bindings from:', registry)
     try {
-      let {cds} = JSON.parse (sync ? readFileSync (filename) : await read (filename))
-      Object.assign (this,cds)
+      let src = read (this.registry)
+      let {cds} = JSON.parse (src.then ? await src : src)
+      Object.assign (this, cds)
     }
     catch { /* ignored */ }
     return this
   }
-  async store (sync) {
-    DEBUG?.('writing bindings to:', registry)
-    const json = JSON.stringify ({cds:this},null,'  ')
-    return sync ? writeFileSync (filename, json) : write (filename, json)
+
+  async store (write = fs.promises.writeFile) {
+    LOG.debug ('writing bindings to:', registry)
+    const json = JSON.stringify ({ cds: this },null,'  ')
+    return write (this.registry, json)
   }
 
   async import() {
-    const required = cds.requires; if (!required) return this
-    const provided = (await this.load()) .provides
-    for (let each in required) {
-      const req = required[each]; if (typeof req !== 'object') continue
-      const bound = provided [req.service||each]
-      if (bound) {
-        Object.assign (req.credentials || (req.credentials = {}), bound.credentials)
-        // REVISIT: temporary fix to inherit kind as well for mocked odata services
-        // otherwise mocking with two services does not work for kind:odata-v2
-        if (req.kind === 'odata-v2' || req.kind === 'odata-v4') req.kind = 'odata'
-      }
-    }
+    await this.load()
+    for (let each in cds.requires) this.bind (each)
     return this
   }
 
@@ -67,23 +82,28 @@ module.exports = class Bindings {
       // if (each.name in cds.env.requires)  continue
       const options = each.options || {}
       provides[each.name] = {
-        kind: options.to || 'odata',
+        kind: options.to || each.endpoints[0]?.kind || 'odata',
         credentials: {
           ...options.credentials,
           url: url + each.path
         },
         server: pid
       }
+      // if (each.endpoints.length > 1)  provides[each.name].other = each.endpoints.slice(1).map(
+      //   ep => ({ kind: ep.kind, url: url + ep.path })
+      // )
     }
-    process.on ('exit', ()=>this.purge())
+    process.on ('exit', ()=> this.purge())
+    cds.on ('shutdown', ()=> this.purge())
     return this.store()
   }
 
   purge() {
-    this.load(true)
-    DEBUG?.('purging bindings from:', registry)
+    if (this.done) return; else this.done = true
+    this.load (fs.readFileSync)
+    LOG.debug ('purging bindings from:', registry)
     this.cleanup()
-    this.store(true)
+    this.store (fs.writeFileSync)
   }
 
   /**
@@ -100,6 +120,7 @@ module.exports = class Bindings {
 
 const {NODE_ENV} = process.env
 if (NODE_ENV === 'test' || global.it || cds.env.no_bindings) {
-  module['exports'] = { then: (r) => r() }
+  Object.defineProperty (module, 'exports', { value: { at: ()=> undefined }})
+} else {
+  module.exports = new Bindings
 }
-/* eslint no-console:off */

package/lib/srv/cds-connect.js

@@ -61,7 +61,7 @@ connect.to = (datasource, options) => {
 
 function options4 (name, _o) {
   const [, kind=_o?.kind, url ] = /^(\w+):(.*)/.exec(name) || []
-  const conf = cds.requires[name] || cds.requires[kind] || cds.requires.kinds[name] || cds.requires.kinds[kind]
+  const conf = cds.service.bindings.at(name) || cds.requires[name] || cds.requires[kind] || cds.requires.kinds[name] || cds.requires.kinds[kind]
   const o = { kind, ...conf, ..._o }
   if (!o.kind && !o.impl && !o.silent) throw cds.error(
     conf ? `Configuration for 'cds.requires.${name}' lacks mandatory property 'kind' or 'impl'` :

package/lib/srv/cds-serve.js

@@ -35,7 +35,7 @@ module.exports = function cds_serve (som, _options) { // NOSONAR
   const loaded = options.then (async ({from}=o) => {
     if (!from || from === 'all' || from === '*') from = cds.model || '*'
     if (from.definitions) return from
-    if (from === '?') try { return await cds.load('*',o) } catch { return }
+    if (from === '?') try { return cds.model || await cds.load('*',o) } catch { return }
     return cds.load(from, {...o, silent:true })
   })
 
@@ -97,7 +97,7 @@ module.exports = function cds_serve (som, _options) { // NOSONAR
       const { serve } = cds.service.protocols
       if (!cds.env.features.odata_new_adapter && cds.edmxs) ready = ready.then (()=> cds.edmxs)
       ready = ready.then (()=> all.forEach (each => {
-        const d = each.definition
+        const d = each.definition || {}
         if (d['@protocol'] === 'none' || d['@cds.api.ignore']) return each._is_dark = true
         else serve (each, /*to:*/ app)
         if (!o.silent) cds.emit ('serving',each)

package/lib/srv/middlewares/auth/ias-auth.js

@@ -57,7 +57,9 @@ module.exports = function ias_auth(config) {
     const clientid = tokenInfo.getClientId()
     if (clientid === payload.sub) { //> grant_type === client_credentials or x509
       const roles = { 'system-user': 1 }
+      if (Array.isArray(payload.ias_apis)) payload.ias_apis.forEach(r => (roles[r] = 1))
       if (clientid === credentials.clientid) roles['internal-user'] = 1
+      else delete roles['internal-user']
       return new cds.User({ id: 'system', roles, tokenInfo })
     }
 

package/lib/srv/protocols/http.js

@@ -44,7 +44,7 @@ class HttpAdapter {
 
   /** Returns a handler to check required roles, or null if no check required. */
   get requires_check() {
-    const d = this.service.definition
+    const d = this.service.definition; if (!d) return null
     const roles = d['@requires'] || d['@restrict']?.map(r => r.to).flat().filter(r => r)
     const required = !roles?.length ? restricted_by_default : Array.isArray(roles) ? roles : [roles]
     return required && function requires_check (req, res, next) {
@@ -57,7 +57,7 @@ class HttpAdapter {
 
   get body_parser_options() {
     let options = cds.env.server.body_parser
-    let limit = this.service.definition['@cds.server.body_parser.limit']
+    let limit = this.service.definition?.['@cds.server.body_parser.limit']
     if (limit) options = { ...options, limit }
     return super.body_parser_options = options
   }

package/lib/srv/protocols/index.js

@@ -96,7 +96,7 @@ class Protocols {
    * @returns {{ kind:string, path:string }[]} Array of { kind, path } objects
    */
   endpoints4 (srv, o = srv.options) {
-    const def = srv.definition; if (!def) return
+    const def = srv.definition || {}
 
     // get @protocol annotations from service definition
     let annos = o?.to || def['@protocol']

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

@@ -1,6 +1,5 @@
 const cds = require('../../index')
 if (cds.env.features.odata_new_adapter) {
-  cds.log().info('using new OData adapter')
   module.exports = require('../../../libx/odata/ODataAdapter')
 } else {
   module.exports = require('./okra')

package/lib/srv/srv-tx.js

@@ -99,7 +99,7 @@ class Transaction {
      * err is undefined if nested tx (cf. "root.before ('failed', ()=> this.rollback())")
      */
     // FIXME: with noa, this.context === cds.context and not the individual cds.Request
-    if (err) for (const each of this.handlers._error) each.handler.call(this, err, this.context)
+    if (err && this.handlers?._error) for (const each of this.handlers._error) each.handler.call(this, err, this.context)
 
     if (this.ready) { //> nothing to do if no transaction started at all
       // don't actually roll back if already committed (e.g., error thrown in on succeeded or on done)

package/lib/test/cds-test.js

@@ -177,7 +177,7 @@ class Test extends require('./axios') {
     }}
   }
   set expect(x) { super.expect = x }
-  get expect() { return _expect || this.chai.expect }
+  get expect() { return this.chai.expect }
   get assert() { return this.chai.assert }
   get should() { return this.chai.should() }
 }
@@ -191,7 +191,6 @@ Object.setPrototypeOf (exports, Test.prototype)
 
 
 // Provide same global functions for jest and mocha
-let _expect = undefined
 ;(function _support_jest_and_mocha() {
   const _global = p => Object.getOwnPropertyDescriptor(global,p)?.value
   const is_jest = _global('beforeAll')
@@ -203,7 +202,7 @@ let _expect = undefined
     global.afterAll   = global.after     = (msg,fn) => repl.on?.('exit',fn||msg)
     global.beforeEach = global.afterEach = ()=>{}
     global.describe   = ()=>{}
-    global.expect = _expect = require('./expect')
+    global.expect = require('./expect')
 
   } else if (is_mocha) { // it's mocha
 
@@ -237,7 +236,7 @@ let _expect = undefined
     global.afterAll = global.after = (msg,fn) => after(fn||msg)
     global.beforeEach = beforeEach
     global.afterEach = afterEach
-    global.expect = _expect = require('./expect')
+    global.expect = require('./expect')
     // suite was introduced in Node 22
     suite?.('<next>', ()=>{}) //> to signal the start of a test file
 

package/lib/utils/cds-utils.js

@@ -5,7 +5,7 @@ const cds = require('../index')
 // eslint-disable-next-line no-unused-vars
 const _tarLib = () => { try { return require('tar') } catch(_) {} }
 
-module.exports = exports = new class {
+exports = module.exports = new class {
   get colors() { return super.colors = require('./colors') }
   get inflect() { return super.inflect = require('./inflect') }
   get inspect() {
@@ -20,11 +20,11 @@ module.exports = exports = new class {
   get uuid() { return super.uuid = require('crypto').randomUUID }
   get yaml() { return super.yaml = require('@sap/cds-foss').yaml }
   get pool() { return super.pool = require('@sap/cds-foss').pool }
-  get tar()  { return super.tar = process.platform === 'win32' && _tarLib() ? require('./tar-lib') : require('./tar') }  
+  get tar()  { return super.tar = process.platform === 'win32' && _tarLib() ? require('./tar-lib') : require('./tar') }
 }
 
 /** @type {import('node:path')} */
-const path = exports.path = require('path'), { dirname, extname, join, resolve, relative } = path
+const path = exports.path = require('path'), { dirname, join, resolve, relative } = path
 
 /** @type {import('node:fs')} */
 const fs = exports.fs = Object.assign (exports,require('fs')) //> for compatibility
@@ -200,17 +200,20 @@ exports.mkdirp = async function (...path) {
 
 exports.rmdir = async function (...path) {
   const d = resolve (cds.root,...path)
-  return fs.promises.rm (d, {recursive:true})
+  await fs.promises.rm (d, {recursive:true})
+  return d
 }
 
 exports.rimraf = async function (...path) {
   const d = resolve (cds.root,...path)
-  return fs.promises.rm (d, {recursive:true,force:true})
+  await fs.promises.rm (d, {recursive:true,force:true})
+  return d
 }
 
 exports.rm = async function rm (x) {
   const y = resolve (cds.root,x)
-  return fs.promises.rm(y)
+  await fs.promises.rm(y)
+  return y
 }
 
 exports.find = function find (base, patterns='*', filter=()=>true) {
@@ -284,20 +287,17 @@ exports.deprecated = (fn, { kind = 'Method', old = fn.name+'()', use } = {}) =>
 exports.csv = require('./csv-reader')
 
 /**
- * Internal utility to load a file through ESM or CommonJs.  TODO find a better place.
+ * Loads a file through ESM or CommonJs.
+ * @returns { Promise<any> }
  */
-exports._import = id => require(id)
-if (process.env.JEST_WORKER_ID === undefined) {  // jest's ESM support is experimental: https://jestjs.io/docs/ecmascript-modules
-  const { pathToFileURL } = require('url')
-  exports._import = id => {
-    if (extname(id) === '.ts') {
-      try {
-        return require(id) // ts-node w/ ESM not working ootb (cap/issues#14463), so try CommonJS first
-      } catch (err) {
-        if (err.code !== 'ERR_REQUIRE_ESM')  throw err
-        // else: this means ts-node is configured w/ an ESM loader, so fall through and try w/ ESM
-      }
-    }
+// TODO find a better place.
+exports._import = id => {
+  try {
+    return require(id) // try CommonJS first
+  } catch (err) {
+    if (err.code !== 'ERR_REQUIRE_ESM')  throw err
+    // else try w/ ESM
+    const { pathToFileURL } = require('url')
     return import (pathToFileURL(id).href) // must use a file: URL, esp. on Windows for C:\... paths
   }
 }

package/lib/utils/colors.js

@@ -1,50 +1,51 @@
 const enabled = process.stdout.isTTY && !process.env.NO_COLOR || process.env.FORCE_COLOR
-const colors = {
+const color = enabled ? ttl => ttl[0] : ()=>''
+
+module.exports = {
   enabled,
-  RESET:        enabled ? '\x1b[0m' : '',
-  BOLD:         enabled ? '\x1b[1m' : '',
-  BRIGHT:       enabled ? '\x1b[1m' : '',
-  DIMMED:       enabled ? '\x1b[2m' : '',
-  ITALIC:       enabled ? '\x1b[3m' : '',
-  UNDER:        enabled ? '\x1b[4m' : '',
-  BLINK:        enabled ? '\x1b[5m' : '',
-  FLASH:        enabled ? '\x1b[6m' : '',
-  INVERT:       enabled ? '\x1b[7m' : '',
-  BLACK:        enabled ? '\x1b[30m' : '',
-  RED:          enabled ? '\x1b[31m' : '',
-  GREEN:        enabled ? '\x1b[32m' : '',
-  YELLOW:       enabled ? '\x1b[33m' : '',
-  BLUE:         enabled ? '\x1b[34m' : '',
-  PINK:         enabled ? '\x1b[35m' : '',
-  CYAN:         enabled ? '\x1b[36m' : '',
-  LIGHT_GRAY:   enabled ? '\x1b[37m' : '',
-  DEFAULT:      enabled ? '\x1b[39m' : '',
-  GRAY:         enabled ? '\x1b[90m' : '',
-  LIGHT_RED:    enabled ? '\x1b[91m' : '',
-  LIGHT_GREEN:  enabled ? '\x1b[92m' : '',
-  LIGHT_YELLOW: enabled ? '\x1b[93m' : '',
-  LIGHT_BLUE:   enabled ? '\x1b[94m' : '',
-  LIGHT_PINK:   enabled ? '\x1b[95m' : '',
-  LIGHT_CYAN:   enabled ? '\x1b[96m' : '',
-  WHITE:        enabled ? '\x1b[97m' : '',
+  RESET:          color `\x1b[0m`,
+  BOLD:           color `\x1b[1m`,
+  BRIGHT:         color `\x1b[1m`,
+  DIMMED:         color `\x1b[2m`,
+  ITALIC:         color `\x1b[3m`,
+  UNDER:          color `\x1b[4m`,
+  BLINK:          color `\x1b[5m`,
+  FLASH:          color `\x1b[6m`,
+  INVERT:         color `\x1b[7m`,
+  BLACK:          color `\x1b[30m`,
+  RED:            color `\x1b[31m`,
+  GREEN:          color `\x1b[32m`,
+  YELLOW:         color `\x1b[33m`,
+  BLUE:           color `\x1b[34m`,
+  PINK:           color `\x1b[35m`,
+  CYAN:           color `\x1b[36m`,
+  LIGHT_GRAY:     color `\x1b[37m`,
+  DEFAULT:        color `\x1b[39m`,
+  GRAY:           color `\x1b[90m`,
+  LIGHT_RED:      color `\x1b[91m`,
+  LIGHT_GREEN:    color `\x1b[92m`,
+  LIGHT_YELLOW:   color `\x1b[93m`,
+  LIGHT_BLUE:     color `\x1b[94m`,
+  LIGHT_PINK:     color `\x1b[95m`,
+  LIGHT_CYAN:     color `\x1b[96m`,
+  WHITE:          color `\x1b[97m`,
   bg: {
-    BLACK: enabled ? '\x1b[40m' : '',
-    RED: enabled ? '\x1b[41m' : '',
-    GREEN: enabled ? '\x1b[42m' : '',
-    YELLOW: enabled ? '\x1b[43m' : '',
-    BLUE: enabled ? '\x1b[44m' : '',
-    PINK: enabled ? '\x1b[45m' : '',
-    CYAN: enabled ? '\x1b[46m' : '',
-    WHITE: enabled ? '\x1b[47m' : '',
-    DEFAULT: enabled ? '\x1b[49m' : '',
-    LIGHT_GRAY: enabled ? '\x1b[100m' : '',
-    LIGHT_RED: enabled ? '\x1b[101m' : '',
-    LIGHT_GREEN: enabled ? '\x1b[102m' : '',
-    LIGHT_YELLOW: enabled ? '\x1b[103m' : '',
-    LIGHT_BLUE: enabled ? '\x1b[104m' : '',
-    LIGHT_PINK: enabled ? '\x1b[105m' : '',
-    LIGHT_CYAN: enabled ? '\x1b[106m' : '',
-    LIGHT_WHITE: enabled ? '\x1b[107m' : '',
+    BLACK:        color `\x1b[40m`,
+    RED:          color `\x1b[41m`,
+    GREEN:        color `\x1b[42m`,
+    YELLOW:       color `\x1b[43m`,
+    BLUE:         color `\x1b[44m`,
+    PINK:         color `\x1b[45m`,
+    CYAN:         color `\x1b[46m`,
+    WHITE:        color `\x1b[47m`,
+    DEFAULT:      color `\x1b[49m`,
+    LIGHT_GRAY:   color `\x1b[100m`,
+    LIGHT_RED:    color `\x1b[101m`,
+    LIGHT_GREEN:  color `\x1b[102m`,
+    LIGHT_YELLOW: color `\x1b[103m`,
+    LIGHT_BLUE:   color `\x1b[104m`,
+    LIGHT_PINK:   color `\x1b[105m`,
+    LIGHT_CYAN:   color `\x1b[106m`,
+    LIGHT_WHITE:  color `\x1b[107m`,
   },
 }
-module.exports = colors

package/lib/utils/csv-reader.js

@@ -3,16 +3,16 @@ const { Readable } = require('stream')
 const cds = require('../../lib')
 
 const SEPARATOR = /[,;\t]/
-module.exports = { parse: cds.parse.csv, readHeader, stripComments, serialize }
 
+exports.parse = cds.parse.csv
 
-function serialize(rows, columns, bom = '\ufeff') {
+exports.serialize = function (rows, columns, bom = '\ufeff') {
   let csv = bom + (columns || Object.keys(rows[0])).join(';') + "\n"
   for (let key in rows) csv += `${key};${rows[key]}\r\n`
   return csv
 }
 
-async function readHeader(inStream, o = { ignoreComments: true }) {
+exports.readHeader = async function (inStream, o = { ignoreComments: true }) {
   let delimiter = ';'
   let cols = []
   let filtered = false
@@ -33,9 +33,9 @@ async function readHeader(inStream, o = { ignoreComments: true }) {
   return { cols, delimiter, filtered }
 }
 
-async function stripComments(file, outStream) {
+exports.stripComments = async function (file, outStream) {
   // most files don't need filtering, so do a quick check first
-  const { filtered } = await readHeader(createReadStream(file))
+  const { filtered } = await exports.readHeader(createReadStream(file))
   if (!filtered) return false
 
   // buffer whole content so that we can write the out file

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

@@ -22,7 +22,6 @@ const { resolveStructuredName } = require('../utils/handlerUtils')
 const getError = require('../../../../common/error')
 const { getSapMessages } = require('../../../../common/error/frontend')
 const { getPageSize } = require('../../../../common/generic/paging')
-const { getTransition } = require('../../../../common/utils/resolveView')
 const { Readable } = require('stream')
 
 /**
@@ -312,7 +311,7 @@ const _resolveContentProperty = (req, annotName, resolvedProp) => {
       LOG.warn(
         `"${annotName}" in entity "${req.target.name}" points to property "${resolvedProp}" which was renamed or is not part of the projection. You must update the annotation value.`
       )
-    const mapping = getTransition(req.target, cds.db).mapping
+    const mapping = cds.ql.resolve.transitions(req.query, cds.db).mapping
     const key = [...mapping.entries()].find(({ 1: val }) => val.ref[0] === resolvedProp)
     return key?.length && key[0]
   }

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

@@ -11,7 +11,7 @@ const createToCQN = require('./createToCQN')
 const deleteToCQN = require('./deleteToCQN')
 
 const parseToCqn = (component, service, target, data, odataReq, upsert) => {
-  let query = cds.odata.parse(odataReq.getIncomingRequest().url, { service })
+  let query = cds.odata.parse(odataReq.getIncomingRequest().url, { service, protocol: 'odata' })
 
   // for concat
   if (component === 'READ' && Array.isArray(query)) return query

package/libx/_runtime/common/Service.js

@@ -1,6 +1,6 @@
 const cds = require('../cds')
 
-const { resolveView, findQueryTarget } = require('./utils/resolveView')
+const { findQueryTarget } = require('./utils/resolveView')
 const postProcess = require('./utils/postProcess')
 
 /**
@@ -76,10 +76,12 @@ class ApplicationService extends cds.Service {
     let result
     let target = req.target
 
+    // REVISIT: We must not allow arbitrary CQNs, so this shouldn't be here!
     if (!this._requires_resolving(req)) {
       result = await super.handle(req)
     } else {
-      const query = resolveView(req.query, this.model, this)
+      const query = cds.ql.resolve(req.query, this)
+      if (!query) throw new Error(`Target ${target.name} cannot be resolved for service ${this.name}`)
       target = findQueryTarget(query) || req.target
       // REVISIT: get rid of _4odata
       if (req.query.SELECT?._4odata) Object.defineProperty(query.SELECT, '_4odata', { value: true })

package/libx/_runtime/common/composition/data.js

@@ -2,7 +2,6 @@ const { getCompositionTree } = require('./tree')
 const ctUtils = require('./utils')
 const { getEntityNameFromUpdateCQN } = require('../utils/cqn')
 const { ensureNoDraftsSuffix } = require('../utils/draft')
-const { getDBTable } = require('../utils/resolveView')
 const { cqn2cqn4sql } = require('../utils/cqn2cqn4sql')
 const cds = require('../../cds')
 const { DRAFT_COLUMNS_MAP } = require('../constants/draft')
@@ -49,7 +48,7 @@ const _isSameEntity = (cqn, req) => {
     return false
   }
 
-  const target = getDBTable(req.target)
+  const target = cds.ql.resolve.table(req.target)
   if (target.name !== (cqn.UPDATE.entity.ref && cqn.UPDATE.entity.ref[0]) && target.name !== cqn.UPDATE.entity) {
     return false
   }

package/libx/_runtime/common/composition/tree.js

@@ -1,7 +1,5 @@
 const cds = require('../../cds')
 
-const { getTransition, getDBTable } = require('../utils/resolveView')
-
 const { prefixForStruct } = require('../../common/utils/csn')
 
 /*
@@ -30,7 +28,11 @@ const _resolvedElement = (element, service) => {
   if (!element.target) return element
   // skip forbidden view check if association to view with foreign key in target
   const skipForbiddenViewCheck = element._isAssociationStrict
-  const { target, mapping } = getTransition(element._target, service, skipForbiddenViewCheck)
+  const { target, mapping } = cds.ql.resolve.transitions4db(
+    { target: element._target },
+    cds.db.tx(service),
+    skipForbiddenViewCheck
+  ) // must use db service
   const newElement = { target: target.name, _target: target }
   Object.setPrototypeOf(newElement, element)
   if (element.on) {
@@ -164,7 +166,7 @@ const _getCompositionTreeRec = ({
 const _resolvedEntityName = (entityName, definitions) => {
   const target = definitions[entityName]
   if (!target) return entityName
-  const resolved = getDBTable(target)
+  const resolved = cds.ql.resolve.table(target)
   return resolved.name
 }
 

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

@@ -20,7 +20,7 @@ const _getStaticOrders = req => {
     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 } })
+        ordersFromKeys.push({ by: { '=': key }, implicit: true })
       }
     }
   }
@@ -53,7 +53,11 @@ const _addDefaultSortOrder = (req, select) => {
   select.orderBy.push(
     ...staticOrders
       .filter(d => !select.orderBy.find(o => o.ref && o.ref.join('_') === d.by['=']))
-      .map(d => ({ ref: [d.by['=']], sort: d.desc ? 'desc' : 'asc' }))
+      .map(d => {
+        const orderByRef = { ref: [d.by['=']], sort: d.desc ? 'desc' : 'asc' }
+        if (d.implicit) orderByRef.implicit = true
+        return orderByRef
+      })
   )
 }