@sap/cds 6.3.2 → 6.4.1

package/lib/core/index.js

@@ -26,6 +26,7 @@ const roots = _roots ({
 	Association: {type:'type'},
 	Composition: {type:'Association'},
 	service: {type:'context'},
+	$self: {}, //> to support polymorphic self links like in: action foo( self: [many] $self, ...)
 })
 
 /**
@@ -35,13 +36,12 @@ const roots = _roots ({
  function _roots (defs) {
 	const linked = { any: classes.any.prototype }
 	for (const t in defs) {
-		if (t in classes) {
-			linked[t] = classes[t].prototype
-			continue
+		if (t in classes) linked[t] = classes[t].prototype
+		else {
+			const c = class extends classes[defs[t].type || 'any'] {}
+			classes[t] = Object.defineProperty (c, 'name', {value:t})
+			linked[t] = Object.defineProperty (c.prototype, 'name', {value:t})
 		}
-		const c = class extends classes[defs[t].type || 'any'] {}
-		linked[t] = Object.defineProperty (c.prototype, 'name', {value:t})
-		classes[t] = Object.defineProperty (c, 'name', {value:t})
 	}
 	return linked
 }
@@ -56,9 +56,9 @@ const types = _common ({ __proto__: roots,
 		Int16: {type:'Integer'},
 		Int32: {type:'Integer'},
 		Int64: {type:'Integer'},
-		Integer16: {type:'Integer'},
-		Integer32: {type:'Integer'},
-		Integer64: {type:'Integer'},
+		Integer16: {type:'Int16'},
+		Integer32: {type:'Int32'},
+		Integer64: {type:'Int64'},
 	Decimal: {type:'number'},
 	DecimalFloat: {type:'number'},
 	Float: {type:'number'},

package/lib/core/infer.js

@@ -5,6 +5,7 @@ module.exports = (q,defs) => {
   if (!q._target || q._target.kind !== 'entity') Object.defineProperty (q, '_target', {value:(
     q.SELECT ? _resolve (q.SELECT.from, defs) :
     q.INSERT ? _resolve (q.INSERT.into, defs) :
+    q.UPSERT ? _resolve (q.UPSERT.into, defs) :
     q.UPDATE ? _resolve (q.UPDATE.entity, defs) :
     q.DELETE ? _resolve (q.DELETE.from, defs) :
     _resolve (undefined)

package/lib/dbs/cds-deploy.js

@@ -1,4 +1,4 @@
-const cds = require('../index'), { local, inspect } = cds.utils
+const cds = require('../index'), { local, inspect } = cds.utils, { UPSERT } = cds.ql
 const DEBUG = cds.debug('deploy')
 
 const colors = !!process.stdout.isTTY && !!process.stderr.isTTY
@@ -14,7 +14,7 @@ const term = {
  * deploy create tables and views in case of a SQL database, then fills
  * in initial data, if present.
  */
-exports = module.exports = function cds_deploy (model,options) { return {
+exports = module.exports = function cds_deploy (model,options,csvs) { return {
 
   /** @param {cds.Service} db */
   async to (db, o = options || cds.options || {}) {
@@ -40,10 +40,10 @@ exports = module.exports = function cds_deploy (model,options) { return {
 
     // create tables & views...
     const any = await exports.create (db,model,o)
-    if (!any) return db
+    if (!any && !csvs) return db
 
     // fill in initial data...
-    await exports.init (db,model, file => LOG(
+    await exports.init (db,model,o,csvs, file => LOG(
       term.info(` > init from ${local(file)}`)
     ))
 
@@ -105,55 +105,113 @@ exports.exclude_external_entities_in = function (csn) { // NOSONAR
   }
 }
 
-
-exports.create = async function (db, csn=db.model, o) {
-  if (!db.deploy || o.lean) {
-    const creates = cds.compile.to.sql (csn,o); if (!creates || creates.length === 0) return
-    const drops = creates.map (each => {
+function getSqls(db, csn, o, beforeCsn) {
+  const schemaEvo = (db.options?.schema_evolution === 'auto' || o.schema_evolution === 'auto')
+  const creds = db.options?.credentials 
+  const in_memory = (creds?.url || creds?.database) === ':memory:';
+  if (!in_memory && schemaEvo) {
+    const { afterImage: afterCsn, drops, createsAndAlters: creas } = cds.compile.to.sql.delta (csn, o, beforeCsn);
+    if(beforeCsn === undefined) {
+      // If this is the first deployment done with automatic schema evolution, generate everything as if it was a drop create
+      // but set the afterCsn in the db so we can calculate a delta going forward
+      return { afterCsn, drops: creas.map (each => {
+        let [, kind, entity] = each.match(/^CREATE (TABLE|VIEW) "?([^\s"(]+)/im) || []
+        return `DROP ${kind} IF EXISTS ${entity};`
+      }).reverse(), creas };
+    }
+    return { afterCsn, drops, creas };
+  } else {
+    const creas = cds.compile.to.sql(csn, o);
+    const drops = creas.map (each => {
       let [, kind, entity] = each.match(/^CREATE (TABLE|VIEW) "?([^\s"(]+)/im) || []
       return `DROP ${kind} IF EXISTS ${entity};`
-    }).reverse()
-    if (o.dry) {
-      console.log(); for (let each of drops) console.log(each)
-      console.log(); for (let each of creates) console.log(each,'\n')
-      return
-    } else return db.run (async tx => {
-      await tx.run(drops)
-      await tx.run(creates)
-      return true
-    })
+    }).reverse();
+    return { afterCsn: {}, drops, creas };
   }
-  else return db.deploy (csn,o)
 }
 
+exports.create = async function (db, csn=db.model, o) {
+  const schemaEvo = (db.options?.schema_evolution === 'auto' || o.schema_evolution === 'auto')
+  if(db.deploy && !schemaEvo) {
+    // reset CSN state saved in db - if there is any
+    await db.run('DROP table if exists cds_Model;');
+    return db.deploy(csn, o);
+  }
 
-exports.init = (db, csn=db.model, log=()=>{}) => db.run (async tx => {
+  const in_memory = db.options?.credentials?.url === ':memory:';
+  let beforeCsn
+  if (!in_memory && schemaEvo) try {
+    const [{ csn }] = await db.read('cds.Model')
+    beforeCsn = JSON.parse(csn);
+  } catch(e) {
+    if (e.message.includes('no such table: cds_Model')) {
+      await db.run('CREATE table cds_Model ( csn CLOB )')
+      await db.insert({csn:''}).into('cds.Model')
+    }
+  }
+
+  const { afterCsn, drops, creas } = getSqls(db, csn, o, beforeCsn);
+
+  if (!creas || creas.length === 0) return
+  if (o.dry) {
+    console.log(); for (let each of drops) console.log(each,'\n')
+    console.log(); for (let each of creas) console.log(each,'\n')
+    return
+  } else return db.run (async tx => {
+    await tx.run(drops)
+    await tx.run(creas)
+    if (!in_memory && schemaEvo) {
+      await tx.update('cds.Model').with({ csn: JSON.stringify(afterCsn) })
+    }
+    return true
+  })
+}
+
+
+exports.init = (db, csn=db.model, o, csvs, log=()=>{}) => db.run (async tx => {
   const resources = await exports.resources(csn, {testdata: cds.env.features.test_data})
   const inits=[]
-  for (let [file,e] of Object.entries(resources)) {
-    if (e === '*') { // init.js/ts
-      let x = await cds.utils._import(file);  if (!x) continue
-      if (x.default)  x = x.default  // default ESM export
-      inits.push (!x.then && typeof x === 'function' ? x(db,csn) : x)
-      log (file)
-    } else { // from .csv or .json
-      const INSERT_into = _from_csv_or_json [path.extname(file)]
-      const src = await read(file,'utf8'); if (!src) continue
-      const q = INSERT_into (e,src); if (!q) continue
+  const schemaEvo = (db.options?.schema_evolution === 'auto' || o?.schema_evolution === 'auto')
+
+
+  if (csvs) {
+    const ccsn = cds.compile.for['nodejs'](csn) // compile to calculate keys for newly added entities
+    for(let [e,src] of Object.entries(csvs)) {
+      const q = INSERT_from_csv (e,src,schemaEvo); if (!q) continue
       if (db.kind === 'better-sqlite') _add_missing_pks2(q)
-      log (file,e)
+      q._target = ccsn.definitions[e]
       inits.push (tx.run(q) .catch (e => {
         throw Object.assign (e, { message: 'in cds.deploy(): ' + e.message +'\n'+ inspect(q) })
       }))
     }
+  } else {
+    for (let [file,e] of Object.entries(resources)) {
+      if (e === '*') { // init.js/ts
+        let x = await cds.utils._import(file);  if (!x) continue
+        if (x.default)  x = x.default  // default ESM export
+        inits.push (!x.then && typeof x === 'function' ? x(db,csn) : x)
+        log (file)
+      } else { // from .csv or .json
+        const INSERT_into = _from_csv_or_json [path.extname(file)]
+        const src = await read(file,'utf8'); if (!src) continue
+        const q = INSERT_into (e,src,schemaEvo); if (!q) continue
+        if (db.kind === 'better-sqlite') _add_missing_pks2(q)
+        if (cds.requires['cds.xt.ModelProviderService']?.kind === 'in-sidecar') q._target = csn.definitions[e]
+        log (file,e)
+        inits.push (tx.run(q) .catch (e => {
+          throw Object.assign (e, { message: 'in cds.deploy(): ' + e.message +'\n'+ inspect(q) })
+        }))
+      }
+    }
   }
+
   await Promise.all (inits)
 
   function _add_missing_pks2 (q) {
-    const {columns,rows} = q.INSERT // REVISIT: .entries are covered by current runtime. Should eventually also be handled here, as we likely don't do so in new db services
+    const {columns,rows} =  q.UPSERT || q.INSERT // REVISIT: .entries are covered by current runtime. Should eventually also be handled here, as we likely don't do so in new db services
     if (columns) {
       const entity = csn.definitions[q._target.name], {uuid} = cds.utils
-      for (let k in entity.keys) if (!columns.includes(k)) {
+      for (let k in entity.keys) if (!columns.includes(k) && !entity.keys[k].isAssociation) {
         columns.push(k)
         const t = entity.keys[k]._type, pk = t === 'cds.UUID' ? uuid : index => index+1
         rows.forEach ((row,index) => row.push(pk(index)))
@@ -216,7 +274,7 @@ const _entity4 = (file,csn) => {
   if (!entity) {
     if (/(.+)[._]texts_?/.test(name)) { // 'Books.texts', 'Books.texts_de'
       const base = csn.definitions [RegExp.$1]
-      return base && _entity4 (base.elements.texts.target,csn)
+      return base?.elements?.texts && _entity4 (base.elements.texts.target, csn)
     }
     else return DEBUG && DEBUG (`warning: ${name} not in model`)
   }
@@ -228,16 +286,14 @@ const _entity4 = (file,csn) => {
   return entity.name ? entity : { name, __proto__:entity }
 }
 
-const INSERT_from_csv = (entity, csv) => {
+const INSERT_from_csv = (entity, csv, schemaEvo) => {
   let [ cols, ...rows ] = cds.parse.csv (csv)
-  if (rows.length > 0) return INSERT.into (entity) .columns (cols) .rows (rows)
-  // if (rows.length > 0) return UPSERT.into (entity) .columns (cols) .rows (rows)
+  if (rows.length > 0) return (schemaEvo ? UPSERT : INSERT).into (entity) .columns (cols) .rows (rows)
 }
 
-const INSERT_from_json = (entity, json) => {
+const INSERT_from_json = (entity, json, schemaEvo) => {
   let records = JSON.parse (json)
-  if (records.length > 0) return INSERT.into (entity) .entries (records)
-  // if (records.length > 0) return UPSERT.into (entity) .entries (records)
+  if (records.length > 0) return (schemaEvo ? UPSERT : INSERT).into (entity) .entries (records)
 }
 
 const _from_csv_or_json = { '.json': INSERT_from_json, '.csv': INSERT_from_csv, }

package/lib/env/cds-env.js

@@ -64,19 +64,16 @@ class Config {
       }
     }
 
-    // 4. link dependent services (through kind/use)
-    this._link_required_services()
-
-    // 5. add process env
+    // 4. add process env before linking to allow things like CDS_requires_db=sql
     this._add_process_env(_context, _home)
 
-    // 6. link dependent services again -> e.g. to allow things like CDS_requires_db=sql
+    // 5. link dependent services
     this._link_required_services()
 
-    // 7. complete service configurations from cloud service bindings
+    // 6. complete service configurations from cloud service bindings
     this._add_cloud_service_bindings(process.env)
 
-    // 8. Add compatibility for mtx
+    // 7. Add compatibility for mtx
     if (this.requires && this.requires.db) {
       if (this.requires.multitenancy !== undefined) {
         Object.defineProperty(this.requires.db, 'multiTenant', { value: !!this.requires.multitenancy })
@@ -84,7 +81,7 @@ class Config {
       else if (this.requires.db.multiTenant !== undefined) this.requires.multitenancy = this.requires.db.multiTenant
     }
 
-    // 9. apply presets
+    // 8. apply presets
     presets (this)
 
     // Only if feature is enabled
@@ -230,10 +227,12 @@ class Config {
     if (!config) config = {}
     const pref_ = RegExp('^'+prefix+'[._]','i')
     for (let p in env) if (!(p in my) && pref_.test(p)) {
-      const key = /[a-z]/.test(p) ? p : p.toLowerCase() //> CDS_FOO_BAR -> cds_foo_bar
-      const path = key.slice(prefix.length+1) .split (key[prefix.length]) //> ['foo','bar']
+      const pEsc = p.replace(/__/g, '!!') // escaping of _ by __ :  protect __ so that it's not split below
+      const key = /[a-z]/.test(pEsc) ? pEsc : pEsc.toLowerCase() //> CDS_FOO_BAR -> cds_foo_bar
+      let path = key.slice(prefix.length+1) .split (key[prefix.length]) //> ['foo','bar']
       for (var o=config,next;;) {
         next = path.shift()
+        next = next.replace(/!!/g, '_')  // undo !! protection and reduce __ to _
         if (!path.length) break
         if (!path[0]) next = next+'-'+path.shift()+path.shift() // foo__bar -> foo-bar
         o = o[next] || (o[next] = {})

package/lib/env/cds-requires.js

@@ -7,6 +7,10 @@ exports = module.exports = {
     middlewares: true
   },
 
+  "[schevo]": {
+    db: { schema_evolution: 'auto' },
+  },
+
   db: undefined,
   messaging: undefined,
   multitenancy: undefined,
@@ -251,8 +255,10 @@ require = (id) => { // eslint-disable-line no-global-assign
 }
 
 // REVISIT: we should have a real modular plugin technique for cds.env
-// eslint-disable-next-line cds/no-missing-dependencies
-const _mtxs = !process.env.OLD_MTX && require('@sap/cds-mtxs/lib/env-requires') || {
+const utils = require ('../utils/cds-utils')
+const _mtxs = !utils._oldMtx()
+  // eslint-disable-next-line cds/no-missing-dependencies
+  && require('@sap/cds-mtxs/lib/env-requires') || {
   "toggles": {
     model: "@sap/cds/srv/mtx"
   },

package/lib/env/defaults.js

@@ -12,10 +12,6 @@ module.exports = {
   },
 
   features: {
-    "[schevo]": {
-      schema_evolution: true,
-    },
-    schema_evolution: false,
     folders: 'fts/*', // where to find feature toggles -> switch on by default when released
     cls: major > 12 || major == 12 && minor >= 18,
     live_reload: !production,

package/lib/env/schemas/cds-rc.json

@@ -237,6 +237,10 @@
             }
           ]
         },
+        "middlewares": {
+          "type": "boolean",
+          "description": "Enables new middlewares support (experimental)."
+        },
         "multitenancy": {
           "type": "boolean",
           "description": "Shortcut to enable multitenancy."
@@ -360,6 +364,40 @@
           ]
         }
       }
+    },
+    "protocols": {
+      "type": "object",
+      "description": "List protocols to enable in addition to the default protocol adaptors.",
+      "additionalProperties": true,
+      "patternProperties": {
+        ".+": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "description": "Enables a built-in protocol adapter with defaults"
+            },
+            {
+              "type": "string",
+              "description": "The endpoint to serve this protocol at."
+            },
+            {
+              "type": "object",
+              "default": {},
+              "additionalProperties": true,
+              "properties": {
+                "path": {
+                  "type": "string",
+                  "description": "The endpoint to serve this protocol at."
+                },
+                "impl": {
+                  "type": "string",
+                  "description": "The module pathname of the protocol adapter implementation."
+                }
+              }
+            }
+          ]
+        }
+      }
     }
   },
   "$defs": {

package/lib/ql/SELECT.js

@@ -6,16 +6,22 @@ module.exports = class Query extends Whereable {
   static _api() {
     const $ = Object.assign
     return $((..._)       => new this()._select_or_from(..._), {
-      one: $((...x)       => new this({one:true})._select_or_from(...x),{
-        columns: (..._)   => new this({one:true}).columns(..._),
-        from: (..._)      => new this({one:true}).from(..._),
+      localized: $((...x) => new this({localized:true})._select_or_from(...x),{
+        columns: (..._)   => new this({localized:true}).columns(..._),
+        from: (..._)      => new this({localized:true}).from(..._),
       }),
       distinct: $((...x)  => new this({distinct:true})._select_or_from(...x),{
         columns: (..._)   => new this({distinct:true}).columns(..._),
         from: (..._)      => new this({distinct:true}).from(..._),
       }),
+      one: $((...x)       => new this({one:true})._select_or_from(...x),{
+        columns: (..._)   => new this({one:true}).columns(..._),
+        from: (..._)      => new this({one:true}).from(..._),
+      }),
+      from: $((..._)      => new this().from(..._), {
+        localized: (..._) => new this({localized:true}).from(..._)
+      }),
       columns: (..._)     => new this().columns(..._),
-      from: (..._)        => new this().from(..._),
     })
   }
 

package/lib/srv/bindings.js

@@ -12,7 +12,7 @@ module.exports = class Bindings {
     static get registry(){ return registry }
 
     static then(r,e) {
-        const LOG = cds.log('serve', { prefix:'cds' })
+        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))

package/lib/srv/factory.js

@@ -1,6 +1,6 @@
 const cds = require('..'), { path, isfile } = cds.utils
 const paths = Array.from (new Set ([ cds.root, ...require.resolve.paths('x') ]))
-const DEBUG = cds.debug('srv.factory'); DEBUG && DEBUG ({ 'cds.root':cds.root, paths })
+const DEBUG = cds.debug('cds.service.factory',); DEBUG && DEBUG ({ 'cds.root':cds.root, paths })
 
 /** @typedef {import('./srv-api')} Service @type { (()=>Service) & (new()=>Service) } */
 const ServiceFactory = function (name, model, options) { //NOSONAR

package/lib/srv/middlewares/cds-context.js

@@ -7,8 +7,6 @@ module.exports = ()=> {
     const ctx = {}
     ctx.http = { req, res }
     ctx.id = _id4(req)
-    ctx.user = req.user
-    ctx.tenant = req.tenant || ctx.user?.tenant
     cds._context.run (ctx, next)
   }
 

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

@@ -0,0 +1,11 @@
+const cds = require ('../../index')
+
+/**
+ * Propagates auth results to cds.context
+ */
+module.exports = ()=> function cds_context_auth (req, res, next) {
+  const ctx = cds.context
+  ctx.user = req.user
+  ctx.tenant = req.tenant || ctx.user?.tenant
+  next()
+}

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

@@ -1,24 +1,26 @@
-module.exports = ()=>{
+module.exports = ()=> {
+
   const cds = require ('../../index')
-  if (cds.requires.extensibility || cds.requires.toggles || cds.mtx) {
-    const { model4 } = require('../srv-models')
-    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) 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) {
-        console.error(e)
-        return res.status(503) .json ({ // REVISIT: we should throw a simple error, nothing else! -> this is overly OData-specific!
-          error: { code: '503', message:
-            process.env.NODE_ENV === 'production' ? 'Service Unavailable' :
-            'Unable to get context-specific model due to: ' + e.message
-          }
-        })
-      }
-      next()
+  const context_model_required = cds.requires.extensibility || cds.requires.toggles || cds.mtx
+  if (!context_model_required) return []
+
+  const { model4 } = require('../srv-models')
+  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) 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) {
+      console.error(e)
+      return res.status(503) .json ({ // REVISIT: we should throw a simple error, nothing else! -> this is overly OData-specific!
+        error: { code: '503', message:
+          process.env.NODE_ENV === 'production' ? 'Service Unavailable' :
+          'Unable to get context-specific model due to: ' + e.message
+        }
+      })
     }
+    next()
   }
-  else return []
+
 }

package/lib/srv/middlewares/index.js

@@ -1,22 +1,20 @@
 const auth      = exports.auth      = require('../../auth')
 const context   = exports.context   = require('./cds-context')
+const ctx_auth  = exports.ctx_auth  = require('./ctx-auth')
 const ctx_model = exports.ctx_model = require('./ctx-model')
 const errors    = exports.errors    = require('./errors')
 const trace     = exports.trace     = require('./trace')
 
 // middlewares running before protocol adapters
 exports.before = [
-  trace(),    // provides detailed trace logs when DEBUG=trace
-  auth(),     // provides req.user & tenant
-  context(),  // provides cds.context
-  ctx_model(),    // fills in cds.context.model
+  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
 ]
 
+// middlewares running after protocol adapters -> usually error middlewares
 exports.after = [
-  // usually error middlewares
   errors(),
 ]
-
-exports.bootstrap = ()=>{
-  require('../protocols')()
-}

package/lib/srv/protocols/_legacy.js

@@ -1,5 +1,7 @@
 const libx = require('../../../libx/_runtime')
 const cds_context_model = require('../srv-models')
+const cds_context = require('../middlewares/cds-context')()
+const ctx_auth = require('../middlewares/ctx-auth')()
 const { ProtocolAdapter } = require('.')
 
 class LegacyProtocolAdapter extends ProtocolAdapter {
@@ -14,9 +16,11 @@ class LegacyProtocolAdapter extends ProtocolAdapter {
   static serve (srv, /* in: */ app) {
     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,
       cds_context_model.middleware4(srv)
     ], after:[] })
   }

package/lib/srv/protocols/graphql.js

@@ -1,7 +1,7 @@
 const cds = require ('../../index'), { decodeURIComponent } = cds.utils
 const LOG = cds.log('graphql')
 
-const GraphQLAdapter = require('@sap/cds-graphql/lib') // eslint-disable-line cds/no-missing-dependencies
+const GraphQLAdapter = require('@cap-js/graphql') // eslint-disable-line cds/no-missing-dependencies
 const express = require ('express') // eslint-disable-line cds/no-missing-dependencies
 
 function CDSGraphQLAdapter (options) {
@@ -33,7 +33,7 @@ function CDSGraphQLAdapter (options) {
   })
 
   /** The global /graphql route */
-  .use (new GraphQLAdapter (services, options))
+  .use (new GraphQLAdapter (options))
 }
 
 module.exports = CDSGraphQLAdapter

package/lib/srv/protocols/index.js

@@ -10,7 +10,6 @@ class ProtocolAdapter {
     for (let [k,o] of Object.entries(protocols)) if (typeof o === 'string') protocols[k] = {path:o}
     if (!protocols.odata) protocols.odata = { impl: join(__dirname,'odata-v4') }
     if (!protocols.rest) protocols.rest = { impl: join(__dirname,'rest') }
-    
     // odata must always be first for fallback
     return this.protocols = { odata: protocols.odata, ...protocols }
   }
@@ -84,5 +83,10 @@ const protocols = Object.keys(ProtocolAdapter.init())
 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 = Object.assign (ProtocolAdapter.serveAll, { ProtocolAdapter, protocol4 })
-if (!cds.requires.middlewares) module.exports.ProtocolAdapter = require('./_legacy')
+module.exports = { ProtocolAdapter, protocol4 }
+if (cds.env.protocols) {
+  cds.middlewares = require('../middlewares')
+  ProtocolAdapter.serveAll()
+} else if (!cds.requires.middlewares) {
+  module.exports.ProtocolAdapter = require('./_legacy')
+}

package/lib/srv/srv-api.js

@@ -76,6 +76,7 @@ class Service extends require('./srv-handlers') {
   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) }
 
   /**

package/lib/srv/srv-methods.js

@@ -1,5 +1,5 @@
 const cds = require('..')
-const LOG = cds.log('cds-app-service-methods')
+const LOG = cds.log('cds.serve',{label:'cds'})
 
 
 module.exports = (srv) => {

package/lib/utils/cds-utils.js

@@ -176,6 +176,17 @@ exports.find = function find (base, patterns='*', filter=()=>true) {
   return files
 }
 
+// TODO find a better place
+exports._oldMtx = function _oldMtx() {
+  function _hasMtxDependency() {
+    try {
+      return require(join(cds.root, 'package.json'))?.dependencies?.['@sap/cds-mtx']
+    } catch(e) {
+      return false
+    }
+  }
+  return (_hasMtxDependency() || process.env.OLD_MTX?.toLowerCase() === 'true') ?? false
+}
 
 /**
  * Internal utility to load a file through ESM or CommonJs.  TODO find a better place.

package/lib/utils/data.js

@@ -13,8 +13,8 @@ class DataUtil {
       }
     }
     if (this._deletes.length > 0) {
-      const log = cds.log('deploy')
-      if (log._info)  log.info('Deleting all data in', this._deletes)
+      const LOG = cds.log('deploy')
+      if (!this._autoReset)  LOG.info('Deleting all data for', db.model.each('entity'))
       await db.run(this._deletes)
     }
   }