@sap/cds-dk 10.0.7 → 10.1.0

package/node_modules/@sap/cds/lib/env/defaults.js

@@ -35,11 +35,11 @@ module.exports = exports = {
     sql_simple_queries: 0,
     pre_compile_edmxs: false,
     live_reload: !production,
-    in_memory_db: !production,
     test_data: !production,
     test_mocks: !production,
     with_mocks: !production,
     mocked_bindings: !production,
+    in_memory_db: true,
     // skip_unused: 'all',
     skip_unused: true,
     deploy_data_onconflict: 'insert',
@@ -223,6 +223,9 @@ module.exports = exports = {
 
   remote: {
     native_fetch: undefined,
+    timeout: '10s',
+    cache_size: 0,
+    cache_expiry_buffer: '5min',
   },
 
 }

package/node_modules/@sap/cds/lib/env/schemas/cds-rc.js

@@ -3,6 +3,7 @@ const cds = require('../../index')
 module.exports = {
   _version: cds.version,
 
+  $id: 'cdsjsonschema://schemas/cds-rc.json',
   title: 'JSON schema for CDS configuration',
   $schema: 'https://json-schema.org/draft-07/schema',
   description: 'This is a JSON schema representation for CDS project configuration',
@@ -961,12 +962,14 @@ module.exports = {
       enum: [
         'hana',
         'sql',
-        'sqlite'
+        'sqlite',
+        'sqlite:memory'
       ],
       enumDescriptions: [
         'SAP HANA',
         'In-memory SQLite (development), SAP HANA (production)',
-        'File-based SQLite'
+        'File-based SQLite',
+        'In-memory SQLite'
       ]
     },
 

package/node_modules/@sap/cds/lib/plugins.js

@@ -1,6 +1,12 @@
 const DEBUG = /\b(y|all|plugins)\b/.test(process.env.DEBUG) ? console : undefined // eslint-disable-line no-console
 const cds = require('.')
 
+const prioritized = {
+  '@sap/cds-mtxs': true,    // plugins may register handlers for mtxs services
+  '@cap-js/sqlite': true,   // to enable override by @cap-js/ai
+  '@cap-js/telemetry': true // to allow better instrumentation
+}
+
 /**
  * Fetch cds-plugins from project's package dependencies.
  * Called in cds.env to populate the plugins configuration
@@ -8,7 +14,7 @@ const cds = require('.')
  */
 exports.fetch = function (DEV = process.env.NODE_ENV !== 'production') {
   DEBUG?.time ('[cds.plugins] - fetched plugins in')
-  const plugins = JSON.parse(process.env.CDS_PLUGINS||'{}')
+  let plugins = JSON.parse(process.env.CDS_PLUGINS||'{}')
   fetch_plugins_in (cds.home, false)
   fetch_plugins_in (cds.root, DEV)
   function fetch_plugins_in (root, dev) {
@@ -19,6 +25,8 @@ exports.fetch = function (DEV = process.env.NODE_ENV !== 'production') {
       plugins[each] = { impl }
     } catch { /* no cds-plugin.js */ }
   }
+  for (const each in prioritized)
+    if (each in plugins) plugins = Object.assign({ [each]: plugins[each] }, plugins)
   DEBUG?.timeEnd ('[cds.plugins] - fetched plugins in')
   return plugins
 }
@@ -30,10 +38,6 @@ exports.fetch = function (DEV = process.env.NODE_ENV !== 'production') {
 exports.activate = async function (plugins = cds.env?.plugins || exports.fetch()) {
   DEBUG?.time ('[cds.plugins] - loaded plugins in')
   const all = Object.entries(plugins), { local } = cds.utils
-  const prioritized = {
-    '@sap/cds-mtxs': true,    // plugins may register handlers for mtxs services
-    '@cap-js/telemetry': true // to allow better instrumentation
-  }
   await Promise.all (all.map (([n,c]) => n in prioritized && _load(n,c)))
   await Promise.all (all.map (([n,c]) => n in prioritized || _load(n,c)))
   async function _load (plugin, conf) {

package/node_modules/@sap/cds/lib/req/spawn.js

@@ -12,7 +12,7 @@ module.exports = function spawn (o, fn, /** @type {import('../index')} */ cds=th
       if (cds.model && (cds.env.requires.extensibility || cds.env.requires.toggles)) {
         const ctx = cds.context
         const ExtendedModels = require('../srv/srv-models') // the sentinel is automatically started when required
-        cds.context.model = await ExtendedModels.model4(ctx.tenant, ctx.features)
+        cds.context.model = await cds.tx(() => ExtendedModels.model4(ctx.tenant, ctx.features))
         tx.model = cds.context.model
       }
       return Promise.resolve(fn(tx))

package/node_modules/@sap/cds/lib/srv/srv-dispatch.js

@@ -113,5 +113,5 @@ const _ensure_fqn = (x,p,srv, name = x[p]) => {
 
 const _unhandled = (srv,req) => {
   const event = req.event + (req.path ? ' ' + req.path : '')
-  return req.reject (501, `Service "${srv.name}" has no handler for "${event}".`)
+  cds.error (501, `Service "${srv.name}" has no handler for "${event}".`)
 }

package/node_modules/@sap/cds/lib/srv/srv-models.js

@@ -148,7 +148,7 @@ if (!extensibility) {
 // helper to get model for tenant/features
 const _is_extended = extensibility ? ()=> cds.db.exists('cds.xt.Extensions') : ()=> false
 const _get_model4 = async (tenant, features) => {
-  const { 'cds.xt.ModelProviderService':mps } = cds.services
+  const mps = await cds.connect.to('cds.xt.ModelProviderService')
   const csn = await mps.getCsn (tenant, features)
   const nsn = cds.compile.for.nodejs(csn)
   if (cds.edmxs) await cds.compile.to.edmx.files ( csn,

package/node_modules/@sap/cds/lib/utils/cds-utils.js

@@ -389,7 +389,8 @@ exports.sh = function shell (cmd,..._) {
  */
 const ms4 = exports.ms4 = (ts, unit, u=unit) => {
   if (typeof ts === 'string') [,ts,u] = /(\d+) ?(\w*)/.exec(ts) || cds.error `Invalid time span format: ${ts}`
-  return ts * ms4[u||unit||'ms'] || cds.error `Invalid time span unit: ${unit} in ${ts}`
+  const factor = ms4[u||unit||'ms'] || cds.error `Invalid time span unit: ${unit} in ${ts}`
+  return ts * factor
 }
 
 /**

package/node_modules/@sap/cds/libx/_runtime/common/generic/assert.js

@@ -132,9 +132,8 @@ module.exports = cds.service.impl(function () {
               // If error function was used in @assert expression -> use its output
               // Note: depending on DB, function result may be JavaScript object or JSON string
               if (typeof message === 'string') {
-                if (message[0] === '{')
-                  message = JSON.parse(message) //> it's an error function result
-                else return error //> it's a plain message string
+                if (message[0] !== '{' || message.startsWith('{i18n>')) return error //> it's a plain message string
+                message = JSON.parse(message) //> it's an error function result
               }
               let { targets = [], ...details } = message
               if (targets.length) details.target = targets.shift()

package/node_modules/@sap/cds/libx/_runtime/common/generic/auth/restrict.js

@@ -238,7 +238,14 @@ async function enforce_auth(req) {
   // REVISIT with cds^11
   // - remove compat_static_auth
   // - make check on CREATE/ NEW and unbound a compat opt-in
-  if (cds.env.features.compat_static_auth || req.event in { CREATE: 1, NEW: 1 } || this.operations[req.event]) {
+  const boundAction = req.target?.actions?.[req.event]
+  if (
+    cds.env.features.compat_static_auth ||
+    req.event in { CREATE: 1, NEW: 1 } ||
+    this.operations[req.event] ||
+    // collection-bound actions have no instance to filter -> only a static where can apply
+    (boundAction && isBoundToCollection(boundAction))
+  ) {
     const staticAuthRestriction = _getStaticAuthRestrictions(resolvedApplicables)
     if (staticAuthRestriction.length > 0) {
       return _handleStaticAuthRestrictions(staticAuthRestriction, req)

package/node_modules/@sap/cds/libx/_runtime/common/generic/crud.js

@@ -2,6 +2,8 @@ const cds = require('../../cds')
 const { SELECT } = cds.ql
 
 module.exports = exports = cds.service.impl(function () {
+  const { parent_skip_auth } = cds.env.features
+
   // prettier-ignore
   this.on(['CREATE', 'READ', 'UPDATE', 'UPSERT', 'DELETE'], '*', async function handle_crud_requests(req) {
     if (!cds.db)
@@ -11,18 +13,26 @@ module.exports = exports = cds.service.impl(function () {
     if (req.target['@cds.persistence.skip'] === true && req.target['@cds.persistence.table'] !== true)
       return req.reject(501, `Entity "${req.target.name}" is annotated with "@cds.persistence.skip" and cannot be served generically.`)
 
-    const { ref } = req.query.INSERT?.into || req.query.SELECT?.from || {}
-    const check_parent = ref?.length > 1 ? SELECT.one(1).from({ ref: ref.slice(0, -1) }) : null
-    if (check_parent && req.event === 'CREATE') (await check_parent) || req.reject(404)
-    else if (req.target?._isSingleton) await handle_singleton_request(req)
-    else if (req.query?.SELECT && req.locale) req.query.SELECT.localized ??= true
+    const { ref } = req.query?.INSERT?.into || req.query?.SELECT?.from || {}
+    const parent_exists_query = ref?.length > 1 && !('$parent' in (req.query?.elements ?? {}))
+      ? SELECT.one`1 as $parent`.from({ ref: ref.slice(0, -1) })
+      : null
+    const parent_readable_check = parent_exists_query
+      ? async () => (parent_skip_auth ? cds.db : this).run(parent_exists_query).catch(() => null)
+      : null
+
+    if (req.event === 'CREATE' && parent_readable_check != null) (await parent_readable_check()) || req.reject(404)
+
+    if (req.target?._isSingleton) await handle_singleton_request(req)
+
+    if (req.query?.SELECT && req.locale) req.query.SELECT.localized ??= true
 
     // REVISIT for cds^10: can we always use cds.db.dispatch(req)?
     const result = req.iterator && !req.objectMode
       ? await cds.db.dispatch(req)
       : await cds.run(req.query, req.data)
 
-    return await exports._handle_result(req, result, check_parent)
+    return await exports._handle_result(req, result, parent_readable_check)
   })
 })
 
@@ -42,14 +52,14 @@ async function handle_singleton_request(req) {
   req.query.where(singleton)
 }
 
-async function new_behavior(req, result, parent) {
+async function new_behavior(req, result, parent_readable_check) {
   const n = result?.affected ?? result?.length ?? result
 
   // prettier-ignore
   switch (req.event) {
     case 'READ':
       if (!n && req._etagValidationType === 'if-match') req.reject(412)
-      if (!n) !parent || (await parent) || req.reject(404)
+      if (!n && parent_readable_check != null) (await parent_readable_check()) || req.reject(404)
       return result
     case 'INSERT': case 'CREATE':
       if (result.affected != null) return result //> db service returned [affected]

package/node_modules/@sap/cds/libx/_runtime/fiori/lean-draft.js

@@ -453,7 +453,7 @@ const compileUpdatedDraftMessages = (newMessages, persistedMessages, requestData
   if (!prefixRef) return null
 
   const draftMessageTargetPrefix = cds.odata.urlify(
-    { SELECT: { from: { ref: prefixRef } } },
+    { query: { SELECT: { from: { ref: prefixRef } } }, subject: { ref: prefixRef } },
     { kind: 'odata-v4', model: txModel }
   ).path
 
@@ -483,7 +483,7 @@ const compileUpdatedDraftMessages = (newMessages, persistedMessages, requestData
     }
 
     message.prefix = cds.odata.urlify(
-      { SELECT: { from: { ref: messagePrefixRef } } },
+      { query: { SELECT: { from: { ref: messagePrefixRef } } }, subject: { ref: messagePrefixRef } },
       { kind: 'odata-v4', model: txModel }
     ).path
 
@@ -1437,11 +1437,11 @@ const Read = {
 
           // TODO: This seems excessive ... how to compare more efficiently?
           const queryPrefixUrl = cds.odata.urlify(
-            { SELECT: { from: { ref: queryPrefixRef } } },
+            { query: { SELECT: { from: { ref: queryPrefixRef } } }, subject: { ref: queryPrefixRef } },
             { kind: 'odata-v4', model: txModel }
           ).path
           const msgPrefixUrl = cds.odata.urlify(
-            { SELECT: { from: { ref: msgPrefixRef } } },
+            { query: { SELECT: { from: { ref: msgPrefixRef } } }, subject: { ref: msgPrefixRef } },
             { kind: 'odata-v4', model: txModel }
           ).path
 
@@ -2443,7 +2443,7 @@ async function onCancel(req, next) {
 
         const prefixRef = _extractPrefixRef(req.query.DELETE.from.ref, queryRootEntity)
         const messageTargetPrefix = cds.odata.urlify(
-          { SELECT: { from: { ref: prefixRef } } },
+          { query: { SELECT: { from: { ref: prefixRef } } }, subject: { ref: prefixRef } },
           { kind: 'odata-v4', model: req.context.tx.model }
         ).path
 
@@ -2570,6 +2570,7 @@ const _readAfterDraftAction = async function ({ req, payload, action }) {
   }
 }
 
+// prettier-ignore
 module.exports = cds.service.impl(function () {
   if (!this.entities?.DraftAdministrativeData) return
 
@@ -2577,14 +2578,17 @@ module.exports = cds.service.impl(function () {
   Object.defineProperty(this, '_datasource', { value: cds.db })
 
   // Extend the AppService's API by draft specific functions
-  this.new = (draft, key) => ({
-    then: (r, e) => this.send('NEW', draft, key).then(r, e),
-    for: key => this.send('EDIT', typeof draft === 'string' ? draft.replace(/\.drafts$/, '') : draft.actives, key)
-  })
-  this.edit = (active, key) => this.send('EDIT', active, key)
-  this.save = (draft, key) => this.send('SAVE', draft, key)
-  this.cancel = (draft, key) => this.send('CANCEL', draft, key)
-  this.discard = (draft, key) => this.send('DISCARD', draft, key)
+  this.new = function (draft, key) {
+    return {
+      then: (r, e) => this.send('NEW', draft, key).then(r, e),
+      for: key => this.send('EDIT', typeof draft === 'string' ? draft.replace(/\.drafts$/, '') : draft.actives, key)
+    }
+  }
+
+  this.edit = function (active, key) { return this.send('EDIT', active, key) }
+  this.save = function (draft, key) { return this.send('SAVE', draft, key) }
+  this.cancel = function (draft, key) { return this.send('CANCEL', draft, key) }
+  this.discard = function (draft, key) { return this.send('DISCARD', draft, key) }
 
   // Override the AppService's handle function
   this.handle = !cds.env.features.legacy_srv_results
@@ -2596,9 +2600,13 @@ module.exports = cds.service.impl(function () {
         return Array.isArray(res) && 'affected' in res ? req.data : res
       }
 
-  this.on('NEW', '*', onNew.bind(this))
-  this.on('EDIT', '*', onEdit.bind(this))
-  this.on('CANCEL', '*', onCancel.bind(this))
-  this.on('draftPrepare', '*', onPrepare.bind(this))
+  // NOTE: These handler registrations MUST use inline functions
+  // NOTE: > Arrow functions or functions bound with `.bind` will 
+  // NOTE: > ... not be able to access the context tx from `this` 
+  this.on('NEW', '*', function (req, next) { return onNew.call(this, req, next) })
+  this.on('EDIT', '*', function (req, next) { return onEdit.call(this, req, next) })
+  this.on('CANCEL', '*', function (req, next) { return onCancel.call(this, req, next) })
+  this.on('draftPrepare', '*', function (req, next) { return onPrepare.call(this, req, next) })
 })
+
 module.exports.compileUpdatedDraftMessages = compileUpdatedDraftMessages

package/node_modules/@sap/cds/libx/_runtime/messaging/enterprise-messaging-utils/registerEndpoints.js

@@ -20,16 +20,18 @@ class EndpointRegistry {
     this.webhookCallbacks = new Map()
     this.deployCallbacks = new Map()
 
-    const _IS_SECURED = !!(
+    const _HAS_APP_AUTH = !!(
       cds.env.requires.auth &&
       (cds.env.requires.auth.impl || !(cds.env.requires.auth.kind in { mocked: 1, 'mocked-auth': 1 }))
     )
+    const _HAS_MESSAGING_XSUAA = !!cds.env.requires.messaging?.xsuaa
+    const _IS_SECURED = _HAS_APP_AUTH || _HAS_MESSAGING_XSUAA
     const _IS_PRODUCTION = process.env.NODE_ENV === 'production'
 
     cds.app.use(basePath, cds.middlewares.context())
     if (_IS_SECURED) {
       // unofficial XSUAA fallback
-      if (cds.env.requires.messaging?.xsuaa) {
+      if (_HAS_MESSAGING_XSUAA) {
         cds.app.use(basePath, _xsuaa_fallback())
       } else {
         cds.app.use(basePath, cds.middlewares.auth())
@@ -38,7 +40,11 @@ class EndpointRegistry {
       cds.app.use(basePath, (_req, _res, next) => {
         next(cds.context.user._is_anonymous ? 401 : undefined)
       })
-    } else if (_IS_PRODUCTION) LOG.warn('Messaging endpoints not secured')
+    } else if (_IS_PRODUCTION) {
+      throw new Error(
+        'Messaging endpoints require authentication in production. Configure cds.requires.auth or cds.requires.messaging.xsuaa.'
+      )
+    }
 
     cds.app.use(basePath, express.json({ type: 'application/*+json' }))
     cds.app.use(basePath, express.json())

package/node_modules/@sap/cds/libx/_runtime/remote/Service.js

@@ -1,10 +1,5 @@
 const cds = require('../cds')
-const {
-  getCloudSdk,
-  getCloudSdkConnectivity,
-  getCloudSdkResilience,
-  shouldUseCloudSdk
-} = require('./utils/cloudSdkProvider')
+const { getCloudSdk, getCloudSdkResilience, shouldUseCloudSdk } = require('./utils/cloudSdkProvider')
 const { run } = require('./utils/client')
 const { extractRequestConfig } = require('./utils/query')
 const { hasAliasedColumns } = require('./utils/data')
@@ -171,13 +166,6 @@ const _isSelectWithAliasedColumns = q => q?.SELECT && !q._transitions && q.SELEC
 
 const resolvedTargetOfQuery = q => q?._transitions?.at(-1)?.target
 
-const _resolveSelectionStrategy = selectionStrategy => {
-  const { DestinationSelectionStrategies } = getCloudSdkConnectivity()
-  const strategy = DestinationSelectionStrategies[selectionStrategy]
-  if (typeof strategy !== 'function') cds.error`Unsupported destination selection strategy "${selectionStrategy}".`
-  return strategy
-}
-
 const _getKind = options => {
   let kind = options.credentials?.kind ?? options.kind
   if (typeof kind === 'object') {
@@ -206,9 +194,6 @@ class RemoteService extends cds.Service {
       this.datasource = this.options.datasource
 
       this.destinationOptions = this.options.destinationOptions || {}
-      if (typeof this.destinationOptions.selectionStrategy === 'string') {
-        this.destinationOptions.selectionStrategy = _resolveSelectionStrategy(this.destinationOptions.selectionStrategy)
-      }
 
       if (this.options.credentials.destination) this.destination = this.options.credentials.destination
       else this.destination = _getDestination(this.definition?.name ?? this.datasource, this.options.credentials)
@@ -223,7 +208,7 @@ class RemoteService extends cds.Service {
 
       // This is required for BAS creating remote services only for events
       // Middlewares are created at time of the first request, on the fly
-      if (shouldUseCloudSdk(this.destination)) {
+      if (shouldUseCloudSdk()) {
         this.middlewares = {
           timeout: getCloudSdkResilience().timeout(this.requestTimeout),
           csrf: this.csrf && getCloudSdk().csrf(this.csrf)
@@ -249,7 +234,7 @@ class RemoteService extends cds.Service {
       if (typeof this.destination === 'object' && !this.destination.url)
         cds.error`"url" or "destination" property must be configured in "credentials" of "${this.name}".`
 
-      const requestConfig = extractRequestConfig(req, query, this)
+      const requestConfig = extractRequestConfig(req, this)
       requestConfig.headers = _getHeaders(requestConfig.headers, req)
 
       if (this.kind === 'hcql' && req.iterator && !req.objectMode)
@@ -284,7 +269,7 @@ class RemoteService extends cds.Service {
       if (jwt) additionalOptions.jwt = jwt
 
       const csrfConfig = requestConfig._autoBatchedGet ? this.csrfInBatch : this.csrf
-      if (shouldUseCloudSdk(this.destination)) {
+      if (shouldUseCloudSdk()) {
         // Mount resilience and csrf middlewares for SAP Cloud SDK
         requestConfig.middleware = [this.middlewares.timeout]
         if (csrfConfig && this.middlewares.csrf) requestConfig.middleware.push(this.middlewares.csrf)

package/node_modules/@sap/cds/libx/_runtime/remote/utils/LruCache.js

@@ -0,0 +1,42 @@
+/**
+ * LRU cache backed by Map insertion order.
+ * On get/set the entry is moved to the MRU end; the LRU entry (first key) is
+ * evicted when the map is full. `maxSize = 0` means unlimited.
+ */
+class LruCache {
+  /** @param {number} [maxSize=0] Maximum number of entries; 0 = unlimited. */
+  constructor(maxSize = 0) {
+    this._map = new Map()
+    this._maxSize = maxSize
+  }
+
+  /** @param {*} key Cache key. */
+  get(key) {
+    const value = this._map.get(key)
+    if (value !== undefined) {
+      this._map.delete(key)
+      this._map.set(key, value)
+    }
+    return value
+  }
+
+  /**
+   * @param {*} key Cache key. `null` and `undefined` are ignored.
+   * @param {*} value Value to store.
+   * @param {number} [ttl] Time-to-live in milliseconds. Entry is auto-deleted after this duration.
+   */
+  set(key, value, ttl) {
+    if (key == null) return
+    this._map.delete(key)
+    if (this._maxSize > 0 && this._map.size >= this._maxSize) this._map.delete(this._map.keys().next().value)
+    this._map.set(key, value)
+    if (ttl > 0) setTimeout(() => this._map.delete(key), ttl).unref()
+  }
+
+  /** @param {*} key Cache key. */
+  delete(key) {
+    this._map.delete(key)
+  }
+}
+
+module.exports = { LruCache }

package/node_modules/@sap/cds/libx/_runtime/remote/utils/client.js

@@ -1,7 +1,7 @@
 const cds = require('../../cds')
 const LOG = cds.log('remote')
 
-const { getCloudSdk, shouldUseCloudSdk } = require('./cloudSdkProvider')
+const { getCloudSdk, getCloudSdkConnectivity, shouldUseCloudSdk } = require('./cloudSdkProvider')
 const { executeHttpRequest: fetchExecuteHttpRequest } = require('./fetchClient')
 
 const SANITIZE_VALUES = process.env.NODE_ENV === 'production' && cds.env.log.sanitize_values !== false
@@ -27,7 +27,6 @@ const _sanitizeHeaders = headers => {
 }
 
 const _executeHttpRequest = async ({ requestConfig, destination, destinationOptions, jwt }) => {
-  const useCloudSdk = shouldUseCloudSdk(destination)
   if (typeof destination === 'string') {
     destination = { destinationName: destination, ...destinationOptions }
     if (destination.jwt === undefined) destination.jwt = jwt
@@ -48,7 +47,7 @@ const _executeHttpRequest = async ({ requestConfig, destination, destinationOpti
   const maxBodyLength = cds.env?.remote?.max_body_length
   if (maxBodyLength) requestConfig.maxBodyLength = maxBodyLength
 
-  if (useCloudSdk) {
+  if (shouldUseCloudSdk()) {
     const { executeHttpRequestWithOrigin } = getCloudSdk()
     // cloud sdk requires a new mechanism to differentiate the priority of headers
     // "custom" keeps the highest priority as before
@@ -56,6 +55,15 @@ const _executeHttpRequest = async ({ requestConfig, destination, destinationOpti
       ...requestConfig,
       headers: { custom: { ...requestConfig.headers } }
     }
+    // selectionStrategy is kept as a plain string in destinationOptions;
+    // Cloud SDK needs the corresponding function — resolve it lazily here
+    if (typeof destination.selectionStrategy === 'string') {
+      const { DestinationSelectionStrategies } = getCloudSdkConnectivity()
+      const strategy = DestinationSelectionStrategies[destination.selectionStrategy]
+      if (typeof strategy !== 'function')
+        cds.error`Unsupported destination selection strategy "${destination.selectionStrategy}".`
+      destination = { ...destination, selectionStrategy: strategy }
+    }
     if (LOG._debug) LOG.debug('Executing via @sap-cloud-sdk/http-client.')
     return executeHttpRequestWithOrigin(destination, sdkConfig, { fetchCsrfToken: false })
   }
@@ -270,8 +278,10 @@ module.exports.run = async (requestConfig, options) => {
 
   if (kind === 'hcql') {
     if (response.headers?.['content-type']?.includes('application/octet-stream')) return response.data
-    let { data = [], affected } = response.data
+    let { data = [], affected, $count } = response.data
     if (affected !== undefined) data.affected = affected
+    if ($count == null && response.headers['x-total-count']) $count = Number(response.headers['x-total-count'])
+    if ($count !== undefined) data.$count = $count
     return data
   }
 

package/node_modules/@sap/cds/libx/_runtime/remote/utils/cloudSdkProvider.js

@@ -1,5 +1,4 @@
 const cds = require('../../cds')
-const { findLocalDestinations } = require('./fetchClient')
 
 const _require = module => {
   try {
@@ -39,14 +38,8 @@ const isCloudSdkInstalled = () => {
   return _cloudSdkInstalled
 }
 
-const shouldUseCloudSdk = destination => {
-  // Native node fetch for named destinations is supported only if locally resolvable via process.env.destinations
-  const _destination = typeof destination === 'string' ? findLocalDestinations(destination)[0] : destination
-  if (!_destination?.url) return true
-  if (_destination.authentication && !(_destination.authentication in { NoAuthentication: 1, BasicAuthentication: 1 }))
-    return true
-  // here, it would be _possible_ to use native fetch
-  // explicit config?
+const shouldUseCloudSdk = () => {
+  // Explicit config takes priority
   if (cds.env.remote?.native_fetch != null) return !cds.env.remote.native_fetch
   // if cloud sdk is there, use it
   return isCloudSdkInstalled()