@sap/cds 6.2.2 → 6.3.0

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

@@ -353,7 +353,7 @@ const _newSelect = (query, transitions, service) => {
   if (!newSelect.columns && targetTransition.mapping.size) newSelect.columns = _initialColumns(targetTransition)
   if (newSelect.columns) {
     rewriteAsterisks({ SELECT: query.SELECT }, service.model, {
-      _4db: service instanceof cds.DatabaseService,
+      _4db: service instanceof cds.DatabaseService || service.kind === 'better-sqlite',
       target: targetTransition.queryTarget
     })
     newSelect.columns = _newColumns(newSelect.columns, targetTransition, service, service.kind !== 'app-service')
@@ -517,26 +517,20 @@ const _getTransitionData = (target, columns, service, skipForbiddenViewCheck) =>
   if (!skipForbiddenViewCheck) _checkForForbiddenViews(target)
   const targetStartsWithSrvName = service.namespace && target.name.startsWith(`${service.namespace}.`)
   const persistenceTable = _isPersistenceTable(target)
-  columns = _queryColumns(
-    target,
-    columns,
-    persistenceTable,
-    !(service instanceof cds.DatabaseService) && !targetStartsWithSrvName
-  )
-  if (persistenceTable && service instanceof cds.DatabaseService) {
+  const isDatabaseService = service instanceof cds.DatabaseService || service.kind === 'better-sqlite'
+  columns = _queryColumns(target, columns, persistenceTable, !isDatabaseService && !targetStartsWithSrvName)
+  // REVISIT: Change once we expose database service
+  if (persistenceTable && isDatabaseService) {
     return { target, transitionColumns: columns }
   }
   // stop projection resolving if it starts with the service name prefix
-  if (!(service instanceof cds.DatabaseService) && targetStartsWithSrvName) {
+  if (!isDatabaseService && targetStartsWithSrvName) {
     return { target, transitionColumns: columns }
   }
   // continue projection resolving if the target is a projection
   if (target.query && target.query._target) {
     const newTarget = target.query._target
-    if (
-      service instanceof cds.DatabaseService ||
-      !(service.namespace && newTarget.name.startsWith(`${service.namespace}.`))
-    ) {
+    if (isDatabaseService || !(service.namespace && newTarget.name.startsWith(`${service.namespace}.`))) {
       return _getTransitionData(newTarget, columns, service, skipForbiddenViewCheck)
     }
     return { target: newTarget, transitionColumns: columns }

package/libx/_runtime/db/utils/generateAliases.js

@@ -57,6 +57,7 @@ const _generateAliases = (partialCqn, aliasMap = new Map()) => {
     _redirectXpr(partialCqn.SELECT.having, selectMap)
     _redirectXpr(partialCqn.SELECT.columns, selectMap)
     _redirectXpr(partialCqn.SELECT.groupBy, selectMap)
+    _redirectXpr(partialCqn.SELECT.orderBy, selectMap)
     return
   }
 

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

@@ -160,7 +160,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/fiori/generic/read.js

@@ -187,16 +187,23 @@ const _getDraftPropertiesDetermineDraft = (req, where, tableName, calcDraftUUID
 }
 
 function _copyCQNPartial(partial) {
-  if (partial.SELECT && partial.SELECT.where) {
+  if (partial.SELECT) {
     const newPartial = Object.assign({}, partial)
     const newSELECT = Object.assign({}, partial.SELECT)
     newSELECT.from = _copyCQNPartial(partial.SELECT.from)
     newPartial.SELECT = newSELECT
+    if (partial.SELECT._4odata) newSELECT._4odata = true
     if (partial.SELECT.columns) newPartial.SELECT.columns = _copyArray(partial.SELECT.columns)
     if (partial.SELECT.where) newPartial.SELECT.where = _copyArray(partial.SELECT.where)
     return newPartial
   }
 
+  if (partial.id) {
+    const res = Object.assign({}, partial)
+    if (res.where) res.where = _copyArray(res.where)
+    return res
+  }
+
   if (partial.ref) {
     return Object.assign({}, partial, { ref: _copyArray(partial.ref) })
   }
@@ -1272,12 +1279,12 @@ const fioriGenericRead = async function (req) {
   req.target = _getLocalizedEntity(this.model, req.target, req.user) || req.target
 
   // REVISIT DRAFT HANDLING: cqn2cqn4sql must not be called here
-  const query4sql = cqn2cqn4sql(req.query, this.model, { _4fiori: true })
+  const query4sql = cqn2cqn4sql(_copyCQNPartial(req.query), this.model, { _4fiori: true })
 
   // Clone the request. Do not clone with Object.assign as that would skip all non-enumerable properties.
   // REVISIT: query4sql.clone() doesn't really clone the original query, hence _generateCQN will heavily modify
   // it, e.g. IsActiveEntity is stripped. This is a problem for subsequent handlers which rely on this information.
-  const reqClone = { __proto__: req, query: query4sql.clone() }
+  const reqClone = { __proto__: req, query: query4sql }
   // Clone draft restrictions to the cloned query.
   reqClone.query._draftRestrictions = query._draftRestrictions
 
@@ -1320,7 +1327,7 @@ const fioriGenericRead = async function (req) {
   _adaptColumns4readAfterWrite(req, cqnScenario, query4sql)
 
   const result = await cds.tx(req).send({ query: cqnScenario.cqn, target: req.target })
-  return _postProcess(result, req, cqnScenario, enhancedWithLastChangeDateTime)
+  return _postProcess(result, reqClone, cqnScenario, enhancedWithLastChangeDateTime)
 }
 
 module.exports = cds.service.impl(function (srv, entity) {

package/libx/_runtime/hana/execute.js

@@ -51,8 +51,8 @@ const BASE64 = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Z
 
 function _getProcedureName(sql) {
   // name delimited with "" allows any character
-  const match = sql.trim().match(/^call \s*(("(?<delimited>.+)")|(?<undelimited>\w+))\s*\(/i)
-  return match && (match.groups.undelimited || match.groups.delimited)
+  const match = sql.trim().match(/^call \s*(("\w+"\.)?("(?<delimited>.+)")|(\w+\.)?(?<undelimited>\w+))\s*\(/i)
+  return match && (match.groups.undelimited ?? match.groups.delimited)
 }
 
 function _hdbGetResultForProcedure(rows, args, outParameters) {

package/libx/_runtime/hana/search2cqn4sql.js

@@ -82,6 +82,7 @@ const _addAliasToQuery = (query, entity, columnsToBeSearched) => {
   SELECT.columns = addAliasToExpression(SELECT.columns, getEntityName)
   columnsToBeSearched = addAliasToExpression(columnsToBeSearched, getEntityName)
   SELECT.groupBy = addAliasToExpression(SELECT.groupBy, getEntityName)
+  SELECT.orderBy = addAliasToExpression(SELECT.orderBy, getEntityName)
   SELECT.where = addAliasToExpression(SELECT.where, getEntityName)
   return columnsToBeSearched
 }

package/libx/_runtime/messaging/AMQPWebhookMessaging.js

@@ -38,7 +38,7 @@ class AMQPWebhookMessaging extends MessagingService {
   }
 
   startListening(opt = {}) {
-    if (!this.subscribedTopics.size) return
+    if (!this._listenToAll && !this.subscribedTopics.size) return
     if (!opt.doNotDeploy) {
       const management = this.getManagement()
       this.queued(management.createQueueAndSubscriptions.bind(management))()

package/libx/_runtime/messaging/enterprise-messaging-utils/EMManagement.js

@@ -87,12 +87,15 @@ class EMManagement {
         this.subdomain ? { queue: queueName, subdomain: this.subdomain } : { queue: queueName }
       )
     try {
+      const queueConfig = this.queueConfig && { ...this.queueConfig }
+      if (queueConfig?.deadMsgQueue)
+        queueConfig.deadMsgQueue = queueConfig.deadMsgQueue.replace(/\$namespace/g, this.namespace)
       const res = await authorizedRequest({
         method: 'PUT',
         uri: this.options.uri,
         path: `/hub/rest/api/v1/management/messaging/queues/${encodeURIComponent(queueName)}`,
         oa2: this.options.oa2,
-        dataObj: this.queueConfig,
+        dataObj: queueConfig,
         tokenStore: this
       })
       if (res.statusCode === 201) return true
@@ -389,7 +392,7 @@ class EMManagement {
         this.LOG._info && this.LOG.info('Unchanged subscriptions', unchangedSubs, ' ', this.subdomainInfo)
         await Promise.all([
           ...obsoleteSubs.map(s => this.deleteSubscription(s)),
-          ...additionalSubs.map(async s => this.createSubscription(s))
+          ...additionalSubs.map(async t => this.createSubscription(t))
         ])
         return
       }

package/libx/_runtime/messaging/enterprise-messaging.js

@@ -139,7 +139,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
     const doNotDeploy = _multitenancyEnabled() && !this.options.deployForProvider
     if (doNotDeploy) this.LOG._info && this.LOG.info('Skipping deployment of messaging artifacts for provider account')
     super.startListening({ doNotDeploy })
-    if (!doNotDeploy && this.subscribedTopics.size) {
+    if (!doNotDeploy && (this._listenToAll || this.subscribedTopics.size)) {
       const management = this.getManagement()
       // Webhooks will perform an OPTIONS call on creation to check the availability of the app.
       // On systems like Cloud Foundry the app URL will only be advertised once
@@ -218,6 +218,11 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
     const topic = msg.event
     const message = { ...(msg.headers || {}), data: msg.data }
 
+    const contentType =
+      msg.headers && ['id', 'source', 'specversion', 'type'].every(el => el in msg.headers)
+        ? 'application/cloudevents+json'
+        : 'application/json'
+
     await this.queued(() => {})()
 
     try {
@@ -229,6 +234,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
         tenant,
         dataObj: message,
         headers: {
+          'Content-Type': contentType,
           'x-qos': 1
         },
         tokenStore: {}

package/libx/_runtime/messaging/file-based.js

@@ -35,7 +35,7 @@ class FileBasedMessaging extends MessagingService {
   }
 
   startWatching() {
-    if (!this.subscribedTopics.size) return
+    if (!this._listenToAll && !this.subscribedTopics.size) return
     const watcher = async () => {
       if (!(await touched(this.file, this.recent))) return // > not touched since last check
       // REVISIT: Bad if lock file wasn't cleaned up (due to crashes...)

package/libx/_runtime/messaging/message-queuing.js

@@ -61,12 +61,15 @@ class MQManagement {
   async createQueue(queueName = this.queueName) {
     this.LOG._info && this.LOG.info('Create queue', { queue: queueName })
     try {
+      const queueConfig = this.queueConfig && { ...this.queueConfig }
+      if (queueConfig?.deadMessageQueue)
+        queueConfig.deadMessageQueue = queueConfig.deadMessageQueue.replace(/\$namespace/g, '')
       const res = await authorizedRequest({
         method: 'PUT',
         uri: this.options.url,
         path: `/v1/management/queues/${encodeURIComponent(queueName)}`,
         oa2: this.options.auth.oauth2,
-        dataObj: this.queueConfig,
+        dataObj: queueConfig,
         tokenStore: this
       })
       if (res.statusCode === 201) return true
@@ -182,7 +185,7 @@ class MQManagement {
           .filter(s => !existingSubscriptions.some(e => s === e))
         await Promise.all([
           ...obsoleteSubs.map(s => this.deleteSubscription(s)),
-          ...additionalSubs.map(s => this.createSubscription(s))
+          ...additionalSubs.map(t => this.createSubscription(t))
         ])
         return
       }

package/libx/_runtime/messaging/outbox/utils.js

@@ -50,7 +50,7 @@ const _processSingleMessage = async (service, message, succeededMessages) => {
   // Promise resolve is necessary because we want to set `cds.context` only
   // inside this call
   return Promise.resolve().then(async () => {
-    if (userId) cds.context.user = new cds.User.Privileged(userId)
+    if (userId) cds.context = { user: new cds.User.Privileged(userId) }
     try {
       service._emitImmediate && (await service._emitImmediate(msg))
       succeededMessages.push(message.ID)

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)
@@ -94,7 +97,8 @@ class MessagingService extends OutboxService {
   on(event, cb) {
     const _event = _warnAndStripTopicPrefix(event, this.LOG)
     // save all subscribed topics (not needed for local-messaging)
-    this.subscribedTopics.set(this.prepareTopic(_event, true), _event)
+    if (event !== '*') this.subscribedTopics.set(this.prepareTopic(_event, true), _event)
+    else this._listenToAll = true
     return super.on(_event, cb)
   }
 
@@ -131,8 +135,9 @@ class MessagingService extends OutboxService {
       const subscribedEvent =
         this.subscribedTopics.get(_msg.event) ||
         (this.wildcarded && this.subscribedTopics.get(this.wildcarded(_msg.event)))
-      if (!subscribedEvent) throw new Error(`No handler for incoming message with topic '${_msg.event}' found.`)
-      _msg.event = subscribedEvent
+      if (!subscribedEvent && !this._listenToAll)
+        throw new Error(`No handler for incoming message with topic '${_msg.event}' found.`)
+      _msg.event = subscribedEvent || _msg.event
     }
     return _msg
   }

package/libx/odata/cqn2odata.js

@@ -516,12 +516,15 @@ const _select = (cqn, kind, model) => {
 const _insert = (cqn, kind, model) => {
   const INSERT = getProp(cqn, 'INSERT')
   const { url } = _from(getProp(INSERT, 'into'), kind, model)
-  const body = Array.isArray(INSERT.entries) && INSERT.entries.length === 1 ? INSERT.entries[0] : INSERT.entries
+  const body = _copyData(
+    Array.isArray(INSERT.entries) && INSERT.entries.length === 1 ? INSERT.entries[0] : INSERT.entries
+  )
   return { method: 'POST', path: url, body }
 }
 
 const _copyData = data => {
   // only works on flat structures
+  if (Array.isArray(data)) return data.map(_copyData)
   const copied = {}
   for (const property in data) {
     copied[property] =

package/libx/odata/utils.js

@@ -52,10 +52,9 @@ const formatVal = (val, elementName, csnTarget, kind) => {
   if (typeof val === 'boolean') return val
   if (typeof val === 'number') return getSafeNumber(val)
   if (!csnTarget && typeof val === 'string' && UUID.test(val)) return kind === 'odata-v2' ? `guid'${val}'` : val
-  const { type } = _getElement(csnTarget, elementName)
-
+  const element = _getElement(csnTarget, elementName)
   if (kind === 'odata-v2') {
-    switch (type) {
+    switch (element.type) {
       case 'cds.Decimal':
       case 'cds.Integer64':
       case 'cds.Int64':
@@ -64,20 +63,22 @@ const formatVal = (val, elementName, csnTarget, kind) => {
       case 'cds.LargeBinary':
         return `binary'${toBase64url(val)}'`
       case 'cds.Date':
-        return `datetime'${val}T00:00:00'`
+        return element['@odata.Type'] === 'Edm.DateTimeOffset'
+          ? `datetimeoffset'${val}T00:00:00'`
+          : `datetime'${val}T00:00:00'`
       case 'cds.DateTime':
-        return `datetime'${val}'`
+        return element['@odata.Type'] === 'Edm.DateTimeOffset' ? `datetimeoffset'${val}'` : `datetime'${val}'`
       case 'cds.Time':
         return `time'${_PT(val.split(':'))}'`
       case 'cds.Timestamp':
-        return `datetimeoffset'${val}'`
+        return element['@odata.Type'] === 'Edm.DateTime' ? `datetime'${val}'` : `datetimeoffset'${val}'`
       case 'cds.UUID':
         return `guid'${val}'`
       default:
         return `'${val}'`
     }
   } else {
-    switch (type) {
+    switch (element.type) {
       case 'cds.Binary':
       case 'cds.LargeBinary':
         return `binary'${toBase64url(val)}'`

package/libx/rest/RestAdapter.js

@@ -197,10 +197,7 @@ const RestAdapter = function (srv) {
 
     next(err)
   })
-  
-  if (!cds.env.features.rest_error_handler) {
-    router.use(error) // FIXME: nope -> call next()
-  }
+  router.use(error) // FIXME: nope -> call next()
 
   return router
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "6.2.2",
+  "version": "6.3.0",
   "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",