@sap/cds 9.4.4 → 9.5.1

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

@@ -45,14 +45,23 @@ const _processComplex = (processFn, row, template, key, pathOptions) => {
   if (rows.length === 0) return
   const keyNames = pathOptions.includeKeyValues && _getTargetKeyNames(template.target)
 
+  let rowIndex = -1
   for (const row of rows) {
+    rowIndex++
     if (row == null) continue
     const args = { processFn, data: row, template, isRoot: false, pathOptions }
 
     let pathSegmentInfo
     if (pathOptions.includeKeyValues) {
       pathOptions.rowUUIDGenerator?.(keyNames, row, template)
-      pathSegmentInfo = { key, keyNames, row, elements: template.target.elements, draftKeys: pathOptions.draftKeys }
+      pathSegmentInfo = {
+        key,
+        keyNames,
+        row,
+        rowIndex,
+        elements: template.target.elements,
+        draftKeys: pathOptions.draftKeys
+      }
     }
 
     if (pathOptions.pathSegmentsInfo) pathOptions.pathSegmentsInfo.push(pathSegmentInfo || key)

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

@@ -1,24 +1,30 @@
-const segmentSerializer = pathSegmentInfo => {
+const segmentKeySerializer = pathSegmentInfo => {
   const { key: tKey, row, elements, draftKeys } = pathSegmentInfo
   let keyNames = pathSegmentInfo.keyNames
 
   const keyValuePairs = keyNames
     .map(key => {
-      let quote
+      const keyValue = row[key] ?? draftKeys?.[key]
+      if (keyValue == null) return
+
+      let formattedValue
 
       switch (elements[key].type) {
         case 'cds.String':
-          quote = "'"
+          formattedValue = `'${keyValue}'`
+          break
+
+        case 'cds.Binary':
+          if (Buffer.isBuffer(keyValue)) formattedValue = keyValue.toString('base64')
+          formattedValue = `binary'${formattedValue}'`
           break
 
         default:
-          quote = ''
+          formattedValue = keyValue
           break
       }
 
-      const keyValue = row[key] ?? draftKeys?.[key]
-      if (keyValue == null) return
-      return `${key}=${quote}${keyValue}${quote}`
+      return `${key}=${formattedValue}`
     })
     .filter(c => c)
 
@@ -27,10 +33,16 @@ const segmentSerializer = pathSegmentInfo => {
   return pathSegment
 }
 
-const templatePathSerializer = (elementName, pathSegmentsInfo) => {
+const segmentIndexSerializer = pathSegmentInfo => {
+  const { key: tKey, rowIndex } = pathSegmentInfo
+  return `${tKey}[${rowIndex}]`
+}
+
+const templatePathSerializer = (elementName, pathSegmentsInfo, serializeWithIndices = false) => {
   const pathSegments = pathSegmentsInfo.map(pathSegmentInfo => {
     if (typeof pathSegmentInfo === 'string') return pathSegmentInfo
-    return segmentSerializer(pathSegmentInfo)
+    if (serializeWithIndices) return segmentIndexSerializer(pathSegmentInfo)
+    return segmentKeySerializer(pathSegmentInfo)
   })
   const path = `${pathSegments.join('/')}${pathSegments.length ? '/' : ''}${elementName}`
   return path