@sap/cds 6.6.2 → 6.7.0

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 }
+)

package/libx/_runtime/audit/Service.js

@@ -1,13 +1,11 @@
 const cds = require('../cds')
 const OutboxService = require('../messaging/Outbox')
-
 const v2utils = require('./utils/v2')
-
 const ANONYMOUS = 'anonymous'
 
 const _getTenantAndUser = () => ({
-  user: (cds.context && cds.context.user && cds.context.user.id) || ANONYMOUS,
-  tenant: cds.context && cds.context.tenant
+  user: cds.context?.user?.id ?? ANONYMOUS,
+  tenant: cds.context?.tenant
 })
 
 module.exports = class AuditLogService extends OutboxService {
@@ -82,11 +80,8 @@ module.exports = class AuditLogService extends OutboxService {
     }
 
     // write the logs
-    await Promise.all(
-      entries.map(entry => {
-        v2utils.sendDataAccessLog(entry).catch(err => errors.push(err))
-      })
-    )
+    await Promise.all(entries.map(entry => v2utils.sendDataAccessLog(entry).catch(err => errors.push(err))))
+
     if (errors.length) {
       throw errors.length === 1 ? errors[0] : Object.assign(new Error('MULTIPLE_ERRORS'), { details: errors })
     }
@@ -108,6 +103,7 @@ module.exports = class AuditLogService extends OutboxService {
         v2utils.sendDataModificationLog(entry).catch(err => errors.push(err))
       })
     )
+
     if (errors.length) {
       throw errors.length === 1 ? errors[0] : Object.assign(new Error('MULTIPLE_ERRORS'), { details: errors })
     }
@@ -124,10 +120,12 @@ module.exports = class AuditLogService extends OutboxService {
           tenant = parsed.tenant
           delete parsed.tenant
         }
+
         if (parsed.user && typeof parsed.user === 'string') {
           user = parsed.user
           delete parsed.user
         }
+
         data = JSON.stringify(parsed)
       } catch (e) {
         // ignore
@@ -157,6 +155,7 @@ module.exports = class AuditLogService extends OutboxService {
         v2utils.sendConfigChangeLog(entry).catch(err => errors.push(err))
       })
     )
+
     if (errors.length) {
       throw errors.length === 1 ? errors[0] : Object.assign(new Error('MULTIPLE_ERRORS'), { details: errors })
     }

package/libx/_runtime/audit/generic/personal/index.js

@@ -8,7 +8,7 @@ const {
 const { auditAccessHandler } = require('./access')
 
 exports.impl = cds.service.impl(function () {
-  if (!cds.db) return cds.on('connect', srv => srv instanceof cds.DatabaseService && exports.impl.call(this))
+  if (!cds.db) return cds.on('connect', srv => srv.isDatabaseService && exports.impl.call(this))
   // REVISIT: diff() doesn't work in srv after phase but foreign key propagation has not yet taken place in srv before phase
   //          -> calc diff in db layer and store in audit data structure at context
   //          -> REVISIT for GA: clear req._.partialPersistentState?

package/libx/_runtime/audit/generic/personal/utils.js

@@ -7,7 +7,7 @@ const WRITE = { CREATE: 1, UPDATE: 1, DELETE: 1 }
 const getMapKeyForCurrentRequest = req => {
   // running in srv or db layer? -> srv's req.query used as key of diff and logs maps at req.context
   // REVISIT: req._tx should not be used like that!
-  return req.tx instanceof cds.DatabaseService ? req._.query : req.query
+  return req.tx.isDatabaseService ? req._.query : req.query
 }
 
 const getRootEntity = element => {

package/libx/_runtime/audit/utils/v2.js

@@ -3,26 +3,23 @@ const LOG = cds.log('audit-log')
 
 const { getObjectAndDataSubject, getAttributeToLog } = require('./log')
 
-function connect(credentials) {
-  return new Promise((resolve, reject) => {
-    let auditLogging
-    try {
-      // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
-      auditLogging = require('@sap/audit-logging')
-    } catch (e) {
-      // not able to require lib -> no audit logging ootb
-      return resolve()
-    }
-    try {
-      auditLogging.v2(credentials, function (err, auditLog) {
-        if (err) return reject(err)
-        resolve(auditLog)
-      })
-    } catch (e) {
-      LOG._warn && LOG.warn('Unable to initialize audit-logging client with error:', e)
-      return resolve()
-    }
-  })
+async function connect(credentials) {
+  let auditLogging
+
+  try {
+    // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
+    auditLogging = require('@sap/audit-logging')
+  } catch (error) {
+    // not able to require lib -> no audit logging ootb
+    return Promise.resolve()
+  }
+
+  try {
+    return await auditLogging.v2(credentials)
+  } catch (error) {
+    LOG._warn && LOG.warn('Unable to initialize audit-logging client with error:', error)
+    return Promise.resolve()
+  }
 }
 
 function sendDataAccessLog(entry) {

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

@@ -255,6 +255,8 @@ class ODataRequest extends cds.Request {
       }
     })
 
+    Object.defineProperty(this, '_isOData', { value: true })
+
     /*
      * req.validateEtag()
      */

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

@@ -21,7 +21,8 @@ const { isStreaming, getStreamProperties } = require('../utils/stream')
 const { resolveStructuredName } = require('../utils/handlerUtils')
 const getError = require('../../../../common/error')
 const { getSapMessages } = require('../../../../common/error/frontend')
-const { getMaxPageSize } = require('../../../../common/utils/page')
+const { getPageSize, commonGenericPaging } = require('../../../../common/generic/paging')
+const { handler: commonGenericSorting } = require('../../../../common/generic/sorting')
 
 /**
  * Checks whether a bound function or function import is invoked.
@@ -255,8 +256,12 @@ const _reliablePagingPossible = req => {
   if (req.target._isDraftEnabled) return false
   if (cds.context?.http.req.query.$apply) return false
   if (req.query.SELECT.limit.offset?.val ?? req.query.SELECT.limit.offset > 0) return false
-  if (req.query.SELECT.orderBy.some(o => !o.ref)) return false
-  return req.query.SELECT.orderBy.every(o => req.query.SELECT.columns.some(c => o.ref[0] === c.ref[0]))
+  if (req.query.SELECT.orderBy?.some(o => !o.ref)) return false
+  return (
+    !req.query.SELECT.columns ||
+    req.query.SELECT.columns.some(c => c === '*' || c.ref?.[0] === '*') ||
+    req.query.SELECT.orderBy?.every(o => req.query.SELECT.columns?.some(c => o.ref[0] === c.ref?.[0]))
+  )
 }
 
 /**
@@ -270,6 +275,8 @@ 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 (Array.isArray(req.query)) {
     const adjustedResult = []
@@ -288,7 +295,7 @@ const _readCollection = async (tx, req, odataReq) => {
   } else if (req.query.SELECT.count && !('$count' in result)) result.$count = 0
 
   const limit = Array.isArray(req.query)
-    ? getMaxPageSize(req.query[0]._target)
+    ? getPageSize(req.query[0]._target).max
     : req.query.SELECT.limit && req.query.SELECT.limit.rows && req.query.SELECT.limit.rows.val
   const top = odataReq.getUriInfo().getQueryOption(QueryOptions.TOP)
   if (limit && limit === result.length && limit !== top && !('$nextLink' in result)) {

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

@@ -11,7 +11,6 @@ const { isReturnMinimal } = require('../utils/handlerUtils')
 const { readAfterWrite } = require('../utils/readAfterWrite')
 const { toODataResult, postProcess, postProcessMinimal } = require('../utils/result')
 const { hasOmitValuesPreference } = require('../utils/omitValues')
-const { isStreaming } = require('../utils/stream')
 
 const { getSapMessages } = require('../../../../common/error/frontend')
 

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

@@ -36,7 +36,7 @@ const expandToCQN = require('./expandToCQN')
 const { resolveStructuredName } = require('../utils/handlerUtils')
 const { isStreaming } = require('../utils/stream')
 
-const { getMaxPageSize, getDefaultPageSize } = require('../../../../common/utils/page')
+const { getPageSize } = require('../../../../common/generic/paging')
 const { isAsteriskColumn } = require('../../../../common/utils/rewriteAsterisks')
 
 const { ensureUnlocalized } = require('../../../../fiori/utils/handler')
@@ -139,9 +139,9 @@ const _apply = (uriInfo, queryOptions, entity, model) => {
 
 const _topSkip = (queryOptions, target, cqn) => {
   if (queryOptions && (queryOptions.$top || queryOptions.$skip)) {
-    const top = queryOptions.$top ? parseInt(queryOptions.$top) : getDefaultPageSize(target)
+    const top = queryOptions.$top ? parseInt(queryOptions.$top) : getPageSize(target).default
     const skip = parseInt(queryOptions.$skip || 0)
-    cqn.limit(Math.min(top, getMaxPageSize(target)), skip)
+    cqn.limit(Math.min(top, getPageSize(target).max), skip)
   }
 }
 

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

@@ -9,7 +9,7 @@ const { deepCopy } = require('../../../../common/utils/copy')
 const { getSegmentKeyValue } = require('../odata-to-cqn/utils')
 
 const _isFunctionInvocation = req =>
-  req.getUriInfo().getLastSegment().getFunction || req.getUriInfo().getLastSegment().getFunctionImport
+  req.getUriInfo().getLastSegment().getFunction() || req.getUriInfo().getLastSegment().getFunctionImport()
 
 const _addStructuredProperties = ([structName, property, ...nestedProperties], paramData, value) => {
   paramData[structName] = paramData[structName] || {}

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

@@ -94,14 +94,14 @@ const _columnsFromQuery = (columns, target, options) => {
 }
 
 const _processFn = columns => {
-  return ({ row, key, element, pathSegments }) => {
+  return ({ row, key, element, pathSegmentsInfo }) => {
     if (!(key in row) || row[key] === null) return
     let cur = columns
     if (element.parent._isStructured) {
-      const prefix = pathSegments.join('/')
+      const prefix = pathSegmentsInfo.join('/')
       key = `${prefix}/${key}`
     } else {
-      for (let p of pathSegments) {
+      for (let p of pathSegmentsInfo) {
         if (!cur[p]) cur[p] = {}
         cur = cur[p]
       }
@@ -116,7 +116,7 @@ const _columnsFromData = (data, definition, service) => {
   if (!template || !template.elements.size) return ''
   const arrayData = Array.isArray(data) ? data : data ? [data] : []
   for (const row of arrayData) {
-    templateProcessor({ processFn: _processFn(columns), row, template, pathOptions: { pathSegments: [] } })
+    templateProcessor({ processFn: _processFn(columns), row, template, pathOptions: { pathSegmentsInfo: [] } })
   }
   return _stringifyColumnsFromData(columns)
 }

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

@@ -1,4 +1,4 @@
-const { getMaxPageSize } = require('../../../../common/utils/page')
+const { getPageSize } = require('../../../../common/generic/paging')
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
 
 const _getEntitySets = (edm, namespace) => {
@@ -37,7 +37,7 @@ const oDataConfiguration = (edm, csn) => {
     const e = findCsnTargetFor(entitySet, csn, namespace)
 
     configuration[entitySet] = {
-      maxPageSize: getMaxPageSize(e),
+      maxPageSize: getPageSize(e).max,
       isConcurrent: !!e._etag
     }