@sap/cds 8.7.2 → 8.8.1

package/CHANGELOG.md

@@ -4,6 +4,56 @@
 - The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Version 8.8.1 - 2025-03-07
+
+### Fixed
+
+- Requests violating `cds.odata.max_batch_header_size` are terminated with `431 Request Header Fields Too Large` instead of `400 - Bad Request`
+- `cds.parse.<x>` writing directly to `stdout`
+- Instance-based authorization for programmatic action invocations
+- Implicit function parameter calls with Array or Object values
+- OData: Throw an error by `POST` with payload that contains array of entity representation
+- `cds.validate` filters out annotations according to OData V4 spec
+- Crash for requests with invalid time data format
+- Add missing 'and' between conditions in object notation of QL
+- Multiline payloads in `$batch` sub requests
+- Instance-based authorization for modeling like `$user.<property> is null`
+- Respect `cds.odata.contextAbsoluteUrl` in new OData adapter 
+- `cds.odata.context_with_columns` also applies to singletons
+
+## Version 8.8.0 - 2025-03-03
+
+### Added
+
+- `cds.ql` method `SELECT.hints()` which passes hints to the database query optimizer that can influence the execution plan
+- Schema updates for MTX configuration
+- Deprecate `cds.requires.db.database` in JSON schema
+- Service level restrictions for application service calls can be enforced with `cds.features.service_level_restrictions=true`
+  + With `@sap/cds^9`, this becomes the new default.
+- Support implicit function parameters calls with @prefix
+- `cds.test` now uses package `@cap-js/cds-test` if installed, otherwise prints a hint to install it. With cds 9, this package will be required.
+- Operation response streaming
+  + OData: Operations returning `cds.LargeBinary` annotated with `@Core.MediaType` may send stream responses. 
+  + REST: Operations may send stream responses. 
+  + Annotations `@Core.MediaType`, `@Core.ContentDisposition.Filename` and `@Core.ContentDisposition.Type` on operation return types will be considered. 
+
+### Changed
+
+- The default index page now shows links to CDS functions with their parameter names but no default values anymore.
+
+### Fixed
+
+- Order by virtual fields in draft-related requests
+- Erroneous cleansing when draft activation is invoked programmatically
+- Skip validation for mandatory fields in update scenarios for entities in draft activation
+- Simplified default configuration: `cds.requires.messaging = true`
+- `cds.connect` called with options erroneously filled in `cds.services`
+- Mocked users won't have a tenant in single-tenant mode
+- Allow usage of latest versions of `chai` and `chai-as-promised` on Node >= 23 with the built-in test runner and `mocha`. The `jest` runner is not able though to load these ESM modules.
+- Reject navigations in expand
+- Activation of drafts for entities using `@cds.api.ignore`
+- Prevent uncaught type error during validation of composition entries
+
 ## Version 8.7.2 - 2025-02-14
 
 ### Fixed

package/_i18n/i18n.properties

@@ -70,6 +70,9 @@ LanguageCode=Language Code
 #XTIT: Language Code Description
 LanguageCode.Description=Language code as specified by ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Time Zone Code
+
 #XTIT: User Identifier
 UserID=User ID
 

package/_i18n/i18n_cs.properties

@@ -26,16 +26,16 @@
 #----------------------------------------------------------------------------------------------------------------------
 
 #XTIT: Created By (Answer to: "Which user has created a certain entity?")
-CreatedBy=Vytvo\u0159il(a)
+CreatedBy=Vytvo\u0159il
 
 #XTIT: Created On (Answer to: "When has a certain entity been created?")
-CreatedAt=Vytvo\u0159eno dne
+CreatedAt=Vytvo\u0159eno
 
 #XTIT: Changed By (Answer to: "Which user has changed a certain entity?")
-ChangedBy=Autor zm\u011Bny
+ChangedBy=Zm\u011Bnil
 
 #XTIT: Changed On (Answer to: "When has a certain entity been changed?")
-ChangedAt=Zm\u011Bn\u011Bno dne
+ChangedAt=Zm\u011Bn\u011Bno
 
 #XTIT: Currency
 Currency=M\u011Bna
@@ -92,7 +92,7 @@ Draft_DraftAdministrativeData=Spr\u00E1vn\u00ED data n\u00E1vrhu
 Draft_DraftUUID=N\u00E1vrh (technick\u00E9 ID)
 
 #XTIT: Creation time of a draft
-Draft_CreationDateTime=N\u00E1vrh vytvo\u0159en dne
+Draft_CreationDateTime=N\u00E1vrh vytvo\u0159en
 
 #XTIT: User created the draft
 Draft_CreatedByUser=N\u00E1vrh vytvo\u0159il
@@ -101,7 +101,7 @@ Draft_CreatedByUser=N\u00E1vrh vytvo\u0159il
 Draft_DraftIsCreatedByMe=N\u00E1vrh vytvo\u0159en mnou
 
 #XTIT: Time a draft was last changed on
-Draft_LastChangeDateTime=N\u00E1vrh naposledy zm\u011Bn\u011Bn dne
+Draft_LastChangeDateTime=N\u00E1vrh naposledy zm\u011Bn\u011Bn
 
 #XTIT: User that changed the draft last
 Draft_LastChangedByUser=N\u00E1vrh naposledy zm\u011Bnil

package/_i18n/i18n_de.properties

@@ -70,6 +70,9 @@ LanguageCode=Sprachencode
 #XTIT: Language Code Description
 LanguageCode.Description=Sprachencode gem\u00E4\u00DF ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Zeitzonencode
+
 #XTIT: User Identifier
 UserID=Benutzer-ID
 

package/_i18n/i18n_en.properties

@@ -70,6 +70,9 @@ LanguageCode=Language Code
 #XTIT: Language Code Description
 LanguageCode.Description=Language code as specified by ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Time Zone Code
+
 #XTIT: User Identifier
 UserID=User ID
 

package/_i18n/i18n_es.properties

@@ -70,6 +70,9 @@ LanguageCode=C\u00F3digo de idioma
 #XTIT: Language Code Description
 LanguageCode.Description=C\u00F3digo de idioma seg\u00FAn especificado por ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=C\u00F3digo de zona horaria
+
 #XTIT: User Identifier
 UserID=ID de usuario
 

package/_i18n/i18n_fr.properties

@@ -70,6 +70,9 @@ LanguageCode=Code langue
 #XTIT: Language Code Description
 LanguageCode.Description=Code langue tel qu'indiqu\u00E9 par ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Code du fuseau horaire
+
 #XTIT: User Identifier
 UserID=ID utilisateur
 

package/_i18n/i18n_it.properties

@@ -70,6 +70,9 @@ LanguageCode=Codice lingua
 #XTIT: Language Code Description
 LanguageCode.Description=Codice lingua come indicato da ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Codice fuso orario
+
 #XTIT: User Identifier
 UserID=ID utente
 

package/_i18n/i18n_ja.properties

@@ -70,6 +70,9 @@ LanguageCode=\u8A00\u8A9E\u30B3\u30FC\u30C9
 #XTIT: Language Code Description
 LanguageCode.Description=ISO 639-1 \u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u8A00\u8A9E\u30B3\u30FC\u30C9
 
+#XTIT Time zone code
+TimeZoneCode=\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u30B3\u30FC\u30C9
+
 #XTIT: User Identifier
 UserID=\u30E6\u30FC\u30B6 ID
 

package/_i18n/i18n_pl.properties

@@ -29,13 +29,13 @@
 CreatedBy=Utworzone przez
 
 #XTIT: Created On (Answer to: "When has a certain entity been created?")
-CreatedAt=Utworzono dnia
+CreatedAt=Data utworzenia
 
 #XTIT: Changed By (Answer to: "Which user has changed a certain entity?")
 ChangedBy=Zmienione przez
 
 #XTIT: Changed On (Answer to: "When has a certain entity been changed?")
-ChangedAt=Zmieniono dnia
+ChangedAt=Data zmiany
 
 #XTIT: Currency
 Currency=Waluta
@@ -70,6 +70,9 @@ LanguageCode=Kod j\u0119zyka
 #XTIT: Language Code Description
 LanguageCode.Description=Kod j\u0119zyka okre\u015Blony zgodnie z norm\u0105 ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=Kod strefy czasowej
+
 #XTIT: User Identifier
 UserID=Identyfikator u\u017Cytkownika
 
@@ -89,7 +92,7 @@ Draft_DraftAdministrativeData=Dane administracyjne wersji roboczej
 Draft_DraftUUID=Wersja robocza (identyfikator techniczny)
 
 #XTIT: Creation time of a draft
-Draft_CreationDateTime=Wersja robocza utworzona dnia
+Draft_CreationDateTime=Data utworzenia wersji roboczej
 
 #XTIT: User created the draft
 Draft_CreatedByUser=Wersja robocza utworzona przez
@@ -98,7 +101,7 @@ Draft_CreatedByUser=Wersja robocza utworzona przez
 Draft_DraftIsCreatedByMe=Wersja robocza utworzona przeze mnie
 
 #XTIT: Time a draft was last changed on
-Draft_LastChangeDateTime=Wersja robocza ostatnio zmieniona dnia
+Draft_LastChangeDateTime=Data ostatniej zmiany wersji roboczej
 
 #XTIT: User that changed the draft last
 Draft_LastChangedByUser=Wersja robocza ostatnio zmieniona przez

package/_i18n/i18n_pt.properties

@@ -70,6 +70,9 @@ LanguageCode=C\u00F3digo de idioma
 #XTIT: Language Code Description
 LanguageCode.Description=C\u00F3digo de idioma como especificado pelo ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=C\u00F3digo de fuso hor\u00E1rio
+
 #XTIT: User Identifier
 UserID=ID do usu\u00E1rio
 

package/_i18n/i18n_ru.properties

@@ -70,6 +70,9 @@ LanguageCode=\u041A\u043E\u0434 \u044F\u0437\u044B\u043A\u0430
 #XTIT: Language Code Description
 LanguageCode.Description=\u041A\u043E\u0434 \u044F\u0437\u044B\u043A\u0430 \u0432 \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0438 \u0441 ISO 639-1
 
+#XTIT Time zone code
+TimeZoneCode=\u041A\u043E\u0434 \u0447\u0430\u0441\u043E\u0432\u043E\u0433\u043E \u043F\u043E\u044F\u0441\u0430
+
 #XTIT: User Identifier
 UserID=\u0418\u0434. \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
 

package/app/index.js

@@ -36,7 +36,7 @@ module.exports = { get html(){
         <ul>${_operations_in(srv).map (e => `
           <li id="${asHtmlId(srv.name)}-${endpoint.kind}-${asHtmlId(e.name)}" class="operation">
             <div>
-              <a href="${endpoint.path}/${e.name}${e.params}" title="${endpoint.path}/${e.name}${e.params}"><span>${e.name}()</span></a>
+              <a href="${endpoint.path}/${e.name}" title="${endpoint.path}/${e.name}"><span>${e.name} ${e.params}</span></a>
             </div>
           </li>`).join('')}
         </ul>
@@ -74,41 +74,13 @@ function _operations_in (service) {
   for (let name in operations) {
     const op = cds.model.definitions[service.name + '.' + name]
     if (op?.kind === 'function') {
-      const params = '('+ Object.values(op.params||[]).map(p => {
-        let val = _sampleValue(p)
-        if (typeof val === 'string') val = encodeURIComponent(`'${val}'`)
-        else if (typeof val === 'object') val = encodeURIComponent(`'${JSON.stringify(val)}'`)
-        return `${p.name}=${val}`
-      }).join(',') + ')'
+      const params = '('+ Object.keys(op.params||[]) + ')'
       exposed.push ({ name, params })
     }
   }
   return exposed
 }
 
-function _sampleValue (param) {
-  if (param.items) // many
-    return [ _sampleValue(param.items) ]
-  if (param.elements) { // structured
-    return Object.entries(param.elements).reduce((all,[n,p]) => {
-      all[n] = _sampleValue(p)
-      return all
-    },{})
-  }
-  // scalar
-  const type = param._type || param.type
-  if (type === 'cds.String') return 'hello'
-  if (type === 'cds.Boolean') return true
-  if (type === 'cds.Decimal'||type === 'cds.Double') return '4.2'
-  if (type === 'cds.Date') return '2021-12-31'
-  if (type === 'cds.Time') return '23:42:42'
-  if (type === 'cds.DateTime') return '2021-12-31T23:42:42Z'
-  if (type === 'cds.Timestamp') return '2021-12-31T23:42:42.123Z'
-  if (type === 'cds.UUID') return cds.utils.uuid()
-  if (type?.match(/cds\..*Int.*/i)) return 42
-  return type // fallback
-}
-
 function _moreLinks (srv, endpoint, entity, div=true) {
   return (srv.$linkProviders || [])
     .map (linkProv => linkProv(entity, endpoint))

package/lib/compile/parse.js

@@ -29,7 +29,7 @@ exports.path = function path (x,...etc) {
   const [,head,tail] = /^([\w._]+)(?::(\w+))?$/.exec(x)||[]
   if (tail) return {ref:[head,...tail.split('.')]}
   if (head) return {ref:[head]}
-  const {SELECT} = cdsc.parse.cql('SELECT from '+x)
+  const {SELECT} = cdsc.parse.cql('SELECT from '+x, undefined, { messages: [] })
   return SELECT.from
 }
 

package/lib/env/cds-env.js

@@ -255,7 +255,7 @@ class Config {
       if (!val || val._is_linked) return val
       if (val === true) {
         let x = kinds[key]
-        if (x) val = x; else return val
+        if (x) val = x; else if (key+'-defaults' in kinds) val = {kind:key+'-defaults'}; else return val
       }
       if (typeof val === 'string') {
         let x = kinds[val] || kinds[val+'-'+key] || kinds[key+'-'+val]

package/lib/env/cds-requires.js

@@ -130,6 +130,7 @@ const _resolve = (preferred, fallback) => {
 
 const _databases = {
 
+  "db-defaults": { kind: 'sql' },
   "sql": {
     '[development]': { kind: 'sqlite', credentials: { url: ':memory:' } },
     '[production]': { kind: 'hana' },
@@ -175,7 +176,6 @@ const _databases = {
       "label": "service-manager"
     }
   },
-
 }
 
 
@@ -197,15 +197,12 @@ const _outbox = {
 
 const _messaging = {
 
-  "local-messaging": {
-    impl: `${_runtime}/messaging/service.js`,
-    local: true
-  },
-  "file-based-messaging": {
-    impl: `${_runtime}/messaging/file-based.js`,
-    file:'~/.cds-msg-box',
-    outbox: true
+  "messaging-defaults": {
+    "[development]": { kind: "file-based-messaging" },
+    "[production]": { kind: "enterprise-messaging" },
+    "[hybrid]": { kind: "enterprise-messaging-amqp" },
   },
+
   "default-messaging": {
     "[development]": { kind: "local-messaging" },
     "[hybrid]": { kind: "enterprise-messaging-amqp" },
@@ -214,6 +211,16 @@ const _messaging = {
       "[multitenant]": { kind: "enterprise-messaging-http" }
     }
   },
+
+  "local-messaging": {
+    impl: `${_runtime}/messaging/service.js`,
+    local: true
+  },
+  "file-based-messaging": {
+    impl: `${_runtime}/messaging/file-based.js`,
+    file:'~/.cds-msg-box',
+    outbox: true
+  },
   "enterprise-messaging": {
     kind: "enterprise-messaging-http",
   },

package/lib/env/schemas/cds-package.js

@@ -20,7 +20,7 @@ module.exports = {
       type: 'object',
       additionalProperties: true,
       $ref: 'cdsJsonSchema://schemas/cds-rc.json#/$defs/cdsRoot',
-      description: 'CDS configuration',
+      description: 'CDS configuration root',
       default: {}
     }
   }

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

@@ -19,6 +19,7 @@ module.exports = {
     {
       properties: {
         cds: {
+          description: 'CDS configuration root',
           $ref: '#/$defs/cdsRoot'
         }
       }
@@ -59,7 +60,8 @@ module.exports = {
               enum: [
                 'mtx-sidecar',
                 'with-mtx-sidecar',
-                'java'
+                'java',
+                'subscription-manager'
               ]
             },
             {
@@ -242,7 +244,9 @@ module.exports = {
                       properties: {
                         database: {
                           type: 'string',
-                          format: 'uri-reference'
+                          format: 'uri-reference',
+                          deprecated: true,
+                          description: 'Deprecated: Use \'url\' instead.'
                         }
                       }
                     },
@@ -329,6 +333,10 @@ module.exports = {
             },
             messaging: {
               oneOf: [
+                {
+                  type: 'boolean',
+                  description: 'Shortcut to enable messaging.'
+                },
                 {
                   type: 'string',
                   description: 'Settings for the primary messaging service (shortcut).',
@@ -425,7 +433,7 @@ module.exports = {
                   type: 'boolean'
                 },
                 {
-                  $ref: '#/$defs/extensionRestrictions'
+                  $ref: '#/$defs/extensibilitySettings'
                 }
               ]
             },
@@ -802,11 +810,16 @@ module.exports = {
       ]
     },
 
-    extensionRestrictions: {
+    extensibilitySettings: {
       type: 'object',
       description: 'Extensibility settings',
       additionalProperties: false,
       properties: {
+        'check-existing-extensions': {
+          type: 'boolean',
+          description: `Specifies whether the extension linter includes existing extensions. Default will be 'true' with the next major release.`,
+          default: false
+        },
         'element-prefix': {
           type: 'array',
           description: 'Field names must start with one of these strings.',

package/lib/index.js

@@ -95,7 +95,7 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   get utils() { return super.utils = require('./utils/cds-utils') }
   get error() { return super.error = require('./log/cds-error') }
   get exec() { return super.exec = require('../bin/serve').exec }
-  get test() { return super.test = require('./test/cds-test.js') }
+  get test() { return super.test = require('./test/cds-test') }
   get log() { return super.log = require('./log/cds-log') }
   get debug() { return super.debug = this.log.debug }
   clone(x) { return structuredClone(x) }

package/lib/ql/SELECT.js

@@ -165,10 +165,15 @@ class SELECT extends Whereable {
     return this.then(rows => rows.map(callback))
   }
 
-  valueOf() {
+  valueOf () {
     return super.valueOf('SELECT * FROM')
   }
 
+  hints (...args) {
+    if (args.length) this.SELECT.hints = args.flat()
+    return this
+  }
+
   /** @private */ get _target_ref(){ return this.SELECT.from }
 
   get elements() { return this.elements = cds.infer.elements4 (this.SELECT.columns, this.source) }

package/lib/ql/cds.ql-predicates.js

@@ -48,6 +48,8 @@ function _qbe (o, xpr=[]) {
   let count = 0
   for (let k in o) { const x = o[k]
 
+    if (k !== 'and' && k !== 'or' && count++) xpr.push('and')      //> add 'and' between conditions
+
     if (k.startsWith('not ')) { xpr.push('not'); k = k.slice(4) }
     switch (k) { // handle special cases like {and:{...}} or {or:{...}}
       case 'between':
@@ -83,7 +85,6 @@ function _qbe (o, xpr=[]) {
     }
 
     const a = cds.parse.ref(k)            //> turn key into a ref for the left side of the expression
-    if (count++) xpr.push('and')      //> add 'and' between conditions
     if (!x || typeof x !== 'object')  xpr.push (a,'=',{val:x})
     else if (is_array(x))             xpr.push (a,'in',{list:x.map(_val)})
     else if (x.SELECT || x.list)      xpr.push (a,'in',x)

package/lib/req/request.js

@@ -1,5 +1,5 @@
+const cds = require('../index'), {production} = cds.env
 const { Responses, Errors } = require('./response')
-const cds = require('../../lib'), {production} = cds.env
 
 /**
  * Class Request represents requests received via synchronous protocols.
@@ -93,7 +93,10 @@ class Request extends require('./event') {
     return super.subject = { ref }
   }
 
-  reply  (results) { return this.results = results }
+  reply (results, ...etc) {
+    if (etc.length) Object.assign (results, ...etc)
+    return this.results = results
+  }
   notify (...args) { return this._messages.add (1, ...args) }
   info   (...args) { return this._messages.add (2, ...args) }
   warn   (...args) { return this._messages.add (3, ...args) }

package/lib/req/validate.js

@@ -48,7 +48,7 @@ class Validation {
   }
 
   unknown(e,d,input) {
-    if (e.startsWith('@')) return delete input[e] //> skip all annotations, like @odata.Type
+    if (e.match(/@.*\./)) return delete input[e] //> skip all annotations, like @odata.Type (according to OData spec annotations contain an "@" and a ".")
     d['@open'] || cds.error (`Property "${e}" does not exist in ${d.name}`, {status:400})
   }
 }
@@ -193,7 +193,9 @@ const $any = class any {
 class struct extends $any {
   validate (data, path, /** @type {Validation} */ ctx, elements = this.elements, skip={}) {
     const path_ = !path ? [] : [...path, this.name]; if (path?.row) path_.push({...path})
-      if (data == null) return
+    if (data == null) return
+    // REVISIT cds^9: rm typeof data !== 'function', misuse in cds-mtxs
+    if (typeof data !== 'object' && typeof data !== 'function') return ctx.error ('ASSERT_DATA_TYPE', path_, this.name, data, this.target)
     // check for required elements in case of inserts -- note: null values are handled in the payload loop below
     if (ctx.insert || data && path_.length && this._is_insert(data)) for (let each of this._required (elements)) {
       if (each.name in data) continue // got value for required element

package/lib/srv/bindings.js

@@ -3,6 +3,7 @@ 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'
+const filename = registry.replace(/^~/, require('os').homedir())
 
 /** TODO: Add documentation */
 module.exports = class Bindings {
@@ -17,27 +18,29 @@ module.exports = class Bindings {
     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() {
+    this.provides = {}
+    this.servers = {}
   }
 
   async load (sync) {
-    DEBUG?.('reading bindings from:', this._source)
-    try { Object.assign (this, JSON.parse (sync ? readFileSync (this._source) : await read (this._source))) }
+    DEBUG?.('reading bindings from:', registry)
+    try {
+      let {cds} = JSON.parse (sync ? readFileSync (filename) : await read (filename))
+      Object.assign (this,cds)
+    }
     catch { /* 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)
+    DEBUG?.('writing bindings to:', registry)
+    const json = JSON.stringify ({cds:this},null,'  ')
+    return sync ? writeFileSync (filename, json) : write (filename, json)
   }
 
   async import() {
     const required = cds.requires; if (!required) return this
-    const provided = (await this.load()) .cds.provides
+    const provided = (await this.load()) .provides
     for (let each in required) {
       const req = required[each]; if (typeof req !== 'object') continue
       const bound = provided [req.service||each]
@@ -52,9 +55,14 @@ module.exports = class Bindings {
   }
 
   async export (services, url) {
-    this.cleanup (this.url = url)
+    this.cleanup (url)
+    const { servers, provides } = this, { pid } = process
+    // register our server
+    servers[pid] = {
+      root: 'file://' + cds.root,
+      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 || {}
@@ -63,7 +71,8 @@ module.exports = class Bindings {
         credentials: {
           ...options.credentials,
           url: url + each.path
-        }
+        },
+        server: pid
       }
     }
     process.on ('exit', ()=>this.purge())
@@ -72,17 +81,19 @@ module.exports = class Bindings {
 
   purge() {
     this.load(true)
-    DEBUG?.('purging bindings from:', this._source)
+    DEBUG?.('purging bindings from:', registry)
     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]
-    }
+  /**
+   * Remove all services served by this server or at the given url.
+   */
+  cleanup (url) {
+    const { servers, provides } = this, { pid } = process
+    for (let [key,srv] of Object.entries (provides))
+      if (srv.server === pid || url && srv.credentials?.url?.startsWith(url)) delete provides [key]
+    delete servers [pid]
     return this
   }
 }

package/lib/srv/cds-connect.js

@@ -45,7 +45,7 @@ connect.to = (datasource, options) => {
     // construct new service instance
     let srv = await new Service (datasource,m,o); await (Service._is_service_class ? srv.init?.() : Service.init?.(srv))
     if (o.outbox) srv = cds.outboxed(srv)
-    if (datasource) {
+    if (datasource && !options) {
       if (datasource === 'db') cds.db = srv
       cds.services[datasource] = srv
       delete _pending[datasource]

package/lib/srv/middlewares/auth/mocked-users.js

@@ -7,6 +7,7 @@ class MockedUsers {
     const tenants = this.tenants = options.tenants || {}
     const users = this.users = options.users || {}
     for (let [k,v] of Object.entries(users)) {
+      if (!cds.env.requires.multitenancy) delete v.tenant
       if (typeof v === 'boolean') continue
       if (typeof v === 'string') v = { password:v }
       let id = _configured(v).id || k