@sap/cds 9.2.1 → 9.3.0

package/CHANGELOG.md

@@ -4,6 +4,76 @@
 - The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Version 9.3.0 - 2025-08-29
+
+### Added
+
+- New method `collect()` has been added to `LinkedCSN`, which can be used like that:
+  ```js
+  const federated_entities = cds.linked(csn).collect (d => d.is_entity && d['@federated'])
+  ```
+- Remote services can now be configured without `kind`, for example:
+  ```json
+  { "cds": { "requires": { "SomeService": true }}}
+  ```
+- Automatic protocol selection is applied if a required service is configured as above
+  and the remote services is served via multiple protocols. For example, if the above
+  service would be declared like that, the best protocol would be chosen automatically
+  (`hcql` in this case):
+  ```cds
+  @hcql @rest @odata service SomeService {...}
+  ```
+- Method `cds.connect.to()` now allows to connect to remote services with just an http url.
+  For example use that from `cds repl` like that:
+  ```js
+  srv = await cds.connect.to ('http://localhost:4004/hcql/books')
+  await srv.read `ID, title, author.name from Books`
+  ```
+- Property `cds.User.authInfo` as generic container for authentication-related information
+  + For `@sap/xssec`-based authentication strategies, `cds.context.user.authInfo` is an instance of `@sap/xssec`'s `SecurityContext`
+- Support for state transition flows (`@flow`):
+  + Generic handlers for validating entry (`@from`) and exit (`@to`) states
+  + Automatic addition of necessary annotations for Fiori UIs (`@Common.SideEffects` and `@Core.OperationAvailable`) during compile to EDMX with feature flag `cds.features.compile_for_flows = true`
+- Experimental support for consuming remote HCQL services (`cds.requires.<remote>.kind = 'hcql'`)
+- Infrastructure for implementing the tenant mapping notification of Unified Customer Landscape's (UCL) Service Provider Integration Interface (SPII) API
+  + Bootstrap the `UCLService` via `cds.requires.ucl = true` and implement the assign and unassign operations like so:
+    ```js
+    // custom server.js
+    cds.on('served', async () => {
+      const ucl = await cds.connect.to('ucl')
+      ucl.on('assign', async function(req) { ... })
+      ucl.on('unassign', async function(req) { ... })
+    })
+    ```
+  + Currently, only the synchronous interaction pattern is supported!
+- The targets of `@Common.Text` are added to the default search targets
+- Patch Level Validations are enabled by default. Opt-out with `cds.fiori.draft_messages=false`
+- Enable custom aggregations for currency codes and units of measure
+
+### Changed
+
+- `UCLService` only pushes the application template to UCL if `cds.requires.ucl.applicationTemplate` is present
+- `cds.User.tokenInfo` is deprecated. Use `cds.context.user.authInfo.token` instead.
+- Undocumented compat `cds.context.http.req.authInfo` is deprecated. Use `cds.context.user.authInfo` instead.
+- Delete all persisted draft messages, when the first request targeting a draft child without containment is handled.
+- cds build now trims leading or trailing whitespace characters for all values in CSV files deployed to SAP HANA.
+
+### Fixed
+
+- Errors when reading complementary drafts
+- Apply configurations in case `cds.env` was loaded before `cds.log` is initialized.
+- `req.diff` resolves correctly deleted nested composition by deep update
+- `cds-deploy` did not terminate correctly even though deployment was successful
+- Requests to an unimplemented unbound action/ function are rejected
+- Custom app-service implementations configured through `cds.requires.app-service.impl` is now correctly resolved (again)
+- Validation of UUID format for navigation by key
+
+### Removed
+
+- Internal property `cds.services._pending` was removed => use `cds.services` instead.
+- Internal property `srv._is_dark` was removed => use `!srv.endpoints?.length` instead.
+- Internal method `cds.env.requires._resolved` was removed => use `cds.requires` instead.
+
 ## Version 9.2.1 - 2025-08-15
 
 ### Fixed
@@ -41,7 +111,7 @@
 - Runtime error in transaction handling in messaging services when used with outbox
 - Always use `cds.context` middleware for `enterprise-messaging` endpoints
 - Crash during Location header generation caused by custom response not matching the entity definition.
-- Support for logging of correct error locations with `cds watch` and `cds run`. 
+- Support for logging of correct error locations with `cds watch` and `cds run`.
 - Double-unescaping of values in double quotes during OData URL parsing
 - Throw explicit error if the result of a media data query is not an instance of `Readable`, rather than responding with `No Content`
 - When loading `.csv` files quoted strings containing the separator (comma or semicolon) where erroneously
@@ -204,6 +274,12 @@
 - Deprecated stripping of unnecessary topic prefix `topic:` in messaging
 - Deprecated messaging `Outbox` class. Please use config or `cds.outboxed(srv)` to outbox your service.
 
+## Version 8.9.6 - 2025-07-29
+
+### Fixed
+
+- Batch insert using `INSERT.entries()` on draft enabled entities
+
 ## Version 8.9.5 - 2025-07-25
 
 ### Fixed

package/_i18n/i18n_es.properties

@@ -26,16 +26,16 @@
 #----------------------------------------------------------------------------------------------------------------------
 
 #XTIT: Created By (Answer to: "Which user has created a certain entity?")
-CreatedBy=Creado por
+CreatedBy=Autor
 
 #XTIT: Created On (Answer to: "When has a certain entity been created?")
 CreatedAt=Fecha de creaci\u00F3n
 
 #XTIT: Changed By (Answer to: "Which user has changed a certain entity?")
-ChangedBy=Modificado por
+ChangedBy=Autor de modificaci\u00F3n
 
 #XTIT: Changed On (Answer to: "When has a certain entity been changed?")
-ChangedAt=Modificado el
+ChangedAt=Fecha de modificaci\u00F3n
 
 #XTIT: Currency
 Currency=Moneda

package/_i18n/i18n_es_MX.properties

@@ -26,16 +26,16 @@
 #----------------------------------------------------------------------------------------------------------------------
 
 #XTIT: Created By (Answer to: "Which user has created a certain entity?")
-CreatedBy=Creado por
+CreatedBy=Autor
 
 #XTIT: Created On (Answer to: "When has a certain entity been created?")
 CreatedAt=Fecha de creaci\u00F3n
 
 #XTIT: Changed By (Answer to: "Which user has changed a certain entity?")
-ChangedBy=Modificado por
+ChangedBy=Autor de modificaci\u00F3n
 
 #XTIT: Changed On (Answer to: "When has a certain entity been changed?")
-ChangedAt=Modificado el
+ChangedAt=Fecha de modificaci\u00F3n
 
 #XTIT: Currency
 Currency=Moneda

package/_i18n/i18n_fr.properties

@@ -29,13 +29,13 @@
 CreatedBy=Auteur de la cr\u00E9ation
 
 #XTIT: Created On (Answer to: "When has a certain entity been created?")
-CreatedAt=Date de cr\u00E9ation
+CreatedAt=Date/Heure de cr\u00E9ation
 
 #XTIT: Changed By (Answer to: "Which user has changed a certain entity?")
 ChangedBy=Auteur de la modification
 
 #XTIT: Changed On (Answer to: "When has a certain entity been changed?")
-ChangedAt=Date de modification
+ChangedAt=Date/Heure de modification
 
 #XTIT: Currency
 Currency=Devise

package/_i18n/messages.properties

@@ -97,3 +97,9 @@ DRAFT_ACTIVE_DELETE_FORBIDDEN_DRAFT_EXISTS = Entity cannot be deleted because a
 
 # singleton
 SINGLETON_NOT_NULLABLE = The singleton entity is not nullable
+
+# flows
+#XMSG: Action "acceptTravel" requires "travelStatus" to be "Open".
+INVALID_FLOW_TRANSITION_SINGLE=Action "{0}" requires "{1}" to be "{2}".
+#XMSG: Action "cancelTravel" requires "travelStatus" to be one of the following values: Open,Accepted.
+INVALID_FLOW_TRANSITION_MULTI=Action "{0}" requires "{1}" to be one of the following values: {2}.

package/app/index.js

@@ -18,7 +18,6 @@ module.exports = { get html(){
     ).join('\n') || '— none —'
   )
   .replace ('{{services}}', cds.service.providers
-  .filter(srv => !srv._is_dark)
   .flatMap(srv => srv.endpoints.map(endpoint => ({srv, endpoint})))
   .map (({srv, endpoint}) => `
       <div id="${asHtmlId(srv.name)}-${endpoint.kind}">

package/bin/deploy.js

@@ -18,7 +18,7 @@ Promise.resolve(cds.plugins).then(async () => {
   }
   console.debug('Deploying with options:', db, o)
   cds.db = await cds.connect.to(db)
-  return await cds.deploy('*',o).to(db)
+  return await cds.deploy('*',o).to(cds.db)
 })
 .catch (e => { console.error(e); process.exitCode = 1 })
 .finally (() => cds.db?.disconnect?.())

package/bin/serve.js

@@ -171,14 +171,6 @@ async function serve (all=[], o={}) {
   // Ensure loading plugins before calling cds.env!
   await cds.plugins
 
-  const TRACE = cds.debug('trace')
-  TRACE?.time('total startup time'.padEnd(22))
-  if (TRACE) {
-    TRACE?.time('require express'.padEnd(22))
-    require('express')
-    TRACE?.timeEnd('require express'.padEnd(22))
-  }
-
   // Load local server.js early in order to allow setting custom cds.log.Loggers
   const cds_server = await _local_server_js() || cds.server
   if (!o.silent) _prepare_logging ()
@@ -255,7 +247,6 @@ async function serve (all=[], o={}) {
       process.on('message', msg => msg.close && _shutdown())  // by `cds watch` on Windows
     }
 
-    TRACE?.timeEnd('total startup time'.padEnd(22))
     return server
   })
 }
@@ -264,7 +255,7 @@ async function _local_server_js() {
   const _local = file => isfile(file) || isfile (path.join(cds.env.folders.srv,file))
   let server_js = process.env.CDS_TYPESCRIPT && _local('server.ts') || _local('server.js')
   if (server_js) {
-    console.log ('[cds] - loading server from', { file: local(server_js) })
+    console.log ('[cds] - bootstrapping from', { file: local(server_js) })
     let fn = await cds.utils._import(server_js)
     if (fn && fn.default)  fn = fn.default  // default ESM export
     return typeof fn === 'function' ? fn : cds.server
@@ -290,24 +281,20 @@ function _prepare_logging () { // NOSONAR
 
   // print information about each connected service
   cds.on ('connect', ({name,kind,options:{use,credentials,impl}})=>{
-    LOG.info (`connect to ${name} > ${use||kind||impl}`, credentials ? redacted(credentials) : '')
+    LOG.info (`connect to ${name} > ${use||kind||impl||'(builtin)'}`, redacted(credentials) || '')
   })
 
   // print information about each provided service
   cds.on ('serving', (srv) => {
-    const details = {}
-    if (srv._source && !srv._source.startsWith('@sap'))
-      details.impl = local(srv._source)
-    if (srv.endpoints.length === 1)
-      details.path = srv.endpoints[0].path // for brevity, omit 'kind' if there is only one protocol
-    else if (srv.endpoints.length > 1)
-      details.endpoints = srv.endpoints    // full endpoint details if more than one
-    LOG.info (`${srv.mocked ? 'mocking' : 'serving'} ${srv.name}`, details)
+    const details = {}, loc = srv.definition?.$location, src = srv._source
+    if (srv.endpoints.length) details.at = srv.endpoints.map(ep => ep.path)
+    if (loc?.file) details.decl = local(loc.file)+':'+loc.line
+    if (src && !src.startsWith('@sap')) details.impl = local(src)
+    LOG.info (srv.mocked ? 'mocking' : 'serving', srv.name, details)
   })
 
   // print info when we are finally on air
   cds.once ('listening', ({url})=>{
-    console.log()
     LOG.info ('server listening on',{url})
     LOG.info ('server', 'v'+cds.version, 'launched in', performance.now().toFixed(0),'ms')
     if (process.stdin.isTTY) LOG.info (`[ terminate with ^C ]\n`)

package/lib/compile/cdsc.js

@@ -17,6 +17,9 @@ function _options4 (src, ...mappings) {
     let v = dst[k];  if (v === undefined) continue
     let m = map[k];  if (typeof m === 'function') m(dst,v); else dst[m] = v
   }
+
+  dst.draftMessages ??= cds.env.fiori.draft_messages // REVISIT: Is this the appropriate way to forward config to compiler?
+
   // Optionally add .messages array to avoid compiler writing messages to stderr
   dst.messages = dst.messages || []
   // Finally override with options from cds.env.cdsc

package/lib/compile/for/flows.js

@@ -0,0 +1,102 @@
+// REVISIT: to be moved to cds-compiler later
+
+const cds = require('../../..')
+
+const FLOW_STATUS = '@flow.status'
+const FROM = '@from'
+const TO = '@to'
+// backwards compat
+const FLOW_FROM = '@flow.from'
+const FLOW_TO = '@flow.to'
+
+const getFrom = action => {
+  let from = action[FROM] ?? action[FLOW_FROM]
+  from = Array.isArray(from) ? from : [from]
+  return from.map(f => f['#'] ?? f['='] ?? f)
+}
+
+function addOperationAvailableToActions(actions, statusEnum, statusElementName) {
+  for (const action of Object.values(actions)) {
+    const fromList = getFrom(action)
+    const conditions = fromList.map(from => `$self.${statusElementName} = '${statusEnum[from].val ?? from}'`)
+    const condition = `(${conditions.join(' OR ')})`
+    const parsedXpr = cds.parse.expr(condition)
+    action['@Core.OperationAvailable'] ??= {
+      ...parsedXpr,
+      ['=']: condition
+    }
+  }
+}
+
+function addSideEffectToActions(actions, statusElementName) {
+  for (const action of Object.values(actions)) {
+    const properties = []
+    if (statusElementName.endsWith('.code')) {
+      const baseName = statusElementName.slice(0, -5)
+      properties.push(`in/${statusElementName}`)
+      properties.push(`in/${baseName}/*`)
+      properties.push(`in/${baseName}_code`)
+    } else {
+      properties.push(`in/${statusElementName}`)
+    }
+    const sideEffect = '@Common.SideEffects.TargetProperties'
+    if (action[sideEffect]) {
+      action[sideEffect].push(...properties)
+    } else {
+      action[sideEffect] = properties
+    }
+  }
+}
+
+function resolveStatusEnum(csn, codeElem) {
+  if (codeElem.enum !== undefined) return codeElem.enum
+  if (codeElem.type) {
+    const typeDef = csn.definitions[codeElem.type]
+    return typeDef ? typeDef.enum : undefined
+  }
+}
+
+function enhanceCSNwithFlowAnnotations4FE(csn) {
+  for (const definition of Object.values(csn.definitions)) {
+    if (definition.kind !== 'entity') continue
+    const entity = definition
+
+    if (!entity.elements || !entity.actions) continue
+    for (const [elemName, element] of Object.entries(entity.elements)) {
+      if (!element[FLOW_STATUS]) continue
+
+      const fromActions = []
+      const toActions = []
+      for (const action of Object.values(entity.actions)) {
+        if (action[FROM] || action[FLOW_FROM]) fromActions.push(action)
+        if (action[TO] || action[FLOW_TO]) toActions.push(action)
+      }
+      if (fromActions.length === 0 && toActions.length === 0) continue
+      if (element.enum) {
+        // Element is an enum directly
+        addSideEffectToActions(toActions, elemName)
+        addOperationAvailableToActions(fromActions, element.enum, elemName)
+      } else if (element.target) {
+        // Element is an association to a codelist
+        const targetDef = csn.definitions[element.target]
+        if (targetDef?.elements?.code) {
+          const codeElem = targetDef.elements.code
+          const statusEnum = resolveStatusEnum(csn, codeElem)
+          if (statusEnum) {
+            addSideEffectToActions(toActions, elemName + '.code')
+            addOperationAvailableToActions(fromActions, statusEnum, elemName + '.code')
+          }
+        }
+      } else if (element['@odata.foreignKey4']) {
+        // when compiling to edmx, the foreign key is also annotated with @flow.status, but has no info about the target
+        continue
+      } else {
+        cds.error(
+          `Status element in entity ${entity.name} is not an enum and does not have a valid target with code enum.`
+        )
+      }
+    }
+  }
+}
+
+module.exports = { enhanceCSNwithFlowAnnotations4FE, getFrom }

package/lib/compile/for/nodejs.js

@@ -9,6 +9,34 @@ function _compile_for_nodejs (csn, o) {
   dsn = unfold_csn(dsn)
   dsn = cds.linked(dsn)
   cds.compile.for.lean_drafts(dsn, o)
+
+  // @Common.Text → @cds.search
+  text_to_search: for (const name in dsn.definitions) {
+    const def = dsn.definitions[name]
+    if (!def.associations) continue
+
+    // if any @cds.search.* === true, @Common.Text should be ignored
+    for (const key in def) if (key.startsWith('@cds.search') && def[key]) continue text_to_search
+
+    let searched = false
+    for (const name in def.associations) {
+      const assoc = def.associations[name]
+      if (assoc['@Common.Text']?.['='] && def[`@cds.search.${assoc['@Common.Text']['=']}`] !== false) {
+        def[`@cds.search.${assoc['@Common.Text']['=']}`] = true
+        if (!searched) {
+          // add all string elements to @cds.search, if not annotated with @cds.search = false
+          for (const el in def.elements) {
+            const search_el = def.elements[el]
+            if (search_el._type === 'cds.String' && def[`@cds.search.${search_el.name}`] !== false) {
+              def[`@cds.search.${search_el.name}`] = true
+            }
+          }
+          searched = true
+        }
+      } 
+    }
+  }
+
   Object.defineProperty(csn, '_4nodejs', { value: dsn })
   Object.defineProperty(dsn, '_4nodejs', { value: dsn })
   Object.assign (dsn.meta, csn.meta, dsn.meta) // merge meta data, as it may have been enhanced

package/lib/compile/to/edm.js

@@ -1,7 +1,9 @@
-const cdsc = require ('../cdsc')
 const cds = require ('../../index')
+const cdsc = require ('../cdsc')
 const TRACE = cds.debug('trace')
 
+const { enhanceCSNwithFlowAnnotations4FE  } = require("../for/flows")
+
 if (cds.env.features.precompile_edms !== false) {
   const _precompiled = new WeakMap
   const to_edm = cdsc.to.edm
@@ -36,9 +38,14 @@ function cds_compile_to_edmx (csn,_o) {
   csn = _4odata(csn,o)
   TRACE?.time('cds.compile 2edmx'.padEnd(22))
   try {
-    let result, next = ()=> result ??= o.service === 'all' ? _many ('.xml',
-      cdsc.to.edmx.all (csn,o)
-    ) : cdsc.to.edmx (csn,o)
+    let result
+    const next = () => {
+      if (!result) {
+        if (cds.env.features.compile_for_flows) enhanceCSNwithFlowAnnotations4FE(csn)
+        result = o.service === 'all' ? _many('.xml', cdsc.to.edmx.all(csn, o)) : cdsc.to.edmx(csn, o)
+      }
+      return result
+    } 
     cds.emit ('compile.to.edmx', csn, o, next)
     return next() //> in case no handler called next
   }

package/lib/core/classes.js

@@ -190,7 +190,7 @@ class LinkedDefinitions {
 }
 
 
-module.exports = {
+exports = module.exports = {
 
   LinkedDefinitions,
 

package/lib/core/linked-csn.js

@@ -82,6 +82,14 @@ class LinkedCSN {
     return Object.values(defs).filter(_is(x))
   }
 
+  collect (picker, collector) {
+    if (!collector) collector = picker, picker = () => true
+    let d, x, collected = []
+    for (d of this.definitions)
+      if (picker(d) && (x = collector(d)) !== undefined) collected.push (x)
+    return collected
+  }
+
   foreach (x, v, defs=this.definitions) {
     const y=_is(x), visit = typeof v !== 'function' ? x : (d,n,p) => y(d) && v(d,n,p)
     for (let name in defs) visit (defs[name],name)

package/lib/dbs/cds-deploy.js

@@ -1,4 +1,4 @@
-const cds = require('../index'), { local, path } = cds.utils
+const cds = require('../index'), { local, path, colors: { DIMMED, RESET } } = cds.utils
 const DEBUG = cds.debug('deploy')
 const TRACE = cds.debug('trace')
 
@@ -10,7 +10,6 @@ const deploy = module.exports = function cds_deploy (model, options, csvs) {
     /* eslint-disable no-console */
 
     // prepare logging
-    const [ GREY, RESET ] = process.stdout.isTTY && !process.env.NO_COLOR || process.env.FORCE_COLOR ? ['\x1b[2m', '\x1b[0m' ] : ['','']
     const LOG = !o.silent && !o.dry && cds.log('deploy')._info ? console.log : undefined
 
     // prepare model
@@ -38,7 +37,7 @@ const deploy = module.exports = function cds_deploy (model, options, csvs) {
     try {
       await db.run (async tx => {
         let any = await deploy.schema (tx, model, o)
-        if (any || csvs) await deploy.data (tx, model, o, csvs, file => LOG?.(GREY, ' > init from', local(file), RESET))
+        if (any || csvs) await deploy.data (tx, model, o, csvs, file => LOG?.(DIMMED, ' > init from', local(file), RESET))
       })
       LOG?.('/> successfully deployed to', descr, '\n')
     } catch (e) {
@@ -92,7 +91,7 @@ deploy.schema = async function (db, csn = db.model, o) {
     creas = createsAndAlters
     drops = d
   } else {
-    // cds deploy -- w/o auto schema evoution > drop-create db
+    // cds deploy -- w/o auto schema evolution > drop-create db
     creas = cds.compile.to.sql(csn,o) // NOTE: this used to call cds.linked(cds.minify) and thereby corrupted the passed in csn
   }
 
@@ -155,12 +154,13 @@ deploy.schema = async function (db, csn = db.model, o) {
 deploy.data = async function (db, csn = db.model, o, srces, log=()=>{}) {
 
   const t = cds.context?.tenant; if (t && t === cds.requires.multitenancy?.t0) return
+  const data = await deploy.prepare (csn,srces); if (!data.length) return
+  // IMPORTANT: That ^^^^^^^^^^^^^^^^^^^ has to be called with the original csn, not the compile.for.nodejs one created below!
 
   return db.run (async tx => {
     TRACE?.time('cds.deploy data'.padEnd(22))
 
-    const m = tx.model = cds.compile.for.nodejs(csn) // NOTE: this used to create a redundant 4nodejs model for the same csn
-    const data = await deploy.prepare (m,srces)
+    const m = tx.model = cds.compile.for.nodejs(csn) // REVISIT: Why do we need that?!? // NOTE: this used to create a redundant 4nodejs model for the same csn
     const query = _queries4 (db,m)
     const INSERT_from = INSERT_from4 (db,m,o)
 
@@ -343,13 +343,13 @@ deploy.include_external_entities_in = function (csn) {
 /** Exclude external entities from the given model */
 deploy.exclude_external_entities_in = function (csn) {
   // IMPORTANT to use cds.env.requires below, not cds.requires !!
-  for (let [each,{service=each,model,credentials}] of Object.entries (cds.env.requires)) {
-    if (!model) continue //> not for internal services like cds.requires.odata
+  for (let [each,{service=each,credentials}] of Object.entries (cds.env.requires)) {
+    if (!csn.definitions[service]?.['@cds.external']) continue
     if (!credentials && csn._mocked) continue //> not for mocked unbound services
-    DEBUG?.('excluding external entities for', service, '...')
-    const prefix = service+'.'
-    for (let each in csn.definitions) if (each.startsWith(prefix)) _exclude (each)
-  }
+      DEBUG?.('excluding external entities for', service, '...')
+      const prefix = service+'.'
+      for (let each in csn.definitions) if (each.startsWith(prefix)) _exclude (each)
+    }
   return csn
 
   function _exclude (each) {

package/lib/env/cds-env.js

@@ -509,7 +509,7 @@ function _readYaml (file) {
 
 function _readEnv (file) {
   if (isfile(file)) {
-    const ENV = _readEnv.parser = require('../compile/etc/properties')
+    const ENV = _readEnv.parser ??= require('../compile/etc/properties')
     return ENV.parse (fs.readFileSync(file,'utf-8'))
   }
 }

package/lib/env/cds-requires.js

@@ -20,15 +20,13 @@ exports = module.exports = {
    * plus additional entries for all cds.required.<name>.service
    * @returns {import('./cds-requires')}
    */
-   _resolved() {
-    const dict = Object.create (this)
-    for (let [name,e] of Object.entries (this)) if (e.service) {
-      if (e.service in dict && !e.override && e.service !== name) {
-        throw new Error (`Datasource name '${e.service}' conflicts with service definition, referred to in 'cds.requires.${name}'`)
-      }
-      else dict[e.service] = { ...e, name }
+  _resolved() {
+    const requires = { __proto__: this }
+    for (let [name,e] of Object.entries(this)) if (e.service) {
+      if (!(e.service in requires) || e.override || e.service !== name) requires[e.service] = { ...e, name }
+      else throw new Error (`Config 'cds.requires.${name}.service = ${e.service}' conflicts with 'cds.requires.${e.service}'`)
     }
-    return dict
+    return requires
   }
 }
 
@@ -92,26 +90,30 @@ const _services = {
 
   "app-service": {
     // this is the default implementation used for provided services
-    impl: `${_runtime}/common/Service.js`
+    impl: `@sap/cds/srv/app-service.js`,
   },
   "rest": {
-    impl: `${_runtime}/remote/Service.js`,
+    impl: `@sap/cds/srv/remote-service.js`,
+    external: true
+  },
+  "hcql": {
+    impl: `@sap/cds/srv/remote-service.js`,
     external: true
   },
   "odata": {
-    impl: `${_runtime}/remote/Service.js`,
+    impl: `@sap/cds/srv/remote-service.js`,
     external: true
   },
   "odata-v2": { // REVISIT: we should introduce .version
-    impl: `${_runtime}/remote/Service.js`,
+    impl: `@sap/cds/srv/remote-service.js`,
     external: true
   },
   "odata-v4": { // REVISIT: we should introduce .version
-    impl: `${_runtime}/remote/Service.js`,
+    impl: `@sap/cds/srv/remote-service.js`,
     external: true
   },
   "graphql": { // REVISIT: we should introduce .version
-    impl: `${_runtime}/remote/Service.js`,
+    impl: `@sap/cds/srv/remote-service.js`,
     external: true
   },
 
@@ -242,9 +244,11 @@ const _messaging = {
 const _platform_services = {
 
   ucl: {
-    impl: `${_runtime}/ucl/Service.js`,
-    host: 'compass-gateway-sap-mtls.mps.kyma.cloud.sap',
-    path: '/director/graphql',
+    model: '@sap/cds/srv/ucl-service.cds',
+    // REVISIT: how to configure such that a cds.connect.to('ucl') returns the already initialized UCLService?
+    // service: 'UCLService',
+    // impl: `${_runtime}/ucl/Service.js`,
+    // REVISIT: remove default as only needed for push mode
     vcap: { label: 'xsuaa' }
   },
 
@@ -272,6 +276,3 @@ exports.kinds = {
   ..._messaging,
   ..._platform_services,
 }
-
-
-Object.defineProperty(exports,'_resolved',{value:exports._resolved,enumerable:false}) // hide it in outputs

package/lib/env/defaults.js

@@ -56,7 +56,8 @@ module.exports = {
     lean_draft: true,
     wrap_multiple_errors: true,
     draft_lock_timeout: true,
-    draft_deletion_timeout: true
+    draft_deletion_timeout: true,
+    draft_messages: true
   },
 
   ql: {

package/lib/index.js

@@ -72,7 +72,6 @@ const cds = exports = module.exports = global.cds = new class cds extends EventE
   // Providing and Consuming Services
   /** @type { Record<string,Service> } */ services = new class {
     *[Symbol.iterator](){ for (let e in this) yield this[e] }
-    get _pending(){ return this.#pending ??= {} } #pending
   }
   get server() { return super.server = require('../server.js') }
   get serve() { return super.serve = require('./srv/cds-serve.js') }
@@ -95,10 +94,10 @@ const cds = exports = module.exports = global.cds = new class cds extends EventE
   get validate() { return super.validate = require('./req/validate.js') }
 
   // Services, Protocols and Periphery
-  get ApplicationService() { return super.ApplicationService = require('../libx/_runtime/common/Service.js') }
-  get MessagingService() { return super.MessagingService = require('../libx/_runtime/messaging/service.js') }
-  get DatabaseService() { return super.DatabaseService = require('@cap-js/db-service').DatabaseService }
-  get RemoteService() { return super.RemoteService = require('../libx/_runtime/remote/Service.js') }
+  get ApplicationService() { return super.ApplicationService = require('../srv/app-service.js') }
+  get MessagingService() { return super.MessagingService = require('../srv/msg-service.js') }
+  get DatabaseService() { return super.DatabaseService = require('../srv/db-service.js') }
+  get RemoteService() { return super.RemoteService = require('../srv/remote-service.js') }
 
   // Helpers
   get utils() { return super.utils = require('./utils/cds-utils.js') }
@@ -151,4 +150,4 @@ function D (old,use,fn) { return G (old, cds.utils.deprecated (fn,{kind:'Global
 function G (p,v) { Object.defineProperty (global, p, { value:v, enumerable:1,configurable:1}); return v }
 
 // Allow for `import cds from '@sap/cds'` without `esModuleInterop` in tsconfig.json
-Object.defineProperties (module.exports, { default: {value:cds}, __esModule: {value:true} })
+Object.defineProperties (exports, { default: {value:cds}, __esModule: {value:true} })