@sap/cds 6.0.2 → 6.1.0

package/libx/_runtime/hana/pool.js

@@ -10,13 +10,9 @@ const getError = require('../common/error')
 function multiTenantInstanceManager(config = cds.env.requires.db) {
   const { credentials } = config
 
-  if (
-    !credentials ||
-    typeof credentials !== 'object' ||
-    !(credentials.get_managed_instance_url || credentials.sm_url)
-  ) {
-    throw Object.assign(new Error('No or malformed db credentials'), { credentials: credentials })
-  }
+  if (!credentials) throw Object.assign(new Error('No database credentials provided'))
+  else if (typeof credentials !== 'object' || !(credentials.get_managed_instance_url || credentials.sm_url))
+    throw Object.assign(new Error('Malformed database credentials provided'))
 
   // new instance manager
   return new Promise((resolve, reject) => {
@@ -53,9 +49,9 @@ function multiTenantInstanceManager(config = cds.env.requires.db) {
 function singleTenantInstanceManager(config = cds.env.requires.db) {
   const { credentials } = config
 
-  if (!credentials || typeof credentials !== 'object' || !credentials.host) {
-    throw Object.assign(new Error('No or malformed db credentials'), { credentials })
-  }
+  if (!credentials) throw Object.assign(new Error('No database credentials provided'))
+  else if (typeof credentials !== 'object' || !credentials.host)
+    throw Object.assign(new Error('Malformed database credentials provided'))
 
   // mock instance manager
   return {

package/libx/_runtime/hana/search2Contains.js

@@ -51,11 +51,6 @@ const search2Contains = (cqnSearchPhrase, columns) => {
 
   const expressionArgs = [{ list: columns }, { val: searchString }]
 
-  // REVISIT: Mark the expression args with a `_$search` flag, as the `CONTAINS`
-  // predicate is not fully supported in the CustomFunctionBuilder class.
-  // The `_$search` property is enumerable: false (default), writable: false (default)
-  Object.defineProperty(expressionArgs, '_$search', { value: true })
-
   const expression = {
     func: 'contains',
     args: expressionArgs

package/libx/_runtime/hana/search2cqn4sql.js

@@ -58,6 +58,7 @@ const search2cqn4sql = (query, entity, options) => {
 
   if (useContains) {
     expression = search2Contains(cqnSearchPhrase, columns2Search)
+    Object.defineProperty(query.SELECT, '_$searchUsingContains', { value: true, enumerable: true })
   } else {
     // No CONTAINS optimization possible. The search implementation for localized
     // texts falls back to the LIKE predicate.

package/libx/_runtime/messaging/AMQPWebhookMessaging.js

@@ -38,26 +38,25 @@ class AMQPWebhookMessaging extends MessagingService {
   }
 
   startListening(opt = {}) {
-    if (this.subscribedTopics.size) {
-      const management = this.getManagement()
-      if (!opt.doNotDeploy) this.queued(management.createQueueAndSubscriptions.bind(management))()
-      this.queued(this.listenToClient.bind(this))(async (_topic, _payload, _other, { done, failed }) => {
-        const msg = Object.assign(normalizeIncomingMessage(_payload), _other || {})
-        msg.event = _topic
+    if (!this.subscribedTopics.size) return
+    const management = this.getManagement()
+    if (!opt.doNotDeploy) this.queued(management.createQueueAndSubscriptions.bind(management))()
+    this.queued(this.listenToClient.bind(this))(async (_topic, _payload, _other, { done, failed }) => {
+      const msg = Object.assign(normalizeIncomingMessage(_payload), _other || {})
+      msg.event = _topic
 
-        if (!msg._) msg._ = {}
-        msg._.topic = _topic
-        try {
-          await super.emit(msg)
-          done()
-        } catch (e) {
-          // In case of AMQP and Solace, the `failed` callback must be called
-          // with an error, otherwise there are problems with the redelivery count.
-          failed(new Error('processing failed'))
-          this.LOG.error('ERROR occured in asynchronous event processing:', e)
-        }
-      })
-    }
+      if (!msg._) msg._ = {}
+      msg._.topic = _topic
+      try {
+        await super.emit(msg)
+        done()
+      } catch (e) {
+        // In case of AMQP and Solace, the `failed` callback must be called
+        // with an error, otherwise there are problems with the redelivery count.
+        failed(new Error('processing failed'))
+        this.LOG.error('ERROR occured in asynchronous event processing:', e)
+      }
+    })
   }
 
   listenToClient(cb) {

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

@@ -35,6 +35,7 @@ class FileBasedMessaging extends MessagingService {
   }
 
   startWatching() {
+    if (!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/outbox/utils.js

@@ -191,7 +191,7 @@ const _createMessage = (name, msg, context) => {
 const writeInOutbox = async (name, msg, context) => {
   const outboxMsg = _createMessage(name, msg, context)
   const messagesEntity = _getMessagesEntity()
-  return INSERT.into(messagesEntity).entries(outboxMsg)
+  return cds.tx(context).run(INSERT.into(messagesEntity).entries(outboxMsg))
 }
 
 module.exports = { processMessages, registerMessageProcessor, writeInOutbox, hasPersistentOutbox, isUnrecoverable }

package/libx/_runtime/messaging/service.js

@@ -1,6 +1,7 @@
 const cds = require('../cds')
 const queued = require('./common-utils/queued')
 const OutboxService = require('./Outbox')
+const ExtendedModels = require('../../../lib/srv/srv-models')
 
 const appId = require('./common-utils/appId')
 
@@ -76,9 +77,17 @@ class MessagingService extends OutboxService {
     return super.init()
   }
 
-  emit(event, data, headers) {
+  async emit(event, data, headers) {
     const _msg = typeof event === 'object' ? event : { event, data, headers }
-    const msg = _msg instanceof cds.Event ? _msg : new cds.Event(this.message4(_msg))
+    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)
+      }
+    }
+    const msg = new cds.Event(this.message4(_msg))
     return super.emit(msg)
   }
 
@@ -112,10 +121,6 @@ class MessagingService extends OutboxService {
 
   message4(msg) {
     const _msg = { ...msg }
-    if (msg.inbound && !cds.context) {
-      // REVISIT: why are all inbound messages executed with privileged user?
-      cds.context = { tenant: msg.tenant, user: cds.User.privileged }
-    }
     _msg.event = _warnAndStripTopicPrefix(_msg.event, this.LOG)
     if (!_msg.headers) _msg.headers = {}
     if (!_msg.inbound) {

package/libx/_runtime/remote/utils/client.js

@@ -450,8 +450,12 @@ const getReqOptions = (req, query, service) => {
   }
 
   if (reqOptions.data && reqOptions.method !== 'GET' && reqOptions.method !== 'HEAD') {
-    reqOptions.headers['content-type'] = 'application/json'
-    reqOptions.headers['content-length'] = Buffer.byteLength(JSON.stringify(reqOptions.data))
+    if (typeof reqOptions.data === 'object' && !Buffer.isBuffer(reqOptions.data)) {
+      reqOptions.headers['content-type'] = 'application/json'
+      reqOptions.headers['content-length'] = Buffer.byteLength(JSON.stringify(reqOptions.data))
+    } else if (typeof reqOptions.data === 'string' || Buffer.isBuffer(reqOptions.data)) {
+      reqOptions.headers['content-length'] = Buffer.byteLength(reqOptions.data)
+    }
   }
   reqOptions.url = formatPath(reqOptions.url)
 

package/libx/_runtime/remote/utils/data.js

@@ -114,6 +114,7 @@ const _convertValue = (ieee754Compatible, exponentialDecimals) => (value, elemen
 
   return value
 }
+const _PT = ([hh, mm, ss]) => `PT${hh}H${mm}M${ss}S`
 
 const _convertPayloadValue = (value, element) => {
   const type = _elementType(element)
@@ -121,6 +122,10 @@ const _convertPayloadValue = (value, element) => {
   // see https://www.odata.org/documentation/odata-version-2-0/json-format/
   if (value == null) return value
   switch (type) {
+    case 'cds.Time':
+      return value.match(/^(PT)([H,M,S,0-9])*$/) ? value : _PT(value.split(':'))
+    case 'cds.Decimal':
+      return typeof value === 'string' ? value : new String(value)
     case 'cds.Date':
     case 'cds.DateTime':
       return `/Date(${new Date(value).getTime()})/`

package/libx/_runtime/sqlite/Service.js

@@ -70,7 +70,6 @@ module.exports = class SQLiteDatabase extends DatabaseService {
   }
 
   _registerBeforeHandlers() {
-    this._ensureModel && this.before('*', this._ensureModel)
     this.before(['CREATE', 'UPDATE'], '*', this._input) // > has to run before rewrite
     this.before(['CREATE', 'READ', 'UPDATE', 'DELETE'], '*', this._rewrite)
 

package/libx/odata/afterburner.js

@@ -111,6 +111,77 @@ function addRefToWhereIfNecessary(where, entity) {
   return 1
 }
 
+function getResolvedElement(entity, { ref }) {
+  const element = entity.elements[ref[0]]
+  if (element && element.isAssociation && ref.length > 1) {
+    return getResolvedElement(element._target, { ref: ref.slice(1) })
+  } else if (element && element._isStructured) {
+    return getResolvedElement(element, { ref: ref.slice(1) })
+  }
+
+  return element
+}
+
+function _processWhere(where, entity) {
+  for (let i = 0; i < where.length; i++) {
+    const ref = where[i]
+    const val = where[i + 2]
+
+    if (ref === '(' || ref === ')' || ref === 'and' || ref === 'or' || ref === 'not' || val === 'not' || ref.func) {
+      continue
+    }
+    if (ref.xpr) {
+      _processWhere(ref.xpr, entity)
+      continue
+    }
+
+    let valIndex = -1
+    let refIndex = -1
+    if (typeof val === 'object') {
+      if (val.val !== undefined) valIndex = i + 2
+      if (val.ref != undefined) refIndex = i + 2
+    }
+    if (typeof ref === 'object') {
+      if (ref.val !== undefined) valIndex = i
+      if (ref.ref != undefined) refIndex = i
+    }
+
+    // no need to check ref = ref or val = val, if no ref or no val exists we can't do anything
+    if (valIndex === refIndex || valIndex === -1 || refIndex == -1) continue
+
+    const realRef = where[refIndex]
+    const element = getResolvedElement(entity, realRef)
+
+    if (element) {
+      i += 2
+      where[valIndex].val = _convertVal(element, where[valIndex].val)
+    }
+  }
+}
+
+function _convertVal(element, value) {
+  if (value === null) return value
+  switch (element._type) {
+    case 'cds.Integer':
+      // eslint-disable-next-line no-case-declarations
+      const n = Number(value)
+      if (Number.isSafeInteger(n)) return n
+      throw new Error('Not a valid integer') // TODO
+    case 'cds.String':
+    case 'cds.LargeString':
+    case 'cds.Decimal':
+    case 'cds.DecimalFloat':
+    case 'cds.Double':
+    case 'cds.Integer64':
+      if (typeof value === 'string') return value
+      return String(value)
+    case 'cds.Boolean':
+      return typeof value === 'string' ? value === 'true' : value
+    default:
+      return value
+  }
+}
+
 function _processSegments(from, model, namespace) {
   const { ref } = from
 
@@ -142,8 +213,7 @@ function _processSegments(from, model, namespace) {
           .join(',')})`
         base.where.push({ ref: [key] }, '=', { val })
       } else {
-        const val =
-          element._type === 'cds.Integer' ? Number(seg) : element._type === 'cds.Boolean' ? seg === 'true' : seg
+        const val = _convertVal(element, seg)
         base.where.push({ ref: [key] }, '=', { val })
       }
       ref[i] = null
@@ -168,6 +238,7 @@ function _processSegments(from, model, namespace) {
           keyCount += addRefToWhereIfNecessary(ref[i].where, current)
           _resolveAliasesInXpr(ref[i].where, current)
           _resolveAliasInParams(params, current)
+          _processWhere(ref[i].where, current)
         }
 
         _addDefaultParams(ref[i], current)
@@ -201,6 +272,7 @@ function _processSegments(from, model, namespace) {
           _resolveAliasInParams(params, current)
           // in case of Foo(1), params will be {} (before addRefToWhereIfNecessary was called)
           if (!Object.keys(params).length) params = where2obj(ref[i].where)
+          _processWhere(ref[i].where, current)
           _checkAllKeysProvided(params, current)
         }
       } else if ({ action: 1, function: 1 }[current.kind]) {
@@ -221,6 +293,7 @@ function _processSegments(from, model, namespace) {
         if (ref[i].where) {
           keyCount += addRefToWhereIfNecessary(ref[i].where, current)
           _resolveAliasesInXpr(ref[i].where, current)
+          _processWhere(ref[i].where, current)
         }
       } else if (current._isStructured) {
         // > nested property
@@ -349,6 +422,10 @@ function _4service(service) {
      */
     const { one, current, target } = _processSegments(from, model, namespace)
 
+    if (cqn.SELECT.where) {
+      _processWhere(cqn.SELECT.where, root)
+    }
+
     // one?
     if (one) cqn.SELECT.one = true
 

package/libx/odata/cqn2odata.js

@@ -114,11 +114,11 @@ const _odataV2Func = (func, args) => {
   }
 }
 
-const _format = (cur, element, target, kind, isLambda) => {
-  if (typeof cur !== 'object') return encodeURIComponent(formatVal(cur, element, target, kind))
+const _format = (cur, elementName, target, kind, isLambda) => {
+  if (typeof cur !== 'object') return encodeURIComponent(formatVal(cur, elementName, target, kind))
   if (hasValidProps(cur, 'ref'))
     return encodeURIComponent(isLambda ? [LAMBDA_VARIABLE, ...cur.ref].join('/') : cur.ref[0].id || cur.ref.join('/'))
-  if (hasValidProps(cur, 'val')) return encodeURIComponent(formatVal(cur.val, element, target, kind))
+  if (hasValidProps(cur, 'val')) return encodeURIComponent(formatVal(cur.val, elementName, target, kind))
   if (hasValidProps(cur, 'xpr')) return `(${_xpr(cur.xpr, target, kind, isLambda)})`
   // REVISIT: How to detect the types for all functions?
   if (hasValidProps(cur, 'func', 'args')) {
@@ -180,7 +180,8 @@ function _xpr(expr, target, kind, isLambda) {
         res.push(OPERATORS[cur] || cur.toLowerCase())
       }
     } else {
-      const formatted = _format(cur, res[res.length - 2], target, kind, isLambda)
+      const ref = expr[i - 2]
+      const formatted = _format(cur, ref?.ref && (ref.ref.length ? ref.ref : ref.ref[0]), target, kind, isLambda)
       if (formatted !== undefined) res.push(formatted)
     }
   }
@@ -406,7 +407,7 @@ function $orderBy(orderBy) {
   return '$orderby=' + res.join(',')
 }
 
-function parseSearch(search) {
+function parseSearch(search, kind) {
   const res = []
 
   for (const cur of search) {
@@ -417,7 +418,8 @@ function parseSearch(search) {
 
     if (hasValidProps(cur, 'val')) {
       // search term must not be formatted
-      res.push(`"${encodeURIComponent(cur.val)}"`)
+      if (kind === 'odata-v2') res.push(`${encodeURIComponent(cur.val)}`)
+      else res.push(`"${encodeURIComponent(cur.val)}"`)
     }
 
     if (typeof cur === 'string') {
@@ -433,7 +435,7 @@ function parseSearch(search) {
 }
 
 function $search(search, kind) {
-  const expr = parseSearch(search).join('%20').replace('(%20', '(').replace('%20)', ')')
+  const expr = parseSearch(search, kind).join('%20').replace('(%20', '(').replace('%20)', ')')
 
   if (expr) {
     // odata-v2 may support custom query option "search"