@sap/cds 5.6.3 → 5.7.3

package/libx/odata/{odata2cqn/afterburner.js → afterburner.js}

@@ -1,7 +1,7 @@
-const cds = require('../../_runtime/cds')
+const cds = require('../_runtime/cds')
 
-const { where2obj } = require('../../_runtime/common/utils/cqn')
-const { findCsnTargetFor } = require('../../_runtime/common/utils/csn')
+const { where2obj } = require('../_runtime/common/utils/cqn')
+const { findCsnTargetFor } = require('../_runtime/common/utils/csn')
 
 function _keysOf(entity) {
   return entity && entity.keys
@@ -11,11 +11,11 @@ function _keysOf(entity) {
     : []
 }
 
-function _getDefinition(definition, name) {
+function _getDefinition(definition, name, namespace) {
   return (
     (definition.definitions && definition.definitions[name]) ||
     (definition.elements && definition.elements[name]) ||
-    (definition.actions && definition.actions[name]) ||
+    (definition.actions && (definition.actions[name] || definition.actions[name.replace(namespace + '.', '')])) ||
     definition[name]
   )
 }
@@ -29,7 +29,7 @@ function _resolveAliasInWhere(where, entity) {
 }
 
 // case: single key without name, e.g., Foo(1)
-function _addRefToWhereIfNecessary(where, entity) {
+function addRefToWhereIfNecessary(where, entity) {
   if (!where || where.length !== 1) return 0
   const keys = _keysOf(entity)
   if (keys.length !== 1) return 0
@@ -37,8 +37,9 @@ function _addRefToWhereIfNecessary(where, entity) {
   return 1
 }
 
-function _processSegments(cqn, model) {
-  const { ref } = cqn.SELECT.from
+function _processSegments(cqn, model, namespace) {
+  const from = _resolveFrom(cqn.SELECT.from)
+  const ref = from.ref
 
   let current = model
   let path
@@ -59,7 +60,15 @@ function _processSegments(cqn, model) {
       let base = ref[i - keyCount]
       if (!base.id) base = { id: base, where: [] }
       if (base.where.length) base.where.push('and')
-      base.where.push({ ref: [key] }, '=', { val: element.type === 'cds.Integer' ? Number(seg) : seg })
+      if (ref[i].id) {
+        // > fix case key value parsed to collection with filter
+        const val = `${ref[i].id}(${Object.keys(params)
+          .map(k => `${k}='${params[k]}'`)
+          .join(',')})`
+        base.where.push({ ref: [key] }, '=', { val })
+      } else {
+        base.where.push({ ref: [key] }, '=', { val: element.type === 'cds.Integer' ? Number(seg) : seg })
+      }
       ref[i] = null
       ref[i - keyCount] = base
       incompleteKeys = keyCount < keys.length
@@ -71,7 +80,7 @@ function _processSegments(cqn, model) {
 
       path = path ? path + `${path.match(/:/) ? '.' : ':'}${seg}` : seg
       // REVISIT: replace use case: <namespace>.<entity>_history is at <namespace>.<entity>.history
-      current = _getDefinition(current, seg) || _getDefinition(current, seg.replace(/_/g, '.'))
+      current = _getDefinition(current, seg, namespace) || _getDefinition(current, seg.replace(/_/g, '.'), namespace)
       // REVISIT: 404 or 400?
       if (!current) cds.error(`Invalid resource path "${path}"`, { code: 404 })
 
@@ -80,7 +89,7 @@ function _processSegments(cqn, model) {
         one = !!(ref[i].where || current._isSingleton)
         incompleteKeys = ref[i].where ? false : i === ref.length - 1 || one ? false : true
         if (ref[i].where) {
-          keyCount += _addRefToWhereIfNecessary(ref[i].where, current)
+          keyCount += addRefToWhereIfNecessary(ref[i].where, current)
           _resolveAliasInWhere(ref[i].where, current)
         }
       } else if ({ action: 1, function: 1 }[current.kind]) {
@@ -98,7 +107,7 @@ function _processSegments(cqn, model) {
         incompleteKeys = one || i === ref.length - 1 ? false : true
         current = model.definitions[current.target]
         if (ref[i].where) {
-          keyCount += _addRefToWhereIfNecessary(ref[i].where, current)
+          keyCount += addRefToWhereIfNecessary(ref[i].where, current)
           _resolveAliasInWhere(ref[i].where, current)
         }
       } else if (current._isStructured) {
@@ -125,7 +134,7 @@ function _processSegments(cqn, model) {
   }
 
   // remove all nulled refs
-  cqn.SELECT.from.ref = ref.filter(r => r)
+  from.ref = ref.filter(r => r)
 
   // one?
   if (one) cqn.SELECT.one = true
@@ -135,11 +144,13 @@ function _processSegments(cqn, model) {
   cqn.__target = current
 }
 
+const _resolveFrom = from => (from.SELECT ? _resolveFrom(from.SELECT.from) : from)
+
 function _4service(service) {
   const { namespace, model } = service
 
   return cqn => {
-    const { ref } = cqn.SELECT.from
+    const { ref } = _resolveFrom(cqn.SELECT.from)
 
     // REVISIT: shouldn't be necessary
     /*
@@ -154,7 +165,7 @@ function _4service(service) {
     /*
      * key vs. path segments (/Books/1/author/books/2/...) and more
      */
-    _processSegments(cqn, model)
+    _processSegments(cqn, model, namespace)
 
     return cqn
   }
@@ -166,5 +177,6 @@ module.exports = {
   for: service => {
     if (!cache.has(service)) cache.set(service, _4service(service))
     return cache.get(service)
-  }
+  },
+  addRefToWhereIfNecessary
 }

package/libx/odata/{cqn2odata/index.js → cqn2odata.js}

@@ -1,4 +1,4 @@
-const { formatVal } = require('../utils')
+const { formatVal } = require('./utils')
 
 const OPERATORS = {
   '=': 'eq',