@sap/cds 7.2.0 → 7.2.1

package/CHANGELOG.md

@@ -4,6 +4,19 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## Version 7.2.1 - 2023-09-21
+
+### Fixed
+
+- HTTP headers argument was not forwarded to remote services when using the `srv.send(...)` API.
+- Not existing draft upon `SAVE` has own error code.
+- Links to documentation in Typescript definitions.
+- Remote service won't check for `credentials.url` in case of messaging.
+- Lean draft: Implicitly added `limit` in some lean draft read scenarios.
+- Lean draft: Association keys in lean draft.
+- Remote service: Preserve namespaces in URLs that do not match the service's namespace.
+
 ## Version 7.2.0 - 2023-09-04
 
 ### Added

package/apis/connect.d.ts

@@ -18,7 +18,7 @@ declare class cds {
 
 		/**
 		 * Connects the primary datasource.
-		 * @see [capire](https://cap.cloud.sap/docs/node.js/api#cds-connect)
+		 * @see [capire](https://cap.cloud.sap/docs/node.js/cds-connect)
 		 */
 		(options?: string | ConnectOptions) : Promise<typeof cds>  //> cds.connect(<options>)
 	}

package/apis/serve.d.ts

@@ -27,7 +27,7 @@ declare class cds_serve {
 
 	/**
 	 * Constructs service providers from respective service definitions
-	 * @see [capire](https://cap.cloud.sap/docs/node.js/api#cds-serve)
+	 * @see [capire](https://cap.cloud.sap/docs/node.js/cds-serve)
 	 */
 	serve (service : string, options?: service_options) : _fluent & Promise<cds_services>
 

package/apis/services.d.ts

@@ -13,7 +13,7 @@ export class QueryAPI {
   entities : LinkedModel['entities']
 
   /**
-   * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-run)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
    */
   read: {
     <T extends ArrayConstructable<any>>(entity: T, key?: any): Awaitable<SELECT<T>, InstanceType<T>>
@@ -21,7 +21,7 @@ export class QueryAPI {
   }
 
   /**
-   * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-run)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
    */
   create: {
     <T extends ArrayConstructable<any>>(entity: T, key?: any): INSERT<T>
@@ -29,7 +29,7 @@ export class QueryAPI {
   }
 
   /**
-   * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-run)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
    */
   insert: {
     <T extends ArrayConstructable<any>>(data: T): INSERT<T>
@@ -37,7 +37,7 @@ export class QueryAPI {
   }
 
   /**
-   * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-run)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
    */
   upsert: {
     <T extends ArrayConstructable<any>>(data: T): UPSERT<T>
@@ -45,7 +45,7 @@ export class QueryAPI {
   }
 
   /**
-   * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-run)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
    */
   update: {
     <T extends ArrayConstructable<any>>(entity: T, key?: any): UPDATE<T>
@@ -53,7 +53,7 @@ export class QueryAPI {
   }
 
   /**
-   * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-run)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
    */
   run: {
     (query: ConstructedQuery | ConstructedQuery[]): Promise<ResultSet | any>
@@ -62,17 +62,17 @@ export class QueryAPI {
   }
 
   /**
-   * @see [docs](https://cap.cloud.sap/docs/node.js/cds-facade?q=cds.delete)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
    */
   delete<T>(entity: Definition | string, key?: any): DELETE<T>
 
   /**
-   * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-run)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#srv-foreach-entity)
    */
   foreach(query: Query, callback: (row: object) => void): this
 
   /**
-   * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-stream)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#srv-stream-column)
    */
   stream: {
     (column: string): {
@@ -85,18 +85,18 @@ export class QueryAPI {
 
   /**
    * Starts or joins a transaction
-   * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-tx)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/cds-tx)
    */
   tx(context?: object): Transaction
   transaction(context?: object): Transaction
 
   /**
-   * @see [docs](https://pages.github.tools.sap/cap/docs/node.js/cds-context-tx?q=spawn#cds-spawn)
+   * @see [docs](https://cap.cloud.sap/docs/node.js/cds-tx#cds-spawn)
    */
   spawn(options: Options, fn: (tx: Transaction) => {}): SpawnEventEmitter
 
   /**
-   * @see [docs](https://pages.github.tools.sap/cap/docs/node.js/cds-context-tx?q=cds.context#cds-context
+   * @see [docs](https://cap.cloud.sap/docs/node.js/cds-tx#event-contexts
    */
   context:  ContextProperties
 }
@@ -110,7 +110,7 @@ type ContextProperties = {
 
 /**
  * Class cds.Service
- * @see [capire docs](https://cap.cloud.sap/docs/node.js/services)
+ * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
  */
 export class Service extends QueryAPI {
   constructor(
@@ -129,44 +129,44 @@ export class Service extends QueryAPI {
 
   /**
    * The model from which the service's definition was loaded
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-reflect)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
    */
   model: LinkedModel
 
   /**
    * Provides access to the entities exposed by a service
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-reflect)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
    */
   entities: Definitions & ((namespace: string) => Definitions)
 
   /**
    * Provides access to the events declared by a service
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-reflect)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
    */
   events: Definitions & ((namespace: string) => Definitions)
 
   /**
    * Provides access to the types exposed by a service
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-reflect)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
    */
   types: Definitions & ((namespace: string) => Definitions)
 
   /**
    * Provides access to the operations, i.e. actions and functions, exposed by a service
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-reflect)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
    */
   operations: Definitions & ((namespace: string) => Definitions)
 
   /**
    * Acts like a parameter-less constructor. Ensure to call `await super.init()` to have the base class’s handlers added.
    * You may register own handlers before the base class’s ones, to intercept requests before the default handlers snap in.
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#cds-service-subclasses)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#srv-init)
    */
   init(): Promise<void>
 
   /**
    * Constructs and emits an asynchronous event.
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-emit)
+   * @see [capire docs](https://cap.cloud.sap/docs/core-services#srv-emit-event)
    */
   emit: {
     <T = any>(details: { event: EventArg; data?: object; headers?: object }): Promise<T>
@@ -175,7 +175,7 @@ export class Service extends QueryAPI {
 
   /**
    * Constructs and sends a synchronous request.
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srvsend--method-path-data-headers--results-)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#srv-send-request)
    */
   send: {
     <T = any>(event: EventArg, path: string, data?: object, headers?: object): Promise<T>
@@ -188,22 +188,22 @@ export class Service extends QueryAPI {
 
   /**
    * Constructs and sends a GET request.
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-send)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#rest-style-api)
    */
   get<T = any>(entityOrPath: Target, data?: object): Promise<T>
   /**
    * Constructs and sends a POST request.
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-send)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#rest-style-api)
    */
   post<T = any>(entityOrPath: Target, data?: object): Promise<T>
   /**
    * Constructs and sends a PUT request.
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-send)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#rest-style-api)
    */
   put<T = any>(entityOrPath: Target, data?: object): Promise<T>
   /**
    * Constructs and sends a PATCH request.
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-send)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#rest-style-api)
    */
   patch<T = any>(entityOrPath: Target, data?: object): Promise<T>
   /**
@@ -259,7 +259,7 @@ export interface ResultSet extends Array<{}> {}
 
 declare class cds {
   /**
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/services)
+   * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
    */
   Service: typeof Service
   Request: typeof Request
@@ -314,7 +314,7 @@ type OneOrMany<T> = T | T[];
 
 type TypedRequest<T> = Omit<Request, 'data'> & { data: T }
 
-// https://cap.cloud.sap/docs/node.js/services#event-handlers
+// https://cap.cloud.sap/docs/node.js/core-services#srv-on-before-after
 export namespace CRUDEventHandler {
   type Before<P,R> = (req: TypedRequest<P>) => Promise<R> | R
   type On<P,R> = (req: TypedRequest<P>, next: (...args: any) => Promise<R> | R) => Promise<R> | R

package/common.cds

@@ -35,7 +35,7 @@ context sap.common {
   /**
    * Code list for languages
    *
-   * See https://cap.cloud.sap/docs/cds/common#entity-sapcommonlanguages
+   * See https://cap.cloud.sap/docs/cds/common#entity-languages
    */
   entity Languages : CodeList {
     key code : Locale;
@@ -44,7 +44,7 @@ context sap.common {
   /**
    * Code list for countries
    *
-   * See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncountries
+   * See https://cap.cloud.sap/docs/cds/common#entity-countries
    */
   entity Countries : CodeList {
     key code : String(3) @(title : '{i18n>CountryCode}');
@@ -53,7 +53,7 @@ context sap.common {
   /**
    * Code list for currencies
    *
-   * See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncurrencies
+   * See https://cap.cloud.sap/docs/cds/common#entity-currencies
    */
   entity Currencies : CodeList {
     key code      : String(3) @(title : '{i18n>CurrencyCode}');
@@ -64,7 +64,7 @@ context sap.common {
   /**
    * Aspect for a code list with name and description
    *
-   * See https://cap.cloud.sap/docs/cds/common#aspect-sapcommoncodelist
+   * See https://cap.cloud.sap/docs/cds/common#aspect-codelist
    */
   aspect CodeList @(
     cds.autoexpose,

package/libx/_runtime/common/generic/paging.js

@@ -35,6 +35,7 @@ const commonGenericPaging = function (req) {
 }
 
 const _addPaging = function ({ SELECT }, target) {
+  if (SELECT.limit === false) return
   const { rows } = SELECT.limit || (SELECT.limit = {})
   const conf = getPageSize(target)
   SELECT.limit.rows = {

package/libx/_runtime/common/i18n/messages.properties

@@ -83,6 +83,7 @@ CRUD_VIA_NAVIGATION_NOT_SUPPORTED=CRUD via navigations is not yet supported
 
 # draft
 DRAFT_ALREADY_EXISTS=A draft for this entity already exists
+DRAFT_NOT_EXISTING=No draft for this entity exists
 DRAFT_LOCKED_BY_ANOTHER_USER=The entity is locked by user "{0}"
 DRAFT_MODIFICATION_ONLY_VIA_ROOT=A draft can only be modified via its root entity
 

package/libx/_runtime/fiori/lean-draft.js

@@ -48,6 +48,10 @@ const _promiseAll = async array => {
 
 const _isCount = query => query.SELECT.columns?.length === 1 && query.SELECT.columns[0].func === 'count'
 
+const entity_keys = e => {
+  return Object_keys(e.keys).filter(k => k !== 'IsActiveEntity' && !e.keys[k].isAssociation)
+}
+
 const _inProcessByUserXpr = lockShiftedNow => ({
   xpr: [
     'case',
@@ -257,7 +261,7 @@ cds.ApplicationService.prototype.handle = async function (req) {
           { ref: ['DraftAdministrativeData'], expand: [{ ref: ['InProcessByUser'] }] }
         ])
     )
-    if (!res) req.reject(_etagValidationType ? 412 : 404)
+    if (!res) req.reject(_etagValidationType ? 412 : { code: 'DRAFT_NOT_EXISTING', status: 404 })
     if (res.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id)
       req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [res.DraftAdministrativeData?.InProcessByUser])
     const DraftAdministrativeData_DraftUUID = res.DraftAdministrativeData_DraftUUID
@@ -287,9 +291,7 @@ cds.ApplicationService.prototype.handle = async function (req) {
   if (req.target.actions?.[req.event] && draftParams.IsActiveEntity === false) {
     if (query.SELECT?.from?.ref) query.SELECT.from.ref = _redirectRefToDrafts(query.SELECT.from.ref, this.model)
     const rootQuery = query.clone()
-    const columns = Object_keys(query._target.keys)
-      .filter(k => k !== 'IsActiveEntity')
-      .map(k => ({ ref: [k] }))
+    const columns = entity_keys(query._target).map(k => ({ ref: [k] }))
     columns.push({ ref: ['DraftAdministrativeData'], expand: [{ ref: ['InProcessByUser'] }] })
     rootQuery.SELECT.columns = columns
     rootQuery.SELECT.one = true
@@ -377,7 +379,7 @@ const Read = {
     if (query._target.name.endsWith('.DraftAdministrativeData')) return run(query._drafts)
     if (!query._target._isDraftEnabled) return run(query)
     if (!query.SELECT.groupBy && query.SELECT.columns && !query.SELECT.columns.some(c => c === '*')) {
-      const keys = Object_keys(query._target.keys).filter(k => k !== 'IsActiveEntity')
+      const keys = entity_keys(query._target)
       for (const key of keys) {
         if (!query.SELECT.columns.some(c => c.ref?.[0] === key)) query.SELECT.columns.push({ ref: [key] })
       }
@@ -409,11 +411,10 @@ const Read = {
   unchanged: async function (run, query) {
     LOG.debug('List Editing Status: Unchanged')
     const draftsQuery = query._drafts
-    const keys = Object_keys(query._target.keys).filter(k => k !== 'IsActiveEntity')
     draftsQuery.SELECT.count = undefined
-    draftsQuery.SELECT.limit = undefined
     draftsQuery.SELECT.orderBy = undefined
-    draftsQuery.SELECT.columns = keys.map(k => ({ ref: [k] }))
+    draftsQuery.SELECT.limit = false
+    draftsQuery.SELECT.columns = entity_keys(query._target).map(k => ({ ref: [k] }))
 
     const drafts = await draftsQuery.where({ HasActiveEntity: true })
     const res = await Read.onlyActives(run, query.where(Read.whereNotIn(query._target, drafts)), {
@@ -457,11 +458,10 @@ const Read = {
     LOG.debug('List Editing Status: All')
     if (!query._drafts) return []
     query._drafts.SELECT.count = false
-    query._drafts.SELECT.limit = undefined // We need all entries for the keys to properly select actives (count)
+    query._drafts.SELECT.limit = false // We need all entries for the keys to properly select actives (count)
     const isCount = _isCount(query._drafts)
     if (isCount) {
-      const keys = Object_keys(query._target.keys).filter(k => k !== 'IsActiveEntity')
-      query._drafts.SELECT.columns = keys.map(k => ({ ref: [k] }))
+      query._drafts.SELECT.columns = entity_keys(query._target).map(k => ({ ref: [k] }))
     }
     if (!query._drafts.SELECT.columns) query._drafts.SELECT.columns = ['*']
     if (!query._drafts.SELECT.columns.some(c => c.ref?.[0] === 'HasActiveEntity'))
@@ -525,13 +525,14 @@ const Read = {
   },
   activesFromDrafts: async function (run, query, { isLocked = true }) {
     const draftsQuery = query._drafts
-    const keys = Object_keys(query._target.keys).filter(k => k !== 'IsActiveEntity')
     const additionalCols = draftsQuery.SELECT.columns
       ? draftsQuery.SELECT.columns.filter(
           c => c.ref && ['DraftAdministrativeData', 'DraftAdministrativeData_DraftUUID'].includes(c.ref[0])
         )
       : [{ ref: ['DraftAdministrativeData_DraftUUID'] }]
-    draftsQuery.SELECT.columns = keys.map(k => ({ ref: [k] })).concat(additionalCols)
+    draftsQuery.SELECT.columns = entity_keys(query._target)
+      .map(k => ({ ref: [k] }))
+      .concat(additionalCols)
     draftsQuery.where({
       HasActiveEntity: true,
       'DraftAdministrativeData.InProcessByUser': { '!=': cds.context.user.id },
@@ -560,7 +561,7 @@ const Read = {
   },
   whereNotIn: (target, data) => Read.whereIn(target, data, true),
   whereIn: (target, data, not = false) => {
-    const keys = Object_keys(target.keys).filter(k => k !== 'IsActiveEntity')
+    const keys = entity_keys(target)
     const dataArray = data ? (Array.isArray(data) ? data : [data]) : []
     if (not && !dataArray.length) return []
     const left = { list: keys.map(k => ({ ref: [k] })) }
@@ -573,9 +574,7 @@ const Read = {
     if (!actives.length) return []
     const drafts = cds.ql.clone(query._drafts)
     drafts.SELECT.where = Read.whereIn(query._target, actives)
-    const newColumns = Object_keys(query._target.keys)
-      .filter(k => k !== 'IsActiveEntity')
-      .map(k => ({ ref: [k] }))
+    const newColumns = entity_keys(query._target).map(k => ({ ref: [k] }))
     if (
       !drafts.SELECT.columns ||
       drafts.SELECT.columns.some(c => c === '*' || c.ref?.[0] === 'DraftAdministrativeData_DraftUUID')
@@ -594,8 +593,10 @@ const Read = {
     // Indexes the data for fast key access
     const dataArray = Read._makeArray(data)
     if (!dataArray.length) return
-    const _keys = Object_keys(target.keys).filter(k => k !== 'IsActiveEntity')
-    const hash = row => _keys.map(k => row[k]).reduce((res, curr) => res + '|$|' + curr, '')
+    const hash = row =>
+      entity_keys(target)
+        .map(k => row[k])
+        .reduce((res, curr) => res + '|$|' + curr, '')
     const hashMap = new Map()
     for (const row of dataArray) hashMap.set(hash(row), row)
     return { hashMap, hash }
@@ -1074,12 +1075,11 @@ async function onPrepare(req) {
   }
   const where = req.query.SELECT.from.ref[0].where
 
-  const keys = Object_keys(req.target.keys).filter(k => k !== 'IsActiveEntity')
   const draftQuery = SELECT.one
     .from(req.target, d => {
       d.DraftAdministrativeData(a => a.InProcessByUser)
     })
-    .columns(keys)
+    .columns(entity_keys(req.target))
     .where(where)
   draftQuery[DRAFT_PARAMS] = draftParams
   const data = await draftQuery

package/libx/_runtime/remote/Service.js

@@ -109,8 +109,9 @@ const _handleUnboundActionFunction = (srv, def, req, event) => {
       def &&
       def.returns &&
       (def.returns.type === 'cds.LargeBinary' || def.returns.type === 'cds.Binary')
+    const { headers, data } = req
 
-    return srv.send({ method: 'POST', path: `/${event}`, data: req.data, _binary: isBinary })
+    return srv.send({ method: 'POST', path: `/${event}`, headers, data, _binary: isBinary })
   }
 
   const url =
@@ -118,16 +119,17 @@ const _handleUnboundActionFunction = (srv, def, req, event) => {
   return srv.get(url)
 }
 
-const _sendV2RequestActionFunction = (srv, def, url) => {
+const _sendV2RequestActionFunction = (srv, def, req, url) => {
+  const { headers } = req
   return def.kind === 'function'
-    ? srv.send({ method: 'GET', path: url, _returnType: def.returns })
-    : srv.send({ method: 'POST', path: url, data: {}, _returnType: def.returns })
+    ? srv.send({ method: 'GET', path: url, headers, _returnType: def.returns })
+    : srv.send({ method: 'POST', path: url, headers, data: {}, _returnType: def.returns })
 }
 
 const _handleV2ActionFunction = (srv, def, req, event, kind) => {
   const url =
     Object.keys(req.data).length > 0 ? _buildPartialUrlFunctions(`/${event}`, req.data, def.params, kind) : `/${event}`
-  return _sendV2RequestActionFunction(srv, def, url)
+  return _sendV2RequestActionFunction(srv, def, req, url)
 }
 
 const _handleV2BoundActionFunction = (srv, def, req, event, kind) => {
@@ -147,7 +149,7 @@ const _handleV2BoundActionFunction = (srv, def, req, event, kind) => {
   }
 
   const url = `${`/${event}`}?${params.join('&')}`
-  return _sendV2RequestActionFunction(srv, def, url)
+  return _sendV2RequestActionFunction(srv, def, req, url)
 }
 
 const _addHandlerActionFunction = (srv, def, target) => {
@@ -262,6 +264,8 @@ class RemoteService extends cds.Service {
     }
 
     this.on('*', async (req, next) => {
+      const { query } = req
+      if (!query && !(typeof req.path === 'string')) return next()
       // early validation on first request for use case without remote API
       // ideally, that's done on bootstrap of the remote service
       if (typeof this.destination === 'object' && !this.destination.url)
@@ -269,9 +273,6 @@ class RemoteService extends cds.Service {
       if (this._resilienceMiddlewares && !this._resilienceMiddlewares.timeout)
         this._resilienceMiddlewares.timeout = cloudSdkResilience().timeout(this.requestTimeout)
 
-      const { query } = req
-      if (!query && !(typeof req.path === 'string')) return next()
-
       const resolvedTarget = resolvedTargetOfQuery(query) || getTransition(req.target, this).target
       const reqOptions = getReqOptions(req, query, this)
       reqOptions.headers = _setHeaders(reqOptions.headers, req)

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

@@ -427,12 +427,13 @@ const _stringToReqOptions = (query, data, target) => {
   return reqOptions
 }
 
-const _pathToReqOptions = (method, path, data, target) => {
+const _pathToReqOptions = (method, path, data, target, namespace) => {
   let url = path
   if (!url.startsWith('/')) {
     // extract entity name and instance identifier (either in "()" or after "/") from fully qualified path
     const parts = path.match(/([\w.]*)([\W.]*)(.*)/)
     if (!parts) url = '/' + path.match(/\w*$/)[0]
+    else if (url.startsWith(namespace)) url = '/' + parts[1].replace(namespace + '.', '') + parts[2] + parts[3]
     else url = '/' + parts[1].match(/\w*$/)[0] + parts[2] + parts[3]
 
     // normalize in case parts[2] already starts with /
@@ -459,7 +460,7 @@ const getReqOptions = (req, query, service) => {
       ? _cqnToReqOptions(query, service, req)
       : typeof query === 'string'
       ? _stringToReqOptions(query, req.data, req.target)
-      : _pathToReqOptions(req.method, req.path, req.data, req.target)
+      : _pathToReqOptions(req.method, req.path, req.data, req.target, service.namespace)
 
   if (service.kind === 'odata-v2' && req.event === 'READ' && reqOptions.url?.match(/(\/any\()|(\/all\()/)) {
     req.reject(501, 'Lambda expressions are not supported in OData v2')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "7.2.0",
+  "version": "7.2.1",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [