@sap/cds 6.2.2 → 6.2.4

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 6.2.4 - 2022-11-04
+
+### Fixed
+
+- Draft ownership was erroneously checked for bound actions on active instances
+
+## Version 6.2.3 - 2022-10-21
+
+### Fixed
+
+- New continuation for incoming messages
+- `cds.test` no longer fails if used in ESM modules with `mocha` (`ERR_REQUIRE_ESM` error)
+- Collection-bound actions/functions don't need draft ownership check
+
 ## Version 6.2.2 - 2022-10-13
 
 ### Fixed

package/lib/index.js

@@ -138,7 +138,8 @@ _global ('parse','CDL','CQL','CXL')
 // Check Node.js version
 if (process.env.CDS_STRICT_NODE_VERSION !== 'false') {
   const v = version => { let vv = version.split('.'); return { version, major: +vv[0], minor: +vv[1] }}
-  const required = v('14.15'), given = v(process.version.match(/^v(\d+\.\d+)/)[1])
+  const required = v(_require('../package.json').engines.node.match(/>=(.*)/)[1])
+  const given = v(process.version.match(/^v(\d+\.\d+)/)[1])
   if (given.major < required.major || given.major === required.major && given.minor < required.minor) process.exit (process.stderr.write (`
   Node.js v${required.version} or higher is required for @sap/cds.
   Current v${given.version} does not satisfy this.

package/lib/utils/cds-utils.js

@@ -136,7 +136,7 @@ exports.find = function find (base, patterns='*', filter=()=>true) {
 
 // internal utility to load a file through ESM or CommonJs.  TODO find a better place.
 exports._import = id => require(id)
-if (!global.test && !global.it) {
+if (typeof jest === 'undefined') {  // jest's ESM support is experimental: https://jestjs.io/docs/ecmascript-modules
   const { pathToFileURL } = require('url')
   exports._import = id => {
     if (extname(id) === '.ts') return require(id) // ts-node w/ ESM not working (cap/issues#11980)

package/libx/_runtime/fiori/generic/before.js

@@ -77,7 +77,7 @@ const _getRoot = req => {
   return root
 }
 
-const _getDraftDataFromExistingDraft = async (req, root) => {
+const _getDraftDataFromExistingDraft = async (req, root, isBoundAction) => {
   if (!root) return []
   if (root?.IsActiveEntity === false) {
     const query = _getSelectDraftDataCqn(root.entityName, root.where)
@@ -85,6 +85,9 @@ const _getDraftDataFromExistingDraft = async (req, root) => {
     return result
   }
 
+  // do not expect validate draft ownership for action call on active instances
+  if (isBoundAction) return []
+
   const rootWhere = getKeysCondition(req)
   const query = _getSelectDraftDataCqn(ensureNoDraftsSuffix(req.target.name), rootWhere)
   const result = await cds.tx(req).run(query)
@@ -147,8 +150,8 @@ const _deleteCancel = async function (req) {
 }
 
 const _validateDraftBoundAction = async function (req) {
-  const result = await _getDraftDataFromExistingDraft(req, _getRoot(req))
   const isBoundAction = true
+  const result = await _getDraftDataFromExistingDraft(req, _getRoot(req), isBoundAction)
   if (result && result.length > 0) _validateDraft(req, result, isBoundAction)
 }
 
@@ -160,7 +163,8 @@ const _registerBoundActionHandlers = function (entityName, actions) {
       action.kind === 'action' &&
       action.name !== 'draftPrepare' &&
       action.name !== 'draftEdit' &&
-      action.name !== 'draftActivate'
+      action.name !== 'draftActivate' &&
+      !action['@cds.odata.bindingparameter.collection']
   )
 
   for (const action of boundActions) {

package/libx/_runtime/messaging/service.js

@@ -81,11 +81,14 @@ class MessagingService extends OutboxService {
     const _msg = typeof event === 'object' ? event : { event, data, headers }
     if (_msg instanceof cds.Event) return super.emit(_msg)
     if (_msg.inbound && !cds.context) {
-      cds.context = { tenant: _msg.tenant, user: cds.User.privileged }
-      if (cds.model) {
-        const ctx = cds.context
-        ctx.model = await ExtendedModels.model4(ctx.tenant, ctx.features)
-      }
+      return cds._context.run({ tenant: _msg.tenant, user: cds.User.privileged }, async () => {
+        if (cds.model) {
+          const ctx = cds.context
+          ctx.model = await ExtendedModels.model4(ctx.tenant, ctx.features)
+        }
+        const msg = new cds.Event(this.message4(_msg))
+        return super.emit(msg)
+      })
     }
     const msg = new cds.Event(this.message4(_msg))
     return super.emit(msg)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "6.2.2",
+  "version": "6.2.4",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -27,7 +27,7 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=14.18.0"
   },
   "dependencies": {
     "@sap/cds-compiler": "^3.2.0",