@sap/cds 8.9.4 → 9.0.3

package/libx/_runtime/messaging/common-utils/connections.js

@@ -1,4 +1,4 @@
-const waitingTime = require('../../common/utils/waitingTime')
+const { expBkfRnd: waitingTime } = require('../../common/utils/waitingTime')
 
 const _connectUntilConnected = (client, LOG, x) => {
   const _waitingTime = waitingTime(x)

package/libx/_runtime/messaging/enterprise-messaging-utils/EMManagement.js

@@ -335,6 +335,7 @@ class EMManagement {
       })
       if (res.statusCode === 201) return true
     } catch (e) {
+      if (e.body?.error?.code === 'CONFLICT') return true // might have been created by another instance
       const error = new Error(`Webhook "${webhookName}" could not be created ${this.subdomainInfo}`)
       error.code = 'CREATE_WEBHOOK_FAILED'
       error.target = { kind: 'WEBHOOK', queue: queueName, webhook: webhookName }

package/libx/_runtime/messaging/enterprise-messaging-utils/registerEndpoints.js

@@ -2,9 +2,9 @@ const cds = require('../../cds.js')
 const express = require('express')
 const getTenantInfo = require('./getTenantInfo.js')
 const isSecured = () => cds.requires.auth && (cds.requires.auth.impl || cds.requires.auth.credentials)
-const { ODATA_UNAUTHORIZED } = require('../../common/error/constants')
 
 const _isAll = a => a && a.includes('all')
+let jwt_auth
 
 class EndpointRegistry {
   constructor(basePath, LOG) {
@@ -15,7 +15,7 @@ class EndpointRegistry {
       if (cds.requires.auth.impl) {
         cds.app.use(basePath, cds.middlewares.before) // contains auth, trace, context
       } else {
-        const jwt_auth = require('../../../../lib/srv/middlewares/auth/jwt-auth.js')
+        jwt_auth ??= require('../../../../lib/srv/middlewares/auth/jwt-auth.js')
         cds.app.use(basePath, cds.middlewares.context())
         cds.app.use(basePath, jwt_auth(cds.requires.auth))
         cds.app.use(basePath, (err, req, res, next) => {
@@ -26,7 +26,7 @@ class EndpointRegistry {
       // unsuccessful auth doesn't automatically reject!
       cds.app.use(basePath, (req, res, next) => {
         // REVISIT: we should probably pass an error into next so that a (custom) error middleware can handle it
-        if (cds.context.user._is_anonymous) return res.status(401).json({ error: ODATA_UNAUTHORIZED })
+        if (cds.context.user._is_anonymous) return res.status(401).end()
         next()
       })
     } else if (process.env.NODE_ENV === 'production') {

package/libx/_runtime/messaging/enterprise-messaging.js

@@ -43,7 +43,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
     // REVISIT: Is that tested with MTX services in sidecar?
     const deploymentSrv = await cds.connect.to('cds.xt.DeploymentService')
     const provisioningSrv = await cds.connect.to('cds.xt.SaasProvisioningService')
-    deploymentSrv.impl(() => {
+    deploymentSrv.prepend(() => {
       deploymentSrv.after('subscribe', async (_res, req) => {
         const { subscribedSubdomain: subdomain } = req.data.metadata
         const management = await this.getManagement(subdomain).waitUntilReady()
@@ -67,7 +67,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
         }
       })
     })
-    provisioningSrv.impl(() => {
+    provisioningSrv.prepend(() => {
       provisioningSrv.on('dependencies', async (_req, next) => {
         this.LOG._info && this.LOG.info('Include Enterprise-Messaging as SaaS dependency')
         const res = (await next()) || []

package/libx/_runtime/messaging/file-based.js

@@ -54,12 +54,10 @@ class FileBasedMessaging extends MessagingService {
               if (this.subscribedTopics.has(topic)) {
                 const event = this.subscribedTopics.get(topic)
                 if (!event) return
-                try {
-                  await this.processInboundMsg({}, { event, ...json })
-                } catch (e) {
+                this.processInboundMsg({}, { event, ...json }).catch(e => {
                   e.message = 'ERROR occurred in asynchronous event processing: ' + e.message
                   this.LOG.error(e)
-                }
+                })
               } else other.push(each + '\n')
             }
           } catch {

package/libx/_runtime/messaging/redis-messaging.js

@@ -1,6 +1,6 @@
 const redis = require('redis')
 const cds = require('../../../lib')
-const waitingTime = require('../common/utils/waitingTime')
+const { expBkfRnd: waitingTime } = require('../common/utils/waitingTime')
 const normalizeIncomingMessage = require('./common-utils/normalizeIncomingMessage')
 
 const _handleReconnects = (client, LOG) => {

package/libx/_runtime/messaging/service.js

@@ -6,19 +6,8 @@ const appId = require('./common-utils/appId')
 
 const _topic = declared => declared['@topic'] || declared.name
 
-const _stripTopicPrefix = event => event.replace(/topic:/, '')
-
-const _warnAndStripTopicPrefix = event => {
-  if (event.startsWith('topic:'))
-    event = cds.utils.deprecated(_stripTopicPrefix, {
-      kind: '',
-      old: 'Unnecessary topic prefix "topic:"'
-    })(event)
-  return event
-}
-
 // There's currently no mechanism to detect mocked services, this is the best we can do.
-class MessagingService extends cds.Service {
+module.exports = class MessagingService extends cds.Service {
   init() {
     // enables queued async operations (without awaiting)
     this.queued = queued()
@@ -91,15 +80,15 @@ class MessagingService extends cds.Service {
     // this.tx expects cds.context.model
     if (cds.model && (cds.env.requires.extensibility || cds.env.requires.toggles))
       cds.context.model = await ExtendedModels.model4(ctx.tenant, ctx.features || {})
-    return await this.tx(ctx, tx => tx.emit(msg))
+    const me = this.options.inboxed || this.options.inbox ? cds.queued(this) : this
+    return await me.tx(ctx, tx => tx.emit(msg))
   }
 
   on(event, cb) {
-    const _event = _warnAndStripTopicPrefix(event)
     // save all subscribed topics (not needed for local-messaging)
-    if (event !== '*') this.subscribedTopics.set(this.prepareTopic(_event, true), _event)
+    if (event !== '*') this.subscribedTopics.set(this.prepareTopic(event, true), event)
     else this._listenToAll.value = true
-    return super.on(_event, cb)
+    return super.on(event, cb)
   }
 
   prepareTopic(topic, _inbound) {
@@ -125,7 +114,6 @@ class MessagingService extends cds.Service {
 
   message4(msg) {
     const _msg = { ...msg }
-    _msg.event = _warnAndStripTopicPrefix(_msg.event)
     if (!_msg.headers) _msg.headers = {}
     if (!_msg.inbound) {
       _msg.headers = { ..._msg.headers } // don't change the original object
@@ -146,5 +134,3 @@ class MessagingService extends cds.Service {
     return _msg
   }
 }
-
-module.exports = MessagingService

package/libx/_runtime/remote/Service.js

@@ -3,7 +3,6 @@ const cds = require('../cds')
 const { run, getReqOptions } = require('./utils/client')
 const { getCloudSdk, getCloudSdkConnectivity, getCloudSdkResilience } = require('./utils/cloudSdkProvider')
 const { hasAliasedColumns } = require('./utils/data')
-const { findQueryTarget } = require('../common/utils/resolveView')
 const postProcess = require('../common/utils/postProcess')
 const { formatVal } = require('../../odata/utils')
 
@@ -77,7 +76,7 @@ const _buildKeys = (req, kind) => {
 
 const _handleBoundActionFunction = (srv, def, req, url) => {
   if (def.kind === 'action') {
-    return srv.post(url, def.params ? _extractParamsFromData(req.data, def.params) : {})
+    return srv.post(url, def.params ? _extractParamsFromData(req.data, def.params) : {}, req.headers)
   }
 
   if (def.params) {
@@ -87,7 +86,7 @@ const _handleBoundActionFunction = (srv, def, req, url) => {
     url = `${url}()`
   }
 
-  return srv.get(url)
+  return srv.get(url, {}, req.headers)
 }
 
 const _handleUnboundActionFunction = (srv, def, req, event) => {
@@ -102,7 +101,7 @@ const _handleUnboundActionFunction = (srv, def, req, event) => {
 
   const url =
     Object.keys(req.data).length > 0 ? _buildPartialUrlFunctions(`/${event}`, req.data, def.params) : `/${event}()`
-  return srv.get(url)
+  return srv.get(url, {}, req.headers)
 }
 
 const _sendV2RequestActionFunction = (srv, def, req, url) => {
@@ -156,13 +155,9 @@ const _addHandlerActionFunction = (srv, def, target) => {
   }
 }
 
-const _isSelectWithAliasedColumns = q =>
-  q?.SELECT && !q.SELECT._transitions && q.SELECT.columns?.some(hasAliasedColumns)
+const _isSelectWithAliasedColumns = q => q?.SELECT && !q._transitions && q.SELECT.columns?.some(hasAliasedColumns)
 
-const resolvedTargetOfQuery = q => {
-  const transitions = (typeof q === 'object' && (q.SELECT || q.INSERT || q.UPDATE || q.DELETE)._transitions) || []
-  return transitions.length && [transitions.length - 1].target
-}
+const resolvedTargetOfQuery = q => q?._transitions?.at(-1)?.target
 
 const _resolveSelectionStrategy = options => {
   if (typeof options?.selectionStrategy !== 'string') return
@@ -202,12 +197,6 @@ class RemoteService extends cds.Service {
     if (this.options.credentials) {
       this.datasource = this.options.datasource
       this.destinationOptions = this.options.destinationOptions
-      // set useCache by default
-      if (!this.destinationOptions) {
-        this.destinationOptions = { useCache: true }
-      } else if (typeof this.destinationOptions.useCache === 'undefined') {
-        this.destinationOptions.useCache = true
-      }
       _resolveSelectionStrategy(this.destinationOptions)
       this.destination =
         this.options.credentials.destination ??
@@ -257,6 +246,9 @@ class RemoteService extends cds.Service {
       const reqOptions = getReqOptions(req, query, this)
       reqOptions.headers = _getHeaders(reqOptions.headers, req)
 
+      // REVISIT: we should not have to set the content-type at all for that
+      if (reqOptions.headers.accept?.match(/stream|image|tar/)) reqOptions.responseType = 'stream'
+
       // ensure request correlation (even with systems that use x-correlationid)
       const correlationId = reqOptions.headers['x-correlation-id'] || cds.context?.id //> prefer custom header over context id
       reqOptions.headers['x-correlation-id'] = correlationId
@@ -289,23 +281,18 @@ class RemoteService extends cds.Service {
   // Overload .handle in order to resolve projections up to a definition that is known by the remote service instance.
   // Result is post processed according to the inverse projection in order to reflect the correct result of the original query.
   async handle(req) {
-    let result
-
-    if (!this._requires_resolving(req)) {
-      result = await super.handle(req)
-      // we need to post process if alias was explicitly set in query
-      if (_isSelectWithAliasedColumns(req.query)) result = postProcess(req.query, result, this, true)
-    } else {
-      const query = cds.ql.resolve(req.query, this)
-      if (!query) throw new Error(`Target ${req.target.name} cannot be resolved for service ${this.name}`)
-      const target = findQueryTarget(query) || req.target
-      // we need to provide target explicitly because it's cached within ensure_target
-      const _req = new cds.Request({ query, target, _resolved: true, headers: req.headers, method: req.method })
-      result = await super.dispatch(_req)
-      result = postProcess(query, result, this, true)
-    }
-
-    return result
+    if (!this._requires_resolving(req))
+      return super.handle(req).then(
+        // we need to post process if alias was explicitly set in query
+        result => (_isSelectWithAliasedColumns(req.query) ? postProcess(req.query, result, this, true) : result)
+      )
+    // rewrite the query to a target entity served by this service...
+    const query = this.resolve(req.query)
+    if (!query) throw new Error(`Target ${req.target.name} cannot be resolved for service ${this.name}`)
+    const target = query._target || req.target
+    // we need to provide target explicitly because it's cached within ensure_target
+    const _req = new cds.Request({ query, target, _resolved: true, headers: req.headers, method: req.method })
+    return await super.dispatch(_req).then(result => postProcess(query, result, this, true))
   }
 }
 

package/libx/_runtime/remote/utils/client.js

@@ -1,6 +1,7 @@
 const cds = require('../../cds')
 const LOG = cds.log('remote')
 const { getCloudSdk } = require('./cloudSdkProvider')
+const { Readable } = require('stream')
 
 const SANITIZE_VALUES = process.env.NODE_ENV === 'production' && cds.env.log.sanitize_values !== false
 const { convertV2ResponseData, deepSanitize, convertV2PayloadData } = require('./data')
@@ -35,18 +36,7 @@ const _executeHttpRequest = async ({ requestConfig, destination, destinationOpti
   }
 
   // Cloud SDK throws error if useCache is activated and jwt is undefined
-  if (destination.jwt === undefined) delete destination.useCache
-
-  // prevent token exchange if ias token for technical user (unofficial!!!)
-  if (cds.env.features.remote_prevent_token_exchange) {
-    try {
-      const jsonwebtoken = require('jsonwebtoken')
-      const decoded = jsonwebtoken.decode(jwt)
-      if (decoded.app_tid && decoded.azp && decoded.azp === decoded.sub) destination.iasToXsuaaTokenExchange = false
-    } catch (error) {
-      LOG._debug && LOG.debug('Preventing token exchange failed:', error)
-    }
-  }
+  if (destination.jwt === undefined) destination.useCache = false
 
   if (LOG._debug) {
     const req2log = { headers: _sanitizeHeaders({ ...requestConfig.headers }) }
@@ -155,20 +145,12 @@ const _getPurgedRespActionFunc = (data, returnType) => {
   return data
 }
 
-const _purgeODataV2 = (data, target, returnType, reqHeaders) => {
+const _purgeODataV2 = (data, target, returnType) => {
   if (typeof data !== 'object' || !data.d) return data
 
   data = returnType ? _getPurgedRespActionFunc(data.d, returnType) : data.d
-  const ieee754Compatible = reqHeaders.accept && reqHeaders.accept.includes('IEEE754Compatible=true')
-  const exponentialDecimals = ieee754Compatible && reqHeaders.accept.includes('ExponentialDecimals=true')
   const purgedResponse = typeof data === 'object' && 'results' in data ? data.results : data
-  const convertedResponse = convertV2ResponseData(
-    purgedResponse,
-    target,
-    returnType,
-    ieee754Compatible,
-    exponentialDecimals
-  )
+  const convertedResponse = convertV2ResponseData(purgedResponse, target, returnType)
 
   return _normalizeMetadata(/^__/, data, convertedResponse)
 }
@@ -305,12 +287,12 @@ const run = async (requestConfig, options) => {
 
   const { kind, resolvedTarget, returnType } = options
   if (kind === 'odata-v4') return _purgeODataV4(response.data)
-  if (kind === 'odata-v2') return _purgeODataV2(response.data, resolvedTarget, returnType, requestConfig.headers)
+  if (kind === 'odata-v2') return _purgeODataV2(response.data, resolvedTarget, returnType)
   if (kind === 'odata') {
     if (typeof response.data !== 'object') return response.data
 
     // try to guess if we need to purge v2 or v4
-    if (response.data.d) return _purgeODataV2(response.data, resolvedTarget, returnType, requestConfig.headers)
+    if (response.data.d) return _purgeODataV2(response.data, resolvedTarget, returnType)
     return _purgeODataV4(response.data)
   }
 
@@ -408,7 +390,7 @@ const getReqOptions = (req, query, service) => {
     reqOptions.data &&
     reqOptions.method !== 'GET' &&
     reqOptions.method !== 'HEAD' &&
-    !(reqOptions.data instanceof require('stream').Readable)
+    !(reqOptions.data instanceof Readable)
   ) {
     if (typeof reqOptions.data === 'object' && !Buffer.isBuffer(reqOptions.data)) {
       reqOptions.headers['content-type'] = 'application/json'

package/libx/_runtime/remote/utils/cloudSdkProvider.js

@@ -1,22 +1,17 @@
+const cds = require('../../cds')
+
 let _cloudSdkConnectivity
-const getCloudSdkConnectivity = () => {
-  if (_cloudSdkConnectivity) return _cloudSdkConnectivity
-  _cloudSdkConnectivity = require('@sap-cloud-sdk/connectivity')
-  return _cloudSdkConnectivity
-}
+const getCloudSdkConnectivity = () => (_cloudSdkConnectivity ??= require('@sap-cloud-sdk/connectivity'))
 
 let _cloudSdkResilience
-const getCloudSdkResilience = () => {
-  if (_cloudSdkResilience) return _cloudSdkResilience
-  _cloudSdkResilience = require('@sap-cloud-sdk/resilience')
-  return _cloudSdkResilience
-}
+const getCloudSdkResilience = () => (_cloudSdkResilience ??= require('@sap-cloud-sdk/resilience'))
 
 let _cloudSdk
 const getCloudSdk = () => {
-  if (_cloudSdk) return _cloudSdk
-
-  _cloudSdk = require('@sap-cloud-sdk/http-client')
+  _cloudSdk ??= require('@sap-cloud-sdk/http-client')
+  const { version } = require('@sap-cloud-sdk/http-client/package.json')
+  if (version && Number(version.split('.')[0]) < 4)
+    cds.utils.deprecated({ old: `SAP Cloud SDK version ${version} `, use: `SAP Cloud SDK version >= 4.` })
   return _cloudSdk
 }
 

package/libx/_runtime/remote/utils/data.js

@@ -1,6 +1,3 @@
-const { big } = require('@sap/cds-foss')
-const cds = require('../../cds')
-
 // Code adopted from @sap/cds-odata-v2-adapter-proxy
 // https://www.w3.org/TR/xmlschema11-2/#nt-duDTFrag
 const DurationRegex = /^P(?:(\d)Y)?(?:(\d{1,2})M)?(?:(\d{1,2})D)?T(?:(\d{1,2})H)?(?:(\d{2})M)?(?:(\d{2}(?:\.\d+)?)S)?$/i
@@ -65,39 +62,11 @@ const _convertActionFuncResponse = (returnType, convertValueFn) => data => {
   return convertValueFn(data, returnType.items || returnType)
 }
 
-const _convertValue = (ieee754Compatible, exponentialDecimals) => (value, element) => {
+const _convertValue = () => (value, element) => {
   if (value == null) return value
 
   const type = _elementType(element)
 
-  if (cds.env.features.odata_v2_result_conversion) {
-    cds.utils.deprecated({ old: 'flag cds.env.features.odata_v2_result_conversion' })
-    if (type === 'cds.Boolean') {
-      if (value === 'true') {
-        value = true
-      } else if (value === 'false') {
-        value = false
-      }
-    } else if (type === 'cds.Integer' || type === 'cds.UInt8' || type === 'cds.Int16' || type === 'cds.Int32') {
-      value = parseInt(value, 10)
-    } else if (
-      type === 'cds.Decimal' ||
-      type === 'cds.DecimalFloat' ||
-      type === 'cds.Integer64' ||
-      type === 'cds.Int64'
-    ) {
-      const bigValue = big(value)
-      if (ieee754Compatible) {
-        // TODO test with arrayed => element.items.scale?
-        value = exponentialDecimals ? bigValue.toExponential(element.scale) : bigValue.toFixed(element.scale)
-      } else {
-        // OData V2 does not even mention ieee754Compatible, but V4 requires JSON number if ieee754Compatible=false
-        value = bigValue.toNumber()
-      }
-    } else if (type === 'cds.Double') {
-      value = parseFloat(value)
-    }
-  }
   if (type === 'cds.Time') {
     const match = value.match(DurationRegex)
 
@@ -176,9 +145,9 @@ const _elementType = element => {
   return type
 }
 
-const convertV2ResponseData = (data, target, returnType, ieee754Compatible, exponentialDecimals) => {
+const convertV2ResponseData = (data, target, returnType) => {
   if (!((target && target.elements) || returnType)) return data
-  return _convertData(data, target, _convertValue(ieee754Compatible, exponentialDecimals), returnType)
+  return _convertData(data, target, _convertValue(), returnType)
 }
 
 const convertV2PayloadData = (data, target) => {

package/libx/_runtime/types/api.js

@@ -109,14 +109,6 @@
  * @property {string} locale The user locale
  */
 
-/**
- * @typedef {object} cqn2cqn4sqlOptions
- * @property {boolean} [suppressSearch=false] Indicates whether the search handler is called.
- * @property {boolean} [_4fiori]
- * @property {boolean} [_4db]
- * @property {import('../db/Service')} [service]
- */
-
 // Assert targets map
 
 /**

package/libx/_runtime/ucl/Service.js

@@ -192,14 +192,6 @@ const DELETE_MUTATION = `
     }
   }`
 
-const _deepAssign = (a, b) => {
-  for (const key in b) {
-    if (typeof b[key] === 'object' && !Array.isArray(b[key])) a[key] = _deepAssign(a[key] || {}, b[key])
-    else a[key] = b[key]
-  }
-  return a
-}
-
 const _getApplicationTemplate = options => {
   let applicationTemplate = {
     applicationInput: {
@@ -223,7 +215,7 @@ const _getApplicationTemplate = options => {
     ],
     accessLevel: 'GLOBAL'
   }
-  applicationTemplate = _deepAssign(applicationTemplate, options.applicationTemplate)
+  applicationTemplate = cds.utils.merge(applicationTemplate, options.applicationTemplate)
 
   const pkg = require(cds.root + '/package')
   if (!applicationTemplate.name) applicationTemplate.name = pkg.name

package/libx/common/utils/path.js

@@ -3,14 +3,13 @@ const cds = require('../../../')
 const { where2obj } = require('../../_runtime/common/utils/cqn')
 const propagateForeignKeys = require('../../_runtime/common/utils/propagateForeignKeys')
 
-let _consistent_params
+let _consistent_params //> remove with cds^10
 
 // REVISIT: do we already have something like this _without using okra api_?
 // REVISIT: should we still support process.env.CDS_FEATURES_PARAMS? probably nobody uses it...
 exports.getKeysAndParamsFromPath = (from, { model }) => {
   if (!from.ref || !from.ref.length) return {}
 
-  // REVISIT: make opt-out feature in cds^9
   _consistent_params ??= cds.env.features.consistent_params
 
   const params = []
@@ -50,7 +49,7 @@ exports.getKeysAndParamsFromPath = (from, { model }) => {
 
   let current = data
   for (let nav of navigations) {
-    propagateForeignKeys(nav.name, current, nav._foreignKeys, true, { enumerable: true, generateKeys: false })
+    propagateForeignKeys(nav.name, current, nav._foreignKeys, true, { generateKeys: false })
     current = current[nav.name]
   }
 

package/libx/common/utils/streaming.js

@@ -1,3 +1,4 @@
+const cds = require('../../../lib')
 const { Readable } = require('node:stream')
 
 exports.validateMimetypeIsAcceptedOrThrow = (headers, contentType) => {
@@ -34,7 +35,7 @@ const _annotation = (def,a) => {
 
 // REVISIT: Such helpers are a pain -> use classes with methods instead, e.g. RestAdapter extends HttpAdapter, ODataAdapter extends RestAdapter, etc.
 exports.collectStreamMetadata = (result, operation, query) => {
-  const element = query?._propertyAccess ? query.target?.elements?.[query._propertyAccess] : undefined
+  const element = query?._propertyAccess ? cds.infer.target(query).elements?.[query._propertyAccess] : undefined
   const returns = operation?.returns
 
   const filename =

package/libx/http/HttpRequest.js

@@ -0,0 +1,13 @@
+const cds = require('../_runtime/cds')
+
+module.exports = class HttpRequest extends cds.Request {
+  constructor(args) {
+    super(args)
+    this.req = args.req
+    this.res = args.res
+  }
+
+  get protocol() {
+    throw new Error('Not implemented')
+  }
+}

package/libx/{odata/middleware → http}/body-parser.js

@@ -19,14 +19,16 @@ module.exports = function bodyParser4(adapter, options = {}) {
       req._raw = req.body || '{}'
       try {
         req.body = JSON.parse(req._raw)
-        if (typeof req.body !== 'object') {
-          res.status(400).json({ error: { message: 'Expected JSON object in body', statusCode: 400, code: '400' } })
-          return
-        }
       } catch (e) {
-        return next(Object.assign(e, { statusCode: 400 }))
+        // Need to wrap, as a rethrow would crash the server
+        let err = new InvalidJSON(e.message)
+        return next(err)
       }
       next()
     })
   }
 }
+
+class InvalidJSON extends Error {}
+InvalidJSON.prototype.name = 'Invalid JSON body'
+InvalidJSON.prototype.status = 400

package/libx/http/location.js

@@ -0,0 +1,41 @@
+module.exports = (target, srv, result, keys_as_segments) => {
+  const targetName = target.name.replace(`${srv.definition.name}.`, '')
+  if (!target.keys) return targetName
+
+  const filteredKeys = [...target.keys].filter(k => !k.isAssociation).map(k => k.name)
+  if (!filteredKeys.every(k => k in result)) return
+
+  const keyValuePairs = filteredKeys.reduce((acc, key) => {
+    const value = result[key]
+    if (result[key] === undefined) return acc
+
+    if (Buffer.isBuffer(value)) {
+      acc[key] = value.toString('base64')
+    } else {
+      const _type = target.elements[key]._type
+      if (!keys_as_segments && typeof value === 'string' && _type !== 'cds.UUID') acc[key] = `'${value}'`
+      else acc[key] = value
+    }
+
+    return acc
+  }, {})
+
+  if (keys_as_segments) { 
+    let location = targetName
+    for (const k in keyValuePairs) location += `/${keyValuePairs[k]}` 
+    return location 
+  }
+
+  let keys
+  const entries = Object.entries(keyValuePairs)
+  if (entries.length === 1) {
+    keys = entries[0][1]
+    if (target.elements[entries[0][0]]['@odata.Type'] === 'Edm.String') keys = `'${keys}'`
+  } else {
+    keys = entries
+      .map(([key, value]) => `${key}=${target.elements[key]['@odata.Type'] === 'Edm.String' ? `'${value}'` : value}`)
+      .join(',')
+  }
+
+  return `${targetName}(${keys})`
+}

package/libx/http/put.js

@@ -0,0 +1,36 @@
+// based on now removed libx/_runtime/common/generic/put.js
+
+const cds = require('../../lib')
+
+const getTemplate = require('../_runtime/common/utils/template')
+
+/**
+ * adds default value or null (if nullable) for each property that was not provided
+ * and is neither key nor read-only (e.g., managed, virtual, etc.)
+ */
+module.exports = function prepare_put_requests(service, target, data) {
+  // REVISIT: export a no op insetad of this early exit (requires to rewrite tests)
+  if (!cds.env.runtime.put_as_replace) return
+
+  const template = getTemplate('put', service, target, {
+    pick: element => {
+      if (!element.isAssociation && !element.key && !element._isReadOnly && !element['@cds.api.ignore']) {
+        if (element.default) return { category: 'default', args: element.default }
+        if (!element.notNull) return { category: 'null' }
+      }
+    },
+    ignore: element => element._isAssociationStrict
+  })
+  if (template.elements.size === 0) return
+
+  template.process(data, ({ row, key, element, plain }) => {
+    if (!row || row[key] !== undefined) return
+
+    const { category, args } = plain
+    if (category === 'default') {
+      row[key] = args.val
+    } else if (category === 'null' && !element._isStructured) {
+      row[key] = null
+    }
+  })
+}