@sap/cds 7.6.3 → 7.6.4

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 7.6.4 - 2024-02-21
+
+### Fixed
+
+- Emitting multiple message with an in-memory outbox
+- Occasional crash for invalid draft requests
+- On the index page, aditional links now show up again for non-OData services.
+- Handling of thenables for queries
+
 ## Version 7.6.3 - 2024-02-13
 
 ### Fixed

package/app/index.js

@@ -53,12 +53,12 @@ function _entities_in (service) {
 }
 
 function _moreLinks (srv, entity) {
-  return odata(srv) ? (srv.$linkProviders || [])
+  return (srv.$linkProviders || [])
     .map (linkProv => linkProv(entity))
-    .filter (l => l && l.href && l.name)
-    .sort ((l1, l2) => l1.name.localeCompare(l2))
+    .filter (l => l?.href && l?.name)
+    .sort ((l1, l2) => l1.name.localeCompare(l2.name))
     .map (l => ` <a class="preview" href="${l.href}" title="${l.title||l.name}"> &rarr; ${l.name}</a>`)
-    .join (' ') : ''
+    .join (' ')
 }
 
 function _project(){

package/lib/ql/Query.js

@@ -34,7 +34,7 @@ class Query {
     const srv = this._srv || cds.db || cds.error `Can't execute query as no primary database is connected.`
     const q = new AsyncResource('await cds.query')
     // Temporary solution for cds.stream in .then. Remove with the next major release.
-    return (r,e) => q.runInAsyncScope (srv.run, srv, this) .then(rt => { rt = this._stream && rt ? Object.values(rt)[0] : rt; r(rt) }, e)
+    return (r,e) => q.runInAsyncScope (srv.run, srv, this) .then(rt => { rt = this._stream && rt ? Object.values(rt)[0] : rt; return r(rt) }, e)
   }
 
   _target4 (...args) {

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/http/HttpHeaderReader.js

@@ -111,11 +111,13 @@ class HttpHeaderReader extends commons.http.HttpHeaderReader {
         throw new Error('Expected valid type at index ' + this._index + ' but found ' + this._getCurrentChar())
       }
 
-      this._readChar('/')
+      if (type === '*') try { this._readChar('/') } catch {}
+      else this._readChar('/')
 
       let subtype
-      if (type === '*') subtype = this._readChar('*')
+      if (type === '*') try { subtype = this._readChar('*') } catch {}
       if (!subtype) subtype = this._checkChar('*') ? '*' : this._readToken()
+      if (!subtype && type === '*') subtype = '*'
       if (!subtype) {
         throw new Error('Expected valid subtype at index ' + this._index + ' but found ' + this._getCurrentChar())
       }

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

@@ -549,6 +549,7 @@ const Read = {
   unchanged: async function (run, query) {
     LOG.debug('List Editing Status: Unchanged')
     const draftsQuery = query._drafts
+    if (!draftsQuery) throw new Error('Invalid draft request')
     draftsQuery.SELECT.count = undefined
     draftsQuery.SELECT.orderBy = undefined
     draftsQuery.SELECT.limit = null
@@ -564,6 +565,8 @@ const Read = {
   ownDrafts: async function (run, query) {
     LOG.debug('List Editing Status: Own Draft')
 
+    if (!query._drafts) throw new Error('Invalid draft request')
+
     // read active from draft
     if (!query._drafts._target?.name.endsWith('.drafts')) {
       const result = await run(query._drafts)
@@ -758,6 +761,8 @@ const Read = {
 
   activesFromDrafts: async function (run, query, { isLocked = true }) {
     const draftsQuery = query._drafts
+    if (!draftsQuery) throw new Error('Invalid draft request')
+
     const additionalCols = draftsQuery.SELECT.columns
       ? draftsQuery.SELECT.columns.filter(
           c => c.ref && ['DraftAdministrativeData', 'DraftAdministrativeData_DraftUUID'].includes(c.ref[0])

package/libx/outbox/index.js

@@ -281,10 +281,10 @@ function outboxed(srv, customOpts) {
         // REVISIT: Also allow maxAttempts for in-memory outbox?
         for (const _req of context[$stored_reqs]) {
           try {
-            if (req.reply) await originalSrv.send(req)
-            else await originalSrv.emit(req)
+            if (_req.reply) await originalSrv.send(_req)
+            else await originalSrv.emit(_req)
           } catch (e) {
-            LOG.error('Emit failed', { event: req.event, cause: e })
+            LOG.error('Emit failed', { event: _req.event, cause: e })
             if (isStandardError(e)) cds.exit(1)
           }
         }

package/package.json

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