@sap/cds 6.3.2 → 6.4.1

package/lib/utils/inflect.js

@@ -1,24 +1,25 @@
-const last = /\w+$/
 
-exports.singular4 = (dn,stripped) => {
+this.singular4 = (dn,stripped) => {
 	let n = dn.name || dn; if (stripped) n = n.match(last)[0]
 	return dn['@singular'] || (
-		/.*species|news$/i.test(n) ? n  :
-		/.*ess$/.test(n) ?  n :      							// Address
-		/.*ees$/.test(n) ? n.slice(0, -1) : 			// Employees --> Employee
-		/.*[sz]es$/.test(n) ?  n.slice(0, -2) :
-		/.*[^aeiou]ies$/.test(n) ? n.slice(0, -3) + 'y' :     // Deliveries --> Delivery
-		/.*s$/.test(n) ?  n.slice(0, -1) :
+		/species|news$/i.test(n) ? n  :
+		/ess$/.test(n) ? n :      							// Address
+		/ees$/.test(n) ? n.slice(0, -1) : 			// Employees --> Employee
+		/[sz]es$/.test(n) ?  n.slice(0, -2) :
+		/[^aeiou]ies$/.test(n) ? n.slice(0, -3) + 'y' :     // Deliveries --> Delivery
+		/s$/.test(n) ?  n.slice(0, -1) :
 		n
 	)
 }
 
-exports.plural4 = (dn,stripped) => {
+this.plural4 = (dn,stripped) => {
 	let n = dn.name || dn; if (stripped) n = n.match(last)[0]
 	return dn['@plural'] || (
-		/.*analysis|status|species|news$/i.test(n) ? n  :
-		/.*[^aeiou]y$/.test(n) ? n.slice(0,-1) + 'ies'  :
-		/.*(s|x|z|ch|sh)$/.test(n) ? n + 'es' :
+		/analysis|status|species|sheep|news$/i.test(n) ? n  :
+		/[^aeiou]y$/.test(n) ? n.slice(0,-1) + 'ies'  :
+		/(s|x|z|ch|sh)$/.test(n) ? n + 'es' :
 		n + 's'
 	)
 }
+
+const last = /\w+$/

package/lib/utils/tar.js

@@ -15,16 +15,37 @@ const win = path => {
   if (Array.isArray(path)) return path.map(el => win(el))
 }
 
-// Copy files to temp dir on Windows and pack temp dir.
+async function copyDir(src, dest) {
+  if ((await fs.promises.stat(src)).isDirectory()) {
+    const entries = await fs.promises.readdir(src)
+    return Promise.all(entries.map(async each => copyDir(path.join(src, each), path.join(dest, each))))
+  } else {
+    await fs.promises.mkdir(path.dirname(dest), { recursive: true })
+    return fs.promises.copyFile(src, dest)
+  }
+}
+
+// Copy resources containing files and folders to temp dir on Windows and pack temp dir.
 // cli tar has a size limit on Windows.
-const createTemp = async (root, files) => {
-  const temp = await fs.promises.mkdtemp(`${fs.realpathSync(require('os').tmpdir())}${path.sep}tar-`)    
-  for (const file of files) {
-      const fname = path.relative(root, file)
-      const destination = path.join(temp, fname)
-      const dirname = path.dirname(destination)
-      if (!await exists(dirname)) await fs.promises.mkdir(dirname, { recursive: true })
-      await fs.promises.copyFile(file, destination)          
+const createTemp = async (root, resources) => {
+  // Asynchronously copies the entire content from src to dest.
+  const temp = await fs.promises.mkdtemp(`${fs.realpathSync(require('os').tmpdir())}${path.sep}tar-`)
+  for (let resource of resources) {
+    const destination = path.join(temp, path.relative(root, resource))
+    if ((await fs.promises.stat(resource)).isFile()) {
+      const dirName = path.dirname(destination)
+      if (!await exists(dirName)) {
+        await fs.promises.mkdir(dirName, { recursive: true })
+      }
+      await fs.promises.copyFile(resource, destination)
+    } else {
+      if (fs.promises.cp) {
+        await fs.promises.cp(resource, destination, { recursive: true })
+      } else {
+        // node < 16
+        await copyDir(resource, destination)
+      }
+    }
   }
 
   return temp
@@ -58,8 +79,9 @@ exports.create = async (dir='.', ...args) => {
 
   if (typeof dir === 'string') dir = _resolve(dir)
   if (Array.isArray(dir)) [ dir, ...args ] = [ cds.root, dir, ...args ]
-  
+
   let c, temp
+  args = args.filter(el => el)
   if (process.platform === 'win32') {
     const spawnDir = (dir, args) => {      
       if (args.some(arg => arg === '-f')) return spawn ('tar', ['c', '-C', win(dir), ...win(args)])
@@ -76,7 +98,7 @@ exports.create = async (dir='.', ...args) => {
   } else {
     if (Array.isArray(args[0])) args.push (...args.shift().map (f => path.isAbsolute(f) ? path.relative(dir,f) : f))
     else args.push('.')
-
+  
     c = spawn ('tar', ['c', '-C', dir, ...args])
   }
 
@@ -88,8 +110,16 @@ exports.create = async (dir='.', ...args) => {
      * @example const buffer = await tar.c('src/dir')
      */
     then (r,e) {
-      const bb=[]; c.stdout.on('data', b => bb.push(b))
-      c.on('close', ()=>r(Buffer.concat(bb)))
+      const bb=[]
+      const eb=[]
+      c.stdout.on('data', b => bb.push(b))
+      c.stderr.on('data', b => eb.push(b))
+      c.on('close', (code) => {
+        if (code === 0) {
+          return r(Buffer.concat(bb))
+        }
+        e(new Error('tar: ' + Buffer.concat(eb)))
+      })
       c.on('error', e)
       if (process.platform === 'win32') {
         c.on('close', async () => temp && exists(temp) && await rimraf(temp))

package/libx/_runtime/cds-services/adapter/odata-v4/ODataRequest.js

@@ -162,10 +162,10 @@ class ODataRequest extends cds.Request {
        * super
        */
       const { user } = req
-
+      const tenant = req.tenant || user?.tenant
       // REVISIT: public API for query options (express style req.query already in use)?
       const _queryOptions = odataReq.getQueryOptions()
-      super({ event, target, data, query, user, method, headers, req, res, _queryOptions })
+      super({ event, target, data, query, user, method, headers, req, res, _queryOptions, tenant })
     }
 
     /*

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/action.js

@@ -82,7 +82,7 @@ const action = service => {
         await tx.rollback(e).catch(() => {})
       }
     } finally {
-      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
+      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req.http.req))
 
       if (err) next(err)
       else next(null, toODataResult(result, req))

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/create.js

@@ -68,7 +68,7 @@ const create = service => {
         await tx.rollback(e).catch(() => {})
       }
     } finally {
-      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
+      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req.http.req))
 
       if (err) next(err)
       else next(null, toODataResult(result, req))

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/delete.js

@@ -49,7 +49,7 @@ const del = service => {
         await tx.rollback(e).catch(() => {})
       }
     } finally {
-      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
+      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req.http.req))
 
       if (err) next(err)
       else next(null, null)

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/metadata.js

@@ -20,20 +20,6 @@ const metadata = service => {
 
     try {
       const { 'cds.xt.ModelProviderService': mps } = cds.services
-      // REVISIT: The following block should replaced with the one commented bellow after the next release of cds-mtxs.
-      // Currently lkg tests fail w/o the try-catch.
-      let edmx
-      try {
-        if (mps) edmx = await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
-        // eslint-disable-next-line no-empty
-      } catch (_) {}
-      if (!edmx)
-        edmx = cds.localize(
-          service.model,
-          locale,
-          cds.compile.to.edmx(service.model, { service: service.definition.name })
-        )
-      /*      
       let edmx = mps
         ? await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
         : cds.localize(
@@ -41,7 +27,7 @@ const metadata = service => {
             locale,
             // REVISIT: we could cache this in model._cached
             cds.compile.to.edmx(service.model, { service: service.definition.name })
-          ) */
+          )
       return next(null, toODataResult(edmx))
     } catch (e) {
       if (LOG._error) {

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/read.js

@@ -491,7 +491,7 @@ const read = service => {
         await tx.rollback(e).catch(() => {})
       }
     } finally {
-      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
+      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req.http.req))
 
       if (err) next(err)
       else next(null, result, additional)

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/update.js

@@ -179,7 +179,7 @@ const update = service => {
         await tx.rollback(e).catch(() => {})
       }
     } finally {
-      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
+      req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req.http.req))
 
       if (err) next(err)
       else if (primitive && result) {

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/errors/UriSyntaxError.js

@@ -37,7 +37,7 @@ UriSyntaxError.Message = {
   KEY_VALUE_NOT_FOUND: "No '%s' value found for key '%s'",
   PREVIOUS_TYPE_HAS_NO_MEDIA: "Previous segment type '%s' does not have a media resource",
   MUST_BE_COUNT_OR_BOUND_OPERATION: "Expected current segment '%s' to be '$count' or a bound operation",
-  MUST_BE_COUNT_OR_REF_OR_BOUND_OPERATION: "Expected current segment '%s' to be '$count', '$ref', or a bound operation",
+  MUST_BE_COUNT_OR_REF_OR_BOUND_OPERATION: "Expected current segment '%s' to be '$count', '$ref', a bound operation or a key value with a proper type",
 
   ALIAS_NOT_FOUND: "Parameter alias '%s' not found",
   WRONG_ALIAS_VALUE: "Wrong value for parameter alias '%s'",

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriParser.js

@@ -143,7 +143,12 @@ class UriParser {
    * @returns {UriInfo} the result of parsing
    */
   parseRelativeUri (uri, queryOptions) {
-    let uriPathSegments = uri.split('/').map(decodeURIComponent)
+    let uriPathSegments
+    try {
+      uriPathSegments = uri.split('/').map(decodeURIComponent)
+    } catch (error) {
+      throw new UriSyntaxError('wrong percent encoding in uri: ' + uri)
+    }
 
     let uriInfo = new UriInfo()
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/utils/BufferedWriter.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { AsyncResource } = require('node:async_hooks')
+const { AsyncResource } = require('async_hooks')
 const Transform = require('stream').Transform
 
 /**

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/validator/ConditionalRequestValidator.js

@@ -24,18 +24,6 @@ class ConditionalRequestValidator {
       if (method !== HttpMethods.GET && !ifMatch && !ifNoneMatch) throw new PreconditionRequiredError()
       return
     }
-
-    if (ifMatch || ifNoneMatch) {
-      // Careless clients send this also for DELETE and POST, other careless clients send the star in double-quotes.
-      if ([HttpMethods.POST].includes(method)) {
-        if (
-          (ifMatch && ifMatch.trim() !== '*' && ifMatch.trim() !== '"*"') ||
-          (ifNoneMatch && ifNoneMatch.trim() !== '*' && ifNoneMatch.trim() !== '"*"')
-        ) {
-          throw new PreconditionFailedError()
-        }
-      }
-    }
   }
 
   /**

package/libx/_runtime/cds-services/adapter/odata-v4/utils/oDataConfiguration.js

@@ -18,12 +18,6 @@ const _getEntitySets = (edm, namespace) => {
   return entities
 }
 
-const _getConcurrent = (namespace, element, csn) => {
-  // autoexposed entities now used . in csn and _ in edm
-  const e = findCsnTargetFor(element, csn, namespace)
-  return !!e._etag
-}
-
 const oDataConfiguration = (edm, csn) => {
   let namespace
   for (const prop in edm) {
@@ -44,7 +38,7 @@ const oDataConfiguration = (edm, csn) => {
 
     configuration[entitySet] = {
       maxPageSize: getMaxPageSize(e),
-      isConcurrent: _getConcurrent(namespace, entitySet, csn)
+      isConcurrent: !!e._etag
     }
 
     // custom aggregates

package/libx/_runtime/cds-services/adapter/odata-v4/utils/result.js

@@ -208,6 +208,9 @@ const _processCategory = (req, category, elementInfo, options, previousResult) =
       localizeAfterDraftActivate(row, key, req.locale)
       break
 
+    case '@cds.Boolean':
+      if (row[key] != null) row[key] = !!row[key]
+
     // no default
   }
 }
@@ -270,6 +273,7 @@ const _pick = options => (element, target) => {
 
   if (element['@odata.etag']) categories.push('@odata.etag')
   if (element._type === 'cds.Decimal') categories.push('@cds.Decimal')
+  if (cds.db?.kind === 'better-sqlite' && element._type === 'cds.Boolean') categories.push('@cds.Boolean')
 
   categories.push(..._assocs(element, target))
 

package/libx/_runtime/cds-services/services/Service.js

@@ -50,7 +50,29 @@ class ApplicationService extends cds.Service {
   }
 
   registerFioriHandlers() {
-    return require('../../fiori/generic').impl.call(this)
+    if (cds.env.features.lean_draft) {
+      const {
+        onNewDraft,
+        onDraftPrepare,
+        onDraftActivate,
+        onPatch,
+        onDraftEdit,
+        onDelete
+      } = require('../../fiori/lean-draft')
+      const LOG = cds.log('fiori|drafts')
+
+      for (let each of this.entities)
+        if (each.drafts) {
+          LOG.debug('serving drafts for', { entity: each.name })
+          this.on('NEW', each, onNewDraft)
+          this.on('PATCH', each, onPatch)
+          this.on('EDIT', each, onDraftEdit)
+          this.on('draftPrepare', each, onDraftPrepare)
+          this.on('draftActivate', each, onDraftActivate)
+          this.on('draftActivate', each, onDraftActivate)
+          this.on(['CANCEL', 'DELETE'], each, onDelete)
+        }
+    } else return require('../../fiori/generic').impl.call(this)
   }
 
   registerCrudHandlers() {

package/libx/_runtime/cds-services/util/assert.js

@@ -259,46 +259,6 @@ const _checkFormatElement = (element, value, errors, key, pathSegments) => {
   }
 }
 
-// check for forbidden deep operations for association
-const checkIfAssocDeep = (element, value, req) => {
-  if (!value) return
-
-  if (element.on) {
-    req.error(
-      assertError(
-        element.is2one
-          ? { code: ASSERT_DEEP_ASSOCIATION, args: ['unmanaged to-one', element.name] }
-          : { code: ASSERT_DEEP_ASSOCIATION, args: ['to-many', element.name] },
-        element,
-        value
-      )
-    )
-
-    return
-  }
-
-  if (element.is2one) {
-    // managed to one
-    Object.keys(value).forEach(prop => {
-      if (typeof value[prop] !== 'object') {
-        const foreignKey = element._foreignKeys.find(fk => fk.childElement.name === prop)
-        if (foreignKey) return
-
-        const key = element.keys.find(element => element.ref[0] === prop)
-        if (key) return
-
-        const err = assertError(
-          { code: ASSERT_DEEP_ASSOCIATION, args: ['managed to-one', element.name] },
-          element,
-          value
-        )
-        err.target += `.${prop}`
-        req.error(err)
-      }
-    })
-  }
-}
-
 /**
  * @param {import('../../types/api').InputConstraints} constraints
  */
@@ -407,7 +367,6 @@ module.exports = {
   checkInputConstraints,
   checkKeys,
   assertError,
-  checkIfAssocDeep,
   checkStaticElementByKey,
   assertNotNullError,
   assertTargets

package/libx/_runtime/common/composition/data.js

@@ -283,7 +283,11 @@ const _selectDeepUpdateData = async args => {
 
 // if a view has an orderBy with renamed field, we need to resolve it
 const _resolveOrderBy = (orderBy, transitions) => {
-  if (orderBy && transitions.length > 0) orderBy.map(el => (el.ref[0] = transitions[0].mapping.get(el.ref[0]).ref[0]))
+  // no resolved entity found
+  if (!transitions?.length) return
+  // if there are no renamed fields, no need to resolve
+  if (!transitions[0].mapping.size) return
+  if (orderBy) orderBy.map(el => (el.ref[0] = transitions[0].mapping.get(el.ref[0]).ref[0]))
 }
 
 /*

package/libx/_runtime/common/generic/auth/utils.js

@@ -9,9 +9,9 @@ const reject = (req, reason = null) => {
   // unauthorized or forbidden?
   if (req.user._is_anonymous) {
     // REVISIT: challenges handling should be done in protocol adapter (i.e., express error middleware)
-    // REVISIT: improve `req._.req` check if this is an HTTP request
-    if (req._.req && req.user._challenges && req.user._challenges.length > 0) {
-      req._.res.set('WWW-Authenticate', req.user._challenges.join(';'))
+    // REVISIT: improve `req.http.req` check if this is an HTTP request
+    if (req.http?.req && req.user._challenges && req.user._challenges.length > 0) {
+      req.http.res.set('WWW-Authenticate', req.user._challenges.join(';'))
     }
 
     // REVISIT: security log in else case?

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

@@ -26,7 +26,7 @@ const _targetEntityDoesNotExist = async req => {
 
 exports.impl = cds.service.impl(function () {
   // eslint-disable-next-line complexity
-  this.on(['CREATE', 'READ', 'UPDATE', 'DELETE'], '*', async function (req) {
+  this.on(['CREATE', 'READ', 'UPDATE', 'DELETE', 'UPSERT'], '*', async function (req) {
     if (typeof req.query !== 'string' && req.target && req.target._hasPersistenceSkip) {
       throw getError({
         code: 501,

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

@@ -16,6 +16,7 @@ const { checkInputConstraints, assertTargets } = require('../../cds-services/uti
 const getTemplate = require('../utils/template')
 const templateProcessor = require('../utils/templateProcessor')
 const { getDataFromCQN, setDataFromCQN } = require('../utils/data')
+const getRowUUIDGeneratorFn = require('../utils/rowUUIDGenerator')
 
 const _shouldSuppressErrorPropagation = (event, value) => {
   return (
@@ -34,24 +35,6 @@ const _getSimpleCategory = category => {
   return category
 }
 
-const _rowKeysGenerator = eventName => {
-  if (eventName === 'UPDATE') return
-  return (keyNames, row, template) => {
-    for (const keyName of keyNames) {
-      if (Object.prototype.hasOwnProperty.call(row, keyName)) {
-        continue
-      }
-
-      const elementInfo = template.elements.get(keyName)
-      const plain = elementInfo && elementInfo.picked && elementInfo.picked.plain
-      if (!plain || !plain.categories) continue
-      if (plain.categories.includes('uuid')) {
-        row[keyName] = cds.utils.uuid()
-      }
-    }
-  }
-}
-
 const _isDraftCoreComputed = (req, element, event) =>
   cds.env.features.preserve_computed !== false &&
   req._ &&
@@ -65,10 +48,7 @@ const _isStreamingProperty = (elements, row, property) =>
   )
 
 const _getMediaTypeValue = req =>
-  req._.req &&
-  req._.req.headers['content-type'] &&
-  !req._.req.headers['content-type'].match(/json|multipart/i) &&
-  req._.req.headers['content-type']
+  !req.http?.req?.headers?.['content-type'].match(/json|multipart/i) && req.http?.req?.headers?.['content-type']
 
 const _preProcessAssertTarget = (assocInfo, assertMap) => {
   const { element: assoc, row } = assocInfo
@@ -265,7 +245,7 @@ async function commonGenericInput(req) {
   }
 
   const pathOptions = {
-    rowKeysGenerator: _rowKeysGenerator(req.event),
+    rowUUIDGenerator: getRowUUIDGeneratorFn(req.event),
     includeKeyValues: true,
     pathSegments: []
   }
@@ -276,7 +256,7 @@ async function commonGenericInput(req) {
     if (pathSegment) pathOptions.pathSegments.push(pathSegment)
 
     if (keys && 'IsActiveEntity' in keys) {
-      pathOptions.extraKeys = { IsActiveEntity: keys.IsActiveEntity }
+      pathOptions.draftKeys = { IsActiveEntity: keys.IsActiveEntity }
     }
   }
 

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

@@ -1,23 +1,24 @@
 const cds = require('../../cds')
-const { getDefaultPageSize, getMaxPageSize } = require('../utils/page')
+const { getPageSize } = require('../utils/page')
 
 const commonGenericPaging = function (req) {
   // only if http request
-  if (!(req.http?.req || req._.req)) return
+  if (!req.http?.req) return
 
   // target === null if view with parameters
-  if (!req.target || !req.query.SELECT || req.query.SELECT.one) return
+  if (!req.target || !req.query?.SELECT || req.query.SELECT.one) return
 
   _addPaging(req.query, req.target)
 }
 
-const _addPaging = function (query, target) {
-  let { rows, offset } = query.SELECT.limit || {}
-  rows = rows && 'val' in rows ? rows.val : getDefaultPageSize(target)
-  offset = offset && 'val' in offset ? offset.val : 0
-  query.limit(...[Math.min(rows, getMaxPageSize(target)), offset])
+const _addPaging = function ({ SELECT }, target) {
+  const { rows } = SELECT.limit || (SELECT.limit = {})
+  const conf = getPageSize(target)
+  SELECT.limit.rows = {
+    val: !rows ? conf.default : Math.min(rows.val ?? rows, conf.max)
+  }
   //Handle nested limits
-  if (query.SELECT.from.SELECT) _addPaging(query.SELECT.from, target)
+  if (SELECT.from.SELECT?.limit) _addPaging(SELECT.from, target)
 }
 
 /**

package/libx/_runtime/common/utils/cqn2cqn4sql.js

@@ -804,6 +804,33 @@ const _convertSelect = (query, model, _options) => {
   return query
 }
 
+const _convertUpsert = (query, model) => {
+  // resolve path expression
+  const resolvedIntoClause = _convertPathExpressionForInsert(query.UPSERT.into, model)
+
+  const target = model.definitions[resolvedIntoClause]
+  if (!target) {
+    // if there is no target, just return original query, as a copy is not deep anyways and all the sub items of query.UPSERT are referenced only anyways
+    return query
+  }
+
+  // overwrite only .into, foreign keys are already set
+  // 'a' added as placeholder since its overwritten by Object.assign below
+  const upsert = UPSERT.into('a')
+
+  // REVISIT flatten structured types, currently its done in SQL builder
+
+  // We add all previous properties ot the newly created query.
+  // Reason is to not lose the query API functionality
+  Object.assign(upsert.UPSERT, query.UPSERT, { into: { ref: [resolvedIntoClause], as: query.UPSERT.into.as } })
+
+  const resolved = resolveView(upsert, model, cds.db)
+  // required for deplyoing of extensions, not used anywhere else except UpsertBuilder
+  resolved._target = resolved.UPSERT?._transitions?.[0].target || query._target
+  // resolved._target = query._target
+  return resolved
+}
+
 const _convertInsert = (query, model) => {
   // resolve path expression
   const resolvedIntoClause = _convertPathExpressionForInsert(query.INSERT.into, model)
@@ -950,6 +977,10 @@ const cqn2cqn4sql = (query, model, options = { suppressSearch: false }) => {
     return _convertInsert(query, model)
   }
 
+  if (query.UPSERT) {
+    return _convertUpsert(query, model)
+  }
+
   if (query.DELETE) {
     return _convertDelete(query, model, options)
   }

package/libx/_runtime/common/utils/csn.js

@@ -129,21 +129,22 @@ const _findCsnTarget = (edmName, model, namespace) => {
   return target
 }
 
+const _initializeCache = (model, namespace) => {
+  const cache = {}
+  for (const name in model.definitions) {
+    // do no cache entities within different namespace
+    if (!name.startsWith(`${namespace}.`)) continue
+    // cut off namespace and underscoreify entity name (OData does not allow dots)
+    cache[name.replace(new RegExp(`^${namespace}\\.`), '').replace(/\./g, '_')] = model.definitions[name]
+  }
+  return cache
+}
+
 const findCsnTargetFor = (edmName, model, namespace) => {
-  const cache =
-    model._edmToCSNNameMap || Object.defineProperty(model, '_edmToCSNNameMap', { value: {} })._edmToCSNNameMap
-  const edm2csnMap =
-    cache[namespace] ||
-    Object.defineProperty(cache, namespace, {
-      get() {
-        const _ = {}
-        for (const name in model.definitions) {
-          if (!name.startsWith(`${namespace}.`)) continue
-          _[name.replace(new RegExp(`^${namespace}\\.`), '').replace(/\./g, '_')] = model.definitions[name]
-        }
-        return _
-      }
-    })[namespace]
+  const cache = model._edmToCSNNameMap || (model._edmToCSNNameMap = {})
+  const edm2csnMap = cache[namespace] || (cache[namespace] = _initializeCache(model, namespace))
+
+  if (edm2csnMap[edmName]) return edm2csnMap[edmName]
 
   const target = _findCsnTarget(edmName, model, namespace)
 
@@ -226,7 +227,12 @@ function getDraftTreeRoot(entity, model) {
     for (const k in model.definitions) {
       const e = model.definitions[k]
       if (e.kind !== 'entity' || !e.compositions) continue
-      for (const c in e.compositions) if (e.compositions[c].target === current.name) parents.push(e)
+      for (const c in e.compositions)
+        if (
+          e.compositions[c].target === current.name ||
+          e.compositions[c].target === current.name.replace(/\.drafts/, '')
+        )
+          parents.push(e)
     }
     if (parents.length > 1 && parents.some(p => p !== parents[0])) {
       // > unable to determine single parent

package/libx/_runtime/common/utils/draft.js

@@ -19,7 +19,8 @@ const ensureUnlocalized = table => {
   return _table
 }
 
-const ensureDraftsSuffix = name => (name.endsWith('_drafts') ? name : `${ensureUnlocalized(name)}_drafts`)
+const ensureDraftsSuffix = name =>
+  name.endsWith('_drafts') || name.endsWith('.drafts') ? name : `${ensureUnlocalized(name)}_drafts`
 
 const ensureNoDraftsSuffix = name => name.replace(/_drafts$/g, '')