@sap/cds 5.8.2 → 5.8.3

package/CHANGELOG.md

@@ -4,6 +4,32 @@
 - 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
@@ -36,7 +62,7 @@
 
 ### 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`
@@ -101,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/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/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/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/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/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) => {

package/libx/_runtime/hana/customBuilder/CustomSelectBuilder.js

@@ -48,7 +48,7 @@ class CustomSelectBuilder extends SelectBuilder {
           select.from.ref &&
           select.from.ref.length === 1 &&
           // REVISIT this does not work with join and draft!
-          this._csn.definitions[select.from.ref[0]]
+          this._csn.definitions[select.from.ref[0].id || select.from.ref[0]]
         // TODO FIXME
         skip =
           !select.orderBy ||

package/libx/_runtime/hana/execute.js

@@ -51,7 +51,8 @@ function _getOutputParameters(stmt) {
 const BINARY_TYPES = {
   12: 'BINARY',
   13: 'VARBINARY',
-  27: 'BLOB'
+  27: 'BLOB',
+  33: 'BSTRING'
 }
 
 function _getBinaries(stmt) {

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

@@ -67,6 +67,11 @@ const getDestination = (name, credentials) => {
     throw new Error(`"url" or "destination" property must be configured in "credentials" of "${name}".`)
   }
 
+  // Cloud SDK wants property "queryParameters" but we have documented "queries"
+  if (credentials.queries && !credentials.queryParameters) {
+    credentials.queryParameters = credentials.queries
+  }
+
   return { name, ...credentials }
 }
 

package/libx/gql/resolvers/crud/create.js

@@ -1,3 +1,5 @@
+const cds = require('../../../../lib')
+
 const { ARGUMENT } = require('../../constants/adapter')
 const { getArgumentByName, astToEntries } = require('../parse/ast2cqn')
 const { entriesStructureToEntityStructure } = require('./utils')
@@ -9,7 +11,10 @@ module.exports = async (service, entityFQN, selection) => {
   const entries = entriesStructureToEntityStructure(service, entityFQN, astToEntries(input))
   query.entries(entries)
 
-  const result = await service.tx(tx => tx.run(query))
+  const result = await service.tx(tx => {
+    cds.context = tx
+    return tx.run(query)
+  })
 
   return Array.isArray(result) ? result : [result]
 }

package/libx/gql/resolvers/crud/delete.js

@@ -1,3 +1,5 @@
+const cds = require('../../../../lib')
+
 const { ARGUMENT } = require('../../constants/adapter')
 const { getArgumentByName, astToWhere } = require('../parse/ast2cqn')
 
@@ -11,7 +13,10 @@ module.exports = async (service, entityFQN, selection) => {
 
   let result
   try {
-    result = await service.tx(tx => tx.run(query))
+    result = await service.tx(tx => {
+      cds.context = tx
+      return tx.run(query)
+    })
   } catch (e) {
     if (e.code === 404) {
       result = 0

package/libx/gql/resolvers/crud/read.js

@@ -1,3 +1,5 @@
+const cds = require('../../../../lib')
+
 const { ARGUMENT } = require('../../constants/adapter')
 const { getArgumentByName, astToColumns, astToWhere, astToOrderBy, astToLimit } = require('../parse/ast2cqn')
 
@@ -21,5 +23,8 @@ module.exports = async (service, entityFQN, selection) => {
     query.limit(astToLimit(top, skip))
   }
 
-  return await service.tx(tx => tx.run(query))
+  return await service.tx(tx => {
+    cds.context = tx
+    return tx.run(query)
+  })
 }

package/libx/gql/resolvers/crud/update.js

@@ -1,3 +1,5 @@
+const cds = require('../../../../lib')
+
 const { ARGUMENT } = require('../../constants/adapter')
 const { getArgumentByName, astToColumns, astToWhere, astToEntries } = require('../parse/ast2cqn')
 const { entriesStructureToEntityStructure } = require('./utils')
@@ -24,8 +26,9 @@ module.exports = async (service, entityFQN, selection) => {
 
   let resultBeforeUpdate
   const result = await service.tx(async tx => {
+    cds.context = tx
     // read needs to be done before the update, otherwise the where clause might become invalid (case that properties in where clause are updated by the mutation)
-    resultBeforeUpdate = await service.tx(tx => tx.run(queryBeforeUpdate))
+    resultBeforeUpdate = await tx.run(queryBeforeUpdate)
     return tx.run(query)
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "5.8.2",
+  "version": "5.8.3",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [