@sap/cds 5.5.3 → 5.6.1

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

@@ -1,13 +1,9 @@
 const cds = require('../../cds')
 
-const { isSelfManaged, isBacklink } = require('../utils/backlinks')
-
 const { ensureNoDraftsSuffix } = require('../utils/draft')
 const { isRootEntity } = require('../utils/csn')
 const { getTransition, getDBTable } = require('../utils/resolveView')
 
-const { foreignKeyPropagations } = require('../utils/foreignKeyPropagations')
-
 const getError = require('../../common/error')
 
 /*
@@ -15,21 +11,25 @@ const getError = require('../../common/error')
  */
 
 const _foreignKeysToLinks = (element, inverse) =>
-  foreignKeyPropagations(element).map(e => {
+  element._foreignKeys.map(e => {
     e = inverse
       ? {
-          childFieldName: e.parentFieldName,
-          parentFieldName: e.childFieldName,
+          childElement: e.parentElement,
+          parentElement: e.childElement,
           childFieldValue: e.parentFieldValue,
           parentFieldValue: e.childFieldValue,
           prefix: e.prefix
         }
       : e
-    const link = {
-      entityKey:
-        e.prefix && !e.parentFieldName.includes(e.prefix) ? e.prefix + '_' + e.parentFieldName : e.parentFieldName,
-      targetKey: e.prefix && !e.childFieldName.includes(e.prefix) ? e.prefix + '_' + e.childFieldName : e.childFieldName
-    }
+    const link = {}
+    if (e.parentElement)
+      link.entityKey =
+        e.prefix && !e.parentElement.name.includes(e.prefix)
+          ? `${e.prefix}_${e.parentElement.name}`
+          : e.parentElement.name
+    if (e.childElement)
+      link.targetKey =
+        e.prefix && !e.childElement.name.includes(e.prefix) ? `${e.prefix}_${e.childElement.name}` : e.childElement.name
     if (e.parentFieldValue !== undefined) link.entityVal = e.parentFieldValue
     if (e.childFieldValue !== undefined) link.targetVal = e.childFieldValue
     return link
@@ -57,7 +57,7 @@ const _resolvedElement = (element, service) => {
 const _navigationExistsInCompositionMap = (element, compositionMap) =>
   compositionMap.has(element.target) && element._isCompositionEffective
 
-const _isUnManaged = element => element.on && !isSelfManaged(element)
+const _isUnManaged = element => element.on && !element._isSelfManaged
 
 const _isNonRecursiveNavigation = (element, rootEntityName) =>
   rootEntityName !== element.target && element._isCompositionEffective
@@ -106,7 +106,7 @@ const _getCompositionTreeRec = ({
         backLinks: [],
         customBackLinks: []
       })
-      if (!isSelfManaged(element)) {
+      if (!element._isSelfManaged) {
         const backLinks = _foreignKeysToLinks(element, true) || []
         if (element.is2many) {
           compositionElement.customBackLinks.push(...backLinks)
@@ -118,7 +118,11 @@ const _getCompositionTreeRec = ({
         for (const backLinkName in targetEntity.elements) {
           const _backLink = targetEntity.elements[backLinkName]
           if (!_backLink._isAssociationEffective) continue
-          if (isBacklink(_backLink, definitions[compositionElement.target], false, element.name)) {
+          if (
+            _backLink._isCompositionBacklink &&
+            _backLink.target === compositionElement.target &&
+            _backLink._anchor.name === element.name
+          ) {
             const backLinks = _foreignKeysToLinks(_backLink) || []
             if (_isUnManaged(element)) {
               compositionElement.customBackLinks.push(...backLinks)
@@ -131,7 +135,7 @@ const _getCompositionTreeRec = ({
       compositionTree.compositionElements.push(compositionElement)
     } else if (_isNonRecursiveNavigation(element, rootEntityName)) {
       const subObject = _createSubElement(element, definitions)
-      if (!isSelfManaged(element)) {
+      if (!element._isSelfManaged) {
         const backLinks = _foreignKeysToLinks(element, true) || []
         if (element.is2many) {
           subObject.customBackLinks.push(...backLinks)
@@ -151,7 +155,8 @@ const _getCompositionTreeRec = ({
       })
     } else if (
       element._isAssociationEffective &&
-      isBacklink(element, definitions[compositionTree.target], false, compositionTree.name) &&
+      element._isCompositionBacklink &&
+      element.target === compositionTree.target &&
       compositionMap.has(element.target)
     ) {
       const backLinks = _foreignKeysToLinks(element) || []
@@ -218,7 +223,7 @@ const _cacheCompositionParentsOfOne = ({ definitions }) => {
     if (!parent.kind === 'entity' || !parent.elements) continue
     for (const elementName in parent.elements) {
       const element = parent.elements[elementName]
-      if (element._isCompositionEffective && element.is2one && !isSelfManaged(element)) {
+      if (element._isCompositionEffective && element.is2one && !element._isSelfManaged) {
         const targetName = element.target
         const target = definitions[targetName]
         if (!target) continue

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

@@ -1,5 +1,3 @@
-const { isSelfManaged } = require('../utils/backlinks')
-
 const { ensureNoDraftsSuffix, ensureDraftsSuffix } = require('../utils/draft')
 
 const addDraftSuffix = (draft, name) => {
@@ -24,6 +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
     result[element.name] = data[element.name]
     return result
   }, {})
@@ -33,10 +32,6 @@ const val = element => (element && element.val) || element
 
 const array = x => (Array.isArray(x) ? x : [x])
 
-const isManaged = element => {
-  return isSelfManaged(element) || !element.on
-}
-
 const isCompOrAssoc = (entity, k, onlyToOne) => {
   return (
     entity.elements &&
@@ -60,6 +55,37 @@ const cleanDeepData = (entity, data, onlyToOne = false) => {
   })
 }
 
+const _getBacklinkNameFromOnCond = element => {
+  if (element.on && element.on.length === 3 && element.on[0].ref && element.on[2].ref) {
+    if (element.on[0].ref[0] === '$self') {
+      return element.on[2].ref[element.on[2].ref.length - 1]
+    } else if (element.on[2].ref[0] === '$self') {
+      return element.on[0].ref[element.on[0].ref.length - 1]
+    }
+  }
+}
+
+const isBacklink = (element, parent, checkContained, backLinkName) => {
+  if (!element._isAssociationStrict) return false
+  if (!parent || !(element.keys || element.on)) return false
+  if (element.target !== parent.name) return false
+
+  const _isBackLink = parentElement =>
+    (!checkContained || parentElement._isContained) && _getBacklinkNameFromOnCond(parentElement) === element.name
+
+  if (backLinkName) {
+    const parentElement = parent.elements[backLinkName]
+    return parentElement.isAssociation && _isBackLink(parentElement)
+  }
+  for (const parentElementName in parent.elements) {
+    const parentElement = parent.elements[parentElementName]
+    if (!parentElement.isAssociation) continue
+    if (_isBackLink(parentElement)) return true
+  }
+
+  return false
+}
+
 module.exports = {
   addDraftSuffix,
   whereKey,
@@ -67,7 +93,7 @@ module.exports = {
   key,
   val,
   array,
-  isManaged,
   isCompOrAssoc,
-  cleanDeepData
+  cleanDeepData,
+  isBacklink
 }

package/libx/_runtime/common/error/frontend.js

@@ -22,6 +22,8 @@ const {
   MAX_SEVERITY
 } = require('./constants')
 
+const SKIP_SANITIZATION = '@cds.skip_sanitization'
+
 const _getFiltered = err => {
   const error = {}
 
@@ -103,10 +105,13 @@ const normalizeError = (err, req) => {
   // make sure it's a number
   statusCode = statusCode ? Number(statusCode) : 500
 
-  if (statusCode >= 500 && process.env.NODE_ENV === 'production') {
+  // REVISIT: make === 500 in cds^6
+  // error[SKIP_SANITIZATION] is not an official API!!!
+  if (statusCode >= 500 && process.env.NODE_ENV === 'production' && !error[SKIP_SANITIZATION]) {
     // > return sanitized error to client
     return { error: { code: `${statusCode}`, message: i18n(statusCode, locale) }, statusCode }
   }
+  delete error[SKIP_SANITIZATION]
 
   // no top level null codes
   if (error.code === 'null') {

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

@@ -6,7 +6,7 @@ const cds = require('../../cds')
 const { SELECT } = cds.ql
 
 const { getRequiresAsArray } = require('../utils/auth')
-const cqn2cqn4sql = require('../utils/cqn2cqn4sql')
+const { cqn2cqn4sql } = require('../utils/cqn2cqn4sql')
 const { isActiveEntityRequested, removeIsActiveEntityRecursively } = require('../../fiori/utils/where')
 const { ensureDraftsSuffix } = require('../../fiori/utils/handler')
 
@@ -204,9 +204,10 @@ const _findTableName = (ref, aliases) => {
 
 const _getTableForColumn = (col, aliases, model) => {
   for (let i = 0; i < aliases.length; i++) {
-    const alias = aliases[i]
+    const index = aliases.length - i - 1
+    const alias = aliases[index]
     if (Object.keys(model.definitions[alias].elements).includes(col)) {
-      return { index: i, table: alias.replace(/\./g, '_') }
+      return { index, table: alias.replace(/\./g, '_') }
     }
   }
 
@@ -549,13 +550,18 @@ const _addNormalizedRestrict = (restrict, restricts, definition, definitions) =>
     if (where) {
       // operate on a copy
       let _where = where
-      const paths = where.match(/ (\w*)\.(\w*)/g) || []
+      // find all path expressions in order to normalize shorthand (i.e., inject "[exists ...]")
+      const paths = (where.match(/ (\w\.*)*/g) || []).filter(m => m.match(/\./) && m !== ' ')
       for (let i = 0; i < paths.length; i++) {
         const parts = paths[i].trim().split('.')
         let current = definition
         while (parts.length) {
           current = current.elements[parts.shift()]
-          if (current.is2many) _where = _where.replace(current.name + '.', current.name + '[exists ') + ']'
+          if (current.isAssociation && _where.includes(current.name + '.')) {
+            const matches = _where.match(new RegExp(`(${current.name}).(.*)]`))
+            _where = _where.replace(`${matches[1]}.`, `${current.name}[exists `)
+            _where = _where.replace(matches[2], `${matches[2]}]`)
+          }
           if (current.target) current = definitions[current.target]
         }
       }
@@ -882,19 +888,15 @@ const _secureDependentEntities = srv => {
   }
 }
 
-module.exports = function () {
-  /*
-   * @restrict, @requires, @readonly, @insertonly, and @Capabilities for entities
-   */
+module.exports = cds.service.impl(function () {
+  // @restrict, @requires, @readonly, @insertonly, and @Capabilities for entities
   _secureDependentEntities(this)
   for (const k in this.entities) {
     const entity = this.entities[k]
     if (!_authDependsOnParents(entity)) _registerAuthHandlers(entity, this)
   }
 
-  /*
-   * @restrict and @requires for operations
-   */
+  // @restrict and @requires for operations
   for (const k in this.operations) {
     const operation = this.operations[k]
 
@@ -904,4 +906,4 @@ module.exports = function () {
     // @restrict
     _registerOperationRestrictHandlers(operation, this)
   }
-}
+})

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

@@ -67,7 +67,7 @@ const _updateReqData = (req, that) => {
   }
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   this.on(['CREATE', 'READ', 'UPDATE', 'DELETE'], '*', async function (req) {
     if (typeof req.query !== 'string' && req.target && req.target._hasPersistenceSkip) {
       req.reject(501, 'PERSISTENCE_SKIP_NO_GENERIC_CRUD', [req.target.name])
@@ -128,4 +128,4 @@ module.exports = function () {
 
     return req.data
   })
-}
+})

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

@@ -2,9 +2,9 @@ const cds = require('../../cds')
 const { SELECT } = cds.ql
 
 // REVISIT: draft should not be handled here, e.g., target.name should be adjusted before
-const { isActiveEntityRequested, removeIsActiveEntityRecursively } = require('../../fiori/utils/where')
+const { isActiveEntityRequested } = require('../../fiori/utils/where')
 const { ensureDraftsSuffix } = require('../../fiori/utils/handler')
-const cqn2cqn4sql = require('../../common/utils/cqn2cqn4sql')
+const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const ODataRequest = require('../../cds-services/adapter/odata-v4/ODataRequest')
 
 const C_U_ = {
@@ -22,10 +22,11 @@ const getSelectCQN = (query, target, model) => {
   } else {
     requestTarget = query.DELETE.from
   }
+
+  const targetName = isActiveEntityRequested(requestTarget.ref[0].where) ? target.name : ensureDraftsSuffix(target.name)
   const cqn = cqn2cqn4sql(SELECT.from(requestTarget), model)
-  cqn.SELECT.from.ref[0] = isActiveEntityRequested(cqn.SELECT.where) ? target.name : ensureDraftsSuffix(target.name)
   cqn.columns([target._etag])
-  cqn.SELECT.where = removeIsActiveEntityRecursively(cqn.SELECT.where)
+  cqn.SELECT.from.ref[0] = targetName
 
   return cqn
 }
@@ -60,11 +61,12 @@ const _handler = async function (req) {
   }
 }
 
-/*
+/**
  * handler registration
+ *
  */
 /* istanbul ignore next */
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   _handler._initial = true
 
   for (const k in this.entities) {
@@ -75,8 +77,9 @@ module.exports = function () {
       continue
     }
 
-    // Handler for CREATE is registered for backwards compatiblity w.r.t. ETag generation
+    // handler for CREATE is registered for backwards compatibility w.r.t. ETag generation
     let events = ['CREATE', 'READ', 'UPDATE', 'DELETE']
+
     // if odata and fiori is separated, this will not be needed in the odata version
     if (entity._isDraftEnabled) {
       events = ['READ', 'NEW', 'DELETE', 'PATCH', 'EDIT', 'CANCEL']
@@ -88,4 +91,4 @@ module.exports = function () {
       this.before(action, entity, _handler)
     }
   }
-}
+})

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

@@ -8,7 +8,7 @@
  */
 
 const cds = require('../../cds')
-const enrichDataWithKeysFromWhere = require('../utils/enrichWithKeysFromWhere')
+const { enrichDataWithKeysFromWhere } = require('../utils/keys')
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 const { checkInputConstraints, checkIfAssocDeep } = require('../../cds-services/util/assert')
 const getTemplate = require('../utils/template')
@@ -295,7 +295,7 @@ function _actionFunctionHandler(req) {
 _handler._initial = true
 _actionFunctionHandler._initial = true
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   this.before(['CREATE', 'UPDATE', 'NEW', 'PATCH'], '*', _handler)
 
   const operationNames = []
@@ -318,4 +318,4 @@ module.exports = function () {
       this.before(boundOps, entity.name, _actionFunctionHandler)
     }
   }
-}
+})

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

@@ -1,3 +1,4 @@
+const cds = require('../../cds')
 const { getDefaultPageSize } = require('../utils/page')
 
 const _handler = function (req) {
@@ -5,15 +6,18 @@ const _handler = function (req) {
   if (!req._.req) return
 
   // target === null if view with parameters
-  if (!req.target || !req.query.SELECT || req.query.SELECT.limit || req.query.SELECT.one) return
+  if (!req.target || !req.query.SELECT || req.query.SELECT.one) return
 
-  req.query.limit(...[getDefaultPageSize(req.target), 0])
+  let { rows, offset } = req.query.SELECT.limit || {}
+  rows = rows && 'val' in rows ? rows.val : getDefaultPageSize(req.target)
+  offset = offset && 'val' in offset ? offset.val : 0
+  req.query.limit(...[rows, offset])
 }
 
-/*
+/**
  * handler registration
  */
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   _handler._initial = true
   this.before('READ', '*', _handler)
-}
+})

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

@@ -5,6 +5,7 @@
  *   and is neither key nor read-only (e.g., managed, virtual, etc.)
  */
 
+const cds = require('../../cds')
 const getTemplate = require('../utils/template')
 const templateProcessor = require('../utils/templateProcessor')
 const { getDataFromCQN, setDataFromCQN } = require('../utils/data')
@@ -90,6 +91,6 @@ function _handler(req) {
 
 _handler._initial = true
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   this.before(['UPDATE'], '*', _handler)
-}
+})

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

@@ -85,13 +85,13 @@ const _handler = function (req) {
   }
 }
 
-/*
+/**
  * handler registration
  */
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   _handler._initial = true
   this.before('READ', '*', _handler)
-}
+})
 
 // REVISIT: remove (currently needed for test)
 module.exports.handler = _handler

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

@@ -71,11 +71,11 @@ const _handler = function (req) {
   }
 }
 
-/*
+/**
  * handler registration
  */
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   _handler._initial = true
   // always run to allow interaction with temporal data in custom handlers
   this.before('*', _handler)
-}
+})

package/libx/_runtime/common/toggles/alpha.js

@@ -8,7 +8,7 @@ module.exports = cds => {
     // attach _getHash helper to mtx
     if (!cds.mtx._getHash) {
       cds.mtx._getHash = req => {
-        let hash = req.user.tenant
+        let hash = req.tenant
         if (req.features) hash += ':' + Object.keys(req.features).join(';')
         return hash
       }

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

@@ -16,7 +16,26 @@ const getEntityNameFromUpdateCQN = cqn => {
   return (cqn.UPDATE.entity.ref && cqn.UPDATE.entity.ref[0]) || cqn.UPDATE.entity.name || cqn.UPDATE.entity
 }
 
+// scope: simple wheres à la "[{ ref: ['foo'] }, '=', { val: 'bar' }, 'and', ... ]"
+function where2obj(where, target = null) {
+  const data = {}
+  for (let i = 0; i < where.length; i++) {
+    const whereEl = where[i]
+    const colName = whereEl.ref && whereEl.ref[whereEl.ref.length - 1]
+    // optional validation if target is passed
+    if (target) {
+      const colEl = target.elements[colName]
+      if (!colEl || !colEl.key) continue
+    }
+    const opWhere = where[i + 1]
+    const valWhere = where[i + 2]
+    if (opWhere === '=' && valWhere && 'val' in valWhere) data[colName] = valWhere.val
+  }
+  return data
+}
+
 module.exports = {
   getEntityNameFromDeleteCQN,
-  getEntityNameFromUpdateCQN
+  getEntityNameFromUpdateCQN,
+  where2obj
 }