@sap/cds 6.6.1 → 6.7.0

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)
   }
 

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

@@ -111,7 +111,7 @@ class RawToExpanded {
         let expandedItems = this._getResultCache(toManyTree.concat(key))[mapping[GET_KEY_VALUE](false, entry)] || []
 
         // the expanded items may include the actives of the deleted drafts -> filter out
-        if (!cds.env.features.lean_draft && rootIsActiveEntity !== null) {
+        if (!cds.env.fiori.lean_draft && rootIsActiveEntity !== null) {
           if (mapping[TO_ACTIVE]) expandedItems = expandedItems.filter(ele => ele.IsActiveEntity !== false)
           else expandedItems = expandedItems.filter(ele => !!ele.IsActiveEntity === rootIsActiveEntity)
         }
@@ -144,7 +144,7 @@ class RawToExpanded {
           else if (rootIsActiveEntity) row[key] = parsed && parsed.IsActiveEntity !== false ? parsed : null
           else row[key] = parsed && parsed.IsActiveEntity === rootIsActiveEntity ? parsed : null
         }
-        if (mapping[CLEANUP_KEYS]) {
+        if (parsed && mapping[CLEANUP_KEYS]) {
           for (const key in mapping[CLEANUP_KEYS]) delete parsed[key]
         }
       } else {
@@ -153,7 +153,7 @@ class RawToExpanded {
         // Assume a DB will not return undefined, but always null
         this._convertValue(rawValue, conversionMapper.get(mapping), mapping, row, key)
 
-        isEntityNull = this._isNull(isEntityNull, rawValue)
+        isEntityNull = this._isNull(isEntityNull, rawValue, key)
       }
     }
 
@@ -173,12 +173,12 @@ class RawToExpanded {
    * @returns {boolean}
    * @private
    */
-  _isNull(isEntityNull, value) {
+  _isNull(isEntityNull, value, key) {
     if (isEntityNull === undefined) {
-      return value === null || value === undefined
+      return value === null || value === undefined || key === 'IsActiveEntity'
     }
 
-    return isEntityNull === true && (value === null || value === undefined)
+    return isEntityNull === true && (value === null || value === undefined || key === 'IsActiveEntity')
   }
 
   /**

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

@@ -333,7 +333,7 @@ const _checkReferenceIntegrity = (entity, data, req, csn, run) => {
 }
 
 const _checkIntegrityWrapper = (req, csn, run) => async (data, entity) => {
-  if (cds.env.features.lean_draft && entity.name?.endsWith('.drafts')) return
+  if (cds.env.fiori.lean_draft && entity.name?.endsWith('.drafts')) return
   const errors = await _checkReferenceIntegrity(entity, data, req, csn, run)
   if (errors && errors.length !== 0) for (const err of errors) req.error(err)
 }

package/libx/_runtime/db/utils/columns.js

@@ -16,15 +16,15 @@ const getColumns = (entity, { _4db, onlyKeys } = { _4db: true, onlyKeys: false }
   if (!(entity && entity.elements)) return []
   const columnNames = []
   // REVISIT!!!
-  const elements = cds.env.features.lean_draft
-    ? entity.elements
-    : Object.getPrototypeOf(entity.elements) || entity.elements
+  const { structs = cds.env.features.ucsn_struct_conversion } = cds.env.effective.odata
+  const { lean_draft } = cds.env.fiori
+  const elements = lean_draft ? entity.elements : Object.getPrototypeOf(entity.elements) || entity.elements
   for (const elementName in elements) {
     const element = elements[elementName]
     if (onlyKeys && !element.key) continue
     if (element.isAssociation) continue
-    if (!cds.env.features.lean_draft && _4db && entity._isDraftEnabled && elementName in DRAFT_COLUMNS_MAP) continue
-    if ((cds.env.effective.odata.structs || cds.env.features.ucsn_struct_conversion) && element.elements) {
+    if (!lean_draft && _4db && entity._isDraftEnabled && elementName in DRAFT_COLUMNS_MAP) continue
+    if (structs && element.elements) {
       columnNames.push(...resolveStructured({ element, structProperties: [] }, false))
       continue
     }

package/libx/_runtime/fiori/generic/activate.js

@@ -146,8 +146,8 @@ const fioriGenericActivate = async function (req) {
 
   // REVISIT: should not be necessary
   r._ = Object.assign(r._, req._)
-  r.getUriInfo = () => req.getUriInfo()
-  r.getUrlObject = () => req.getUrlObject()
+  if (req.getUriInfo) r.getUriInfo = () => req.getUriInfo()
+  if (req.getUrlObject) r.getUrlObject = () => req.getUrlObject()
   r._.params = req.params
   r._.query = req.query
 
@@ -178,7 +178,7 @@ const fioriGenericActivate = async function (req) {
 
   // REVISIT: we need to use okra API here because it must be set in the batched request
   // status code must be set in handler to allow overriding for FE V2
-  req?._?.odataRes.setStatusCode(201)
+  req?._?.odataRes?.setStatusCode(201)
 
   return result
 }

package/libx/_runtime/fiori/generic/edit.js

@@ -164,7 +164,7 @@ const fioriGenericEdit = async function (req) {
 
   // REVISIT: we need to use okra API here because it must be set in the batched request
   // status code must be set in handler to allow overriding for FE V2
-  req?._?.odataRes.setStatusCode(201)
+  req?._?.odataRes?.setStatusCode(201)
 
   return results[0][0]
 }

package/libx/_runtime/fiori/generic/new.js

@@ -56,6 +56,10 @@ const fioriGenericNew = async function (req, next) {
 
   if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
 
+  const isRoot = typeof req.query.INSERT.into === 'string' || req.query.INSERT.into.ref?.length === 1
+  // Only allowed for pseudo draft roots (entities with this action)
+  if (isRoot && !req.target['@Common.DraftRoot.ActivationAction']) req.reject(403, 'DRAFT_MODIFICATION_ONLY_VIA_ROOT')
+
   const navigationToMany = isNavigationToMany(req)
 
   const adminDataCQN = navigationToMany