@sap/cds 5.8.0 → 5.8.3

package/CHANGELOG.md

@@ -4,11 +4,65 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 5.8.3 - 2022-03-01
+
+### Fixed
+
+- `queries` property for application defined destinations of remote services
+- `cds serve --watch` no longer fails if `@sap/cds-dk` is installed only globally
+- `cds serve` during development longer redirects URLs with similar path segments from different services, like `/service/one` and `/service`
+- `cds deploy --to sqlite` now ignores a `_texts.csv` file again if there is a language-specific file like `_texts_en.csv` present
+- Using logical blocks (surrounded with `(` and `)`) in ON-conditions of unmanaged associations and compositions
+- Skip "with parameters" clause if no order by clause or all columns in the order by clause are not strings when using parametrized views on hana
+- Limited support for binary data in OData
+  + Using of `base64` string values in `WHERE IN` on hana
+  + `base64url` values in `@odata.context` annotation
+- `cds.context` is set in GraphQL adapter
+- Using payloads with `@odata.type` annotating primitive properties no longer crashes the application. `#` in type value may be ommitted. Example:
+  ```json
+  {
+    "ID": 201,
+    "title@odata.type": "#String",
+    "title": "Wuthering Heights",
+    "stock@odata.type": "Int32",
+    "stock": 12
+  }
+  ```
+- Unicode support for i18n bundles
+
+## Version 5.8.2 - 2022-02-22
+
+### Fixed
+
+- Crash if error does not have a stack in kibana logging
+- Allow short names for bound operations in odata-server
+- Performance issue during deep operations
+- Resolving views with parameters
+- Expanding association-to-many within draft union scenario
+- Erroneous invalidation of deep `INSERT|UPDATE|DELETE` operations if root entity has managed to-one association to non-writable view
+- Handling of falsy results when sending requests to remote services
+- Resolving foreign key propagations for views with union
+
+## Version 5.8.1 - 2022-02-11
+
+### Fixed
+
+- Use single transaction for update mutations in GraphQL adapter
+- ODATA to CQN parser returned not selected keys in `@odata.context`
+- Draft: `$expand` with special draft columns in `$orderBy` for active entities
+- Reading distinct values of draft enabled entity
+- Handling of LOB data on HANA
+- Fix streaming draft by navigation
+- Empty to-many arrays are not removed from req.data for inserts
+- `$filter` query option in structured mode (OData flavors `w4` and `x4`)
+  + Using JSON-stringified objects no longer occasionally crashes an application
+  + Filtering on a structured element with `ne null` condition also selects data having some `null` properties within
+
 ## Version 5.8.0 - 2022-01-27
 
 ### Added
 
-- Custom `server.js` don't have to export `cds.server` anymore -> we use that by default now. 
+- Custom `server.js` don't have to export `cds.server` anymore -> we use that by default now.
 - In `cds.requires`: Support to replace primitive values with objects
 - Support filter functions on renamed properties from external service
 - Results of database queries use `big.js` for values of type `cds.Decimal` and `cds.Integer64` if enabled via `cds.env.features.bigjs`
@@ -21,9 +75,6 @@
 - Restrict access to all services via `cds.env.requires.auth.restrict_all_services = true`
   + That is, all unrestricted services (i.e., w/o own `@requires`) are treated as having `@requires: 'authenticated-user'`
 - Threshold for automatically sending GET requests as `$batch` (beta, cf. @sap/cds@5.6.0) can be configured per remote service via `cds.env.requires.<srv>.max_get_url_length` (if not configured on service, the global config applies)
-- Alpha out-of-the-box support for DwC
-  + Authentication based on headers set by Jupiter router via `cds.env.requires.auth.kind = 'dwc-auth'`
-  + All DwC headers are forwarded to remote service via `cds.env.requires.<srv>.forward_dwc_headers = true`
 - Limited support for binary data in OData
   + In payloads, the binary data must be a base64 encoded string
   + In URLs, the binary data must have the following format: `binary'<url-safe base64 encoded>'`, e.g., `$filter=ID eq binary'Q0FQIE5vZGUuanM='`
@@ -76,6 +127,12 @@
   + Request data properties of types `cds.Date`, `cds.DateTime` and `cds.Timestamp` are converted accordingly to OData V2 specification
   + Response data properties of types `cds.Decimal`, `cds.DecimalFloat` (deprecated) and `cds.Integer64` are handled properly when using `Accept` header with `IEEE754Compatible=true/false` and `ExponentialDecimals=true/false` format parameters
 
+## Version 5.7.6 - 2022-02-23
+
+### Fixed
+
+- `draftActivate` action does not return children if not requested
+
 ## Version 5.7.5 - 2022-01-14
 
 ### Fixed

package/app/fiori/routes.js

@@ -15,6 +15,9 @@ cds.on ('bootstrap', app => {
     app.use('*/'+uri, ({originalUrl}, res, next)=> {  //  */browse/webapp[/prefix]/browse/
       // any of our special URLs ($fiori-, $api-docs) ? -> next
       if (originalUrl.startsWith('/$'))  return next()
+      // is there a service starting with the URL? -> next
+      if (cds.service.providers.find (srv => originalUrl.startsWith(srv.path)))  return next()
+
       // is there a service for '[prefix]/browse' ?
       const srv = serviceForUri[uri] || (serviceForUri[uri] =
         cds.service.providers.find (srv => ('/'+uri).lastIndexOf(srv.path) >=0))

package/bin/cds.js

@@ -15,13 +15,17 @@ const cli = { //NOSONAR
     if (!argv.length) argv = process.argv.slice(3)
     if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
     if (process.env.NODE_ENV !== 'test')  this.errorHandlers()
-    const task = _require ('./'+cmd)
-      || _require ('@sap/cds-dk/bin/'+cmd) // if dk is in installed modules
-      || _require (_npmGlobalModules()+'/@sap/cds-dk/bin/'+cmd)  // needed for running cds in npm scripts
+    const task = this.load(cmd)
     if (!task)  return _requires_cdsdk (cmd)
     return task.apply (this, this.args(task,argv))
   },
 
+  load (cmd) {
+    return _require ('./'+cmd)
+      || _require ('@sap/cds-dk/bin/'+cmd) // if dk is in installed modules
+      || _require (_npmGlobalModules()+'/@sap/cds-dk/bin/'+cmd)  // needed for running cds in npm scripts
+  },
+
   args (task, argv) {
 
     const { options:o=[], flags:f=[], shortcuts:s=[] } = task

package/bin/serve.js

@@ -143,7 +143,7 @@ async function serve (all=[], o={}) { // NOSONAR
 
   // IMPORTANT: never load any @sap/cds modules before the chdir above happened!
   // handle --watch and --project
-  if (o.watch)  return _watch (o.project,o)   // cds serve --watch <project>
+  if (o.watch)  return _watch.call(this, o.project,o)   // cds serve --watch <project>
   if (o.project) _chdir_to (o.project)      // cds run --project <project>
   if (!o.silent) _prepare_logging ()
 
@@ -240,7 +240,7 @@ function _prepare_logging () { // NOSONAR
 /** handles --watch option */
 function _watch (project,o) {
   o.args = process.argv.slice(2) .filter (a => a !== '--watch' && a !== '-w')
-  return require('@sap/cds-dk/bin/watch')([project],o)
+  return this.load('watch')([project],o)
 }
 
 

package/lib/deploy.js

@@ -152,7 +152,7 @@ function init_from_json (db, csn, SILENT) {
  */
 function prefer_translated_texts (file, all) {
   if (/[._]texts\.(json|csv)$/.test (file)) {
-    const pattern = new RegExp('^'+ path.basename(file) +'_')
+    const pattern = new RegExp('^'+ path.parse(file).name +'_')
     const translated = all.filter (f => pattern.test(f))
     if (translated.length > 0) {
       DEBUG && DEBUG (`ignoring '${file}' in favor of [${translated}]`)  // eslint-disable-line

package/lib/log/format/kibana.js

@@ -1,4 +1,4 @@
-const cds = require ('../../')
+const cds = require('../../')
 const util = require('util')
 
 const _l2l = { 1: 'error', 2: 'warn', 3: 'info', 4: 'debug', 5: 'trace' }
@@ -8,7 +8,7 @@ const _l2l = { 1: 'error', 2: 'warn', 3: 'info', 4: 'debug', 5: 'trace' }
  */
 module.exports = (module, level, ...args) => {
   // config
-  const { user: log_user , kibana_custom_fields } = cds.env.log
+  const { user: log_user, kibana_custom_fields } = cds.env.log
 
   // build the object to log
   const toLog = {
@@ -36,7 +36,7 @@ module.exports = (module, level, ...args) => {
   if (args.length && typeof args[0] === 'object' && args[0].message) {
     const err = args.shift()
     toLog.msg = err.message
-    if (err instanceof Error) toLog.stacktrace = err.stack.split(/\s*\r?\n\s*/)
+    if (typeof err.stack === 'string') toLog.stacktrace = err.stack.split(/\s*\r?\n\s*/)
     Object.assign(toLog, err, { level: toLog.level })
   }
 

package/libx/_runtime/cds-services/adapter/odata-v4/ODataRequest.js

@@ -45,9 +45,7 @@ function _getTarget(service, segments) {
       : last.getEdmType().csdlStructuredType.name
 
     // autoexposed entities now used . in csn and _ in edm
-    const target =
-      findCsnTargetFor(name, service.model, namespace) ||
-      (name.endsWith('Parameters') && service.model.definitions[namespace + '.' + name.replace(/Parameters$/, '')])
+    const target = findCsnTargetFor(name, service.model, namespace)
 
     if (target && target.kind === 'entity') {
       return target

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/action.js

@@ -14,6 +14,12 @@ const { setStatusCodeAndHeader, getKeyProperty } = require('../../../../fiori/ut
 const { toODataResult, postProcess } = require('../utils/result')
 const { mergeJson } = require('../../../services/utils/compareJson')
 
+const _isAssocOrCompNotLocalized = (reqTarget, el) => {
+  return (
+    reqTarget.elements[el].isAssociation && (!reqTarget.texts || reqTarget.elements[el].target !== reqTarget.texts.name)
+  )
+}
+
 const _postProcessDraftActivate = async (req, result, service) => {
   // update req.data (keys needed in readAfterWrite)
   req.data = result
@@ -25,6 +31,13 @@ const _postProcessDraftActivate = async (req, result, service) => {
   result.HasActiveEntity = false
   result.HasDraftEntity = false
 
+  // remove children from result, excluding localized composition 'text'
+  if (!cds.env.effective.odata.structs) {
+    for (const k in req.target.elements) {
+      if (_isAssocOrCompNotLocalized(req.target, k)) delete result[k]
+    }
+  }
+
   return result
 }
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/ResourcePathParser.js

@@ -396,7 +396,18 @@ class ResourcePathParser {
       throw new UriSyntaxError(UriSyntaxError.Message.PREVIOUS_TYPE_HAS_NO_MEDIA, currentType.getName())
     }
 
-    const uriResources = this._parsePropertyPath(uriPathSegments, currentResource, tokenizer)
+    let uriResources
+    try {
+      uriResources = this._parsePropertyPath(uriPathSegments, currentResource, tokenizer)
+    } catch (e) {
+      try {
+        uriResources = this._parseBoundOperation(uriPathSegments, currentResource, tokenizer)
+      } catch (e1) {
+        // throw first error
+        throw e
+      }
+    }
+
     return result.concat(uriResources)
   }
 
@@ -409,7 +420,17 @@ class ResourcePathParser {
    * @private
    */
   _parseBoundOperation (uriPathSegments, currentResource, tokenizer) {
-    const fqn = FullQualifiedName.createFromNameSpaceAndName(tokenizer.getText())
+    // allow short names for bound operations
+    let name = tokenizer.getText()
+    if (typeof name === 'string' && !name.match(/\./)) {
+      const namespace = currentResource._entitySet &&
+        currentResource._entitySet._target &&
+        currentResource._entitySet._target.type &&
+        currentResource._entitySet._target.type.namespace
+      if (namespace) name = namespace + '.' + name
+    }
+
+    const fqn = FullQualifiedName.createFromNameSpaceAndName(name)
     const bindingParamTypeFqn = currentResource.getEdmType().getFullQualifiedName()
 
     // parse bound action

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriHelper.js

@@ -50,7 +50,7 @@ class UriHelper {
     if (value === null) return 'null'
     if (edmType === EdmPrimitiveTypeKind.String) return "'" + value.replace(REGEXP_SINGLE_QUOTE, "''") + "'"
     if (edmType === EdmPrimitiveTypeKind.Duration) return "duration'" + value + "'"
-    if (edmType === EdmPrimitiveTypeKind.Binary) return "binary'" + value + "'"
+    if (edmType === EdmPrimitiveTypeKind.Binary) return "binary'" + value.replace(/\//g, '_').replace(/\+/g, '-') + "'"
     if (edmType.getKind() === EdmTypeKind.DEFINITION) {
       return UriHelper.toUriLiteral(value, edmType.getUnderlyingType())
     }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/deserializer/ResourceJsonDeserializer.js

@@ -347,12 +347,9 @@ class ResourceJsonDeserializer {
       }
       const expectedTypeName =
         expectedType.getKind() === EdmTypeKind.PRIMITIVE ? expectedType.getName() : expectedType.getFullQualifiedName()
-      const typeName =
-        typeof value === 'string' &&
-        value.startsWith(isCollection ? '#Collection(' : '#') &&
-        value.endsWith(isCollection ? ')' : '')
-          ? value.substring(isCollection ? 12 : 1, value.length - (isCollection ? 1 : 0))
-          : null
+      const typeNameRegex = isCollection ? /^#?Collection\((.*)\)$/ : /^#?(.*)$/
+      const matchedTypeName = typeof value === 'string' && value.match(typeNameRegex)
+      const typeName = matchedTypeName && matchedTypeName[1]
       // The type name could be an alias-qualified name; for that case we have to do an EDM look-up.
       const fullQualifiedName =
         typeName && typeName.indexOf('.') > 0 && typeName.lastIndexOf('.') < typeName.length - 1
@@ -369,6 +366,8 @@ class ResourceJsonDeserializer {
         throw new DeserializationError(
           "The value of '" + name + "' must describe correctly the type '" + expectedType.getFullQualifiedName() + "'."
         )
+      } else {
+        delete structureValue[name]
       }
     } else if (name.endsWith(JsonAnnotations.BIND) && !isDelta) {
       const navigationPropertyName = name.substring(0, name.length - JsonAnnotations.BIND.length)

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/ContextURLFactory.js

@@ -281,7 +281,7 @@ class ContextURLFactory {
       // If there is one '*' selected, the context URL contains only '*'.
       if (isAll) {
         value = ['*']
-      } else if (type && type.getKind() === EdmTypeKind.ENTITY && isKeyRequired) {
+      } else if (type && type.getKind() === EdmTypeKind.ENTITY && isKeyRequired && !cds.env.features.odata_new_parser) {
         for (const keyName of type.getKeyPropertyRefs().keys()) {
           if (!value.includes(keyName)) value.push(keyName)
         }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/ErrorJsonSerializer.js

@@ -34,6 +34,8 @@ class ErrorJsonSerializer extends ErrorSerializer {
       })
     }
 
+    if (this._error.innererror) result.innererror = this._error.innererror
+
     addAnnotations(this._error, result)
 
     return JSON.stringify({ error: result })

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/utils/UriHelper.js

@@ -6,6 +6,7 @@ const AbstractError = commons.errors.AbstractError
 const UriSyntaxError = commons.errors.UriSyntaxError
 const IllegalArgumentError = commons.errors.IllegalArgumentError
 const NotImplementedError = commons.errors.NotImplementedError
+const EdmPrimitiveTypeKind = require('../../odata-commons/edm/EdmPrimitiveTypeKind')
 
 /**
  * UriHelper has utility methods for reading and constructing URIs.
@@ -103,7 +104,9 @@ class UriHelper {
     for (const key of keys) {
       url = url ? url + ',' : ''
       if (keys.length > 1) url += encodeURIComponent(key.name) + '='
-      url += encodeURIComponent(CommonsUriHelper.toUriLiteral(key.value, key.type))
+      url += key.type === EdmPrimitiveTypeKind.Binary
+        ? CommonsUriHelper.toUriLiteral(key.value, key.type)
+        : encodeURIComponent(CommonsUriHelper.toUriLiteral(key.value, key.type))
     }
     return '(' + url + ')'
   }

package/libx/_runtime/cds-services/adapter/odata-v4/utils/stream.js

@@ -5,6 +5,9 @@ const { SELECT } = cds.ql
 
 const { targetFromPath, isPathToDraft } = require('../../../../common/utils/cqn')
 const { deepCopyArray } = require('../../../../common/utils/copy')
+const { cqn2cqn4sql } = require('../../../../common/utils/cqn2cqn4sql')
+const { ensureDraftsSuffix } = require('../../../../fiori/utils/handler')
+const { removeIsActiveEntityRecursively, isActiveEntityRequested } = require('../../../../fiori/utils/where')
 
 const isStreaming = segments => {
   const lastSegment = segments[segments.length - 1]
@@ -15,6 +18,34 @@ const isStreaming = segments => {
   )
 }
 
+const _adaptSubSelectsDraft = select => {
+  if (select.SELECT.from.ref) {
+    const index = select.SELECT.from.ref.length - 1
+    select.SELECT.from.ref[index] = ensureDraftsSuffix(select.SELECT.from.ref[index])
+  }
+
+  if (select.SELECT.where) {
+    for (let i = 0; i < select.SELECT.where.length; i++) {
+      const element = select.SELECT.where[i]
+      if (element.SELECT) {
+        _adaptSubSelectsDraft(element)
+      } else if (element.xpr) {
+        for (const ele of element.xpr.filter(e => e.SELECT)) {
+          _adaptSubSelectsDraft(ele)
+        }
+      }
+    }
+  }
+}
+
+const adaptStreamCQN = (cqn, isDraft = false) => {
+  if (isDraft || !isActiveEntityRequested(cqn.SELECT.where)) {
+    _adaptSubSelectsDraft(cqn)
+  } else {
+    cqn.SELECT.where = removeIsActiveEntityRecursively(cqn.SELECT.where)
+  }
+}
+
 const getStreamProperties = (req, model) => {
   const mediaTypeProperty = Object.values(req.target.elements).find(val => val['@Core.MediaType'])
 
@@ -56,14 +87,17 @@ const getStreamProperties = (req, model) => {
 
   if (columns.length && cds.db && !req.target._hasPersistenceSkip) {
     // used cloned path
-    const select = SELECT.one.from({ ref: deepCopyArray(req.query.SELECT.from.ref) }).columns(columns)
-
-    if (req.target._isDraftEnabled && isPathToDraft(select.SELECT.from.ref, model))
-      select.SELECT.from.ref[0].id = select.SELECT.from.ref[0].id + '_drafts'
+    let select = SELECT.one.from({ ref: deepCopyArray(req.query.SELECT.from.ref) }).columns(columns)
 
     // new parser has media property as last ref element -> remove
     if (targetFromPath(select.SELECT.from.ref, model).kind === 'element') select.SELECT.from.ref.pop()
 
+    const pathToDraft = isPathToDraft(select.SELECT.from.ref, model)
+    if (req.target._isDraftEnabled && pathToDraft) {
+      select = cqn2cqn4sql(select, model)
+      adaptStreamCQN(select, pathToDraft)
+    }
+
     return cds
       .tx(req)
       .run(select)
@@ -79,5 +113,6 @@ const getStreamProperties = (req, model) => {
 
 module.exports = {
   isStreaming,
-  getStreamProperties
+  getStreamProperties,
+  adaptStreamCQN
 }

package/libx/_runtime/common/composition/index.js

@@ -1,5 +1,5 @@
 const { getCompositionTree, getCompositionRoot } = require('./tree')
-const { hasDeepInsert, getDeepInsertCQNs, cleanEmptyCompositionsOfMany } = require('./insert')
+const { hasDeepInsert, getDeepInsertCQNs } = require('./insert')
 const { hasDeepUpdate, getDeepUpdateCQNs } = require('./update')
 const { hasDeepDelete, getDeepDeleteCQNs, getSetNullParentForeignKeyCQNs } = require('./delete')
 const { selectDeepUpdateData } = require('./data')
@@ -11,7 +11,6 @@ module.exports = {
   // insert
   hasDeepInsert,
   getDeepInsertCQNs,
-  cleanEmptyCompositionsOfMany,
   // update
   hasDeepUpdate,
   getDeepUpdateCQNs,

package/libx/_runtime/common/composition/insert.js

@@ -10,9 +10,9 @@ const { deepCopyArray } = require('../utils/copy')
  * own utils
  */
 
-function _hasCompOrAssocIgnoreEmptyToMany(entity, k, data) {
+function _hasCompOrAssoc(entity, k) {
   // TODO once REST also uses same logic as odata structured check if we can omit 'entity.elements[k] &&'
-  return entity.elements[k] && (entity.elements[k].is2one || (entity.elements[k].is2many && data[k] && data[k].length))
+  return entity.elements[k] && (entity.elements[k].is2one || entity.elements[k].is2many)
 }
 
 const _addSubDeepInsertCQN = (model, compositionTree, data, cqns, draft) => {
@@ -60,25 +60,13 @@ const _entityFromINSERT = (model, INSERT) => {
   }
 }
 
-const cleanEmptyCompositionsOfMany = (model, cqn) => {
-  const entity = _entityFromINSERT(model, cqn.INSERT)
-  if (!entity) return
-  for (const entry of cqn.INSERT.entries || []) {
-    for (const elName in entry || {}) {
-      const el = entity.elements[elName]
-      if (!el) continue
-      if (el.is2many && !entry[elName].length) delete entry[elName]
-    }
-  }
-}
-
 const hasDeepInsert = (model, cqn) => {
   if (cqn.INSERT.entries) {
     const entity = _entityFromINSERT(model, cqn.INSERT)
     if (entity) {
       return !!cqn.INSERT.entries.find(entry => {
         return !!Object.keys(entry || {}).find(k => {
-          return _hasCompOrAssocIgnoreEmptyToMany(entity, k, entry)
+          return _hasCompOrAssoc(entity, k)
         })
       })
     }
@@ -111,7 +99,6 @@ const getDeepInsertCQNs = (model, cqn) => {
 }
 
 module.exports = {
-  cleanEmptyCompositionsOfMany,
   hasDeepInsert,
   getDeepInsertCQNs
 }

package/libx/_runtime/common/composition/tree.js

@@ -38,7 +38,7 @@ const _foreignKeysToLinks = (element, inverse) =>
 const _resolvedElement = (element, service) => {
   if (!element.target) return element
   // skip forbidden view check if association to view with foreign key in target
-  const skipForbiddenViewCheck = element._isAssociationStrict && element.on && !element['@odata.contained']
+  const skipForbiddenViewCheck = element._isAssociationStrict && !element['@odata.contained']
   const { target, mapping } = getTransition(element._target, service, skipForbiddenViewCheck)
   const newElement = { target: target.name, _target: target }
   Object.setPrototypeOf(newElement, element)

package/libx/_runtime/common/error/frontend.js

@@ -30,9 +30,8 @@ const _getFiltered = err => {
   Object.keys(err)
     .concat(['message'])
     .forEach(k => {
-      if (k === 'innererror' && process.env.NODE_ENV === 'production') {
-        return
-      }
+      // REVISIT: do not remove innererror with cds^6
+      if (k === 'innererror' && process.env.NODE_ENV === 'production' && !err[SKIP_SANITIZATION]) return
       if (ALLOWED_PROPERTIES.includes(k) || k.startsWith('@')) {
         error[k] = err[k]
       } else if (k === 'numericSeverity') {

package/libx/_runtime/common/i18n/index.js

@@ -2,7 +2,6 @@ const fs = require('fs')
 const path = require('path')
 
 const cds = require('../../cds')
-const LOG = cds.log('app')
 
 const dirs = (cds.env.i18n && cds.env.i18n.folders) || []
 
@@ -50,36 +49,8 @@ function init(locale, file) {
   if (!file) file = findFile(locale)
   if (!file) return
 
-  let raw
-  try {
-    raw = fs.readFileSync(file, 'utf-8')
-  } catch (e) {
-    if (LOG._warn) {
-      e.message = `Unable to load file "${file}" for locale "${locale}" due to error: ` + e.message
-      LOG.warn(e)
-    }
-    return
-  }
-
-  try {
-    const pairs = raw
-      .replace(/\r/g, '')
-      .split(/\n/)
-      .map(ele => ele.trim())
-      .filter(ele => ele && !ele.startsWith('#'))
-      .map(ele => {
-        const del = ele.indexOf('=')
-        return [ele.slice(0, del), ele.slice(del + 1)].map(ele => ele.trim())
-      })
-    for (const [key, value] of pairs) {
-      i18ns[locale][key] = value
-    }
-  } catch (e) {
-    if (LOG._warn) {
-      e.message = `Unable to process file "${file}" for locale "${locale}" due to error: ` + e.message
-      LOG.warn(e)
-    }
-  }
+  const props = cds.load.properties(file)
+  i18ns[locale] = props
 }
 
 init('default', path.join(__dirname, 'messages.properties'))

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

@@ -50,7 +50,7 @@ const _getDataSubjectUp = (role, model, entity, prev, next, result) => {
 }
 
 const _getDataSubjectDown = (role, entity, prev, next) => {
-  const associations = Object.values(entity.associations).filter(e => !e._isBacklink)
+  const associations = Object.values(entity.associations || {}).filter(e => !e._isBacklink)
   for (const element of associations) {
     const me = { entity, relative: entity, element }
     if (_ifDataSubject(element._target, role)) {
@@ -79,8 +79,20 @@ const getDataSubject = (entity, model, role) => {
   return entity.set(hash, dataSubject)
 }
 
-const _resolve = (name, model, namespace) =>
-  model.entities(namespace)[name] || model.definitions[`${namespace}.${name}`]
+const _findInModel = (name, model, namespace) => {
+  return model.entities(namespace)[name] || model.definitions[`${namespace}.${name}`]
+}
+
+const _resolve = (name, model, namespace) => {
+  const resolved = _findInModel(name, model, namespace)
+  // the edm name has an additional suffix 'Parameters' in case of views with parameters
+  if (!resolved && name.endsWith('Parameters')) {
+    const viewWithParam = _findInModel(name.replace(/Parameters$/, ''), model, namespace)
+    if (!viewWithParam || !viewWithParam.params) return
+    return viewWithParam
+  }
+  return resolved
+}
 
 const _findRootEntity = (model, edmName, namespace) => {
   const parts = edmName.split('_')

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

@@ -178,6 +178,12 @@ const _resolveTargetForeignKey = targetKey => {
   return { targetName, propagation }
 }
 
+const _resolveColumnsFromQuery = query => {
+  if (query && query.SET) return _resolveColumnsFromQuery(query.SET.args[0])
+  if (query && query.SELECT && query.SELECT.columns) return query.SELECT.columns
+  return []
+}
+
 const _resolvedKeys = (foreignKeys, targetKeys, fillChild) => {
   const foreignKeyPropagations = []
 
@@ -191,12 +197,9 @@ const _resolvedKeys = (foreignKeys, targetKeys, fillChild) => {
      * Once you have the full path, you can find it in the target entity.
      * NOTE: There can be projections upon projections and renamings in every projection. -> not yet covered!!!
      */
-    const tkCol =
-      targetKeys[i].parent.query &&
-      targetKeys[i].parent.query.SELECT.columns &&
-      targetKeys[i].parent.query.SELECT.columns.find(
-        c => c.ref && `${fk['@odata.foreignKey4']}_${c.ref.join('_')}` === fk.name
-      )
+    const tkCol = _resolveColumnsFromQuery(targetKeys[i].parent.query).find(
+      c => c.ref && `${fk['@odata.foreignKey4']}_${c.ref.join('_')}` === fk.name
+    )
     tk = tkCol && targetKeys.find(tk => tk.name === (tkCol.as ? tkCol.as : tkCol.ref.join('_')))
     // with composition of aspects, the lookup fails -> we need this final fallback
     if (!tk) tk = targetKeys[i]

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

@@ -4,9 +4,8 @@ const _toRef = (alias, column) => {
 }
 
 const _adaptRefs = (onCond, path, { select, join }) => {
-  const adaptedOnCondition = onCond.map(el => {
+  const _adaptEl = el => {
     const ref = el.ref
-
     if (ref) {
       if (ref[0] === path.join('_') && ref[1]) {
         return _toRef(select, ref.slice(1))
@@ -18,12 +17,13 @@ const _adaptRefs = (onCond, path, { select, join }) => {
       }
 
       return _toRef(join, ref.slice(0))
+    } else if (el.xpr) {
+      el.xpr = el.xpr.map(_adaptEl)
     }
 
     return el
-  })
-
-  return adaptedOnCondition
+  }
+  return onCond.map(_adaptEl)
 }
 
 const _args = (csnElement, path, aliases) => {