@sap/cds 6.6.2 → 6.7.1

package/libx/_runtime/common/code-ext/workerQueryExecutor.js

@@ -1,30 +1,31 @@
 const cds = require('../../cds')
 const LOG = cds.log()
 const { parentPort } = require('worker_threads')
-const executorCallbackMap = new Map()
+const executionContextMap = new Map()
 
 parentPort.on('message', function onWorkerMessageReceived(message) {
   const { id, kind, result } = message
+  if (!executionContextMap.has(id)) return
   if (LOG._debug) LOG.debug(`Post message received on worker thread (workerQueryExecutor.js) from main thread`, message)
-  if (!executorCallbackMap.has(id)) return
 
   switch (kind) {
     case 'responseData':
-      executorCallbackMap.get(id)(result)
-      executorCallbackMap.delete(id)
+      executionContextMap.get(id)(result)
+      executionContextMap.delete(id)
       return
 
     case 'cleanup':
-      executorCallbackMap.delete(id)
+      executionContextMap.delete(id)
       return
   }
 })
 
-function queryExecutor(resolve) {
+function queryExecutor(contextId, resolve) {
   const id = cds.utils.uuid()
-  executorCallbackMap.set(id, result => resolve(result))
+  executionContextMap.set(id, result => resolve(result))
   parentPort.postMessage({
     id,
+    contextId,
     kind: 'run',
     target: 'srv',
     prop: 'run',

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

@@ -230,7 +230,7 @@ const getSetNullParentForeignKeyCQNs = async (model, req, dbQuery) => {
   const cqns = []
   const query = dbQuery || req.query
   // REVISIT: req._tx should not be used like that!
-  const origQuery = (req.tx instanceof cds.DatabaseService && req._ && req._.query) || req.query
+  const origQuery = (req.tx.isDatabaseService && req._ && req._.query) || req.query
   if (!dbQuery && origQuery && origQuery.DELETE && origQuery.DELETE.from.ref && origQuery.DELETE.from.ref.length > 1) {
     // delete via 2one navigation => parent is known => no need to SELECT
     const ref = origQuery.DELETE.from.ref

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

@@ -9,6 +9,7 @@ const { ensureNoDraftsSuffix } = require('../utils/draft')
 const { deepCopyObject } = require('../utils/copy')
 
 const getError = require('../../common/error')
+const { getEntityNameFromUpdateCQN } = require('../utils/cqn')
 
 const CHUNK_SIZE = cds.env.features.chunk_deep || Number.MAX_VALUE
 
@@ -264,9 +265,7 @@ const _addSubDeepUpdateCQN = async ({ model, compositionTree, data, selectData,
 
 const hasDeepUpdate = (model, cqn) => {
   if (cqn && cqn.UPDATE && cqn.UPDATE.entity && (cqn.UPDATE.data || cqn.UPDATE.with)) {
-    const updateEntity = cqn.UPDATE.entity
-    const entityName =
-      (updateEntity.ref && (updateEntity.ref[0].id || updateEntity.ref[0])) || updateEntity.name || updateEntity
+    const entityName = getEntityNameFromUpdateCQN(cqn)
     const entity = model.definitions[ensureNoDraftsSuffix(entityName)]
 
     if (entity) {
@@ -287,8 +286,7 @@ const getDeepUpdateCQNs = async (model, req, selectData) => {
   if (selectData.length > 1) throw getError('Deep update can only be performed on a single instance')
 
   const cqns = []
-  const from =
-    (query.UPDATE.entity.ref && query.UPDATE.entity.ref[0]) || query.UPDATE.entity.name || query.UPDATE.entity
+  const from = getEntityNameFromUpdateCQN(query)
   const entityName = ensureNoDraftsSuffix(from)
   const draft = entityName !== from
   const data = query.UPDATE.data ? deepCopyObject(query.UPDATE.data) : {}

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

@@ -30,7 +30,7 @@ const _getRestrictedExpand = (columns, target, definitions) => {
         if (ref_) return ref_
       }
       // expand: '**' or '*3' is only possible within custom handler, no check needed
-      if (typeof col.expand === 'string' && /^\*{1}[\d|*]+/.test(col.expand)) {
+      if (typeof col.expand[0] === 'string' && /^\*{1}[\d|*]+/.test(col.expand[0])) {
         continue
       } else {
         const restricted = _getRestrictedExpand(col.expand, _getTarget(col.ref, target, definitions), definitions)

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

@@ -1,3 +1,4 @@
+const cds = require('../../../cds')
 const { getAuthRelevantEntity } = require('./utils')
 const { WRITE_EVENTS } = require('./constants')
 
@@ -14,11 +15,11 @@ function handler(req) {
   }
 
   // @read-only
-  const entity = getAuthRelevantEntity(req, this.model, ['@readonly'])
+  let entity = getAuthRelevantEntity(req, this.model, ['@readonly'])
+  if (cds.env.fiori.lean_draft && (req.event === 'NEW' || req.event === 'UPDATE')) entity = entity?.actives
+
   if (!entity || !entity['@readonly']) return
-  if (entity['@readonly'] && req.event in WRITE_EVENTS) {
-    req.reject(405, 'ENTITY_IS_READ_ONLY', [entity.name])
-  }
+  if (entity['@readonly'] && req.event in WRITE_EVENTS) req.reject(405, 'ENTITY_IS_READ_ONLY', [entity.name])
 }
 
 handler._initial = true

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

@@ -142,13 +142,18 @@ const _getRestrictionForTarget = (resolvedApplicables, target) => {
 }
 
 const _addRestrictionsToRead = async (req, model, resolvedApplicables) => {
-  if (!cds.env.features.lean_draft && req.target._isDraftEnabled) {
+  if (!cds.env.fiori.lean_draft && req.target._isDraftEnabled) {
     req.query._draftRestrictions = resolvedApplicables
     return
   }
 
   if (typeof req.query.SELECT.from === 'object')
-    req.query.SELECT.from.ref = _addWheresToRef(req.query.SELECT.from.ref, model, resolvedApplicables)
+    // in case of $apply take a ref from sub SELECT//
+    req.query.SELECT.from.ref = _addWheresToRef(
+      req.query.SELECT.from.ref || req.query.SELECT.from.SELECT?.from?.ref,
+      model,
+      resolvedApplicables
+    )
 
   const restrictionForTarget = _getRestrictionForTarget(resolvedApplicables, req.target)
   if (!restrictionForTarget) return

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

@@ -141,8 +141,11 @@ const resolveUserAttrs = (restrict, req) => {
       attr = parts.shift()
     }
 
-    if (!skip)
-      restrict.where = restrict.where.replace(next[0], val === undefined ? null : val).replace('in null', 'is null')
+    if (!skip) {
+      const v = val === undefined ? null : typeof val === 'string' && val.match(/^\d*$/) ? `'${val}'` : val
+      restrict.where = restrict.where.replace(next[0], v).replace('in null', 'is null')
+    }
+
     next = _getNext(restrict.where)
   }
 

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

@@ -54,10 +54,21 @@ exports.impl = cds.service.impl(function () {
 
     if (req.event in { DELETE: 1, UPDATE: 1 } && req.target && req.target._isSingleton) {
       if (req.event === 'DELETE' && !req.target['@odata.singleton.nullable']) req.reject(400, 'SINGLETON_NOT_NULLABLE')
+      const selectSingleton = SELECT.one(req.target)
       const keyColumns = getColumns(req.target, { onlyNames: true, keysOnly: true })
-      const selectSingleton = SELECT.one(req.target).columns(keyColumns)
+
+      // if no keys available, select all columns so we can delete the singleton with same content
+      if (keyColumns.length) selectSingleton.columns(keyColumns)
+
       const singleton = await cds.tx(req).run(selectSingleton)
       if (!singleton) req.reject(404)
+
+      // REVISIT: Workaround for singleton, to get keys into singleton
+      for (const keyName in singleton) {
+        if (!keyColumns.includes(keyName)) continue
+        req.data[keyName] = singleton[keyName]
+      }
+
       req.query.where(singleton)
     }
 

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

@@ -6,8 +6,7 @@ const { isActiveEntityRequested } = require('../../fiori/utils/where')
 const { ensureDraftsSuffix } = require('../../fiori/utils/handler')
 const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const { isAsteriskColumn } = require('../../common/utils/rewriteAsterisks')
-const ODataRequest = require('../../cds-services/adapter/odata-v4/ODataRequest')
-const { resolveView, getTransition } = require('../utils/resolveView')
+const { resolveView } = require('../utils/resolveView')
 
 const C_U_ = {
   CREATE: 1,
@@ -61,8 +60,17 @@ const _addEtagColumns = (columns, entity) => {
 const _isConcurrentODataReq = req => {
   const isReadAfterDraftAction =
     req.event === 'READ' && req.target._isDraftEnabled && req.context.event in { draftActivate: 1, EDIT: 1 }
+  // It's allowed to also delete drafts when actives are deleted
+  if (
+    cds.env.fiori?.lean_draft &&
+    req.event === 'READ' &&
+    req.context.event === 'DELETE' &&
+    req.target?.name.endsWith('.drafts') &&
+    !req.context?.target?.name.endsWith('.drafts')
+  )
+    return
   const _req = isReadAfterDraftAction ? req.context : req
-  return _req instanceof ODataRequest && _req.isConcurrentResource
+  return _req._isOData && _req.isConcurrentResource
 }
 
 /**

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

@@ -86,7 +86,7 @@ const _preProcessAssertTarget = (assocInfo, assertMap) => {
   if (parentKeys.length === 0) return
 
   foreignKeys.forEach(keyMap => {
-    const clonedAssocInfo = Object.assign({}, assocInfo, { pathSegments: assocInfo.pathSegments.slice(0) })
+    const clonedAssocInfo = Object.assign({}, assocInfo, { pathSegmentsInfo: assocInfo.pathSegmentsInfo.slice(0) })
     const target = {
       key: mapKey,
       entity: assocTarget,
@@ -126,6 +126,8 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
       // > preserve computed values if triggered by draftActivate and not managed
       return
     }
+    // Always take over the values from active entities
+    if (cds.env.fiori?.lean_draft && req.context?.event === 'EDIT') return
 
     delete row[key]
     value.val = undefined
@@ -152,7 +154,7 @@ const _getProcessorFn = (req, errors, assertMap) => {
   const event = req.event
 
   return elementInfo => {
-    const { row, key, element, plain, pathSegments } = elementInfo
+    const { row, key, element, plain, pathSegmentsInfo } = elementInfo
     // ugly pointer passing for sonar
     const value = { mandatory: false, val: row && row[key] }
 
@@ -163,7 +165,7 @@ const _getProcessorFn = (req, errors, assertMap) => {
     if (_shouldSuppressErrorPropagation(event, value)) return
 
     // REVISIT: Convert checkInputConstraints to template mechanism
-    checkInputConstraints({ element, value: value.val, errors, pathSegments, event })
+    checkInputConstraints({ element, value: value.val, errors, pathSegmentsInfo, event })
   }
 }
 
@@ -239,7 +241,7 @@ async function commonGenericInput(req) {
   const pathOptions = {
     rowUUIDGenerator: getRowUUIDGeneratorFn(req.event),
     includeKeyValues: true,
-    pathSegments: []
+    pathSegmentsInfo: []
   }
 
   const boundAction = _getBoundAction(req)
@@ -247,7 +249,7 @@ async function commonGenericInput(req) {
   if (boundAction) {
     const pathSegment = _getBoundActionBindingParameter(boundAction)
     const keys = req._ && req._.params && req._.params[0]
-    if (pathSegment) pathOptions.pathSegments.push(pathSegment)
+    if (pathSegment) pathOptions.pathSegmentsInfo.push(pathSegment)
 
     if (keys && 'IsActiveEntity' in keys) {
       pathOptions.draftKeys = { IsActiveEntity: keys.IsActiveEntity }
@@ -364,7 +366,7 @@ commonGenericInput._initial = true
 _actionFunctionHandler._initial = true
 
 module.exports = cds.service.impl(function () {
-  if (cds.env.features.lean_draft) {
+  if (cds.env.fiori.lean_draft) {
     this.before(['CREATE', 'UPDATE'], '*', commonGenericInput)
   } else {
     this.before(['CREATE', 'UPDATE', 'NEW', 'PATCH'], '*', commonGenericInput)

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

@@ -1,5 +1,27 @@
 const cds = require('../../cds')
-const { getPageSize } = require('../utils/page')
+
+module.exports = exports = cds.service.impl(function () {
+  commonGenericPaging._initial = true
+  this.before('READ', '*', commonGenericPaging)
+})
+
+const DEFAULT = cds.env.query?.limit?.default || 1000
+const MAX = cds.env.query?.limit?.max || 1000
+const _cached = Symbol('@cds.query.limit')
+
+const getPageSize = def => {
+  if (_cached in def) return def[_cached]
+  let max = def['@cds.query.limit.max'] ?? def._service?.['@cds.query.limit.max'] ?? MAX
+  let _default =
+    def['@cds.query.limit.default'] ??
+    def['@cds.query.limit'] ??
+    def._service?.['@cds.query.limit.default'] ??
+    def._service?.['@cds.query.limit'] ??
+    DEFAULT
+  if (!max) max = Number.MAX_SAFE_INTEGER
+  if (!_default || _default > max) _default = max
+  return (def[_cached] = { default: _default, max })
+}
 
 const commonGenericPaging = function (req) {
   // only if http request
@@ -21,10 +43,5 @@ const _addPaging = function ({ SELECT }, target) {
   if (SELECT.from.SELECT?.limit) _addPaging(SELECT.from, target)
 }
 
-/**
- * handler registration
- */
-module.exports = cds.service.impl(function () {
-  commonGenericPaging._initial = true
-  this.before('READ', '*', commonGenericPaging)
-})
+exports.getPageSize = getPageSize
+exports.commonGenericPaging = commonGenericPaging

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

@@ -24,7 +24,7 @@ const _fillStructure = (row, parts, element, category, args) => {
 }
 
 const _getProcessorFn = req => {
-  const REST = req.constructor.name === 'RestRequest'
+  const REST = req._isRest
 
   return ({ row, key, element, plain }) => {
     if (!row || row[key] !== undefined) return

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

@@ -81,5 +81,4 @@ module.exports = cds.service.impl(function () {
   this.before('READ', '*', commonGenericSorting)
 })
 
-// REVISIT: remove (currently needed for test)
 module.exports.handler = commonGenericSorting

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

@@ -86,6 +86,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_LOCKED_BY_ANOTHER_USER=The entity is locked by another user
+DRAFT_MODIFICATION_ONLY_VIA_ROOT=A draft can only be modified via its root entity
 
 # singleton
 SINGLETON_NOT_NULLABLE=The singleton entity is not nullable

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

@@ -17,7 +17,11 @@ const getEntityNameFromDeleteCQN = cqn => {
 }
 
 const getEntityNameFromUpdateCQN = cqn => {
-  return (cqn.UPDATE.entity.ref && cqn.UPDATE.entity.ref[0]) || cqn.UPDATE.entity.name || cqn.UPDATE.entity
+  return (
+    (cqn.UPDATE.entity.ref && cqn.UPDATE.entity.ref[0] && (cqn.UPDATE.entity.ref[0].id || cqn.UPDATE.entity.ref[0])) ||
+    cqn.UPDATE.entity.name ||
+    cqn.UPDATE.entity
+  )
 }
 
 // scope: simple wheres à la "[{ ref: ['foo'] }, '=', { val: 'bar' }, 'and', ... ]"

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

@@ -280,7 +280,7 @@ const _createWindowCQN = (SELECT, model) => {
     }
   }
 
-  delete SELECT.groupBy
+  SELECT.groupBy = undefined
 }
 
 const _unshiftRefsWithNavigation = nav => el => {
@@ -713,7 +713,7 @@ const _convertToOneEqNullInFilter = (query, target) => {
 }
 // eslint-disable-next-line complexity
 const _convertSelect = (query, model, _options) => {
-  const _4db = _options.service instanceof cds.DatabaseService
+  const _4db = _options.service?.isDatabaseService
   const options = Object.assign({ _4db, isStreaming: query._streaming }, _options)
 
   // ensure query is ql enabled
@@ -796,7 +796,7 @@ const _convertSelect = (query, model, _options) => {
   if (options._4db && !query.SELECT.columns) {
     let target = query._target
     if (target && target._unresolved && typeof target.name === 'string') {
-      target = model.definitions[ensureNoDraftsSuffix(target.name)] || target
+      target = model.definitions[cds.env.fiori.lean_draft ? target.name : ensureNoDraftsSuffix(target.name)] || target
     }
 
     if (target && !Object.prototype.hasOwnProperty.call(target, '_unresolved')) {

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

@@ -5,7 +5,7 @@ const PERSISTENCE_TABLE = '@cds.persistence.table'
 const { rewriteAsterisks } = require('../../common/utils/rewriteAsterisks')
 
 const getError = require('../error')
-const { getEntityNameFromDeleteCQN, getEntityNameFromUpdateCQN } = require('../utils/cqn')
+const { getEntityNameFromDeleteCQN } = require('../utils/cqn')
 
 const _setInverseTransition = (mapping, ref, mapped) => {
   const existing = mapping.get(ref)
@@ -332,7 +332,7 @@ const _newUpdate = (query, transitions, service) => {
     newUpdate.where = _newWhere(
       newUpdate.where,
       targetTransition,
-      getEntityNameFromUpdateCQN(query),
+      cds.infer(query, service.model.definitions).name,
       query.UPDATE.entity.as
     )
   }
@@ -353,7 +353,7 @@ const _newSelect = (query, transitions, service) => {
   if (!newSelect.columns && targetTransition.mapping.size) newSelect.columns = _initialColumns(targetTransition)
   if (newSelect.columns) {
     rewriteAsterisks({ SELECT: query.SELECT }, service.model, {
-      _4db: service instanceof cds.DatabaseService || service.kind === 'better-sqlite',
+      _4db: service.isDatabaseService,
       target: targetTransition.queryTarget
     })
     newSelect.columns = _newColumns(newSelect.columns, targetTransition, service, service.kind !== 'app-service')
@@ -380,12 +380,16 @@ const _newInsert = (query, transitions, service) => {
   const targetTransition = transitions[transitions.length - 1]
   const targetName = targetTransition.target.name
   const newInsert = Object.create(query.INSERT)
-  newInsert.into = newInsert.into.ref
-    ? {
-        ...newInsert.into,
-        ref: _rewriteQueryPath(query.INSERT.into, transitions)
-      }
-    : targetName
+  if (newInsert.into) {
+    const refObject = newInsert.into.ref ? newInsert.into : { ref: [query.INSERT.into] }
+    newInsert.into = {
+      ...refObject,
+      ref: _rewriteQueryPath(refObject, transitions)
+    }
+    if (!query.INSERT.into.ref) newInsert.into = newInsert.into.ref[0] // leave as string
+  } else {
+    newInsert.into = targetName
+  }
   if (newInsert.columns) newInsert.columns = _newInsertColumns(newInsert.columns, targetTransition)
   if (newInsert.entries) newInsert.entries = _newEntries(newInsert.entries, targetTransition, service)
   Object.defineProperty(newInsert, '_transitions', {
@@ -536,7 +540,7 @@ const _getTransitionData = (target, columns, service, skipForbiddenViewCheck) =>
   if (!skipForbiddenViewCheck) _checkForForbiddenViews(target)
   const targetStartsWithSrvName = service.namespace && target.name.startsWith(`${service.namespace}.`)
   const persistenceTable = _isPersistenceTable(target)
-  const isDatabaseService = service instanceof cds.DatabaseService || service.kind === 'better-sqlite'
+  const isDatabaseService = service.isDatabaseService
   columns = _queryColumns(target, columns, persistenceTable, !isDatabaseService && !targetStartsWithSrvName)
   // REVISIT: Change once we expose database service
   if (persistenceTable && isDatabaseService) {

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

@@ -29,7 +29,7 @@ const _expandColumn = (column, target, _4db) => {
 const rewriteExpandAsterisk = (columns, target) => {
   const expandAllColIdx = columns.findIndex(col => {
     if (col.ref || !col.expand) return
-    return !Array.isArray(col.expand) ? col.expand === '*' : col.expand.indexOf('*') > -1
+    return col.expand.includes('*')
   })
   if (expandAllColIdx > -1) {
     const { expand } = columns.splice(expandAllColIdx, 1)[0]
@@ -56,7 +56,6 @@ const _rewriteAsterisk = (columns, target, _4db, isRoot) => {
 }
 
 const _rewriteAsterisks = (cqn, target, _4db, isRoot) => {
-  if (cqn.expand === '*') cqn.expand = ['*']
   const columns = cqn.expand || cqn.columns
   _rewriteAsterisk(columns, target, _4db, isRoot)
   rewriteExpandAsterisk(columns, target)
@@ -119,7 +118,7 @@ const rewriteAsterisks = (query, model, options) => {
         if (!target) return
 
         query.SELECT.columns = getColumns(target, { _4db }).map(col => ({ ref: [col.name] }))
-        if (_4db && target._isDraftEnabled && !cds.env.features.lean_draft)
+        if (_4db && target._isDraftEnabled && !cds.env.fiori.lean_draft)
           query.SELECT.columns.push(..._cqlDraftColumns(target))
       }
     }

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

@@ -1,19 +1,17 @@
 const DELIMITER = require('./templateDelimiter')
-const pathSerializer = require('./templateProcessorPathSerializer')
 
-const _processElement = (processFn, row, key, target, picked = {}, isRoot, pathSegments) => {
+const _processElement = (processFn, row, key, target, picked = {}, isRoot, pathSegmentsInfo) => {
   const element = (target.elements || target.params)[key]
   const { plain } = picked
 
   if (!plain) return
 
-  /**
-   * @type import('../../types/api').templateElementInfo
-   */
-  const elementInfo = { row, key, element, target, plain, isRoot, pathSegments }
-  if (!element && target._flat2struct && target._flat2struct[key] && elementInfo.pathSegments) {
-    elementInfo.pathSegments = pathSegments.slice(0)
-    elementInfo.pathSegments.push(...target._flat2struct[key])
+  /** @type import('../../types/api').templateElementInfo */
+  const elementInfo = { row, key, element, target, plain, isRoot, pathSegmentsInfo }
+
+  if (!element && target._flat2struct?.[key] && elementInfo.pathSegmentsInfo) {
+    elementInfo.pathSegmentsInfo = pathSegmentsInfo.slice(0)
+    elementInfo.pathSegmentsInfo.push(...target._flat2struct[key])
   }
 
   processFn(elementInfo)
@@ -23,7 +21,7 @@ const _processRow = (processFn, row, template, tKey, tValue, isRoot, pathOptions
   const { template: subTemplate, picked } = tValue
   const key = tKey.split(DELIMITER).pop()
 
-  _processElement(processFn, row, key, template.target, picked, isRoot, pathOptions.pathSegments)
+  _processElement(processFn, row, key, template.target, picked, isRoot, pathOptions.pathSegmentsInfo)
 
   // process deep
   if (subTemplate && typeof row === 'object' && row) {
@@ -48,20 +46,20 @@ const _processComplex = (processFn, row, template, key, pathOptions) => {
   if (rows.length === 0) return
   const keyNames = pathOptions.includeKeyValues && _getTargetKeyNames(template.target)
 
-  for (let idx = 0; idx < rows.length; idx++) {
-    const row = rows[idx]
+  for (const row of rows) {
     if (row == null) continue
     const args = { processFn, row, template, isRoot: false, pathOptions }
 
-    let pathSegment
+    let pathSegmentInfo
     if (pathOptions.includeKeyValues) {
-      if (pathOptions.rowUUIDGenerator) pathOptions.rowUUIDGenerator(keyNames, row, template)
-      pathSegment = pathSerializer(key, keyNames, row, template.target.elements, pathOptions.draftKeys)
+      pathOptions.rowUUIDGenerator?.(keyNames, row, template)
+      /** @type import('../../types/api').pathSegmentInfo */
+      pathSegmentInfo = { key, keyNames, row, elements: template.target.elements, draftKeys: pathOptions.draftKeys }
     }
 
-    if (pathOptions.pathSegments) pathOptions.pathSegments.push(pathSegment || key)
+    if (pathOptions.pathSegmentsInfo) pathOptions.pathSegmentsInfo.push(pathSegmentInfo || key)
     templateProcessor(args)
-    if (pathOptions.pathSegments) pathOptions.pathSegments.pop()
+    if (pathOptions.pathSegmentsInfo) pathOptions.pathSegmentsInfo.pop()
   }
 }
 

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

@@ -1,10 +1,10 @@
 const cds = require('../../cds')
-const templatePathSerializer = (tKey, keyNames, row, elements, draftKeys) => {
+
+const segmentSerializer = pathSegmentInfo => {
+  const { key: tKey, row, elements, draftKeys } = pathSegmentInfo
+  let keyNames = pathSegmentInfo.keyNames
+
   const keyValuePairs = keyNames
-    .filter(key => {
-      if (cds.env.features.lean_draft && key === 'IsActiveEntity') return false
-      return true
-    })
     .map(key => {
       let quote
 
@@ -19,11 +19,23 @@ const templatePathSerializer = (tKey, keyNames, row, elements, draftKeys) => {
       }
 
       const keyValue = row[key] ?? draftKeys?.[key]
+      if (keyValue == null) return
       return `${key}=${quote}${keyValue}${quote}`
     })
+    .filter(c => c)
 
   const keyValuePairsSerialized = keyValuePairs.join(',')
-  return `${tKey}(${keyValuePairsSerialized})`
+  const pathSegment = `${tKey}(${keyValuePairsSerialized})`
+  return pathSegment
+}
+
+const templatePathSerializer = (elementName, pathSegmentsInfo) => {
+  const pathSegments = pathSegmentsInfo.map(pathSegmentInfo => {
+    if (typeof pathSegmentInfo === 'string') return pathSegmentInfo
+    return segmentSerializer(pathSegmentInfo)
+  })
+  const path = `${pathSegments.join('/')}${pathSegments.length ? '/' : ''}${elementName}`
+  return path
 }
 
 module.exports = templatePathSerializer

package/libx/_runtime/db/Service.js

@@ -138,4 +138,5 @@ class DatabaseService extends cds.Service {
   }
 }
 
+DatabaseService.prototype.isDatabaseService = true
 module.exports = DatabaseService

package/libx/_runtime/db/data-conversion/post-processing.js

@@ -1,7 +1,5 @@
 const { getEntityNameFromCQN, traverseFroms } = require('../../common/utils/entityFromCqn')
 const { ensureNoDraftsSuffix } = require('../../common/utils/draft')
-const { proxifyIfFlattened } = require('../../../common/utils/ucsn')
-const cds = require('../../../../lib')
 
 const _getCastFunction = ({ type }) => {
   switch (type) {
@@ -34,13 +32,6 @@ const _getNestedElement = (entity, key) => {
   return _structElement(entity, structPath)
 }
 
-const _structure = csnEntity => (value, key, row, unaliasedKey) => {
-  proxifyIfFlattened(csnEntity, row)
-  const effectiveKey = unaliasedKey || key
-  delete row[effectiveKey]
-  row[effectiveKey] = value
-}
-
 const _addConverter = (mapper, name, converter) => {
   if (mapper.has(name)) {
     const oldConverter = mapper.get(name)
@@ -126,15 +117,6 @@ const _getMapperForListedElements = (conversionMap, csn, cqn) => {
           row[effectiveKey] = JSON.parse(val)
         }) // > arrayed elements
       }
-
-      if (
-        cds.env.features.ucsn_struct_conversion &&
-        element.parent &&
-        element.parent._isStructured &&
-        !element._isStructured
-      ) {
-        _addConverter(mapper, col.as ? col.as : name, _structure(entity))
-      }
     }
   }
 

package/libx/_runtime/db/expand/expand-v2.js

@@ -119,7 +119,7 @@ const _addForeignKeys = (columns, entity, options) => {
  * @returns object
  */
 const expandV2 = async (model, dbc, query, user, locale, txTimestamp, executeSelectCQN) => {
-  const expandColumn = query.SELECT.columns.find(c => c.expand && typeof c.expand === 'string')
+  const expandColumn = query.SELECT.columns.find(c => c.expand && typeof c.expand[0] === 'string')
   const options = Object.assign({ onlyKeys: false, onlyCompositions: false }, expandColumn._options)
   // remove expand columns from query without modifying
   const topLevelSelect = query.clone().columns(query.SELECT.columns.filter(c => !c.expand))
@@ -137,7 +137,7 @@ const expandV2 = async (model, dbc, query, user, locale, txTimestamp, executeSel
 
   // _associations contains compositions and associations
   if (entity._associations) {
-    const depth = expandColumn.expand === '**' ? -1 : Number(expandColumn.expand.replace('*', ''))
+    const depth = expandColumn.expand[0] === '**' ? -1 : Number(expandColumn.expand[0].replace('*', ''))
     await _autoExpandNavsAndAttachToResult(entity, Array.isArray(result) ? result : [result], depth, options)
   }