@sap/cds 7.0.2 → 7.1.0

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

@@ -1,14 +1,14 @@
 const { getCompositionTree } = require('./tree')
 const ctUtils = require('./utils')
 const { getEntityNameFromUpdateCQN } = require('../utils/cqn')
-
 const { ensureNoDraftsSuffix } = require('../utils/draft')
 const { getDBTable } = require('../utils/resolveView')
 const { cqn2cqn4sql } = require('../utils/cqn2cqn4sql')
 const cds = require('../../cds')
+const { DRAFT_COLUMNS_MAP } = require('../constants/draft')
 const { SELECT } = cds.ql
 
-const CHUNK_SIZE = cds.env.features.chunk_deep || Number.MAX_VALUE
+const CHUNK_SIZE = cds.env.features.chunk_deep ?? Number.MAX_VALUE
 
 /*
  * own utils
@@ -21,9 +21,11 @@ const _isSameEntityInWhere = (where, target, persistentObj) => {
       if (!res) return res
       continue
     }
+
     if (!where[i] || !where[i].ref || !target.elements[where[i].ref]) {
       continue
     }
+
     const key = where[i].ref
     const val = where[i + 2].val
     const sign = where[i + 1]
@@ -32,6 +34,7 @@ const _isSameEntityInWhere = (where, target, persistentObj) => {
       return false
     }
   }
+
   return true
 }
 
@@ -40,27 +43,33 @@ const _isSameEntity = (cqn, req) => {
   const persistentObj = Array.isArray(req._.partialPersistentState)
     ? req._.partialPersistentState[0]
     : req._.partialPersistentState
+
   if (!persistentObj) {
     // If no data was found we don't know if it is the same entity
     return false
   }
+
   const target = getDBTable(req.target)
   if (target.name !== (cqn.UPDATE.entity.ref && cqn.UPDATE.entity.ref[0]) && target.name !== cqn.UPDATE.entity) {
     return false
   }
+
   return _isSameEntityInWhere(where, target, persistentObj)
 }
 
 const _getLinksOfCompTree = compositionTree => {
   const links = []
+
   for (const link of [...compositionTree.backLinks, ...compositionTree.customBackLinks]) {
     links.push(link.entityKey)
   }
+
   for (const compElement of compositionTree.compositionElements || []) {
     for (const link of [...compElement.backLinks, ...compElement.customBackLinks]) {
       links.push(link.targetKey)
     }
   }
+
   return links
 }
 
@@ -74,12 +83,14 @@ const _whereKeys = keySet => {
       list: keys0.map(k => ({ val: row[k] }))
     }))
   }
+
   return [keys, 'in', values]
 }
 
 const _parentKey = (element, key) => {
   let links = [...element.customBackLinks, ...element.backLinks]
   if (element.is2one && links.some(l => l.for2one)) links = links.filter(l => l.for2one)
+
   return links.reduce((parentKey, customBackLink) => {
     // TODO: why Object.prototype.hasOwnProperty?
     parentKey[customBackLink.entityKey] = Object.prototype.hasOwnProperty.call(key, customBackLink.targetKey)
@@ -111,11 +122,7 @@ const _findWhere = (data, where) => {
   })
 }
 
-const _keys = (entity, data) => {
-  return data.map(entry => {
-    return ctUtils.key(entity, entry)
-  })
-}
+const _keys = (entity, data) => data.map(entry => ctUtils.key(entity, entry))
 
 const _parentKeys = (element, keys) => {
   return keys.map(key => _parentKey(element, key)).filter(ele => Object.keys(ele).length)
@@ -143,12 +150,16 @@ const _getWhereObj = (row, links) => {
 const _subWhere = (result, element) => {
   let where
   let links = [...element.backLinks, ...element.customBackLinks]
+
   if (element.is2one && links.some(l => l.for2one)) links = links.filter(l => l.for2one)
+
   if (result.length && links && links.length > 0) {
     where = {}
     const keys0 = Object.keys(_getWhereObj(result[0], links))
+
     if (keys0.length) {
       const keys = { list: keys0.map(pk => ({ ref: [pk] })) }
+
       for (let i = 0; i < result.length; i += CHUNK_SIZE) {
         const values = {
           list: result.slice(i, i + CHUNK_SIZE).map(row => ({
@@ -161,39 +172,46 @@ const _subWhere = (result, element) => {
       }
     }
   }
+
   return where
 }
 
 const _mergeResults = (result, selectData, root, model, compositionTree, entityName) => {
   if (root) {
     return [...selectData, ...result]
-  } else {
-    const parent = model.definitions[compositionTree.target] || model.definitions[entityName]
-    const assoc = (parent && parent.elements[compositionTree.name]) || {}
-    return selectData.map(selectEntry => {
-      if (assoc.is2one) {
-        selectEntry[compositionTree.name] = selectEntry[compositionTree.name] || {}
-      } else if (assoc.is2many) {
-        selectEntry[compositionTree.name] = selectEntry[compositionTree.name] || []
-      }
-      const newData = _findWhere(result, _parentKey(compositionTree, selectEntry))
-      if (assoc.is2one) {
-        if (newData[0]) selectEntry[compositionTree.name] = Object.assign(selectEntry[compositionTree.name], newData[0])
-        else selectEntry[compositionTree.name] = null
-      } else if (assoc.is2many) {
-        selectEntry[compositionTree.name].push(...newData)
-      }
-      return selectEntry
-    })
   }
+
+  const parent = model.definitions[compositionTree.target] || model.definitions[entityName]
+  const assoc = (parent && parent.elements[compositionTree.name]) || {}
+
+  return selectData.map(selectEntry => {
+    if (assoc.is2one) {
+      selectEntry[compositionTree.name] = selectEntry[compositionTree.name] || {}
+    } else if (assoc.is2many) {
+      selectEntry[compositionTree.name] = selectEntry[compositionTree.name] || []
+    }
+
+    const newData = _findWhere(result, _parentKey(compositionTree, selectEntry))
+    if (assoc.is2one) {
+      if (newData[0]) selectEntry[compositionTree.name] = Object.assign(selectEntry[compositionTree.name], newData[0])
+      else selectEntry[compositionTree.name] = null
+    } else if (assoc.is2many) {
+      selectEntry[compositionTree.name].push(...newData)
+    }
+
+    return selectEntry
+  })
 }
 
-const _columns = (entity, data, compositionTree, selectAllColumns) => {
+const _columns = (entity, data, compositionTree, selectAllColumns, draft) => {
   const backLinkKeys = _getLinksOfCompTree(compositionTree)
   const columns = []
+
   for (const elementName in entity.elements) {
     const element = entity.elements[elementName]
     if (element.virtual || element.isAssociation) continue
+    if (!draft && elementName in DRAFT_COLUMNS_MAP) continue
+
     if (
       selectAllColumns ||
       element.key ||
@@ -203,6 +221,7 @@ const _columns = (entity, data, compositionTree, selectAllColumns) => {
       columns.push({ ref: [element.name] })
     }
   }
+
   return columns
 }
 
@@ -223,7 +242,7 @@ const _select = ({
   const from = ctUtils.addDraftSuffix(draft, entity.name)
   const selectCQN = SELECT.from(from)
   if (alias) selectCQN.SELECT.from.as = alias
-  selectCQN.SELECT.columns = _columns(entity, data, compositionTree, selectAllColumns)
+  selectCQN.SELECT.columns = _columns(entity, data, compositionTree, selectAllColumns, draft)
   if (where) selectCQN.SELECT.where = where
   else if (parentKeys) selectCQN.SELECT.where = _whereKeys(parentKeys)
   if (orderBy) selectCQN.SELECT.orderBy = orderBy
@@ -256,6 +275,7 @@ const _selectDeepUpdateData = async args => {
     const selectCQN = _select(args)
     result = await tx.run(selectCQN)
   }
+
   if (!result.length) return Promise.resolve(result)
 
   const keys = _keys(model.definitions[entityName], result)
@@ -312,7 +332,7 @@ const selectDeepUpdateData = (service, model, req, selectAllColumns = false) =>
   const where = sqlQuery.UPDATE.where || []
   const entityName = ensureNoDraftsSuffix(from)
   const draft = entityName !== from
-  const orderBy = req && req.target && req.target.query && req.target.query.SELECT && req.target.query.SELECT.orderBy
+  const orderBy = req?.target?.query?.SELECT?.orderBy
   _resolveOrderBy(orderBy, sqlQuery.UPDATE._transitions)
   const data = Object.assign({}, sqlQuery.UPDATE.data || {}, query.UPDATE.with || {})
   const compositionTree = getCompositionTree({
@@ -331,7 +351,7 @@ const selectDeepUpdateData = (service, model, req, selectAllColumns = false) =>
     where,
     orderBy,
     draft,
-    singleton: req && req.target && req.target._isSingleton,
+    singleton: req?.target?._isSingleton,
     alias,
     selectAllColumns,
     root: true,

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

@@ -282,7 +282,6 @@ const getDeepUpdateCQNs = async (model, req, selectData) => {
   if (!Array.isArray(selectData)) selectData = [selectData]
 
   if (selectData.length === 0) return []
-
   if (selectData.length > 1) throw getError('Deep update can only be performed on a single instance')
 
   const cqns = []

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

@@ -22,7 +22,7 @@ const keyElements = entity => {
 
 const key = (entity, data) => {
   return keyElements(entity).reduce((result, element) => {
-    if (element.name === 'IsActiveEntity' && !Object.prototype.hasOwnProperty.call(data, element.name)) return result
+    if (element.name === 'IsActiveEntity' && !Object.hasOwn(data, element.name)) return result
     result[element.name] = data[element.name]
     return result
   }, {})

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

@@ -74,6 +74,7 @@ exports.impl = cds.service.impl(function () {
         const res = await pathExistsQuery
         if (res.length === 0) req.reject(404)
       }
+
       if (result == null && req._etagValidationType === 'if-match') req.reject(412)
       return result
     }
@@ -92,7 +93,6 @@ exports.impl = cds.service.impl(function () {
 
     // flag to trigger read after write in protocol adapter
     req._.readAfterWrite = true
-
     return req.data
   })
 

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

@@ -9,6 +9,7 @@
 
 const cds = require('../../cds')
 const LOG = cds.log('app')
+
 const { enrichDataWithKeysFromWhere } = require('../utils/keys')
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 const propagateForeignKeys = require('../utils/propagateForeignKeys')
@@ -35,13 +36,6 @@ const _getSimpleCategory = category => {
   return category
 }
 
-const _isDraftCoreComputed = (req, element, event) =>
-  element['@Core.Computed'] &&
-  cds.env.features.preserve_computed !== false &&
-  req._ &&
-  req._.event === 'draftActivate' &&
-  !((event === 'CREATE' && element['@cds.on.insert']) || element['@cds.on.update'])
-
 const _preProcessAssertTarget = (assocInfo, assertMap) => {
   const { element: assoc, row } = assocInfo
   const assocTarget = assoc._target
@@ -95,6 +89,7 @@ const _preProcessAssertTarget = (assocInfo, assertMap) => {
   })
 }
 
+// eslint-disable-next-line complexity
 const _processCategory = (req, category, value, elementInfo, assertMap) => {
   const { row, key, element, isRoot } = elementInfo
   category = _getSimpleCategory(category)
@@ -112,12 +107,22 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
 
   const event = req.event
 
-  // remove readonly & immutable (can also be complex, so do first)
-  if (category === 'readonly' || (category === 'immutable' && event === 'UPDATE')) {
-    if (_isDraftCoreComputed(req, element, event)) {
-      // > preserve computed values if triggered by draftActivate and not managed
-      return
-    }
+  // remove readonly (can also be complex, so do first)
+  if (category === 'readonly') {
+    // preserve computed values if triggered by draftActivate and not managed
+    const managed = `@cds.on.${event === 'CREATE' ? 'insert' : 'update'}`
+    if (cds.env.features.preserve_computed !== false && req._?.event === 'draftActivate' && !element[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
+    return
+  }
+
+  // remove immutable (can also be complex, so do first)
+  if (category === 'immutable' && event === 'UPDATE') {
     // Always take over the values from active entities
     if (cds.env.fiori?.lean_draft && req.context?.event === 'EDIT') return
 

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

@@ -837,7 +837,7 @@ const _convertUpsert = (query, model) => {
   Object.assign(upsert.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
+  // required for deploying of extensions, not used anywhere else except UpsertBuilder
   resolved._target = resolved.UPSERT?._transitions?.[0].target || query._target
   // resolved._target = query._target
   return resolved