@sap/cds 8.2.0 → 8.2.1

package/CHANGELOG.md

@@ -4,6 +4,17 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 8.2.1 - 2024-09-04
+
+### Fixed
+
+- Date validation of legacy OData protocol adapter
+- Content-Length headers in multipart batch request body
+- Streaming requests with virtual properties
+- Bring back support for `x-correlationid`
+- Validation of inlined elements
+- multipart `$batch` parsing with _--_ as part of payload
+
 ## Version 8.2.0 - 2024-08-30
 
 ### Added

package/lib/linked/validate.js

@@ -56,13 +56,15 @@ class Validation {
 class ValidationErrors extends Array {
   add (error) {
     const err = Object.create (ValidationErrors.proto)
-    err.message = err.stack = error
+    err.message = error
     this.push (err)
     return err
   }
   static proto = Object.create (Error.prototype, {
     message: { writable:true, configurable:true },
-    stack: { writable:true, configurable:true, value: '<none>' },
+    stack: { configurable:true, get() { return this.message },
+      set(v) { Object.defineProperty (this, 'stack', { value:v, writable:true, configurable:true }) },
+    },
     code: { value: '400', writable:true }, // REVISIT: should be 'ASSERT_'... (i.e. msg) but we need to adjust all tests, and have a code catalogue
     statusCode: { value: 400 }, // REVISIT: should go into mappings in adapter's error handlers -> requires a code catalogue // REVISIT: .statusCode vs .status?
     numericSeverity: { value: 4, enumerable: true }, // REVISIT: that is OData-specific
@@ -118,12 +120,15 @@ const $any = class any {
   }
 
   _is_mandatory (d=this) {
-    return d.own('_mandatory', ()=> {
-      if (d['@readonly'])                                   return false // readonly -> not mandatory
-      if (d['@mandatory'])                                  return true
-      if (d['@Common.FieldControl']?.['#'] === 'Mandatory') return true
-      else return false
-    })
+    return d.own('_mandatory', ()=> (
+      !d['@readonly'] // readonly -> not mandatory
+      && (d['@mandatory'] || d['@Common.FieldControl']?.['#'] === 'Mandatory')
+      && !d._is_flattened()
+    ))
+  }
+
+  _is_flattened (d=this) {
+    return d.parent?.query?.SELECT.columns?.some (c => c.ref?.length > 1 && d.name === (c.as || c.ref.at(-1)))
   }
 
   _is_readonly (d=this) {

package/lib/srv/middlewares/cds-context.js

@@ -1,5 +1,6 @@
 const cds = require ('../../index')
 const corr_id = 'x-correlation-id'
+const crippled_corr_id = 'x-correlationid'
 const req_id = 'x-request-id'
 const vr_id = 'x-vcap-request-id'
 const { uuid } = cds.utils
@@ -8,7 +9,7 @@ const { EventContext } = cds
 module.exports = () => {
   /** @type { import('express').Handler } */
   return function cds_context (req, res, next) {
-    const id = req.headers[corr_id] ??= req.headers[req_id] || req.headers[vr_id] || uuid()
+    const id = req.headers[corr_id] ??= req.headers[req_id] || req.headers[vr_id] || req.headers[crippled_corr_id] || uuid()
     const ctx = EventContext.for ({ id, http: { req, res } })
     res.set ('X-Correlation-ID', id) // Note: we use capitalized style here as that's common standard in HTTP world
     cds._context.run (ctx, next)

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/validator/ValueValidator.js

@@ -4,7 +4,7 @@ const { big } = require('@sap/cds-foss')
 const { isInvalidBase64string } = require('../../../../../../common/utils/binary')
 const IllegalArgumentError = require('../errors/IllegalArgumentError')
 
-const YEAR_RE = '(?:-?(?:(?:(?:0\\d{3})|(?:[1-9]\\d{3,}))))'
+const YEAR_RE = '(?:-?(?:(?:(?:0\\d{3})|(?:[1-9]\\d{3}))))'
 const MONTH_RE = '(?:(?:0[1-9])|(?:1[012]))'
 const DAY_RE = '(?:(?:0[1-9])|(?:[12]\\d)|(?:3[01]))'
 const HOURS_RE = '(?:(?:[01]\\d)|(?:2[0-3]))'

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

@@ -2,8 +2,10 @@ const cds = require('../../cds')
 const { ensureNoDraftsSuffix, ensureUnlocalized } = require('./draft')
 const { isDuplicate } = require('./rewriteAsterisks')
 
-const _addColumn = (name, type, columns, url) => {
-  const mediaType = typeof type === 'object' ? { ref: [type['='].replaceAll(/\./g, '_')] } : { val: type }
+const _addColumn = (name, type, columns, url, target) => {
+  let mediaType = typeof type === 'object' && type['=']
+  if (mediaType && target.elements[mediaType]?.virtual) return
+  mediaType = mediaType ? { ref: [mediaType.replaceAll(/\./g, '_')] } : { val: type }
   const col = {
     xpr: [
       'case',
@@ -34,8 +36,8 @@ const _addColumn = (name, type, columns, url) => {
 const _addColumns = (target, columns) => {
   for (const k in target.elements) {
     const el = target.elements[k]
-    if (el['@Core.MediaType']) {
-      _addColumn(el.name, el['@Core.MediaType'], columns, el['@Core.IsURL'] && el.type === 'cds.String')
+    if (el['@Core.MediaType'] && !el.virtual) {
+      _addColumn(el.name, el['@Core.MediaType'], columns, el['@Core.IsURL'] && el.type === 'cds.String', target)
     }
   }
 }
@@ -58,7 +60,7 @@ const handleStreamProperties = (target, columns, model) => {
       _addColumns(target, columns)
     } else if (col.ref && (type === 'cds.LargeBinary' || (mediaType && !ignoreMediaType))) {
       if (mediaType) {
-        _addColumn(name, mediaType, columns, element['@Core.IsURL'])
+        _addColumn(name, mediaType, columns, element['@Core.IsURL'], target)
         columns.splice(index, 1)
       } else if (!cds.env.features.stream_compat) {
         columns.splice(index, 1)

package/libx/odata/parse/multipartToJson.js

@@ -69,7 +69,9 @@ const parseStream = async function* (body, boundary) {
     const process = chunk => {
       let changed = chunk
         .toString()
-        .replace(/--(.*)$/gm, (_, g) => `HEAD /${g} HTTP/1.1${g.slice(-2) === '--' ? CRLF : ''}`)
+        .replace(/^--(.*)$/gm, (_, g) => `HEAD /${g} HTTP/1.1${g.slice(-2) === '--' ? CRLF : ''}`)
+        // correct content-length for non-HEAD requests is inserted below
+        .replace(/content-length: \d+\r\n/gim, '')
         .replace(/ \$/g, ' /$')
 
       // HACKS!!!

package/package.json

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