@sap/cds 8.1.1 → 8.2.1

package/lib/srv/cds-connect.js

@@ -1,5 +1,5 @@
 const cds = require('..'), LOG = cds.log('cds.connect')
-const _pending = cds.services._pending || {} // used below to chain parallel connect.to(<same>)
+const _pending = cds.services._pending ??= {} // used below to chain parallel connect.to(<same>)
 const TRACE = cds.debug('trace')
 
 /**
@@ -17,45 +17,46 @@ const connect = module.exports = async function cds_connect (options) {
 /**
  * Connect to a specific service, either served locally, with ad-hoc options
  * or with options configured in cds.env.requires.<datasource>.
- * @param {string} [datasource]
+ * @param { string|Function|object } [datasource]
  * @param {{ kind?:String, impl?:String }} [options]
  * @returns { Promise<import('./srv-api')> }
  */
-connect.to = async (datasource, options) => {
-  TRACE?.time(`cds.connect.to ${datasource}`.padEnd(22).slice(0,22))
-  let Service = cds.service.factory, _done = x=>x
-  if (typeof datasource === 'object') [options,datasource] = [datasource]
+connect.to = (datasource, options) => {
+  let Service = cds.service.factory
+  if (typeof datasource === 'object' && !datasource.name) [options,datasource] = [datasource] // .to({ options })
   else if (datasource) {
-    if (datasource._is_service_class) [ Service, datasource ] = [ datasource, datasource.name ]
+    if (datasource._is_service_class) [ Service, datasource ] = [ datasource, datasource.name ] // .to(ServiceClass)
+    else if (datasource.name)  datasource = datasource.name // .to({ name: 'Service' }) from cds-typer
     if (!options) { //> specifying ad-hoc options disallows caching
-      if (datasource in cds.services) return cds.services[datasource]
+      if (datasource in cds.services) return Promise.resolve (cds.services[datasource])
       if (datasource in _pending) return _pending[datasource]
-      // queue parallel requests to a single promise, to avoid creating multiple services
-      _pending[datasource] = new Promise (r=>_done=r).finally(()=> delete _pending[datasource])
     }
   }
-  const o = Service === cds.service.factory ? options4 (datasource, options) : {}
-  const m = await model4 (o)
-  // check if required service definition exists
-  const required = cds.requires[datasource]
-  if (required?.model?.length && datasource !== 'db' && !m.definitions[required.service||datasource]) {
-    LOG.error(`No service definition found for '${required.service || datasource}', as required by 'cds.requires.${datasource}':`, required)
-    throw new Error (`No service definition found for '${required.service || datasource}'`)
-  }
-  // construct new service instance
-  let srv
-  try {
-    srv = await new Service (datasource,m,o); await srv._init()
-  } catch (e) {
-    _pending[datasource] = Promise.reject(e)
-    throw e
-  }
-  if (o.outbox) srv = cds.outboxed(srv)
-  if (datasource === 'db') cds.db = srv
-  _done (cds.services[datasource] = srv)
-  if (!o.silent) cds.emit ('connect',srv)
-  TRACE?.timeEnd(`cds.connect.to ${datasource}`.padEnd(22).slice(0,22))
-  return srv
+  const promise = (async()=>{
+    TRACE?.time(`cds.connect.to ${datasource}`.padEnd(22).slice(0,22))
+    const o = Service === cds.service.factory ? options4 (datasource, options) : {}
+    const m = await model4 (o)
+    // check if required service definition exists
+    const required = cds.requires[datasource]
+    if (required?.model?.length && datasource !== 'db' && !m.definitions[required.service||datasource]) {
+      LOG.error(`No service definition found for '${required.service || datasource}', as required by 'cds.requires.${datasource}':`, required)
+      throw new Error (`No service definition found for '${required.service || datasource}'`)
+    }
+    // construct new service instance
+    let srv = await new Service (datasource,m,o); await srv._init()
+    if (o.outbox) srv = cds.outboxed(srv)
+    if (datasource) {
+      if (datasource === 'db') cds.db = srv
+      cds.services[datasource] = srv
+      delete _pending[datasource]
+    }
+    if (!o.silent) cds.emit ('connect',srv)
+    TRACE?.timeEnd(`cds.connect.to ${datasource}`.padEnd(22).slice(0,22))
+    return srv
+  })()
+  // queue parallel requests to a single promise, to avoid creating multiple services
+  if (datasource && !options) _pending[datasource] = promise
+  return promise
 }
 
 function options4 (name, _o) {

package/lib/srv/cds-serve.js

@@ -1,7 +1,8 @@
 const cds = require ('..')
 const { Service } = cds.service.factory
 const { serve } = cds.service.protocols
-const _ready = Symbol(), _pending = cds.services._pending || {}
+const _pending = cds.services._pending ??= {}
+const _ready = Symbol()
 const TRACE = cds.debug('trace')
 if (TRACE && !cds.env.features.odata_new_adapter) require('./../../libx/_runtime/cds-services/adapter/odata-v4/to')
 

package/lib/srv/middlewares/cds-context.js

@@ -1,5 +1,6 @@
 const cds = require ('../../index')
 const corr_id = 'x-correlation-id'
+const crippled_corr_id = 'x-correlationid'
 const req_id = 'x-request-id'
 const vr_id = 'x-vcap-request-id'
 const { uuid } = cds.utils
@@ -8,7 +9,7 @@ const { EventContext } = cds
 module.exports = () => {
   /** @type { import('express').Handler } */
   return function cds_context (req, res, next) {
-    const id = req.headers[corr_id] ??= req.headers[req_id] || req.headers[vr_id] || uuid()
+    const id = req.headers[corr_id] ??= req.headers[req_id] || req.headers[vr_id] || req.headers[crippled_corr_id] || uuid()
     const ctx = EventContext.for ({ id, http: { req, res } })
     res.set ('X-Correlation-ID', id) // Note: we use capitalized style here as that's common standard in HTTP world
     cds._context.run (ctx, next)

package/lib/utils/cds-utils.js

@@ -289,13 +289,15 @@ if (process.env.JEST_WORKER_ID === undefined) {  // jest's ESM support is experi
   }
 }
 
+const SECRETS = /(passw)|(cert)|(ca)|(secret)|(key)/i
 /**
  * Masks password-like strings, also reducing clutter in output
+ * @param {any} cred - object or array with credentials
+ * @returns {any}
  */
-const SECRETS = /(password)|(certificate)|(ca)|(clientsecret)|(secret)|(key)|(clientcert)/i
 exports._redacted = function _redacted(cred) {
   if (!cred) return cred
-  if (Array.isArray(cred)) return cred.map(_redacted)
+  if (Array.isArray(cred)) return cred.map(c => typeof c === 'string' ? '...' : _redacted(c))
   if (typeof cred === 'object') {
     const newCred = Object.assign({}, cred)
     Object.keys(newCred).forEach(k => (typeof newCred[k] === 'string' && SECRETS.test(k)) ? (newCred[k] = '...') : (newCred[k] = _redacted(newCred[k])))

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/validator/ValueValidator.js

@@ -4,7 +4,7 @@ const { big } = require('@sap/cds-foss')
 const { isInvalidBase64string } = require('../../../../../../common/utils/binary')
 const IllegalArgumentError = require('../errors/IllegalArgumentError')
 
-const YEAR_RE = '(?:-?(?:(?:(?:0\\d{3})|(?:[1-9]\\d{3,}))))'
+const YEAR_RE = '(?:-?(?:(?:(?:0\\d{3})|(?:[1-9]\\d{3}))))'
 const MONTH_RE = '(?:(?:0[1-9])|(?:1[012]))'
 const DAY_RE = '(?:(?:0[1-9])|(?:[12]\\d)|(?:3[01]))'
 const HOURS_RE = '(?:(?:[01]\\d)|(?:2[0-3]))'

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

@@ -5,7 +5,6 @@ const { resolveFromSelect, targetFromPath } = require('../../../../common/utils/
 const { setEntityContained } = require('../../../../common/utils/csn')
 const { getNavigationIfStruct } = require('../../../../common/utils/structured')
 const getTemplate = require('../../../../common/utils/template')
-const templateProcessor = require('../../../../common/utils/templateProcessor')
 
 const _ignoreColumns = columns => {
   if (!(Array.isArray(columns) && columns.some(c => c === '*' || c.as || c.ref))) return true
@@ -111,10 +110,7 @@ const _columnsFromData = (data, definition, service) => {
   const columns = {}
   const template = getTemplate('odata-context', service, definition, { pick: element => element.isAssociation })
   if (!template || !template.elements.size) return ''
-  const arrayData = Array.isArray(data) ? data : data ? [data] : []
-  for (const row of arrayData) {
-    templateProcessor({ processFn: _processFn(columns), row, template, pathOptions: { pathSegmentsInfo: [] } })
-  }
+  template.process(data, _processFn(columns), { pathSegmentsInfo: [] })
   return _stringifyColumnsFromData(columns)
 }
 

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

@@ -4,7 +4,6 @@ const { Readable } = require('stream')
 const { big } = require('@sap/cds-foss')
 
 const getTemplate = require('../../../../common/utils/template')
-const templateProcessor = require('../../../../common/utils/templateProcessor')
 const { omitValue, applyOmitValuesPreference } = require('./omitValues')
 const { setLocationHeader } = require('./readAfterWrite')
 const normalizeTimestamp = require('../../../../common/utils/normalizeTimestamp')
@@ -251,19 +250,6 @@ const _processorFn = (req, previousResult, options) => elementInfo => {
   }
 }
 
-const _getParent = (model, name) => {
-  const target = model.definitions[name]
-
-  if (target && target.elements) {
-    for (const elementName in target.elements) {
-      const element = target.elements[elementName]
-      if (element._anchor && element._anchor._isContained) return element._anchor
-    }
-  }
-
-  return null
-}
-
 const _isUpAssoc = element => element && /^up_(_up_)*$/.test(element.name) && _isContainedOrBackLink(element)
 
 const _isContainedOrBackLink = element =>
@@ -365,29 +351,14 @@ const postProcess = (req, res, service, result, previousResult) => {
 
   const options = _getOptions(req)
   const cacheKey = _generateCacheKey(headers, options)
-  const parent = _getParent(model, target.name)
   // REVISIT: Why so many templates? -> Create only one (superset) template to reduce memory consumption
-  const template = getTemplate(cacheKey, service, target, { pick: _pick(options) }, parent)
+  const template = getTemplate(cacheKey, service, target, { pick: _pick(options) })
 
   if (template.elements.size === 0) return
 
   // normalize result to rows
   result = result.value != null && Object.keys(result).filter(k => !k.match(/^\W/)).length === 1 ? result.value : result
-
-  if (typeof result === 'object' && result != null) {
-    const rows = Array.isArray(result) ? result : [result]
-
-    // process each row
-    const processFn = _processorFn(req, previousResult, options)
-
-    for (const row of rows) {
-      templateProcessor({
-        processFn,
-        row,
-        template
-      })
-    }
-  }
+  template.process(result, _processorFn(req, previousResult, options))
 
   applyOmitValuesPreference(res, options.omitValuesPreference)
 }

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

@@ -133,6 +133,8 @@ const resolveUserAttrs = (where, req) => {
       r.ref.forEach(el => {
         if (el.where) el.where = resolveUserAttrs(el.where, req)
       })
+    } else if (r.func) {
+      r.args = resolveUserAttrs(r.args, req)
     }
   }
 

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

@@ -15,7 +15,6 @@ const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 const propagateForeignKeys = require('../utils/propagateForeignKeys')
 const { checkInputConstraints, assertTargets } = require('../../cds-services/util/assert')
 const getTemplate = require('../utils/template')
-const templateProcessor = require('../utils/templateProcessor')
 const { getDataFromCQN, setDataFromCQN } = require('../utils/data')
 const getRowUUIDGeneratorFn = require('../utils/rowUUIDGenerator')
 
@@ -276,11 +275,8 @@ async function commonGenericInput(req) {
 
   const data = getDataFromCQN(req.query) // REVISIT: req.data should point into req.query
   enrichDataWithKeysFromWhere(data, req, this)
-  const arrayData = Array.isArray(data) ? data : [data]
 
-  for (const row of arrayData) {
-    templateProcessor({ processFn: _getProcessorFn(req, errors, assertMap), row, template, pathOptions })
-  }
+  template.process(data, _getProcessorFn(req, errors, assertMap), pathOptions)
 
   if (assertMap.targets.size > 0) {
     await assertTargets(assertMap, errors)
@@ -314,12 +310,7 @@ const _processActionFunctionRow = (row, param, key, errors, event, service) => {
     ignore: element => element._isAssociationStrict
   })
 
-  if (template && template.elements.size) {
-    for (const value of values) {
-      const args = { processFn: _getProcessorFnForActionsFunctions(errors, key), row: value, template }
-      templateProcessor(args)
-    }
-  }
+  template.process(values, _getProcessorFnForActionsFunctions(errors, key))
 }
 
 const _processActionFunction = (row, eventParams, errors, event, service) => {

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

@@ -7,7 +7,6 @@
 
 const cds = require('../../cds')
 const getTemplate = require('../utils/template')
-const templateProcessor = require('../utils/templateProcessor')
 const { getDataFromCQN, setDataFromCQN } = require('../utils/data')
 
 const _fillStructure = (row, parts, element, category, args) => {
@@ -73,15 +72,7 @@ function commonGenericPut(req) {
   // REVISIT: req.data should point into req.query
   const data = getDataFromCQN(req.query)
 
-  const arrayData = Array.isArray(data) ? data : [data]
-  for (const row of arrayData) {
-    const args = {
-      processFn: _getProcessorFn(req),
-      row,
-      template
-    }
-    templateProcessor(args)
-  }
+  template.process(data, _getProcessorFn(req))
 
   // REVISIT: req.data should point into req.query
   setDataFromCQN(req)

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

@@ -1,5 +1,4 @@
 const getTemplate = require('./template')
-const templateProcessor = require('./templateProcessor')
 
 // convert the standard base64 encoding to the URL-safe variant
 const toBase64url = value => {
@@ -49,12 +48,7 @@ const _processorFn =
 
 const _processBinaryData = (data, srv, definition, toBuffer) => {
   const template = getTemplate('rest-payload', srv, definition, { pick: _picker })
-  if (template && template.elements.size) {
-    const rows = Array.isArray(data) ? data : [data]
-    for (const row of rows) {
-      templateProcessor({ processFn: _processorFn(toBuffer), row, template })
-    }
-  }
+  template.process(data, _processorFn(toBuffer))
 }
 
 const base64ToBuffer = (data, srv, definition) => {

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

@@ -95,7 +95,7 @@ const _newNestedData = (queryTarget, newData, ref, value) => {
 
   for (let i = 0; i < ref.length; i++) {
     currentEntity = currentEntity.elements[ref[i]]
-    if (currentEntity.isAssociation) {
+    if (!currentEntity || currentEntity.isAssociation) {
       // > don't follow associations
       break
     } else {
@@ -510,7 +510,7 @@ const _queryColumns = (target, columns = [], persistenceTable = false, force = f
 
       // There could be some `where` clause inside `ref` which we don't support yet
       if (!renamed.ref || renamed.ref.some(e => typeof e !== 'string') || renamed.xpr) return res
-      if (isTargetAliased) renamed.ref.shift()
+      if (isTargetAliased && renamed.ref[0] === from.as) renamed.ref.shift()
 
       // If the entity is annotated with the annotation `@cds.persistence.table`
       // and elements aliases exist, the aliases must be used as column references.

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

@@ -28,7 +28,7 @@ const search2cqn4sql = (query, model, options = {}) => {
   const columnsToBeSearched = computeColumnsToBeSearched(query, entity, alias)
   const expression = columnsToBeSearched?.length
     ? searchToLike(cqnSearchPhrase, columnsToBeSearched)
-    : [{ val: 0 }, '=', { val: 1 }]
+    : [{ val: '0' }, '=', { val: '1' }]
 
   // REVISIT: find out here if where or having must be used
   aggregated ? query.having(expression) : query.where(expression)

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

@@ -2,10 +2,23 @@ const cds = require('../../cds')
 const { ensureNoDraftsSuffix, ensureUnlocalized } = require('./draft')
 const { isDuplicate } = require('./rewriteAsterisks')
 
-const _addColumn = (name, type, columns, url) => {
-  const mediaType = typeof type === 'object' ? { ref: [type['='].replaceAll(/\./g, '_')] } : { val: type }
+const _addColumn = (name, type, columns, url, target) => {
+  let mediaType = typeof type === 'object' && type['=']
+  if (mediaType && target.elements[mediaType]?.virtual) return
+  mediaType = mediaType ? { ref: [mediaType.replaceAll(/\./g, '_')] } : { val: type }
   const col = {
-    xpr: ['case', 'when', { ref: [name] }, '=', { val: null }, 'then', 'NULL', 'else', mediaType, 'end'],
+    xpr: [
+      'case',
+      'when',
+      { ref: [name] },
+      '=',
+      { val: null },
+      'then',
+      { val: null },
+      'else',
+      { func: 'coalesce', args: [mediaType, { val: 'application/octet-stream' }] },
+      'end'
+    ],
     as: `${name}@odata.mediaContentType`
   }
 
@@ -23,8 +36,8 @@ const _addColumn = (name, type, columns, url) => {
 const _addColumns = (target, columns) => {
   for (const k in target.elements) {
     const el = target.elements[k]
-    if (el['@Core.MediaType']) {
-      _addColumn(el.name, el['@Core.MediaType'], columns, el['@Core.IsURL'] && el.type === 'cds.String')
+    if (el['@Core.MediaType'] && !el.virtual) {
+      _addColumn(el.name, el['@Core.MediaType'], columns, el['@Core.IsURL'] && el.type === 'cds.String', target)
     }
   }
 }
@@ -47,7 +60,7 @@ const handleStreamProperties = (target, columns, model) => {
       _addColumns(target, columns)
     } else if (col.ref && (type === 'cds.LargeBinary' || (mediaType && !ignoreMediaType))) {
       if (mediaType) {
-        _addColumn(name, mediaType, columns, element['@Core.IsURL'])
+        _addColumn(name, mediaType, columns, element['@Core.IsURL'], target)
         columns.splice(index, 1)
       } else if (!cds.env.features.stream_compat) {
         columns.splice(index, 1)

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

@@ -1,5 +1,7 @@
 const DELIMITER = require('./templateDelimiter')
 
+const templateProcessor = require('./templateProcessor')
+
 const _addSubTemplate = (templateElements, elementName, subTemplate) => {
   if (subTemplate.elements.size > 0) {
     const t = templateElements.get(elementName)
@@ -20,8 +22,8 @@ const _addCacheToTemplateElements = (templateElements, elementName, cached) => {
   else templateElements.set(elementName, cached)
 }
 
-const _pick = (pick, element, target, parent, templateElements, elementName) => {
-  const _picked = pick(element, target, parent)
+const _pick = (pick, element, target, templateElements, elementName) => {
+  const _picked = pick(element, target)
   if (_picked) _addToTemplateElements(templateElements, elementName, { plain: _picked })
 }
 
@@ -68,14 +70,25 @@ const _getNextTarget = (model, element, currentPath = []) => {
  * @param {object} callbacks
  * @param {function} callbacks.pick Callback function to pick elements. If it returns a truthy value, the element will be picked. The returned value is part of the template.
  * @param {function} callbacks.ignore Callback function to ignore the target of an element. If it returns a truthy value, the element's target will be ignored.
- * @param {object} [parent=null] The parent entity
  * @param {Map} [_entityMap] This parameter is an implementation side-effect — don't use it
  * @param {array} [targetPath=[]]
  */
-function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _entityMap = new Map(), targetPath = []) {
+function _getTemplate(model, cache, targetEntity, callbacks, _entityMap = new Map(), targetPath = []) {
   const { pick, ignore, flatAccess } = callbacks
   const templateElements = new Map()
-  const template = { target: targetEntity, elements: templateElements }
+  const template = {
+    target: targetEntity,
+    elements: templateElements,
+    process(data, fn, pathOptions) {
+      templateProcessor({
+        processFn: fn,
+        data,
+        template,
+        pathOptions,
+        isRoot: true
+      })
+    }
+  }
   const currentPath = [...targetPath, targetEntity.name]
   _entityMap.set(currentPath.join(DELIMITER), { template })
   const elements = targetEntity.elements || targetEntity.params
@@ -85,17 +98,17 @@ function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _ent
     if (targetEntity._flat2struct) {
       for (const elementName in targetEntity._flat2struct) {
         const element = targetEntity._flat2struct[elementName]
-        _pick(pick, element, targetEntity, parent, templateElements, elementName)
+        _pick(pick, element, targetEntity, templateElements, elementName)
       }
     }
   }
 
   for (const elementName in elements) {
     const element = elements[elementName]
-    _pick(pick, element, targetEntity, parent, templateElements, elementName)
+    _pick(pick, element, targetEntity, templateElements, elementName)
 
     if (element.items) {
-      _pick(pick, element.items, targetEntity, parent, templateElements, ['_itemsOf', elementName].join(DELIMITER))
+      _pick(pick, element.items, targetEntity, templateElements, ['_itemsOf', elementName].join(DELIMITER))
     }
 
     const { nextTargetName, nextTarget } = _getNextTarget(model, element, currentPath)
@@ -109,10 +122,10 @@ function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _ent
       // inline structures must be handled separately.
       let subTemplate
       if (_isInlineStructured(element))
-        subTemplate = _getTemplate(model, cache, nextTarget, callbacks, targetEntity, _entityMap, currentPath)
+        subTemplate = _getTemplate(model, cache, nextTarget, callbacks, _entityMap, currentPath)
       else if (cache.has(nextTarget)) subTemplate = cache.get(nextTarget)
       else {
-        subTemplate = _getTemplate(model, cache, nextTarget, callbacks, targetEntity, _entityMap)
+        subTemplate = _getTemplate(model, cache, nextTarget, callbacks, _entityMap)
         cache.set(nextTarget, subTemplate)
       }
       _addSubTemplate(templateElements, elementName, subTemplate)
@@ -129,16 +142,13 @@ module.exports = (usecase, tx, target, ...args) => {
   const model = tx.model
   if (!model) return
 
-  const root = model.definitions[target.name] || target
-  if (!root) return
-
   if (!model._templateCache) Object.defineProperty(model, '_templateCache', { value: new Map() })
   if (!model._templateCache.get(usecase)) model._templateCache.set(usecase, new WeakMap())
 
-  let tmplt = model._templateCache.get(usecase).get(root)
+  let tmplt = model._templateCache.get(usecase).get(target)
   if (!tmplt) {
-    tmplt = _getTemplate(model, model._templateCache.get(usecase), root, ...args)
-    model._templateCache.get(usecase).set(root, tmplt)
+    tmplt = _getTemplate(model, model._templateCache.get(usecase), target, ...args)
+    model._templateCache.get(usecase).set(target, tmplt)
   }
   return tmplt
 }

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

@@ -48,7 +48,7 @@ const _processComplex = (processFn, row, template, key, pathOptions) => {
 
   for (const row of rows) {
     if (row == null) continue
-    const args = { processFn, row, template, isRoot: false, pathOptions }
+    const args = { processFn, data: row, template, isRoot: false, pathOptions }
 
     let pathSegmentInfo
     if (pathOptions.includeKeyValues) {
@@ -63,12 +63,13 @@ const _processComplex = (processFn, row, template, key, pathOptions) => {
   }
 }
 
-/**
- * @param {import("../../types/api").TemplateProcessor} args
- */
-const templateProcessor = ({ processFn, row, template, isRoot = true, pathOptions = {} }) => {
-  for (const [tKey, tValue] of template.elements) {
-    _processRow(processFn, row, template, tKey, tValue, isRoot, pathOptions)
+const templateProcessor = ({ processFn, data, template, isRoot = true, pathOptions = {} }) => {
+  if (!template || !template.elements.size || !data || typeof data !== 'object') return
+  const dataArr = Array.isArray(data) ? data : [data]
+  for (const row of dataArr) {
+    for (const [tKey, tValue] of template.elements) {
+      _processRow(processFn, row, template, tKey, tValue, isRoot, pathOptions)
+    }
   }
 }
 

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

@@ -1,7 +1,6 @@
 const cds = require('../../cds')
 const getError = require('../error')
 const getTemplate = require('./template')
-const templateProcessor = require('./templateProcessor')
 const IS_PROXY = Symbol('flat2structProxy')
 
 const proxifyIfFlattened = (definition, payload) => {
@@ -106,10 +105,8 @@ function convertStructured(service, definition, data, { cleanupNull = false, cle
   const template = getTemplate('universal-input', service, definition, { pick: _picker, flatAccess })
   const arrayData = Array.isArray(data) ? data : [data]
   if (template && template.elements.size) {
-    for (let i = 0; i < arrayData.length; i++) {
-      const row = proxifyIfFlattened(definition, arrayData[i])
-      templateProcessor({ processFn: _processor, row, template })
-    }
+    const _data = arrayData.map(d => proxifyIfFlattened(definition, d))
+    template.process(_data, _processor)
   }
   for (const row of arrayData) {
     _cleanup(row, definition, cleanupNull, cleanupStruct, errors)

package/libx/_runtime/db/expand/expandCQNToJoin.js

@@ -999,6 +999,16 @@ class JoinCQNFromExpanded {
               const res = this._buildNewAliasColumn(x, entity, tableAlias, mappings, true)
               delete res.as
               return res
+            }
+            if (x.func && x.args) {
+              x.args = x.args.map(arg => {
+                if (arg.ref) {
+                  const res = this._buildNewAliasColumn(arg, entity, tableAlias, mappings, true)
+                  delete res.as
+                  return res
+                } else return arg
+              })
+              return x
             } else return x
           })
         },

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

@@ -16,7 +16,6 @@ const normalizeTimeData = require('../utils/normalizeTimeData')
 const { enrichDataWithKeysFromWhere } = require('../../common/utils/keys')
 const propagateForeignKeys = require('../../common/utils/propagateForeignKeys')
 const getTemplate = require('../../common/utils/template')
-const templateProcessor = require('../../common/utils/templateProcessor')
 
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
@@ -220,10 +219,7 @@ function dbGenericInput(req) {
 
   if (!draft) enrichDataWithKeysFromWhere(req.data, req, this)
 
-  const data = Array.isArray(req.data) ? req.data : [req.data]
-  for (const row of data) {
-    templateProcessor({ processFn: _processorFn(req), row, template })
-  }
+  template.process(req.data, _processorFn(req))
 }
 
 dbGenericInput._initial = true