@sap/cds 5.6.2 → 5.6.3

package/CHANGELOG.md

@@ -4,6 +4,16 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 5.6.3 - 2021-11-15
+
+### Fixed
+
+- `cds run` does not fail if `cds.requires.multitenancy` is explicitly set to `false`
+- Calculation of `DraftIsCreatedByMe` or `DraftIsProcessedByMe` when expanding or navigating to `DraftAdministrativeData`
+- Nested `any` in `$filter` query option
+- Crash on draft activate after draft edit for not existing composition of one, if no explicit DB service is defined
+- Typescript definition of `srv.delete` no longer leads to a duplication error
+
 ## Version 5.6.2 - 2021-11-08
 
 ### Fixed

package/apis/services.d.ts

@@ -165,6 +165,10 @@ export class Service extends QueryAPI {
 	 * @see [capire docs](https://cap.cloud.sap/docs/node.js/services#srv-send)
 	 */
 	delete (entityOrPath: Target, data?: object) : Promise<this>
+	/**
+	 * @see [docs](https://cap.cloud.sap/docs/node.js/services#srv-run)
+	 */
+	delete <T>(entity : Definition | string, key?: any) : DELETE<T>
 
 	 // The central method to dispatch events
 	dispatch (msg: EventMessage): Promise<any>

package/lib/env/index.js

@@ -242,7 +242,11 @@ _loadFromPath (_path, _basePath) {
 
   _link_required_services () {
     const { requires } = this, protos = requires && requires._prototypes || {}
-    for (let each in requires)  requires[each] = _merged (each)
+    for (let each in requires) {
+      requires[each] = _merged (each)
+      // if we got an invalid value, remove it (would anyways cause trouble down the road)
+      if (!requires[each])  delete requires[each]
+    }
     function _merged (key) {
       const entry = requires[key] || protos[key]
       if (!entry || entry._is_merged || entry.kind === key || !(entry.kind in requires) && !(entry.kind in protos)) return entry

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/ExpressionToCQN.js

@@ -59,6 +59,8 @@ class ExpressionToCQN {
   }
 
   _lambda(pathSegments) {
+    // we don't care about the variable name
+    if (pathSegments[0].getKind() === 'EXPRESSION.VARIABLE') pathSegments = pathSegments.slice(1)
     const nav =
       pathSegments.length > 2 ? pathSegments.slice(0, pathSegments.length - 2).map(this._segmentFromMember) : []
     const navName = this._segmentFromMember(pathSegments[pathSegments.length - 2])

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

@@ -208,7 +208,10 @@ function _addSubDeepUpdateCQNRecursion({ definitions, compositionTree, entity, d
         const selectEntry = selectDataByKey.get(_serializedKey(entity, entry))
 
         if (selectEntry && element.name in selectEntry) {
-          if (selectEntry[element.name] === null && Object.keys(entry[element.name]).length === 0) {
+          if (
+            selectEntry[element.name] === null &&
+            (entry[element.name] === null || Object.keys(entry[element.name]).length === 0)
+          ) {
             continue
           }
           _addToData(selectSubData, entity, element, selectEntry)

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

@@ -257,12 +257,29 @@ const _getOuterMostColumns = (columnsFromRequest, additionalDraftColumns) => {
   return columns
 }
 
+// adds base columns 'InProcessByUser' and 'CreatedByUser' to columns param if needed
+// those are required for calculating 'DraftIsProcessedByMe' and 'DraftIsCreatedByMe'
+const _ensureDraftAdminColumnsForCalculation = columns => {
+  columns.forEach((c, i) => {
+    if (c.ref && c.ref[0] === 'DraftIsCreatedByMe' && !columns.find(e => e.ref && e.ref[0] === 'CreatedByUser')) {
+      columns.push({ ref: ['CreatedByUser'] })
+    } else if (
+      c.ref &&
+      c.ref[0] === 'DraftIsProcessedByMe' &&
+      !columns.find(e => e.ref && e.ref[0] === 'InProcessByUser')
+    ) {
+      columns.push({ ref: ['InProcessByUser'] })
+    }
+  })
+}
+
 const _draftAdminTable = req => {
   const { table } = _getTableName(req)
 
   let cqn = SELECT.from(table)
   if (req.query.SELECT.columns) {
     cqn = cqn.columns(...req.query.SELECT.columns)
+    _ensureDraftAdminColumnsForCalculation(cqn.SELECT.columns)
   }
 
   return {
@@ -1119,6 +1136,14 @@ const _getLocalizedEntity = (model, target, user) => {
   return localizedEntity || model.definitions[`${prefix}.${target.name}`]
 }
 
+const _adaptDraftAdminExpand = cqn => {
+  const draftAdminExpand =
+    cqn.SELECT.columns && cqn.SELECT.columns.find(c => c.expand && c.ref[0] === 'DraftAdministrativeData')
+  if (draftAdminExpand) {
+    _ensureDraftAdminColumnsForCalculation(draftAdminExpand.expand)
+  }
+}
+
 /**
  * Generic Handler for READ requests in the context of draft.
  *
@@ -1154,6 +1179,9 @@ const _handler = async function (req) {
     return
   }
 
+  // ensure base columns for calculation are selected in draft admin expand
+  _adaptDraftAdminExpand(cqnScenario.cqn)
+
   if (cqnScenario.scenario === SCENARIO.ALL_ACTIVE && cqnScenario.cqn.SELECT.where) {
     cqnScenario.cqn.SELECT.where = removeIsActiveEntityRecursively(cqnScenario.cqn.SELECT.where)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "5.6.2",
+  "version": "5.6.3",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [