@sap/cds 7.7.1 → 7.7.3

package/CHANGELOG.md

@@ -4,6 +4,21 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 7.7.3 - 2024-03-18
+
+### Fixed
+
+- `cds.log`: preserve message property of details through stringification (it's non-enumerable if the detail entry is an error)
+- Auto-exposed child entities with multiple restrictions
+- Calculation of read-only values in custom code during creation of new drafts
+
+## Version 7.7.2 - 2024-03-11
+
+### Fixed
+
+- Requests to actions/functions on entities in draft state via navigation.
+- PUT/PATCH with if-none-match: * forces insert
+
 ## Version 7.7.1 - 2024-03-06
 
 ### Fixed

package/lib/compile/cds-compile.js

@@ -6,7 +6,6 @@ const compile = module.exports = Object.assign (cds_compile, {
   for: new class {
     get java(){ return super.java = require('./for/java') }
     get nodejs() { return super.nodejs = require('./for/nodejs') }
-    get drafts() { return super.drafts = require('./for/drafts') }
     get lean_drafts() { return super.lean_drafts = require('./for/lean_drafts') }
     get odata() { return super.odata = require('./for/odata') }
     get sql() { return super.sql = require('./for/sql') }

package/lib/compile/etc/_localized.js

@@ -98,21 +98,7 @@ function unfold_csn (m) { // NOSONAR
 }
 
 
-const _is_localized = (
-	!env.features._ucsn_ ? d => d.own('$localized') // as set by compiler in compile.for.odata
-	: (d,_path={}) => d.own('$localized', ()=>{    // calculate our own for effective CSNs
-		// if (d.elements.texts && d.elements.texts.target === `${d.name}.texts`) return d.set($localized,true)
-		if (!d.elements || d.name.endsWith('.texts')) return false
-		for (let each in d.elements) {
-			const e = d.elements [each]
-			if (e.localized || e._target && !(_path && e._target.name in _path) && _is_localized(e._target,Object.assign(_path, { [d.name]:1 }))) {
-				return true
-			}
-		}
-		return false
-	})
-)
-
+const _is_localized = d => d.own('$localized') // as set by compiler in compile.for.odata
 
 // feature-toggled exports
 module.exports = { unfold_csn, unfold_ddl }

package/lib/compile/for/java.js

@@ -1,9 +1,23 @@
+// The only entry point to produce CSNs consumed by the Java Runtime
+
 const cds = require ('../../index')
 
+// TODO: compiler functions to clarify - publish as individual API functions or
+// have a compiler API function for.java?
+function _4java (csn,o) {
+  const compile = require ('../cdsc');
+  const { addTenantFields } = require ('@sap/cds-compiler/lib/transform/addTenantFields');
+  const _4draft = require ('@sap/cds-compiler/lib/transform/draft/odata');
+  const dsn = JSON.parse (JSON.stringify (csn)) // REVISIT: workaround for bad test setup
+  o = compile._options.for.odata(o); // get compiler options, see compile.for.odata
+  if (o.tenantDiscriminator) addTenantFields (dsn, o);
+  return _4draft (dsn, o);
+}
+
 module.exports = function cds_compile_for_java (csn,o) {
   if ('_4java' in csn) return csn._4java
-  let dsn = csn // cds.minify (csn)
-  dsn = cds.compile.for.drafts (csn,o)
+  // cds.minify (csn) ?
+  const dsn = (!cds.env.features._ucsn_) ? cds.compile.for.odata (csn,o||{}) : _4java (csn,o||{});
   if (dsn.definitions) for (let [name,d] of Object.entries(dsn.definitions)) {
     // Add @cds.external to external services
     if (d.kind === 'service' && name in cds.requires) d['@cds.external'] = true
@@ -16,4 +30,4 @@ module.exports = function cds_compile_for_java (csn,o) {
   Object.defineProperty (csn, '_4java', {value:dsn})
   Object.defineProperty (dsn, '_4java', {value:dsn})
   return dsn
-}
+}

package/lib/compile/for/nodejs.js

@@ -6,7 +6,7 @@ module.exports = function cds_compile_for_nodejs (csn,o) {
   if ('_4nodejs' in csn) return csn._4nodejs
   TRACE?.time('cds.compile 4nodejs'.padEnd(22))
   let dsn = csn // cds.minify (csn)
-  dsn = cds.compile.for.drafts (csn,o) //> creates a partial copy -> avoid any cds.linked() before
+  dsn = cds.compile.for.odata (csn,o) //> creates a partial copy -> avoid any cds.linked() before
   dsn = unfold_csn (dsn)
   dsn = cds.linked (dsn)
   if (cds.env.fiori.lean_draft) cds.compile.for.lean_drafts(dsn, o)

package/lib/log/format/json.js

@@ -74,9 +74,13 @@ module.exports = function format(module, level, ...args) {
     const err = args.shift()
     toLog.msg = `${toLog.msg ? toLog.msg + ' ' : ''}${err.message}`
     if (typeof err.stack === 'string' && !_is4xx(err)) toLog.stacktrace = err.stack.split(/\s*\r?\n\s*/)
-    if (Array.isArray(err.details))
-      for (const d of err.details)
+    if (Array.isArray(err.details)) {
+      for (const d of err.details) {
+        // preserve message property through stringification
+        if (d.message) Object.defineProperty(d, 'message', { value: d.message, enumerable: true })
         if (typeof d.stack === 'string' && !_is4xx(d)) d.stacktrace = d.stack.split(/\s*\r?\n\s*/)
+      }
+    }
     Object.assign(toLog, err, { level: toLog.level })
   }
 

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/update.js

@@ -101,7 +101,9 @@ const _updateThenCreate = async (req, odataReq, odataRes, tx) => {
     result = await tx.dispatch(req)
   } catch (e) {
     const is404 = e.code === 404 || e.status === 404 || e.statusCode === 404
-    if (is404 && _isUpsertAllowed(req)) {
+    const isForcedInsert =
+      (e.code === 412 || e.status === 412 || e.statusCode === 412) && req.headers['if-none-match'] === '*'
+    if ((is404 || isForcedInsert) && _isUpsertAllowed(req)) {
       // PUT/ PATCH with if-match header means "only if already exists", i.e., no insert if not
       if (req.headers['if-match'])
         throw Object.assign(new Error('412'), { statusCode: 412 })

package/libx/_runtime/common/generic/auth/restrict.js

@@ -87,7 +87,7 @@ const _getMergedWhere = restricts => {
     }
     xprs.push({ xpr: [...ele._xpr] })
   })
-  return xprs
+  return restricts.length > 1 ? [{ xpr: [...xprs] }] : xprs
 }
 
 const _addWheresToRef = (ref, model, resolvedApplicables) => {

package/libx/_runtime/common/generic/input.js

@@ -116,8 +116,8 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
     // Always take over the values from active entities
     if (cds.env.fiori?.lean_draft && req.context?.event === 'EDIT') return
 
-    // Read-only valus are already deleted before `NEW` (and they can be set in a `NEW` handler!)
-    if (cds.env.fiori?.lean_draft && event === 'CREATE' && req.context?.event === 'NEW' && req.target.isDraft) return
+    // read-only values are already deleted before `NEW` (and they can be set in a `NEW` handler!)
+    if (cds.env.fiori?.lean_draft && event === 'CREATE' && req.target.isDraft) return
 
     delete row[key]
     value.val = undefined

package/libx/_runtime/fiori/lean-draft.js

@@ -469,9 +469,7 @@ cds.ApplicationService.prototype.handle = async function (req) {
   if (req.target.actions?.[req.event] && draftParams.IsActiveEntity === false) {
     if (query.SELECT?.from?.ref) query.SELECT.from.ref = _redirectRefToDrafts(query.SELECT.from.ref, this.model)
     const rootQuery = query.clone()
-    const columns = entity_keys(query._target).map(k => ({ ref: [k] }))
-    columns.push({ ref: ['DraftAdministrativeData'], expand: [{ ref: ['InProcessByUser'] }] })
-    rootQuery.SELECT.columns = columns
+    rootQuery.SELECT.columns = [{ ref: ['DraftAdministrativeData'], expand: [{ ref: ['InProcessByUser'] }] }]
     rootQuery.SELECT.one = true
     rootQuery.SELECT.from = { ref: [query.SELECT.from.ref[0]] }
     const root = await cds.run(rootQuery)

package/libx/rest/middleware/update.js

@@ -22,7 +22,10 @@ module.exports = srv => async _req => {
     result = await srv.dispatch(new RestRequest({ query, _target, method: _req.method, params: _params }))
     if (_params && result) Object.assign(result, _params[_params.length - 1])
   } catch (e) {
-    if ((e.code === 404 || e.status === 404 || e.statusCode === 404) && UPSERT_ALLOWED) {
+    const is404 = e.code === 404 || e.status === 404 || e.statusCode === 404
+    const isForcedInsert =
+      (e.code === 412 || e.status === 412 || e.statusCode === 412) && _req.headers['if-none-match'] === '*'
+    if ((is404 || isForcedInsert) && UPSERT_ALLOWED) {
       query = INSERT.into(query.UPDATE.entity).entries(
         _params ? Object.assign(_data, _params[_params.length - 1]) : _data
       )

package/package.json

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

package/lib/compile/for/drafts.js

@@ -1,8 +0,0 @@
-let _unfold = (..._) => (_unfold = require ('@sap/cds-compiler/lib/transform/draft/odata')) (..._)
-const cds = require ('../../index')
-module.exports = function cds_compile_for_drafts (csn,o) {
-  if (!cds.env.features._ucsn_) return cds.compile.for.odata (csn,o)
-  csn = JSON.parse (JSON.stringify (csn)) // REVISIT: workaround for bad test setup
-  csn = _unfold (csn,o||{})
-  return csn
-}