@sap/cds 8.5.0 → 8.6.0

package/libx/odata/utils/postProcess.js

@@ -1,11 +1,14 @@
+const cds = require('../../../lib')
+
 const getTemplate = require('../../_runtime/common/utils/template')
 const { toBase64url } = require('../../_runtime/common/utils/binary')
 
 const _addEtags = (row, key) => {
   if (!row[key]) return
-  row.$etag = row[key].startsWith('W/') ? row[key] : `W/"${row[key]}"`
+  // if provided as js date, take the iso string
+  const value = row[key] instanceof Date ? row[key].toISOString() : row[key]
+  row.$etag = value.startsWith?.('W/') ? value : `W/"${value}"`
 }
-
 const _processorFn = elementInfo => {
   const { row, plain } = elementInfo
   if (typeof row !== 'object') return
@@ -29,7 +32,10 @@ const _processorFn = elementInfo => {
         }
         break
       case 'array':
-        row[key] ??= []
+        if (row[key] === null) row[key] = []
+        break
+      case '@cleanup':
+        if (key !== 'DraftAdministrativeData_DraftUUID') delete row[key]
         break
       // no default
     }
@@ -42,6 +48,21 @@ const _pick = element => {
   if (element['@cds.api.ignore'] && !element.isAssociation) categories.push('@cds.api.ignore')
   if (element._type === 'cds.Binary') categories.push('binary')
   if (element.items) categories.push('array')
+
+  // in case of containment managed composition (& assoc backlinks) keys are not exposed and have to be removed from the result
+  if (cds.env.effective.odata.containment) {
+    const _isContainedOrBackLink = element =>
+      element &&
+      element.isAssociation &&
+      element.keys &&
+      (element._isContained || (element._anchor && element._anchor._isContained))
+
+    const assocName = element._foreignKey4
+    const assoc = assocName && element.parent.elements[assocName]
+
+    if (_isContainedOrBackLink(assoc)) categories.push('@cleanup')
+  }
+
   if (categories.length) return { categories }
 }
 

package/package.json

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

package/server.js

@@ -46,7 +46,7 @@ module.exports = async function cds_server (options) {
   if (o.index)     app.get ('/',o.index)                //> if none in ./app
 
   // load and prepare models
-  const csn = await cds.load(o.from||'*',o) .then (cds.minify)
+  const csn = await cds.load(o.from||'*',o)
   cds.edmxs = cds.compile.to.edmx.files (csn)
   cds.model = cds.compile.for.nodejs (csn)
 

package/lib/ql/parse.js

@@ -1,36 +0,0 @@
-// please keep all comments!
-
-const cds = require('../index')
-module.exports = {
-  column:(x) => _simple(x) /* || _parse('column',x) */ || cds.parse.column(x),
-  expr:(x) => _simple(x) /* || _parse('expr',x) */ || cds.parse.expr(x),
-  CQL: (..._) => cds.parse.CQL (..._),
-  CXL: (..._) => cds.parse.CXL (..._),
-  cql: (..._) => cds.parse.cql (..._),
-  path: (..._) => cds.parse.path (..._),
-}
-
-const _simple = (x) => {
-  if (typeof x !== 'string') return {val:x}
-  const t = /^\s*([\w.'?]+)(?:\s*([!?\\/:=\-+<~>]+|like)\s*([\w.'?]+))?\s*$/.exec(x); if (!t) return
-  const [,lhs,op,rhs] = t
-  return op ? {xpr:[_rv(lhs),op,_rv(rhs)]} : _rv(lhs)
-}
-
-const _rv = (x) => {
-  if (x[0] === '?')  return { param: true, ref: x }
-  if (x[0] === "'")  return { val: x.slice(1,-1).replace(/''/g, "'") }
-  if (x === 'null')  return { val: null }
-  if (x === 'true')  return { val: true }
-  if (x === 'false') return { val: false }
-  if (!isNaN(x))     return { val: Number(x) }
-  else               return { ref: x.split('.') }
-}
-
-// const _parse = (startRule,x) => {
-//   try {
-//     return parser.parse(x,{startRule})
-//     // } catch (e) { e.message += ' in: \n' + x;  throw e }
-//   }  catch {/* ignored */}
-// }
-// const parser = require('./parser')