@sap/cds 5.5.5 → 5.6.0

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

@@ -13,8 +13,8 @@ const cds = require('../../cds')
 
 const normalizeTimeData = require('../utils/normalizeTimeData')
 
-const enrichDataWithKeysFromWhere = require('../../common/utils/enrichWithKeysFromWhere')
-const { foreignKeyPropagations, propagateForeignKeys } = require('../../common/utils/foreignKeyPropagations')
+const { enrichDataWithKeysFromWhere } = require('../../common/utils/keys')
+const { propagateForeignKeys } = require('../../common/utils/propagateForeignKeys')
 const getTemplate = require('../../common/utils/template')
 const templateProcessor = require('../../common/utils/templateProcessor')
 
@@ -25,13 +25,13 @@ const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 const _isManaged = (category, event) =>
   (category === '@cds.on.insert' && event === 'CREATE') || (category === '@cds.on.update' && event === 'UPDATE')
 
-const _processComplexCategory = ({ row, key, val, category, req }) => {
+const _processComplexCategory = ({ row, key, val, category, req, element }) => {
   const categoryArgs = category.args
   category = category.category
 
   // propagate keys
   if (category === 'propagateForeignKeys') {
-    propagateForeignKeys(key, row, categoryArgs.foreignKeyPropagations, { onlyWriteCompositionEffective: true })
+    propagateForeignKeys(key, row, element._foreignKeys, element._isCompositionEffective)
     return
   }
 
@@ -63,7 +63,7 @@ const _processComplexCategory = ({ row, key, val, category, req }) => {
 const _processCategory = ({ category, row, key, element, val, req }) => {
   // use args only inside this if (sonar type error warning)
   if (typeof category === 'object') {
-    _processComplexCategory({ category, row, key, val, req })
+    _processComplexCategory({ category, row, key, val, req, element })
     return
   }
 
@@ -136,12 +136,8 @@ const _pick = element => {
     categories.push('associationEffective')
   }
 
-  if (element.isAssociation) {
-    const _foreignKeyPropagations = foreignKeyPropagations(element)
-
-    if (_foreignKeyPropagations) {
-      categories.push({ category: 'propagateForeignKeys', args: { foreignKeyPropagations: _foreignKeyPropagations } })
-    }
+  if (element.isAssociation && element._foreignKeys.length) {
+    categories.push({ category: 'propagateForeignKeys' })
   }
 
   // generate uuid

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

@@ -1,7 +1,7 @@
 const cds = require('../../cds')
 const { SELECT } = cds.ql
 
-const cqn2cqn4sql = require('../../common/utils/cqn2cqn4sql')
+const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const { getDependents } = require('../../common/utils/csn')
 
 const CRUD = {
@@ -54,7 +54,7 @@ async function beforeDelete(req) {
     select = select.where(req.query.DELETE.where)
   }
 
-  select = cqn2cqn4sql(select, this.model)
+  select = cqn2cqn4sql(select, this.model, { service: this })
 
   req._beforeDeleteData = await this._read(this.model, this.dbc, select, req.context || req)
 }

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

@@ -1,6 +1,5 @@
-const cqn2cqn4sql = require('../../common/utils/cqn2cqn4sql')
+const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const generateAliases = require('../utils/generateAliases')
-const rewriteAsterisk = require('../../common/utils/rewriteAsterisk')
 const { restoreLink } = require('../../common/utils/resolveView')
 
 const _isLinked = req => {
@@ -21,13 +20,11 @@ function handler(req) {
   const streaming = req.query._streaming
   const validationQuery = req.query._validationQuery
 
-  rewriteAsterisk(req)
-
   // for restore link to req.data
   const linked = _isLinked(req)
 
   // convert to sql cqn
-  req.query = cqn2cqn4sql(req.query, this.model)
+  req.query = cqn2cqn4sql(req.query, this.model, { service: this })
 
   // REVISIT: should not be necessary
   // restore link to req.data

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

@@ -75,6 +75,7 @@ module.exports = async function (req) {
   } catch (err) {
     // REVISIT: db specifics
     if (err.message.match(/unique constraint/i)) {
+      err.originalMessage = err.message
       err.message = 'UNIQUE_CONSTRAINT_VIOLATION'
       err.code = 400
     }

package/libx/_runtime/db/query/read.js

@@ -10,8 +10,8 @@ function _arrayWithCount(a, count) {
 }
 
 function _createCountQuery(query) {
-  const _query = JSON.parse(JSON.stringify(query)) // REVISIT: Use query.clone() insteadconst _query = JSON.parse(JSON.stringify(query))
-  _query.SELECT.columns = [{ func: 'count', args: [{ val: 1 }], as: '_counted_' }]
+  const _query = JSON.parse(JSON.stringify(query)) // REVISIT: Use query.clone() instead
+  _query.SELECT.columns = [{ func: 'count', args: [{ val: 1 }], as: '$count' }]
   delete _query.SELECT.groupBy
   delete _query.SELECT.limit
   delete _query.SELECT.orderBy // not necessary to keep that
@@ -25,6 +25,11 @@ function _createCountQuery(query) {
   return _query
 }
 
+const countValue = countResult => {
+  if (countResult._counted_ != null) return countResult._counted_
+  if (countResult.$count != null) return countResult.$count
+}
+
 const read = (executeSelectCQN, executeStreamCQN) => (model, dbc, query, req) => {
   const { user, locale, timestamp } = req
   const isoTs = timestampToISO(timestamp)
@@ -45,11 +50,11 @@ const read = (executeSelectCQN, executeStreamCQN) => (model, dbc, query, req) =>
       const countResultPromise = executeSelectCQN(model, dbc, countQuery, user, locale, isoTs)
       if (query.SELECT.limit.rows && query.SELECT.limit.rows.val === 0) {
         // We don't need to perform our result query
-        return countResultPromise.then(countResult => _arrayWithCount([], countResult[0]._counted_))
+        return countResultPromise.then(countResult => _arrayWithCount([], countValue(countResult[0])))
       } else {
         const resultPromise = executeSelectCQN(model, dbc, query, user, locale, isoTs)
         return Promise.all([countResultPromise, resultPromise]).then(([countResult, result]) =>
-          _arrayWithCount(result, countResult[0]._counted_)
+          _arrayWithCount(result, countValue(countResult[0]))
         )
       }
     } else {

package/libx/_runtime/db/sql-builder/SelectBuilder.js

@@ -390,8 +390,13 @@ class SelectBuilder extends BaseBuilder {
           }
         }
       }
-
-      const { sql, values } = new this.ReferenceBuilder(element, this._options, this._csn).build()
+      const { sql, values } = new this.ReferenceBuilder(
+        Object.assign({}, element, {
+          sort: Object.prototype.hasOwnProperty.call(element, 'sort') ? element.sort : true
+        }),
+        this._options,
+        this._csn
+      ).build()
       sqls.push(sql)
       this._outputObj.values.push(...values)
     }

package/libx/_runtime/db/sql-builder/annotations.js

@@ -1,4 +1,5 @@
 const getColumns = require('../utils/columns')
+//  REVISIT: Remove support for @odata.on... with @sap/cds ^6
 const ANNOTATIONS = ['@cds.on.insert', '@odata.on.insert', '@cds.on.update', '@odata.on.update']
 const { ensureNoDraftsSuffix } = require('../../common/utils/draft')
 

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

@@ -3,17 +3,6 @@ const resolveStructured = require('../../common/utils/resolveStructured')
 
 const { DRAFT_COLUMNS } = require('../../common/constants/draft')
 
-const _filterAssociationAndComposition = (entity, columnName) => {
-  return entity.elements[columnName]
-    ? entity.elements[columnName].is2one !== true && entity.elements[columnName].is2many !== true
-    : true
-}
-const _filterDraft = (entity, columnName) => {
-  return DRAFT_COLUMNS.includes(columnName) !== true && _filterAssociationAndComposition(entity, columnName)
-}
-
-const _mapNameToValue = (entity, array) => array.map(key => entity.elements[key] || { name: key })
-
 /**
  * This method gets all columns for an entity.
  * It includes the generated foreign keys from managed associations, structured elements and complex and custom types.
@@ -22,42 +11,24 @@ const _mapNameToValue = (entity, array) => array.map(key => entity.elements[key]
  * @param entity - the csn entity
  * @returns {Array} - array of columns
  */
-const getColumns = entity => {
+const getColumns = (entity, { db, onlyKeys } = { db: true, onlyKeys: false }) => {
   // REVISIT is this correct or just a problem that occurs because of new structure we do not deal with yet?
-  if (!entity.elements) return []
-
-  let columnNames
+  if (!(entity && entity.elements)) return []
+  const columnNames = []
   // REVISIT!!!
-  const proto = Object.getPrototypeOf(entity.elements)
-  if (proto) columnNames = Object.keys(proto)
-  else columnNames = Object.keys(entity.elements)
-
-  if (cds.env.effective.odata.structs) {
-    const toBeDeleted = []
-    for (const column of columnNames) {
-      const element = entity.elements[column]
-      if (element && element.elements) {
-        toBeDeleted.push(column)
-        columnNames.push(
-          ...resolveStructured({ structName: element.name, structProperties: [] }, element.elements, false)
-        )
-      }
+  const 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 (db && entity._isDraftEnabled && DRAFT_COLUMNS.includes(elementName)) continue
+    if (cds.env.effective.odata.structs && element.elements) {
+      columnNames.push(...resolveStructured({ structName: elementName, structProperties: [] }, element.elements, false))
+      continue
     }
-
-    columnNames = columnNames.filter(col => !toBeDeleted.includes(col))
+    columnNames.push(elementName)
   }
-
-  if (entity && entity._isDraftEnabled) {
-    return _mapNameToValue(
-      entity,
-      columnNames.filter(key => _filterDraft(entity, key))
-    )
-  }
-
-  return _mapNameToValue(
-    entity,
-    columnNames.filter(key => _filterAssociationAndComposition(entity, key))
-  )
+  return columnNames.map(name => elements[name] || { name })
 }
 
 module.exports = getColumns

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

@@ -93,6 +93,7 @@ const _draftCompositionTree = async (service, req) => {
   }
 
   if (results[1].length === 1) {
+    _removeIsActiveEntityRecursively(results[1])
     activeData = results[1][0]
   }
 
@@ -175,8 +176,8 @@ const _handler = async function (req) {
   return result
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('draftActivate', entity, _handler)
   }
-}
+})

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

@@ -186,7 +186,7 @@ const _deleteCancel = async function (req) {
   await _addDraftDataFromExistingDraft(req, this)
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   _new._initial = true
   _patchUpdate._initial = true
   _deleteCancel._initial = true
@@ -196,4 +196,4 @@ module.exports = function () {
     this.before(['PATCH', 'UPDATE'], entity, _patchUpdate)
     this.before(['DELETE', 'CANCEL'], entity, _deleteCancel)
   }
-}
+})

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

@@ -1,3 +1,4 @@
+const cds = require('../../cds')
 const { deleteDraft } = require('../utils/delete')
 
 /**
@@ -11,8 +12,8 @@ const _handler = function (req) {
   return deleteDraft(req, this)
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('CANCEL', entity, _handler)
   }
-}
+})

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

@@ -1,3 +1,4 @@
+const cds = require('../../cds')
 const { deleteDraft } = require('../utils/delete')
 
 /**
@@ -13,8 +14,8 @@ const _handler = function (req) {
   return deleteDraft(req, this, true)
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('DELETE', entity, _handler)
   }
-}
+})

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

@@ -172,8 +172,8 @@ const _handler = async function (req) {
   return Object.assign({}, results[0][0], { HasDraftEntity: false, HasActiveEntity: true, IsActiveEntity: false })
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('EDIT', entity, _handler)
   }
-}
+})

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

@@ -96,8 +96,8 @@ const _handler = async function (req, next) {
   return result[0]
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('NEW', entity, _handler)
   }
-}
+})

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

@@ -91,8 +91,8 @@ const _handler = async function (req) {
   return result[0]
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('PATCH', entity, _handler)
   }
-}
+})

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

@@ -50,8 +50,8 @@ const _handler = async function (req) {
   return result[0]
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('draftPrepare', entity, _handler)
   }
-}
+})

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

@@ -1,7 +1,7 @@
 const cds = require('../../cds')
 const { SELECT } = cds.ql
 
-const cqn2cqn4sql = require('../../common/utils/cqn2cqn4sql')
+const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const { getElementDeep } = require('../../common/utils/csn')
 
 const { DRAFT_COLUMNS, DRAFT_COLUMNS_MAP, SCENARIO } = require('../../common/constants/draft')
@@ -15,7 +15,6 @@ const {
   getEnrichedCQN,
   removeDraftUUIDIfNecessary,
   replaceRefWithDraft,
-  hasKeyInWhere,
   filterKeys
 } = require('../utils/handler')
 const { deleteCondition, readAndDeleteKeywords, removeIsActiveEntityRecursively } = require('../utils/where')
@@ -186,34 +185,6 @@ function _copyArray(array) {
   })
 }
 
-const _whereContainsKeys = (req, whereDraft) => {
-  const keys = _getTargetKeys(req)
-  if (whereDraft.length < keys.length * 4 - 1) {
-    return false
-  }
-
-  let i = 0
-  let keyCount = 0
-  while (i < whereDraft.length) {
-    const element = whereDraft[i]
-    const op = whereDraft[i + 1]
-    if (element.ref && keys.some(x => x === element.ref[element.ref.length - 1]) && op === '=') {
-      // op is EQ by keys
-      i = i + 4
-      keyCount++
-      continue
-    }
-
-    i++
-  }
-
-  return keyCount === keys.length
-}
-
-const _isValidActive = (isActiveEntity, req, whereDraft) => {
-  return isActiveEntity.op === '=' && _isTrue(isActiveEntity.value.val) && _whereContainsKeys(req, whereDraft)
-}
-
 const _isValidDraftOfWhichIAmOwner = isActiveEntity => {
   return isActiveEntity.op === '=' && _isFalse(isActiveEntity.value.val)
 }
@@ -275,7 +246,7 @@ const _filterDraftColumnsBySelected = (draftColumns, columns) => {
   )
 }
 
-const _isOnlyCount = columns => columns.length === 1 && columns[0].as === '_counted_'
+const _isOnlyCount = columns => columns.length === 1 && (columns[0].as === '_counted_' || columns[0].as === '$count')
 
 const _getOuterMostColumns = (columnsFromRequest, additionalDraftColumns) => {
   if (_isOnlyCount(columnsFromRequest)) return columnsFromRequest
@@ -428,18 +399,6 @@ const _allActive = (req, columns, model) => {
   }
 }
 
-const _active = (req, draftWhere, columns) => {
-  const { table } = _getTableName(req)
-
-  const outerMostColumns = _getOuterMostColumns(columns, _getDraftPropertiesDetermineDraft(req, draftWhere))
-
-  const cqn = SELECT.from(table).columns(...outerMostColumns)
-
-  draftWhere = _getWhereWithAppendedDraftRestrictions(draftWhere, req)
-
-  return { cqn: getEnrichedCQN(cqn, req.query.SELECT, draftWhere), scenario: SCENARIO.ACTIVE }
-}
-
 const _activeWithoutDraft = (req, draftWhere, columns) => {
   const { table } = _getTableName(req, true)
   const draftName = table.ref[0]
@@ -805,7 +764,7 @@ const _getUnionCQN = (req, draftName, columns, subSelect, draftWhere) => {
         _alignAliasForUnion(ensureNoDraftsSuffix(req.target.name), req.query.SELECT.from.as, subSelect)
       ])
 
-    return union.columns({ func: 'sum', args: [{ ref: ['_counted_'] }], as: '_counted_' })
+    return union.columns({ func: 'sum', args: [{ ref: ['$count'] }], as: '$count' })
   }
 
   const enrichedColumns = _getOrderByEnrichedColumns(req.query.SELECT.orderBy, columns)
@@ -941,9 +900,6 @@ const _validatedWithSiblingInProcess = (req, draftWhere, draftParameters, column
   }
 }
 
-const _validatedActive = (req, draftWhere, draftParameters, columns) =>
-  _isValidActive(draftParameters.isActiveEntity, req, draftWhere) && _active(req, draftWhere, columns)
-
 const _validatedDraftOfWhichIAmOwner = (req, draftWhere, draftParameters, columns) =>
   _isValidDraftOfWhichIAmOwner(draftParameters.isActiveEntity) && _draftOfWhichIAmOwner(req, draftWhere, columns)
 
@@ -989,20 +945,16 @@ const _generateCQN = (reqOriginal, req, columns, model) => {
     return _allActive(req, columns, model)
   }
 
-  if (req.query.SELECT.where.length === 1 && req.query.SELECT.where[0].xpr) {
-    // REVISIT ugly workaround until we support .xpr instead of '('...')' in draft choreo
-    req.query.SELECT.where = req.query.SELECT.where[0].xpr
-  }
+  // REVISIT this function does not only read, but modifies where!
   const draftParameters = _readDraftParameters(req.query.SELECT.where)
 
   if (
     draftParameters.isActiveEntity &&
     _isTrue(draftParameters.isActiveEntity.value.val) &&
     !draftParameters.siblingIsActive &&
-    !draftParameters.hasDraftEntity &&
-    !hasKeyInWhere(reqOriginal.query.SELECT.from.ref[0].where, model.definitions[req.query.SELECT.from.ref[0]])
+    !draftParameters.hasDraftEntity
   ) {
-    return _allActive(req, columns)
+    return _allActive(req, columns, model)
   }
 
   if (!draftParameters.isActiveEntity) {
@@ -1012,7 +964,7 @@ const _generateCQN = (reqOriginal, req, columns, model) => {
       // this is only the case when navigating into tree
       return _allInactive(req, columns)
     }
-    return _allActive(req, columns)
+    return _allActive(req, columns, model)
   }
 
   if (draftParameters.hasDraftEntity) {
@@ -1023,9 +975,7 @@ const _generateCQN = (reqOriginal, req, columns, model) => {
     return _validatedWithSiblingInProcess(req, req.query.SELECT.where, draftParameters, columns)
   }
 
-  return _isTrue(draftParameters.isActiveEntity.value.val)
-    ? _validatedActive(req, req.query.SELECT.where, draftParameters, columns)
-    : _validatedDraftOfWhichIAmOwner(req, req.query.SELECT.where, draftParameters, columns)
+  return _validatedDraftOfWhichIAmOwner(req, req.query.SELECT.where, draftParameters, columns)
 }
 
 const _getColumns = ({ query: { SELECT } }, model) => {
@@ -1183,7 +1133,7 @@ const _handler = async function (req) {
   delete req.query._validationQuery
 
   // REVISIT DRAFT HANDLING: cqn2cqn4sql must not be called here
-  const sqlQuery = cqn2cqn4sql(req.query, this.model)
+  const sqlQuery = cqn2cqn4sql(req.query, this.model, { draft: true })
 
   // do not clone with Object.assign as that would skip all non-enumerable properties
   const reqClone = { __proto__: req, query: _copyCQNPartial(sqlQuery) }
@@ -1204,7 +1154,11 @@ const _handler = async function (req) {
     return
   }
 
-  const enhacnedWithLastChangeDateTime = enhanceQueryForTimeoutIfNeeded(
+  if (cqnScenario.scenario === SCENARIO.ALL_ACTIVE && cqnScenario.cqn.SELECT.where) {
+    cqnScenario.cqn.SELECT.where = removeIsActiveEntityRecursively(cqnScenario.cqn.SELECT.where)
+  }
+
+  const enhancedWithLastChangeDateTime = enhanceQueryForTimeoutIfNeeded(
     cqnScenario.scenario,
     cqnScenario.cqn.SELECT.columns
   )
@@ -1228,7 +1182,7 @@ const _handler = async function (req) {
     _calculateDraftAdminColumns(resultAsArray[0], req.user.id)
   }
 
-  calculateDraftTimeout(cqnScenario.scenario, resultAsArray, enhacnedWithLastChangeDateTime)
+  calculateDraftTimeout(cqnScenario.scenario, resultAsArray, enhancedWithLastChangeDateTime)
 
   if (cqnScenario.scenario === SCENARIO.SIBLING_ENTITY) {
     if (!result || (Array.isArray(result) && !result.length)) return result
@@ -1247,8 +1201,8 @@ const _handler = async function (req) {
   return result
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('READ', entity, _handler)
   }
-}
+})

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

@@ -2,7 +2,7 @@ const cds = require('../../cds')
 const { SELECT } = cds.ql
 const { getEnrichedCQN, hasDraft, ensureDraftsSuffix } = require('../utils/handler')
 const { readAndDeleteKeywords } = require('../utils/where')
-const cqn2cqn4sql = require('../../common/utils/cqn2cqn4sql')
+const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 
 const _modifyCQN = (cqnDraft, where, context) => {
   const whereDraft = [...where]
@@ -45,7 +45,7 @@ const _handler = async function (req) {
   }
 
   // REVISIT DRAFT HANDLING: cqn2cqn4sql must not be called here
-  const sqlQuery = cqn2cqn4sql(req.query, this.model)
+  const sqlQuery = cqn2cqn4sql(req.query, this.model, { draft: true })
   if (req.query._streaming) {
     sqlQuery._streaming = true
   }
@@ -70,8 +70,8 @@ const _handler = async function (req) {
   return cds.tx(req).run(sqlQuery)
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => !e._isDraftEnabled)) {
     this.on('READ', entity, _handler)
   }
-}
+})

package/libx/_runtime/fiori/uiflex/extensibility/index.cds

@@ -0,0 +1,15 @@
+namespace cds_r; //> cds system tables
+
+service ExtensibilityService @(path:'/-/cds/extensibility') {
+  action addExtension(extensions : array of String); // TODO: change to array of CSN extensions
+}
+
+entity Extensions {
+  key ID : UUID;
+  csn    : String;
+}
+
+// @open type Extension {
+//   extend: String;
+//   elements:{ /*  */ }
+// }