@sap/cds 5.7.3 → 5.7.4

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.7.4 - 2021-12-22
+
+### Fixed
+
+- Complex `@restrict.where: 'exists [...] or (... or ...) or ...'` in draft union scenario no longer crashes the application
+- Sanitization of null values for `cds.RemoteService`
+- Handling of boolean values in draft union scenario with `$expand` query option
+- `_4odata` flag in CQN stays non-enumerable when forwarding to another application service
+- Handling of type references on properties of associations in `cds.minify`
+
 ## Version 5.7.3 - 2021-12-16
 
 ### Fixed

package/lib/compile/minify.js

@@ -35,7 +35,7 @@ module.exports = function cds_minify (csn, _roots = global.cds.env.features.skip
       if (d.startsWith('cds.')) return
       else d = all[d]
     } else if (d.ref) return d.ref.reduce((p,n) => {
-      let d = p.elements[n.id || n] // > n.id -> view with parameters
+      let d = (p.elements || csn.definitions[p.target].elements)[n.id || n] // > n.id -> view with parameters
       _visit(d)
       return d
     },{elements:all})

package/libx/_runtime/cds-services/services/Service.js

@@ -128,7 +128,7 @@ class ApplicationService extends cds.Service {
       // compat
       restoreLink(req)
       if (req.query.SELECT && req.query.SELECT._4odata) {
-        q.SELECT._4odata = req.query.SELECT._4odata
+        Object.defineProperty(q.SELECT, '_4odata', { value: req.query.SELECT._4odata })
       }
 
       // REVISIT: We need to provide target explicitly because it's cached already within ensure_target

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

@@ -465,7 +465,7 @@ const _convertWhereExists = (where, cqn, model, options) => {
     }
 
     if (element.xpr) {
-      _convertWhereExists(element.xpr) // > recursing into nested {xpr}
+      _convertWhereExists(element.xpr, cqn, model, options) // > recursing into nested {xpr}
     } else if (element === 'exists' && _isAny(where[i + 1])) {
       where[i + 1] = _getWhereExistsSubSelect(cqn, where, i + 1, model, options)
     } else if (element === 'not' && where[i + 1] === 'exists' && _isAll(where[i + 2])) {

package/libx/_runtime/db/data-conversion/post-processing.js

@@ -1,6 +1,6 @@
 const cds = require('../../cds')
 
-const { ensureUnlocalized } = require('../../common/utils/draft')
+const { ensureUnlocalized, ensureNoDraftsSuffix } = require('../../common/utils/draft')
 
 /**
  * Check if the value is a function or reference to private function.
@@ -48,45 +48,45 @@ const _getEntityName = (csn, from) => {
 
 const _refs = (refs, as) => {
   const arr = []
-  const hasOwnProperty = Object.prototype.hasOwnProperty
-
   for (const element of refs) {
     // multiple join are nested, so we need to find all the table names in there as well
-    if (hasOwnProperty.call(element, 'join')) {
+    if (Object.prototype.hasOwnProperty.call(element, 'join')) {
       arr.push(..._extractRefs(element))
       // Likely a union
-    } else if (hasOwnProperty.call(element, 'SELECT')) {
-      arr.push(..._extractRefs(element.SELECT.from, as))
+    } else if (Object.prototype.hasOwnProperty.call(element, 'SELECT')) {
+      arr.push(..._extractRefs(element.SELECT.from, element.as))
     } else {
-      arr.push(element)
+      arr.push(..._extractRefs(element, as))
     }
   }
 
   return arr
 }
 
+const _getActiveFromUnion = refs => {
+  if (refs.length !== 2) return
+  const [maybeDraft, maybeActive] = refs
+  if (ensureNoDraftsSuffix(maybeDraft.ref[0]) === maybeActive.ref[0]) return maybeActive
+  if (ensureNoDraftsSuffix(maybeActive.ref[0]) === maybeDraft.ref[0]) return maybeDraft
+}
+
 const _extractRefs = (from, as) => {
   if (from.SELECT) {
-    return _extractRefs(from.SELECT.from, from.SELECT.as)
+    return _extractRefs(from.SELECT.from, as || from.SELECT.as)
   }
-
-  const hasOwnProperty = Object.prototype.hasOwnProperty
-
-  if (hasOwnProperty.call(from, 'join')) {
+  if (Object.prototype.hasOwnProperty.call(from, 'join')) {
     // cqn with join in from
     return _refs(from.args)
   }
-
-  if (hasOwnProperty.call(from, 'SET')) {
-    return _refs(from.SET.args, from.SET.as || from.as)
+  if (Object.prototype.hasOwnProperty.call(from, 'SET')) {
+    let refs = _refs(from.SET.args).filter(a => !a.as || a.as !== 'filterAdmin')
+    refs = _getActiveFromUnion(refs) ? [_getActiveFromUnion(refs)] : refs
+    if (as) return refs.map(({ ref }) => ({ as, ref }))
+    return refs
   }
-
-  const ref = { ref: from.ref, as: from.as }
-
-  if (as) {
-    ref.as = as
-  }
-
+  if (!from.ref) return []
+  const ref = { ref: [...from.ref] }
+  if (as || from.as) ref.as = as || from.as
   return [ref]
 }
 

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

@@ -626,7 +626,7 @@ class JoinCQNFromExpanded {
     // if union always only expand with active, otherwise evaluate flag
     // if flag shows false, we check entity for associations to non draft
     const activeTableRequired =
-      readToOneCQN[IS_UNION_DRAFT] ||
+      readToOneCQN[IS_UNION_DRAFT] || // > REVISIT: blocks expanding comp2one
       readToOneCQN[IS_ACTIVE] ||
       (element && element.type === 'cds.Association' && !element['@odata.draft.enclosed']) ||
       !this._csn.definitions[target]._isDraftEnabled
@@ -665,9 +665,9 @@ class JoinCQNFromExpanded {
       readToOneCQN.from.args[1] = {
         SELECT: {
           columns: cols,
-          from: unionFrom,
-          as: tableAlias
-        }
+          from: unionFrom
+        },
+        as: tableAlias
       }
     }
 
@@ -755,9 +755,9 @@ class JoinCQNFromExpanded {
     return {
       SELECT: {
         columns: Array.from(readToOneCQN.columns),
-        from: readToOneCQN.from,
-        as: readToOneCQN.from.as
-      }
+        from: readToOneCQN.from
+      },
+      as: readToOneCQN.from.as
     }
   }
 
@@ -858,18 +858,18 @@ class JoinCQNFromExpanded {
 
       if (arg.args) {
         this._addJoinKeyColumnsToUnion(arg.args, on, parentAlias)
-      } else if (arg.SELECT.from.SET && arg.SELECT.as === parentAlias) {
-        this._addColumns(arg.SELECT.from.SET.args, on, parentAlias)
+      } else if (arg.SELECT.from.SET && (arg.as === parentAlias || arg.SELECT.from.as === parentAlias)) {
+        for (const _arg of arg.SELECT.from.SET.args) {
+          this._addColumns(_arg.SELECT.columns, on, parentAlias)
+        }
+        if (arg.SELECT.columns) {
+          this._addColumns(arg.SELECT.columns, on, parentAlias, true)
+        }
       }
     }
   }
 
-  _addColumns(args, on, parentAlias) {
-    const [
-      {
-        SELECT: { columns }
-      }
-    ] = args
+  _addColumns(columns, on, parentAlias, withAlias = false) {
     const keyColumns = on
       .filter(entry => {
         return (
@@ -878,15 +878,11 @@ class JoinCQNFromExpanded {
           !columns.some(column => column.ref && column.ref[column.ref.length - 1] === entry.ref[1])
         )
       })
-      .map(entry => ({ ref: [entry.ref[1]] }))
-
+      .map(entry =>
+        withAlias ? { ref: [parentAlias, entry.ref[1]], as: `${parentAlias}_${entry.ref[1]}` } : { ref: [entry.ref[1]] }
+      )
     if (keyColumns.length === 0) return
-
-    for (const {
-      SELECT: { columns }
-    } of args) {
-      columns.push(...keyColumns)
-    }
+    columns.push(...keyColumns)
   }
 
   /**

package/libx/_runtime/remote/utils/data.js

@@ -122,7 +122,7 @@ const convertV2ResponseData = (data, target, ieee754Compatible) => {
 
 const deepSanitize = arg => {
   if (Array.isArray(arg)) return arg.map(deepSanitize)
-  if (typeof arg === 'object')
+  if (typeof arg === 'object' && arg !== null)
     return Object.keys(arg).reduce((acc, cur) => {
       acc[cur] = deepSanitize(arg[cur])
       return acc

package/package.json

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