@sap/cds 6.6.1 → 6.7.0

package/lib/ql/CREATE.js

@@ -10,7 +10,7 @@ module.exports = class Query extends require('./Query') {
     if (elements)
       this.CREATE.entity = { elements: elements, kind: 'entity', name:e }
     else
-      this.CREATE.entity = e && e.elements ? e : this._target_name4(e)
+      this.CREATE.entity = e && e.elements ? e : this._target4(e)
     return this
   }
 

package/lib/ql/DELETE.js

@@ -9,7 +9,7 @@ module.exports = class Query extends Whereable {
   }
 
   from(entity, key) {
-    this.DELETE.from = this._target_name4 (...arguments) // supporting tts
+    this.DELETE.from = this._target4 (...arguments) // supporting tts
     if (key) this.byKey(key)
     return this
   }

package/lib/ql/DROP.js

@@ -7,17 +7,17 @@ module.exports = class Query extends require('./Query') {
     })
   }
   entity(e) {
-    this.DROP.entity = this._target_name4 (e)
+    this.DROP.entity = this._target4 (e)
     return this
   }
   table(e) {
     const {DROP} = this
-    DROP.entity = DROP.table = this._target_name4 (e)
+    DROP.entity = DROP.table = this._target4 (e)
     return this
   }
   view(e) {
     const {DROP} = this
-    DROP.entity = DROP.view = this._target_name4 (e)
+    DROP.entity = DROP.view = this._target4 (e)
     return this
   }
 }

package/lib/ql/INSERT.js

@@ -7,7 +7,7 @@ module.exports = class Query extends require('./Query') {
   }
 
   into (entity, ...data) {
-    this[this.cmd].into = this._target_name4 (...arguments) // supporting tts
+    this[this.cmd].into = this._target4 (...arguments) // supporting tts
     if (data.length) this.entries(...data)
     return this
   }

package/lib/ql/Query.js

@@ -52,12 +52,6 @@ class Query {
     || this._expected `${{target}} to be an entity path string, a CSN definition, a {ref}, a {SELECT}, or a {SET}`
   }
 
-  //> REVISIT: should we rather have consistent .from/.entity/.into in CQN?
-  _target_name4 (...args) {
-    const {ref, as} = this._target_ref4 (...args)
-    return ref.length === 1 && typeof ref[0] === 'string' && !as ? ref[0] : as ? {ref, as} : {ref}
-  }
-
   _expected (...args) {
     return cds.error.expected (...args)
   }
@@ -72,8 +66,15 @@ class Query {
     return `${cmd} ${_name(this._target.name)} `
   }
 
+  forSQL (db = cds.db || cds) { return _flat(db.cqn4sql(this)) }
+  toSQL  (db = cds.db || cds) { return _2sql(db.cqn2sql(this)) }
+  toSql  (db = cds.db || cds) { return this.toSQL(db).sql }
+
 }
 
+// skip .cqn property when in repl
+const _2sql = cds.repl ? ({sql,values}) => ({sql,values}) : (x => x)
+const _flat = Query.prototype.flat
 
 const _target4 = (target, arg2) =>  target && (
   typeof target === 'string' ? { name: target } :
@@ -85,5 +86,12 @@ const _target4 = (target, arg2) =>  target && (
 
 const _name = cds.env.sql.names === 'quoted' ? n =>`"${n}"` : n => n.replace(/[.:]/g,'_')
 
+Object.defineProperty (Query.prototype, '_target4', { value: (
+  cds.env.ql.quirks_mode === false ? Query.prototype._target_ref4
+  : function (...args) {
+    const {ref, as} = this._target_ref4 (...args)
+    return ref.length === 1 && typeof ref[0] === 'string' && !as ? ref[0] : as ? {ref, as} : {ref}
+  }
+)})
 
 module.exports = Query

package/lib/ql/SELECT.js

@@ -104,8 +104,14 @@ module.exports = class Query extends Whereable {
     return this._where (args,'and','on')
   }
 
-  having(...x) {
-    return this._where (x,'and','having')
+  having(...args) {
+    return this._where (args,'and','having')
+  }
+
+  search (...args) {
+    let _xpr=[]; for (let val of args) _xpr.push('or',{val})
+    this.SELECT.search = _xpr.slice(1)
+    return this
   }
 
   groupBy (...args) {

package/lib/ql/UPDATE.js

@@ -10,7 +10,7 @@ module.exports = class Query extends Whereable {
   }
 
   entity (e, key) {
-    this.UPDATE.entity = this._target_name4 (...arguments) // supporting tts
+    this.UPDATE.entity = this._target4 (...arguments) // supporting tts
     if (key) this.byKey(key)
     return this
   }

package/lib/ql/Whereable.js

@@ -18,7 +18,7 @@ class Query extends require('./Query') {
         error (`Invalid attempt to call '${this.cmd}.${and_or}()' before a prior call to '${this.cmd}.where()'`)
       )
       if (clause === 'on') _ = _.from
-      let left = Reflect.getOwnPropertyDescriptor(_,clause)?.value
+      let left = _[clause]
       if (!left) { //> .where() called first time
         // SELECT.from `X` .where `x or y` .and `z` -> SELECT from X where (x or y) and z
         if (pred.includes('or')) this._left_has_or = true

package/lib/ql/cds-ql.js

@@ -9,7 +9,7 @@ require = path => { // eslint-disable-line no-global-assign
   }, api)
 }
 
-module.exports = Object.assign (_deprecated_srv_ql, { cdr: true,
+module.exports = {
   Query, clone: (q,_) => Query.prototype.clone.call(q,_),
   SELECT: require('./SELECT'),
   INSERT: require('./INSERT'),
@@ -18,14 +18,6 @@ module.exports = Object.assign (_deprecated_srv_ql, { cdr: true,
   DELETE: require('./DELETE'),
   CREATE: require('./CREATE'),
   DROP: require('./DROP'),
-})
-
-function _deprecated_srv_ql() { // eslint-disable-next-line no-console
-  console.trace(`
-    Method 'srv.ql(req)' is deprecated and superceded by 'cds.context'.
-    Please use global SELECT instead of 'const { SELECT } = srv.ql(req)'.
-  `)
-  return module.exports
 }
 
 module.exports._reset = ()=>{ // for strange tests only

package/lib/req/cds-context.js

@@ -15,12 +15,9 @@ module.exports = new class extends AsyncLocalStorage {
 
   /** @returns {EventContext} */
   _for (cds,v) {
-    Reflect.defineProperty (cds,'context', { enumerable:1, ... cds.env.features.cls ? {
+    Reflect.defineProperty (cds,'context', { enumerable:1, ... {
       set:(v) => this.enterWith(v),
       get:()=> this.getStore(),
-    } : {
-      get:()=> undefined,
-      set:()=> {},
     }})
     return cds.context = v // IMPORTANT: we need to set it initially, to get it all wired up correctly
   }

package/lib/req/request.js

@@ -1,4 +1,5 @@
 const { Responses, Errors } = require('./response')
+const cds = require('../../lib')
 
 /**
  * Class Request represents requests received via synchronous protocols.
@@ -56,6 +57,67 @@ class Request extends require('./event') {
     return this._set ('data', {})
   }
 
+  set subject(d) { if (d) super.subject = d }
+  get subject() {
+    const q = this.query
+    let subject = (
+      q?.SELECT?.from ||
+      q?.INSERT?.into ||
+      q?.UPSERT?.into ||
+      q?.UPDATE?.entity ||
+      q?.DELETE?.from
+    )
+
+    const {target} = this; if (!target) return undefined
+
+    // programmatic action calls as of now only in format /Books(201)/action
+    if (!subject) {
+      let where = []
+      for (const param of this.params) {
+        if (typeof param === 'object') {
+          for (const key in param) {
+            if (key in target.keys) {
+              if (where.length > 1) where.push('and')
+              where.push({ ref: [key] }, '=', { val: param[key] })
+            }
+          }
+        } else {
+          where.push({ ref: [Object.keys(target.keys)[0]] }, '=', { val: param })
+        }
+      }
+      subject = { id: target.name, where }
+    }
+
+    const ref = subject.ref || [ subject ]
+
+    if(!target.drafts || cds.env.fiori.lean_draft) return super.subject = { ref }
+
+    // special handling for old draft logic
+    let subjectRef = []
+    ref.forEach ((item, i) => {
+      // to one assoc & comp
+      if (typeof item === 'string') {
+        subjectRef.push(item)
+        return
+      }
+
+      // create key value pair without IsActiveEntity & adjust root target
+      const keys = {}
+      let id = item.id
+      for (let j = 0; j < item?.where?.length; j = j + 4) {
+        const key = item.where[j].ref[0]
+        const value = item.where[j + 2].val
+        if (key !== 'IsActiveEntity') keys[key] = value
+        else if (i === 0 && key === 'IsActiveEntity' && value === false) id = item.id + '_drafts'
+      }
+
+      // create copy
+      const {SELECT:{from:{ref}}} = SELECT.from(id,keys)
+      subjectRef.push(...ref)      
+    })
+    return super.subject = {ref: subjectRef}
+  }
+
   reply  (results) { return this.results = results }
   notify (...args) { return this._messages.add (1, ...args) }
   info   (...args) { return this._messages.add (2, ...args) }
@@ -116,8 +178,7 @@ const SQL2Crud = {
 }
 
 const Query2Crud = (q) => {
-  if (typeof q === 'string') return SQL2Crud[q] || /^\s*(\w+)/i.test(q) && SQL2Crud[RegExp.$1.toUpperCase()] || q
-  else for (let each in q) if (each in SQL2Crud) return SQL2Crud[each]
+  for (let each in q) if (each in SQL2Crud) return SQL2Crud[each]
 }
 
 const _path4 = (x,p) => {

package/lib/req/response.js

@@ -4,8 +4,9 @@ const cds = require ('../index')
  * Messages Collector, used for `req.errors` and `req.messages`
  */
 class Responses extends Array {
-  static get (severity, code, message, target, args) {
-   let e // be filled in below...
+  static get (severity, code, message, target, args, ...more) {
+    if (code?.raw) [ message, code ] = [ String.raw (code, message, target, args, ...more) ]
+    let e // be filled in below...
     if (typeof code === 'object') e = code; else {
       if (typeof code === 'number') e = { code }; else [ code, message, target, args, e ] = [ undefined, code, message, target, {} ]
       if (typeof message === 'object') e = Object.assign(message,e); else {

package/lib/srv/bindings.js

@@ -1,7 +1,5 @@
-const DEBUG = /\b(y|all|serve|bindings)\b/.test (process.env.DEBUG) && console.warn
-// || console.debug
 
-const cds = require ('..')
+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 registry = '~/.cds-services.json'
@@ -9,88 +7,88 @@ const registry = '~/.cds-services.json'
 /** TODO: Add documentation */
 module.exports = class Bindings {
 
-    static get registry(){ return registry }
+  static get registry(){ return registry }
 
-    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)
-    }
+  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)
+  }
 
-    constructor(url) {
-        this._source = require ('path') .resolve (cds.root, registry.replace(/^~/, require('os').homedir()))
-        this.cds = {provides:{}}
-        this.url = url
-    }
+  constructor(url) {
+    this._source = require ('path') .resolve (cds.root, registry.replace(/^~/, require('os').homedir()))
+    this.cds = {provides:{}}
+    this.url = url
+  }
 
-    async load (sync) {
-        DEBUG && DEBUG('[cds] - reading bindings from:', this._source)
-        try { Object.assign (this, JSON.parse (sync ? readFileSync (this._source) : await read (this._source))) }
-        catch (e) { /* ignored */ }
-        return this
-    }
-    async store (sync) {
-        DEBUG && DEBUG ('[cds] - writing bindings to:', this._source)
-        const json = JSON.stringify ({cds:this.cds},null,'  ')
-        return sync ? writeFileSync (this._source, json) : write (this._source, json)
-    }
+  async load (sync) {
+    DEBUG?.('reading bindings from:', this._source)
+    try { Object.assign (this, JSON.parse (sync ? readFileSync (this._source) : await read (this._source))) }
+    catch (e) { /* ignored */ }
+    return this
+  }
+  async store (sync) {
+    DEBUG?.('writing bindings to:', this._source)
+    const json = JSON.stringify ({cds:this.cds},null,'  ')
+    return sync ? writeFileSync (this._source, json) : write (this._source, json)
+  }
 
-    async import() {
-        const required = cds.requires; if (!required) return this
-        const provided = (await this.load()) .cds.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'
-            }
-        }
-        return this
+  async import() {
+    const required = cds.requires; if (!required) return this
+    const provided = (await this.load()) .cds.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'
+      }
     }
+    return this
+  }
 
-    async export (services, url) {
-        this.cleanup (this.url = url)
-        // register our services
-        const provides = this.cds.provides
-        for (let each of services) {
-            // if (each.name in cds.env.requires)  continue
-            const options = each.options || {}
-            provides[each.name] = {
-                kind: options.to || 'odata',
-                credentials: {
-                    ...options.credentials,
-                    url: url + each.path
-                }
-            }
+  async export (services, url) {
+    this.cleanup (this.url = url)
+    // register our services
+    const provides = this.cds.provides
+    for (let each of services) {
+      // if (each.name in cds.env.requires)  continue
+      const options = each.options || {}
+      provides[each.name] = {
+        kind: options.to || 'odata',
+        credentials: {
+          ...options.credentials,
+          url: url + each.path
         }
-        process.on ('exit', ()=>this.purge())
-        return this.store()
+      }
     }
+    process.on ('exit', ()=>this.purge())
+    return this.store()
+  }
 
-    purge() {
-        this.load(true)
-        DEBUG && DEBUG ('[cds] - purging bindings from:', this._source)
-        this.cleanup()
-        this.store(true)
-    }
+  purge() {
+    this.load(true)
+    DEBUG?.('purging bindings from:', this._source)
+    this.cleanup()
+    this.store(true)
+  }
 
-    cleanup (url=this.url) {
-        // remove all services served at the same url
-        const all = this.cds.provides
-        for (let [key,srv] of Object.entries (all)) {
-            if (srv.credentials && srv.credentials.url && srv.credentials.url.startsWith(url))  delete all [key]
-        }
-        return this
+  cleanup (url=this.url) {
+    // remove all services served at the same url
+    const all = this.cds.provides
+    for (let [key,srv] of Object.entries (all)) {
+      if (srv.credentials && srv.credentials.url && srv.credentials.url.startsWith(url))  delete all [key]
     }
+    return this
+  }
 }
 
 const {NODE_ENV} = process.env
 if (NODE_ENV === 'test' || global.it || cds.env.no_bindings) {
-    module['exports'] = { then: (r) => r() }
+  module['exports'] = { then: (r) => r() }
 }
 /* eslint no-console:off */

package/lib/srv/cds-connect.js

@@ -1,5 +1,6 @@
 const cds = require('..'), {one_model} = cds.env.features, LOG = cds.log('cds.connect')
 const _pending = cds.services._pending || {} // used below to chain parallel connect.to(<same>)
+const TRACE = cds.debug('trace')
 
 /**
  * Connect to a service as primary datasource, i.e. cds.db.
@@ -21,6 +22,7 @@ const connect = module.exports = async function cds_connect (options) {
  * @returns { Promise<import('./srv-api')> }
  */
 connect.to = async (datasource, options) => {
+  TRACE?.time(`cds.connect ${datasource} `)
   let Service = cds.service.factory, _done = x=>x
   if (typeof datasource === 'object') [options,datasource] = [datasource]
   else if (datasource) {
@@ -36,7 +38,7 @@ connect.to = async (datasource, options) => {
   const m = await model4 (o)
   // check if required service definition exists
   const required = cds.requires[datasource]
-  if (required && required.model && datasource !== 'db' && !m.definitions[required.service||datasource]) {
+  if (required?.model?.length && datasource !== 'db' && !m.definitions[required.service||datasource]) {
     LOG.error(`No service definition found for '${required.service || datasource}', as required by 'cds.requires.${datasource}':`, required)
     throw new Error (`No service definition found for '${required.service || datasource}'`)
   }
@@ -46,6 +48,7 @@ connect.to = async (datasource, options) => {
   if (datasource === 'db') cds.db = srv
   _done (cds.services[datasource] = srv)
   if (!o.silent) cds.emit ('connect',srv)
+  TRACE?.timeEnd(`cds.connect ${datasource} `)
   return srv
 }
 

package/lib/srv/cds-serve.js

@@ -2,10 +2,13 @@ const cds = require ('..')
 const { ProtocolAdapter } = cds.service.protocols
 const { Service } = cds.service.factory
 const _ready = Symbol(), _pending = cds.services._pending || {}
+const TRACE = cds.debug('trace')
 
 /** @param som - a service name or a model (name or csn) */
 module.exports = function cds_serve (som, _options) { // NOSONAR
 
+  TRACE?.time(`cds.serve ${som}  `)
+
   if (som && typeof som === 'object' && !is_csn(som) && !is_files(som)) {
     [som,_options] = [undefined,
       som._is_service_instance ? { service:som, from:'*' } :
@@ -123,6 +126,7 @@ module.exports = function cds_serve (som, _options) { // NOSONAR
           return chimera
         }})
       }
+      TRACE?.timeEnd('cds.serve '+som+'  ')
       return _resolve (response)
     }, _error),
 

package/lib/srv/middlewares/index.js

@@ -7,14 +7,45 @@ const trace     = exports.trace     = require('./trace')
 
 // middlewares running before protocol adapters
 exports.before = [
-  context(),    // provides cds.context
-  trace(),      // provides detailed trace logs when DEBUG=trace
-  auth(),       // provides req.user & tenant
-  ctx_auth(),   // propagates auth results to cds.context
-  ctx_model(),  // fills in cds.context.model, in case of extensibility
-]
+  context,    // provides cds.context
+  trace,      // provides detailed trace logs when DEBUG=trace
+  auth,       // provides req.user & tenant
+  ctx_auth,   // propagates auth results to cds.context
+  ctx_model,  // fills in cds.context.model, in case of extensibility
+].map(_instantiate)
 
 // middlewares running after protocol adapters -> usually error middlewares
 exports.after = [
   errors(),
 ]
+
+/**
+ * Convenience method to add custom middlewares like so:
+ * ```js
+ * cds.middlewares.add (mymw, {at:0}) // to the front
+ * cds.middlewares.add (mymw, {at:2})
+ * cds.middlewares.add (mymw, {before:'auth'})
+ * cds.middlewares.add (mymw, {after:'auth'})
+ * cds.middlewares.add (mymw) // to the end
+ * ```
+ */
+exports.add = (new_mw, { at: index, before, after, options }) => {
+  let mw = new_mw (options)
+  if (index)  return exports.before.splice (index, 0, mw)
+  if (before) return exports.before.splice (index, _index4(before), mw)
+  if (after)  return exports.before.splice (index, _index4(after)+1, mw)
+  else return exports.before.push(mw)
+}
+
+function _index4 (middleware) {
+  if (typeof middleware === 'string') middleware = exports[middleware]
+  if (!middleware) throw new Error (`Didn't find a middleware matching ${{middleware}}`)
+  const index = exports.before.findIndex(mw => mw.factory === before)
+  if (index === -1) throw new Error (`Didn't find ${{middleware}} in cds.middlewares.before`)
+  return index
+}
+
+function _instantiate (factory,o) {
+  let mw = factory(o)
+  return mw && Object.assign(mw,{factory})
+}

package/lib/srv/protocols/_legacy.js

@@ -17,10 +17,10 @@ class LegacyProtocolAdapter extends ProtocolAdapter {
     return super.serve (srv, app, { before: [
       // async (req, res, next) => { await 1; next() }, // REVISIT: AsyncResource.bind() -> enable to break cds/tests/_runtime/odata/__tests__/integration/crud-with-mtx.test.js with existing, non-middleware mode, *w/o* fix to BufferedWriter
       cds_context,
-      cap_req_logger,
       libx.perf,
       libx.auth(srv),
       ctx_auth,
+      cap_req_logger,
       cds_context_model.middleware4(srv)
     ], after:[] })
   }

package/lib/srv/protocols/index.js

@@ -80,7 +80,7 @@ class ProtocolAdapter {
 
 
 const protocols = Object.keys(ProtocolAdapter.init())
-const protocol4 = (def, _default = protocols[0]) => def['@protocol'] || protocols.find(p => def['@'+p]) || _default
+const protocol4 = (def, _default = protocols[0]) => def?.['@protocol'] || protocols.find(p => def['@'+p]) || _default
 const is_global = adapter => adapter.length === 1 && !/^(function )?(\w+\s+)?\((srv|service)/.test(adapter)
 
 module.exports = { ProtocolAdapter, protocol4 }

package/lib/srv/srv-api.js

@@ -63,11 +63,9 @@ class Service extends require('./srv-handlers') {
   run (query, data) {
     if (typeof query === 'function') {
       const ctx = cds.context, fn = query
-      if (ctx?.tx && !ctx.tx._done) {
-        return fn (this.tx(ctx)) // with nested tx
-      } else {
-        return this.tx (fn) // with root tx
-      }
+      if (ctx?.tx && !ctx.tx._done)
+        return fn (this.tx(ctx)) // run fn with nested tx
+      else return this.tx(fn)   // run fn with root tx
     }
     const req = new Request ({ query, data })
     return this.dispatch (req)
@@ -100,7 +98,7 @@ class Service extends require('./srv-handlers') {
   get namespace()  {
     return super.namespace  = this.definition && this.definition.name
     || this.model && this.model.namespace
-    || !(this instanceof cds.DatabaseService) && !/\W/.test(this.name) && this.name || undefined
+    || !(this.isDatabaseService) && !/\W/.test(this.name) && this.name || undefined
   }
 
   get operations() { return super.operations = _reflect (this, d => d.kind === 'action' || d.kind === 'function') }

package/lib/srv/srv-dispatch.js

@@ -16,10 +16,11 @@ exports.dispatch = async function dispatch (req) { //NOSONAR
     const ctx = cds.context
     if (ctx?.tx && !ctx.tx._done) {
       return this.tx (ctx) .dispatch(req)      // with nested tx
-    } else {
-      return this.tx (tx => tx.dispatch(req))  // with root tx
     }
+
+    return this.tx (tx => tx.dispatch(req))  // with root tx
   }
+
   if (!req.tx) req.tx = this // `this` is a tx from now on...
 
   // Inform potential listeners // REVISIT: -> this should move into protocol adapters
@@ -112,7 +113,7 @@ const _ensure_target = (srv,req) => {
 
 const _ensure_fqn = (x,p,srv, name = x[p]) => {
   if (typeof name === 'string') {
-    if (srv instanceof cds.DatabaseService) return
+    if (srv.isDatabaseService) return
     if (srv.model && name in srv.model.definitions) return
     if (name.startsWith(srv.namespace)) return
     if (name.endsWith('_drafts')) return // REVISIT: rather fix test/fiori/localized-draft.test.js ?

package/lib/srv/srv-handlers.js

@@ -91,7 +91,7 @@ const _register = function (srv, phase, event, path, handler) { //NOSONAR
     if (!path.startsWith(srv.name+'.')) path = `${srv.name}.${path}`
   }
 
-  if (cds.env.features.lean_draft && cds.env.features.lean_draft_compatibility) {
+  if (cds.env.fiori.lean_draft && cds.env.fiori.draft_compat) {
     const entity = path && srv.model?.definitions[path.name || path]
     if (['PATCH', 'CANCEL', 'NEW'].includes(event)) {
       // delegate to drafts

package/lib/srv/srv-methods.js

@@ -58,7 +58,10 @@ const add_handler_for = (srv, def) => {
   `)
   const stub = srv[event] = function (...args) {
     const req = { event, data:{} }, $ = args[0]
-    const target = this.entities [ $ && $.name ? $.name.match(/\w*$/)[0] : $ ]
+    const target = $ && (
+      this.model.definitions[ $.name ]
+      || this.entities[ $.name?.replace(`${this.name}.`,'') || $ ]
+    )
     if (target) {                        //> bound action/function?
       req.target = target; args.shift() // first argument is the target entity name
       req.params = [ args.shift() ]    // second argument is the target's primary key
@@ -86,7 +89,10 @@ const add_handler_for = (srv, def) => {
 
     return this.send (req)
   }
-  stub._is_stub = true
+  Object.defineProperties(stub,{
+    name: {value: /[^.]+$/.exec(srv.name)[0] +'.'+ event},
+    _is_stub: {value:true},
+  })
 }
 
 

package/lib/utils/cds-test.js

@@ -164,4 +164,7 @@ const spy = (o,f) => {
 
 
 /** @type Test & ()=>Test */
-module.exports = Object.setPrototypeOf ((..._) => (new Test).run(..._), Test.prototype)
+module.exports = Object.assign (
+  Object.setPrototypeOf ((..._) => (new Test).run(..._), Test.prototype),
+  { Test }
+)