@sap/cds 7.6.4 → 7.7.1

package/lib/req/context.js

@@ -95,11 +95,11 @@ class EventContext {
       if (pd?.value) this[p] = pd.value
     }
     let user = u instanceof cds.User ? Object.create(u,{
-      tenant: {get:()=> this.tenant},
-      locale: {get:()=> this.locale},
+      tenant: {get:()=> cds.utils.deprecated (() => this.tenant, {kind: 'Property', old: 'req.user.tenant', use: 'req.tenant'})()},
+      locale: {get:()=> cds.utils.deprecated (() => this.locale, {kind: 'Property', old: 'req.user.locale', use: 'req.locale'})()},
     }) : Object.defineProperties (new cds.User(u), {
-      tenant: {get:()=> this.tenant},
-      locale: {get:()=> this.locale},
+      tenant: {get:()=> cds.utils.deprecated (() => this.tenant, {kind: 'Property', old: 'req.user.tenant', use: 'req.tenant'})()},
+      locale: {get:()=> cds.utils.deprecated (() => this.locale, {kind: 'Property', old: 'req.user.locale', use: 'req.locale'})()},
     })
     super.user = user
   }
@@ -185,17 +185,26 @@ const _anonymous = new cds.User.default
 
 class Features {
   static for (x) { // normalizes features to an object
-    if (!x) return
+    if (x == null) return
     if (x === '*') return this.all
-    const fts = new this
-    if (Array.isArray(x))           { for (let f of x)            fts[f] = true }
-    else if (typeof x === 'object') { for (let f in x) if (x[f])  fts[f] = true }
-    else if (typeof x === 'string') { for (let f of x.split(',')) fts[f] = true }
-    return fts
-  }
-  get $hash() { return super.$hash = Object.keys(this).join(',') }
+    if (Array.isArray(x)) ; //> go on below
+    else if (typeof x === 'object') x = Object.keys(x)
+    else if (typeof x === 'string') x = x.split(',')
+    if (x.length) return Object.assign (new this, x.reduce((o,f)=>{o[f]=true;return o},{}))
+  }
+  get given() { return true }
+  get $hash() { let h = Object.keys(this).join(','); Object.defineProperty(this,'$hash',{value:h}); return h }
+  includes(t) { return t in this }
+  has(t) { return t in this }
+  map(..._) { return Object.keys(this).map(..._) }
+  find(filter) { for (let t in this) if (filter(t)) return t }
+  some(filter) { for (let t in this) if (filter(t)) return true }
+  every(filter) { for (let t in this) if (!filter(t)) return false }
   static all = new Proxy ({'*':true},{ has:() => true, get:(_,p) => p === '$hash' ? '*' : true })
-  static none = new class none extends Features {}
+  static none = new class none extends Features {
+    get given(){ return false }
+    get $hash(){ return '' }
+  }
 }
 
 EventContext.prototype._set('_propagated', Object.seal({}))

package/lib/req/request.js

@@ -1,5 +1,5 @@
 const { Responses, Errors } = require('./response')
-const cds = require('../../lib')
+const cds = require('../../lib'), {production} = cds.env
 
 /**
  * Class Request represents requests received via synchronous protocols.
@@ -41,7 +41,7 @@ class Request extends require('./event') {
       if (q.INSERT) return this._set ('path', _path4 (q.INSERT,'into'))
       if (q.UPSERT) return this._set ('path', _path4 (q.UPSERT,'into'))
       if (q.UPDATE) return this._set ('path', _path4 (q.UPDATE,'entity'))
-      if (q.DELETE) return this._set ('path', _path4 (q.DELETE,'from'))      
+      if (q.DELETE) return this._set ('path', _path4 (q.DELETE,'from'))
     }
     const {_} = this
     if (_.target) return this._set ('path', _.target.name)
@@ -127,7 +127,13 @@ class Request extends require('./event') {
   reject (...args) {
     if (args.length === 0 && this.errors) {
       let errs = this.errors
-      throw errs.length === 1 ? errs[0] : new cds.error ('MULTIPLE_ERRORS', { details: errs }, this.reject)
+      if (errs.length === 1) throw errs[0]
+      let me = new cds.error ('MULTIPLE_ERRORS', { details: errs }, this.reject)
+      if (!production) me.stack += errs.map (e => '\n---------------------------------\n'+ e.stack
+        .replace('\n',': '+ (e.element||e.target||'')+'\n---------------------------------\n')
+        .replace(/^Error: /,'')
+      ).join('')
+      throw me
     }
     if (args[0] === 401 && this._.req?._login) this._.req._login()
     let e = this.error(...args)
@@ -169,7 +175,7 @@ const Http2Crud = {
   DELETE: 'DELETE',
 }
 
-const SQL2Crud = {  
+const SQL2Crud = {
   SELECT:   'READ',
   INSERT:   'CREATE',
   UPSERT:   'UPSERT',

package/lib/srv/cds-connect.js

@@ -22,7 +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} `)
+  TRACE?.time(`cds.connect.to ${datasource}`.padEnd(22).slice(0,22))
   let Service = cds.service.factory, _done = x=>x
   if (typeof datasource === 'object') [options,datasource] = [datasource]
   else if (datasource) {
@@ -43,12 +43,18 @@ connect.to = async (datasource, options) => {
     throw new Error (`No service definition found for '${required.service || datasource}'`)
   }
   // construct new service instance
-  let srv = await new Service (datasource,m,o); await srv._init()
+  let srv
+  try {
+    srv = await new Service (datasource,m,o); await srv._init()
+  } catch (e) {
+    _pending[datasource] = Promise.reject(e)
+    throw e
+  }
   if (o.outbox) srv = cds.outboxed(srv)
   if (datasource === 'db') cds.db = srv
   _done (cds.services[datasource] = srv)
   if (!o.silent) cds.emit ('connect',srv)
-  TRACE?.timeEnd(`cds.connect ${datasource} `)
+  TRACE?.timeEnd(`cds.connect.to ${datasource}`.padEnd(22).slice(0,22))
   return srv
 }
 

package/lib/srv/cds-serve.js

@@ -3,11 +3,13 @@ const { Service } = cds.service.factory
 const { serve } = cds.service.protocols
 const _ready = Symbol(), _pending = cds.services._pending || {}
 const TRACE = cds.debug('trace')
+if (TRACE && !cds.env.features.odata_new_adapter) require('./../../libx/_runtime').to.odata_v4
+
 
 /** @param som - a service name or a model (name or csn) */
 module.exports = function cds_serve (som, _options) { // NOSONAR
 
-  TRACE?.time(`cds.serve ${som}  `)
+  TRACE?.time(`cds.serve ${som}`.padEnd(22).slice(0,22))
 
   if (som && typeof som === 'object' && !is_csn(som) && !is_files(som)) {
     [som,_options] = [undefined,
@@ -102,7 +104,7 @@ module.exports = function cds_serve (som, _options) { // NOSONAR
       ready = ready.then (()=> all.forEach (each => {
         const d = each.definition
         if (d['@protocol'] === 'none' || d['@cds.api.ignore']) return each._is_dark = true
-        serve (each, /*in:*/ app)
+        else serve (each, /*to:*/ app)
         if (!o.silent) cds.emit ('serving',each)
       }))
       return this
@@ -115,7 +117,7 @@ module.exports = function cds_serve (som, _options) { // NOSONAR
      * let CatalogService = await cds.serve(...)    // single only
      */
     then: (_resolve, _error) => ready.then ((s)=>{
-      TRACE?.timeEnd('cds.serve '+som+'  ')
+      TRACE?.timeEnd(`cds.serve ${som}`.padEnd(22).slice(0,22))
       if (all.length === 0) return _resolve()
       if (all.length === 1) return _resolve(Object.defineProperty(s=all[0],s.name,{value:s}))
       else return _resolve (all.reduce ((r,s)=>{ r[s.name]=s; return r },{}))

package/lib/srv/middlewares/ctx-model.js

@@ -8,7 +8,7 @@ module.exports = ()=> {
   return async function cds_context_model (req,res, next) {
     if (req.baseUrl.startsWith('/-/')) return next() //> our own tech services cannot be extended
     const ctx = cds.context
-    if (ctx.tenant || ctx.features) try {
+    if (ctx.tenant || ctx.features?.given) try {
       // if (req.headers.features) ctx.user.features = req.headers.features //> currently done in basic-auth only
       ctx.model = req.__model = await model4 (ctx.tenant, ctx.features) // REVISIT: req.__model is because of Okra
     } catch (e) {

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

@@ -4,6 +4,7 @@ const cds = require('../../index'),
 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()
@@ -25,17 +26,45 @@ module.exports = function ODataAdapter(srv) {
   })
 
   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?
-    router.use(/^\/$/, require('../../../libx/odata/service-document')(srv))
-    router.use('/\\$metadata', require('../../../libx/odata/metadata')(srv))
-    router.get('*', require('../../../libx/odata/read')(srv))
-    router.delete('*', require('../../../libx/odata/delete')(srv))
+    // 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(express.json())
-    router.post('*', require('../../../libx/odata/create')(srv))
-    router.put('*', require('../../../libx/odata/update')(srv))
-    router.patch('*', require('../../../libx/odata/update')(srv))
-    router.use(require('../../../libx/odata/error')(srv))
+    router.use((req, res, next) => {
+      const method = req.method
+      if (method !== 'PUT') {
+        return express.json()(req, res, next)
+      }
+
+      const { _query: query } = req
+      if (isStream(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 express.json()(req, res, next)
+    })
+
+    // 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 {
     router.use(libx.to.odata_v4(srv))
   }

package/lib/srv/srv-api.js

@@ -1,18 +1,21 @@
-const cds = require('..'),
-  { Event, Request } = cds
-const add_methods_to = require('./srv-methods')
-const LOG = cds.log()
+//////////////////////////////////////////////////////////////
+//
+//  PLEASE DO NOT RUN prettier ON THIS FILE
+//
+//////////////////////////////////////////////////////////////
+
+const cds = require('..'), { Event, Request } = cds
+const add_methods_to = require ('./srv-methods')
 
 class Service extends require('./srv-handlers') {
-  constructor(name, model, o) {
+
+  constructor (name, model, o) {
     if (is_object(name)) {
-      ;[model, o] = [name, model]
-      let srv =
-        cds.linked(model).services[0] ||
-        cds.error.expected`${{ model }} passed as first argument to be a CSN with a single service definition`
+      [ model, o ] = [ name, model ]
+      let srv = cds.linked(model).services[0] || cds.error.expected `${{model}} passed as first argument to be a CSN with a single service definition`
       name = srv.name
     }
-    super(name || new.target.name).options = o || (o = {})
+    super (name || new.target.name) .options = o || (o={})
     if (o.kind) this.kind = o.kind // shortcut
     if (model) this.model = model
   }
@@ -20,11 +23,11 @@ class Service extends require('./srv-handlers') {
   /**
    * Subclasses may override this to prepare the given model appropriately
    */
-  set model(csn) {
+  set model (csn) {
     if (csn) {
-      let { definitions: defs = {} } = (super.model = cds.compile.for.nodejs(csn))
+      let {definitions:defs={}} = super.model = cds.compile.for.nodejs(csn)
       super.definition = defs[this.options?.service] || defs[this.name]
-      add_methods_to(this)
+      add_methods_to (this)
     } else {
       super.model = undefined
     }
@@ -33,166 +36,101 @@ class Service extends require('./srv-handlers') {
   /**
    * Messaging API to emit asynchronous event messages, i.e. instances of `cds.Event`.
    */
-  emit(event, data, headers) {
-    const eve = event instanceof Event ? event : new Event(is_object(event) ? event : { event, data, headers })
-    return this.dispatch(eve)
+  emit (event, data, headers) {
+    const eve = event instanceof Event ? event : new Event (
+      is_object(event) ? event
+      : { event, data, headers }
+    )
+    return this.dispatch (eve)
   }
 
   /**
    * REST-style API to send synchronous requests...
    */
-  send(method, path, data, headers) {
-    const req =
-      method instanceof Request
-        ? method
-        : new Request(
-            is_object(method)
-              ? method
-              : is_object(path)
-                ? { method, data: path, headers: data }
-                : { method, path, data, headers }
-          )
-    return this.dispatch(req)
-  }
-  get(...args) {
-    return is_rest(args[0]) ? this.send('GET', ...args) : this.read(...args)
-  }
-  put(...args) {
-    return is_rest(args[0]) ? this.send('PUT', ...args) : this.update(...args)
-  }
-  post(...args) {
-    return is_rest(args[0]) ? this.send('POST', ...args) : this.create(...args)
-  }
-  patch(...args) {
-    return is_rest(args[0]) ? this.send('PATCH', ...args) : this.update(...args)
-  }
-  delete(...args) {
-    return is_rest(args[0]) ? this.send('DELETE', ...args) : DELETE.from(...args).bind(this)
-  }
+  send (method, path, data, headers) {
+    const req = method instanceof Request ? method : new Request (
+      is_object(method) ? method :
+      is_object(path) ? { method, data:path, headers:data }
+      : { method, path, data, headers }
+    )
+    return this.dispatch (req)
+  }
+  get    (...args) { return is_rest(args[0]) ? this.send('GET',   ...args) : this.read   (...args) }
+  put    (...args) { return is_rest(args[0]) ? this.send('PUT',   ...args) : this.update (...args) }
+  post   (...args) { return is_rest(args[0]) ? this.send('POST',  ...args) : this.create (...args) }
+  patch  (...args) { return is_rest(args[0]) ? this.send('PATCH', ...args) : this.update (...args) }
+  delete (...args) { return is_rest(args[0]) ? this.send('DELETE',...args) : DELETE.from (...args).bind(this) }
 
   /**
    * Querying API to send synchronous requests...
    */
-  run(query, data) {
+  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
-      else {
-        if (!ctx.tx._done) return fn(this.tx(ctx)) // run fn with nested tx
-        else if (ctx.tx._done === 'rolled back')
-          // > reject
-          ctx.tx._throw_closed_error()
-        else return this.tx(fn) // run fn with detached root tx
-      }
+      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 req = new Request({ query, data })
-    return this.dispatch(req)
-  }
-  read(...args) {
-    return is_query(args[0]) ? this.run(...args) : SELECT(...args).bind(this)
-  }
-  // Deprecated: To be removed with the next major release
-  stream(...args) {
-    cds._logDeprecation('stream method is deprecated and will be removed in upcoming releases!')
-    if (is_query(args[0])) {
-      Object.defineProperty(args[0], '_stream', { value: true, enumerable: false })
-      if (cds.env.features.stream_compat)
-        Object.defineProperty(args[0], '_streaming', { value: true, enumerable: false })
-      return this.run(...args).then(result => (result ? Object.values(result)[0] : result))
-    }
-    const q = (args ? SELECT.one.columns(args) : SELECT.one).bind(this)
-    Object.defineProperty(q, '_stream', { value: true, enumerable: false })
-    if (cds.env.features.stream_compat) Object.defineProperty(q, '_streaming', { value: true, enumerable: false })
-    return q
-  }
-  insert(...args) {
-    return INSERT(...args).bind(this)
-  }
-  create(...args) {
-    return INSERT.into(...args).bind(this)
-  }
-  update(...args) {
-    return UPDATE.entity(...args).bind(this)
-  }
-  upsert(...args) {
-    return UPSERT(...args).bind(this)
-  }
-  exists(...args) {
-    return SELECT.one([1])
-      .from(...args)
-      .bind(this)
+    const req = new Request ({ query, data })
+    return this.dispatch (req)
   }
+  read   (...args) { return is_query(args[0]) ? this.run(...args) : SELECT(...args).bind(this) }
+  insert (...args) { return INSERT(...args).bind(this) }
+  create (...args) { return INSERT.into(...args).bind(this) }
+  update (...args) { return UPDATE.entity(...args).bind(this) }
+  upsert (...args) { return UPSERT(...args).bind(this) }
+  exists (...args) { return SELECT.one([1]).from(...args).bind(this) }
 
   /**
    * Streaming API variant of .run(). Subclasses should override this to support real streaming.
    * The default implementation doesn't stream, but simply invokes the callback on each row.
    * The callback function is invoked with (row, index).
    */
-  foreach(query, data, callback) {
-    if (!callback) [data, callback] = [undefined, data]
-    return this.run(query, data).then(rows => rows.forEach(callback) || rows)
+  foreach (query, data, callback) {
+    if (!callback)  [ data, callback ] = [ undefined, data ]
+    return this.run (query, data) .then (rows => rows.forEach(callback) || rows)
   }
 
   /**
    * Model Reflection API...
    */
-  get namespace() {
-    return (super.namespace =
-      this.definition?.name ||
-      this.model?.namespace ||
-      (!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 namespace()  {
+    return super.namespace  = this.definition?.name
+    || this.model?.namespace
+    || !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') }
 
   /**
    * Flag to control whether this service is extensible.
    * Can be overridden by subclasses.
-   * REVISIT cds.xt name check should move to respective services
    */
   get isExtensible() {
-    return !this.name?.startsWith('cds.xt.') && this.model === cds.model
+    return this.model === cds.model && !this.name?.startsWith('cds.xt.') // REVISIT cds.xt name check should move to respective services
   }
 
   /**
-   * Subclasses may override this to free private resources
+   * Subclasses may override this to free resources when
+   * tenants offboard or the service is disposed.
    */
-  disconnect(tenant) {
-    if (this === cds.db) {
-      if (tenant && cds.db.dbcs) cds.db.dbcs.delete[tenant]
-      else if (!tenant) cds.db = undefined //> REVISIT: should go into DatabaseService
-    }
-    delete cds.services[this.name]
+  disconnect (tenant) { // eslint-disable-line no-unused-vars
+    // if (this === cds.db) { //> REVISIT: should go into DatabaseService
+    //   if (!tenant) cds.db = undefined
+    //   else if (this.dbcs) this.dbcs.delete[tenant] // This code is obviously wrong and never tested -> is that required ?!?
+    // }
+    // delete cds.services[this.name] // REVISIT: this is in contrast to some tests
   }
 
-  get path() {
-    return (super.path = cds.service.protocols.path4(this))
-  }
-  set path(p) {
-    super.path = p
-  }
+  get path() { return super.path = cds.service.protocols.path4(this) }
+  set path(p) { super.path = p }
 
-  get endpoints() {
-    return (super.endpoints = cds.service.protocols.endpoints4(this))
-  }
-  set endpoints(p) {
-    super.endpoints = p
-  }
+  get endpoints() { return super.endpoints = cds.service.protocols.endpoints4(this) }
+  set endpoints(p) { super.endpoints = p }
 }
 
 const { dispatch, handle } = require('./srv-dispatch')
@@ -205,8 +143,28 @@ Service.prototype._is_service_instance = Service._is_service_class = true //> fo
 module.exports = Service
 
 // Helpers...
-const _reflect = (srv, filter) => (!srv.model ? [] : srv.model.childrenOf(srv.namespace, filter))
+const _reflect = (srv,filter) => !srv.model ? [] : srv.model.childrenOf (srv.namespace,filter)
 const is_rest = x => x && typeof x === 'string' && x[0] === '/'
-const is_query = x => (x && x.bind) || (is_array(x) && !x.raw)
-const is_array = x => Array.isArray(x) && !x.raw
-const is_object = x => typeof x === 'object'
+const is_query = x => x && x.bind || is_array(x) && !x.raw
+const is_array = (x) => Array.isArray(x) && !x.raw
+const is_object = (x) => typeof x === 'object'
+
+// Deprecated
+/** @deprecated: To be removed with the next major release */
+Service.prototype.stream = cds.utils.deprecated (function (...args) {
+  if (is_query(args[0])) {
+    Object.defineProperty(args[0], '_stream', { value: true, enumerable: false })
+    if (cds.env.features.stream_compat)
+      Object.defineProperty(args[0], '_streaming', { value: true, enumerable: false })
+    return this.run(...args).then(result => {
+      if (!result) return result
+      return Array.isArray(result) ? Object.values(result[0])[0] : Object.values(result)[0]})
+  }
+  const q = (args ? SELECT.one.columns(args) : SELECT.one).bind(this)
+  Object.defineProperty(q, '_stream', { value: true, enumerable: false })
+  if (cds.env.features.stream_compat) Object.defineProperty(q, '_streaming', { value: true, enumerable: false })
+  return q
+}, {
+  old: 'srv.stream()',
+  use: 'srv.read()'
+})

package/lib/srv/srv-models.js

@@ -182,9 +182,9 @@ if (!extensibility) {
 
 // helper to get model for tenant/features
 const _is_extended = extensibility ? ()=> cds.db.exists('cds.xt.Extensions') : ()=> false
-const _get_model4 = (tenant, toggles) => {
+const _get_model4 = (tenant, features) => {
   const { 'cds.xt.ModelProviderService':mps } = cds.services
-  return mps.getCsn (tenant, toggles) .then (cds.compile.for.nodejs)
+  return mps.getCsn (tenant, features) .then (cds.compile.for.nodejs)
 }
 
 

package/lib/srv/srv-tx.js

@@ -58,6 +58,7 @@ class Transaction {
     return tx
   }
 
+  /** @param {import('./srv-api')} srv */
   constructor (srv, ctx) {
     const tx = { __proto__:srv, _kind: new.target.name, context: ctx }
     const proto = new.target.prototype

package/lib/utils/cds-utils.js

@@ -28,16 +28,6 @@ exports.Object_keys = o => ({
 })
 
 
-/**
- * CSN-aware function to deep clone objectx
- */
-exports.clone = (x) => {
-  const y = structuredClone(x)
-  if (x.$sources) Object.defineProperty (y, '$sources', { value: x.$sources })
-  return y
-}
-
-
 /**
  * Simple helper to always access results as arrays.
  */
@@ -76,9 +66,9 @@ exports.exists = function exists (x) {
 }
 
 // REVISIT naming: doesn't return boolean
-exports.isdir = function isdir (x) {
-  if (x) try {
-    const y = resolve (cds.root,x)
+exports.isdir = function isdir (...args) {
+  if (args.length) try {
+    const y = resolve (cds.root,...args)
     const ls = fs.lstatSync(y)
     if (ls.isDirectory()) return y
     if (ls.isSymbolicLink()) return isdir (join (dirname(y), fs.readlinkSync(y)))
@@ -86,9 +76,9 @@ exports.isdir = function isdir (x) {
 }
 
 // REVISIT naming: doesn't return boolean
-exports.isfile = function isfile (x) {
-  if (x) try {
-    const y = resolve (cds.root,x)
+exports.isfile = function isfile (...args) {
+  if (args.length) try {
+    const y = resolve (cds.root,...args)
     const ls = fs.lstatSync(y)
     if (ls.isFile()) return y
     if (ls.isSymbolicLink()) return isfile (join (dirname(y), fs.readlinkSync(y)))
@@ -190,20 +180,39 @@ exports.find = function find (base, patterns='*', filter=()=>true) {
   return files
 }
 
-exports.deprecated = (fn, { kind = 'Method', old = fn.name+'()', use } = {}) => function() {
-  if (!fn.warned) {
-    let o={}; Error.captureStackTrace(o)
-    console.warn (
+exports.deprecated = (fn, { kind = 'Method', old = fn.name+'()', use } = {}) => {
+  const yellow = '\x1b[33m'
+  const reset = '\x1b[0m'
+  if(typeof fn !== 'function') {
+    if (cds.env.features.deprecated === 'off') return
+
+    [kind,old,use] = [fn.kind || 'Configuration',fn.old,fn.use]
+    console.log (
+      yellow,
       '\n------------------------------------------------------------------------------',
       '\nDEPRECATED:', old, '\n',
       '\n  ', kind, 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',
+      reset
     )
-    if (cds.env.features.deprecated !== 'show all') fn.warned = true
+  } else return function() {
+    if (cds.env.features.deprecated !== 'off' && !fn.warned) {
+      let o={}; Error.captureStackTrace(o)
+      console.warn (
+        yellow,
+        '\n------------------------------------------------------------------------------',
+        '\nDEPRECATED:', old, '\n',
+        '\n  ', kind, 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',
+        reset
+      )
+      if (cds.env.features.deprecated !== 'show all') fn.warned = true
+    }
+    return fn.apply (this, arguments)
   }
-  return fn.apply (this, arguments)
 }
 
 exports.csv = require('./csv-reader')

package/lib/utils/data.js

@@ -16,7 +16,7 @@ class DataUtil {
 
   async deploy(db) {
     if (!db)  db = await cds.connect.to('db')
-    await cds.deploy.init(db)
+    await cds.deploy.data(db)
   }
 
   async delete(db) {