@sap/cds 8.3.0 → 8.3.1

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 8.3.1 - 2024-10-08
+
+### Fixed
+
+- Erroneous caching in `cds.validate`
+- Precedence of request headers for `cds.context.id`
+- For `quoted` names, overwrite `@cds.persistence.name` for drafts and localized views properly
+- Do not use hana error code as http status code
+
 ## Version 8.3.0 - 2024-09-30
 
 ### Added

package/lib/compile/etc/_localized.js

@@ -83,6 +83,7 @@ function unfold_csn (m) { // NOSONAR
 	function _add_proxy4 (d, name, callback) {
 		if (name in m.definitions) return DEBUG && DEBUG ('NOT overriding existing:', name)
 		const x = {__proto__:d, name };   DEBUG && DEBUG ('adding proxy:', x)
+		if (d['@cds.persistence.name']) x['@cds.persistence.name'] = `localized.${d['@cds.persistence.name']}`
 		Object.defineProperty (m.definitions, name, {value:x,writable:true,configurable:true})
 		if (callback) callback(x)
 	}

package/lib/compile/for/lean_drafts.js

@@ -64,6 +64,11 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
       elements: { ...active.elements, ...Draft.elements },
       query: undefined
     }
+
+    // for quoted names, we need to overwrite the cds.persistence.name of the derived, draft entity
+    if (active['@cds.persistence.name'])
+      draft['@cds.persistence.name'] = active['@cds.persistence.name'] + '_drafts'
+    
     Object.defineProperty(model.definitions, _draftEntity, { value: draft })
     Object.defineProperty(active, 'drafts', { value: draft })
     Object.defineProperty(active, 'actives', { value: active })

package/lib/linked/validate.js

@@ -241,14 +241,16 @@ class Association extends struct {
 /** Compositions are like nested entities, validating deep input against their target entity definitions. */
 class Composition extends entity {
   validate (data, path, ctx) { if (!data) return
-    const elements = this._target.elements
-    const uplinks = {} // statically determine the uplinks for this composition
-    if (this.on) for (let {ref} of this.on) if (ref?.[0] === this.name) {
-      const fk = ref[1], fk_ = fk+'_'; uplinks[fk] = true
-      for (let e in elements) if (e.startsWith(fk_)) uplinks[e] = true
-    }
-    this.validate = (data, path, ctx) => super.validate (data, path, ctx, elements, uplinks)
-    this.validate (data, path, ctx) // call first time
+    const _validate = this.own('_validate', () => {
+      const elements = this._target.elements
+      const uplinks = {} // statically determine the uplinks for this composition
+      if (this.on) for (let {ref} of this.on) if (ref?.[0] === this.name) {
+        const fk = ref[1], fk_ = fk+'_'; uplinks[fk] = true
+        for (let e in elements) if (e.startsWith(fk_)) uplinks[e] = true
+      }
+      return (data, path, ctx) => super.validate (data, path, ctx, elements, uplinks)
+    })
+    _validate (data, path, ctx)
   }
 }
 
@@ -312,4 +314,4 @@ $.LargeBinary.prototype .type_check = v => Buffer.isBuffer(v) || typeof v === 's
 $.LargeString.prototype .type_check = v => Buffer.isBuffer(v) || typeof v === 'string' || v instanceof Readable
 
 // Mixin above class extensions to cds.linked.classes
-$.mixin ( Decimal, string, $any, action, array, struct, entity, Association, Composition )
+$.mixin ( Decimal, string, $any, action, array, struct, entity, Association, Composition )

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

@@ -9,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] || req.headers[crippled_corr_id] || uuid()
+    const id = req.headers[corr_id] ??= req.headers[crippled_corr_id] || req.headers[req_id] || req.headers[vr_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/common/error/frontend.js

@@ -51,7 +51,7 @@ const _rewriteError = error => {
     (code.startsWith('SQLITE_CONSTRAINT') && (message.match(/COMMIT/) || message.match(/FOREIGN KEY/))) ||
     (code === '155' && message.match(/fk constraint violation/))
   ) {
-    // > foreign key constaint violation no sqlite/ hana
+    // > foreign key constaint violation on sqlite/ hana
     error.code = '400'
     error.message = 'FK_CONSTRAINT_VIOLATION'
     return
@@ -63,17 +63,33 @@ const _rewriteError = error => {
   }
 }
 
+const _isInHttpResponseCodeRange = errorCode => errorCode >= 300 && errorCode <= 599
+
+const BAD_REQUEST_ERRORS = new Set(['ENTITY_ALREADY_EXISTS', 'FK_CONSTRAINT_VIOLATION', 'UNIQUE_CONSTRAINT_VIOLATION'])
+
 const _normalize = (err, locale, formatterFn = _getFiltered) => {
   // REVISIT: code and message rewriting
   _rewriteError(err)
 
+  const { message: originalMessage } = err
+
   // message (i18n)
   err.message = getErrorMessage(err, locale)
 
   // ensure code is set and a string
   err.code = String(err.code || 'null')
 
-  let statusCode = err.status || err.statusCode || (_isAllowedError(err.code) && err.code)
+  // determine status code from error
+  let statusCode = err.status || err.statusCode //> REVISIT: why prefer status over statusCode?
+  // well-defined bad request errors
+  if (!statusCode && BAD_REQUEST_ERRORS.has(originalMessage)) statusCode = 400
+  if (!statusCode && _isInHttpResponseCodeRange(err.code)) {
+    if ('sqlState' in err) {
+      // HANA/ database error -> don't use code as status code
+    } else {
+      statusCode = err.code
+    }
+  }
 
   // details
   if (err.details) {
@@ -95,8 +111,6 @@ const _normalize = (err, locale, formatterFn = _getFiltered) => {
   return { error, statusCode }
 }
 
-const _isAllowedError = errorCode => errorCode >= 300 && errorCode < 505
-
 // - for one unique value, we use it
 // - if at least one 5xx exists, we use 500
 // - else if at least one 4xx exists, we use 400

package/libx/odata/utils/index.js

@@ -278,9 +278,11 @@ const skipToken = (token, cqn) => {
 const calculateLocationHeader = (target, srv, result) => {
   const targetName = target.name.replace(`${srv.definition.name}.`, '')
   const filteredKeys = [...target.keys].filter(k => !k.isAssociation).map(k => k.name)
+  if (!filteredKeys.every(k => k in result)) return
+
   const keyValuePairs = filteredKeys.reduce((acc, key) => {
     const value = result[key]
-    if (value === undefined) return
+    if (value === undefined) return acc
     if (Buffer.isBuffer(value)) {
       acc[key] = value.toString('base64')
     } else {
@@ -290,7 +292,6 @@ const calculateLocationHeader = (target, srv, result) => {
     }
     return acc
   }, {})
-  if (!keyValuePairs) return
   let keys
   const entries = Object.entries(keyValuePairs)
   if (entries.length === 1) {

package/package.json

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