@sap/cds 5.9.0 → 5.9.1

package/CHANGELOG.md

@@ -4,6 +4,18 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 5.9.1 - 2022-03-31
+
+### Fixed
+
+- Function arguments might be escaped too often
+- URL encoding for remote services for CQN queries
+- `cds serve` during development again redirects URLs with for UI apps in a folder with the same name as a service, so `/foo/webapp` would redirect to `/foo`.  This got broken in 5.8.3.
+- Endless loop in localization handling
+- Ensure service impl while extending entity from the service
+- Post-processing of custom draft queries
+- No minifying of CSN artifacts for Java build
+
 ## Version 5.9.0 - 2022-03-25
 
 ### Added

package/app/fiori/routes.js

@@ -1,4 +1,6 @@
 const cds = require('../../lib')
+const DEBUG = cds.debug('fiori/routes')
+const {dirname, relative, join} = require('path')
 
 // Only for local cds runs w/o approuter:
 // If there is a relative URL in UI5's manifest.json for the datasource,
@@ -11,16 +13,20 @@ cds.on ('bootstrap', app => {
   const v2Prefix = (env.odata.v2proxy && env.odata.v2proxy.urlpath) || '/v2'
   const serviceForUri = {}
 
-  dataSourceURIs (env.folders.app).forEach(uri => {
-    app.use('*/'+uri, ({originalUrl}, res, next)=> {  //  */browse/webapp[/prefix]/browse/
+  dataSourceURIs (env.folders.app).forEach(({appPath, dataSourceUri}) => {
+    const uiRoutes = [
+      join('/', appPath,      dataSourceUri, '*'), //  /uiApp/webapp/browse/*
+      join('/', appPath, '*', dataSourceUri, '*')  //  /uiApp/webapp/*/browse/*
+    ].map(r => r.replace(/\\/g, '/')) // handle Windows \
+    DEBUG && DEBUG ('Register routes', uiRoutes)
+
+    app.use(uiRoutes, ({originalUrl}, res, next)=> {
       // 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))
+      const srv = serviceForUri[dataSourceUri] || (serviceForUri[dataSourceUri] =
+        cds.service.providers.find (srv => ('/'+dataSourceUri).lastIndexOf(srv.path) >=0))
       if (srv) {
         let redirectUrl
         // odata-proxy may be in the line with its /v2 prefix.  Make sure we retain it.
@@ -30,7 +36,7 @@ cds.on ('bootstrap', app => {
         else // --> /browse/webapp[/prefix]/browse/ -> /browse
           redirectUrl = originalUrl.substring(originalUrl.lastIndexOf(srv.path+'/'))
         if (originalUrl !== redirectUrl)  {// safeguard to prevent running in loops
-          // console.log ('>>', req.originalUrl, '->', redirectUrl)
+          DEBUG && DEBUG ('Redirecting', {src: originalUrl}, '~>', {target: redirectUrl})
           return res.redirect (308, redirectUrl)
         }
       }
@@ -41,10 +47,11 @@ cds.on ('bootstrap', app => {
   function dataSourceURIs (dir) {
     const uris = new Set()
     find (dir, ['*/manifest.json', '*/*/manifest.json']).forEach(file => {
+      const appPath = relative(join(cds.root, dir), dirname(file))
       const {dataSources: ds} = JSON.parse(fs.readFileSync(file))['sap.app'] || {}
       Object.keys (ds||[])
         .filter (k => ds[k].uri && !ds[k].uri.startsWith('/')) // only consider relative URLs)
-        .forEach(k => uris.add(ds[k].uri))
+        .forEach(k => uris.add({ appPath, dataSourceUri: ds[k].uri }))
     })
     return uris
   }

package/lib/compile/cdsc.js

@@ -105,25 +105,7 @@ const _options = {for: Object.assign (_options4, {
  */
 module.exports = exports = {__proto__:compile, _options,
   for: {__proto__: compile.for,
-    odata: (csn,o) => {
-      if (features.ucsn) {
-        const { cloneCsn } = require('@sap/cds-compiler/lib/model/csnUtils') // REVISIT: This should be done by the compiler
-        if (compile.version() >= "2.12.1") {
-          const generateDrafts = require('@sap/cds-compiler/lib/transform/draft/odata')
-          const compiled = generateDrafts(cloneCsn(csn, {}), { messages: [] })
-          compiled.meta._4odata = true
-          return compiled
-        } else {
-            // not yet in compiler branch, can't add drafts
-            const cloned = cloneCsn(csn, {})
-            cloned.meta._4odata = true
-            return cloned
-        }
-      }
-      const compiled = compile.for.odata  (csn, _options.for.odata(o))
-      compiled.meta._4odata = true
-      return compiled
-    },
+    odata: (csn,o) => compile.for.odata  (csn, _options.for.odata(o)),
   },
   to: {__proto__: compile.to,
     edmx: Object.assign ((csn,o) => compile.to.edmx (csn, _options.for.edm(o)), {

package/lib/compile/etc/_localized.js

@@ -96,13 +96,13 @@ function unfold_csn (m) { // NOSONAR
 }
 
 
-const $localized = '$$localized', _is_localized = (d,_path) => {
+const $localized = '$$localized', _is_localized = (d,_path={}) => {
 	if (d.own($localized)) return true
 	if (!d.elements || d.name.endsWith('.texts')) return false
 	// if (d.elements.texts && d.elements.texts.target === `${d.name}.texts`) return d.set($localized,true)
 	for (let each in d.elements) {
 		const e = d.elements [each]
-		if (e.localized || e._target && !(_path && e._target.name in _path) && _is_localized(e._target,{..._path, [d.name]:1 })) {
+		if (e.localized || e._target && !(_path && e._target.name in _path) && _is_localized(e._target,Object.assign(_path, { [d.name]:1 }))) {
 			return d.set($localized,true)
 		}
 	}

package/lib/compile/for/java.js

@@ -4,7 +4,7 @@ const _cached = Symbol('for Java')
 module.exports = function cds_compile_for_java (csn,o) {
   if (!csn) return
   const cached = csn[_cached]; if (cached) return cached
-  csn = cds.minify (csn)
+  // csn = cds.minify (csn)
   csn = cds.compile.for.drafts (csn,o)
   // Add a parsed _where clause for @restrict.{grant,where} annotations
   if (csn.definitions) for (let {'@restrict':rr} of Object.values(csn.definitions)) if (rr) {

package/lib/compile/for/nodejs.js

@@ -4,7 +4,7 @@ const _cached = Symbol('for Node.js')
 module.exports = function cds_compile_for_nodejs (csn,o) {
   if (!csn) return
   const cached = csn[_cached]; if (cached) return cached
-  csn = cds.minify (csn)
+  // csn = cds.minify (csn)
   csn = cds.compile.for.drafts (csn,o) //> creates a partial copy -> avoid any cds.linked() before
   csn = cds.compile._localized.unfold_csn (csn)
   csn = cds.linked (csn)

package/lib/compile/for/odata.js

@@ -13,4 +13,4 @@ module.exports = function cds_compile_for_odata (csn,_o) {
   return _4odata
 }
 
-const _is_odata = csn => csn.meta && csn.meta._4odata
+const _is_odata = csn => csn.meta && csn.meta.transformation === 'odata'

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

@@ -17,12 +17,13 @@ function createOdataService(service) {
   return odataService
 }
 
+const { Service } = require('../../../../../../lib/serve/factory')
 async function createNewService(name, csn, defaultOptions) {
-  const options = Object.assign({}, defaultOptions, { reflectedModel: csn })
-
-  const service = new cds.ApplicationService(name, csn, options)
-  await service.init()
-  if (options.impl) service.impl(options.impl)
+  const options = Object.assign({}, defaultOptions)
+  const service = new Service(name, csn, options)
+  if (!service.path) service.path = cds.service.path4(service)
+  if (service.init) await service.prepend(service.init)
+  if (options.impl) await service.prepend(options.impl)
 
   return createOdataService(service)
 }

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

@@ -783,8 +783,8 @@ const _convertSelect = (query, model, _options) => {
     if (target && target._unresolved && typeof target.name === 'string') {
       target = model.definitions[ensureNoDraftsSuffix(target.name)] || target
     }
-    if (target && !target._unresolved) {
-      const cols = getColumns(target, { onlyNames: true })
+    if (target && !Object.prototype.hasOwnProperty.call(target, '_unresolved')) {
+      const cols = getColumns(target, { onlyNames: true, filterVirtual: true })
       query.columns(cols)
       if (target._isDraftEnabled && query._target._unresolved) {
         query.SELECT.columns.push(...getDraftColumnsCQNForDraft(target))

package/libx/_runtime/db/data-conversion/post-processing.js

@@ -192,6 +192,11 @@ const _getMapperForListedElements = (conversionMap, csn, cqn) => {
  * @private
  */
 const getPostProcessMapper = (conversionMap, csn = {}, cqn = {}) => {
+  // No mapper defined or irrelevant as no READ request
+  if (!Object.prototype.hasOwnProperty.call(cqn, 'SELECT')) {
+    return new Map()
+  }
+
   return cqn.SELECT.columns ? _getMapperForListedElements(conversionMap, csn, cqn) : new Map()
 }
 

package/libx/_runtime/db/sql-builder/FunctionBuilder.js

@@ -56,12 +56,13 @@ class FunctionBuilder extends BaseBuilder {
   }
 
   _escapeLikeParameters(parameters) {
-    for (const parameter of parameters) {
-      if (parameter.val) parameter.val = parameter.val.replace(/(\^|_|%)/g, '^$1')
-      else if (parameter.func) parameter.args = this._escapeLikeParameters(parameter.args)
-    }
-
-    return parameters
+    return parameters.map(parameter => {
+      if (parameter.val) return { ...parameter, val: parameter.val.replace(/(\^|_|%)/g, '^$1') }
+      if (parameter.func) {
+        return { ...parameter, args: this._escapeLikeParameters(parameter.args) }
+      }
+      return parameter
+    })
   }
 
   _handleFunction() {
@@ -117,8 +118,7 @@ class FunctionBuilder extends BaseBuilder {
     const functionName = this._functionName()
     const not = functionName.startsWith('not') ? 'NOT ' : ''
     const columns = this._columns(args)
-    const params = args.slice(1)
-    this._escapeLikeParameters(params)
+    const params = this._escapeLikeParameters(args.slice(1))
 
     const _pattern = (() => {
       if (functionName.includes('contains')) return _ => ["'%'", _, "'%'"]

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

@@ -339,12 +339,10 @@ const _cqnToReqOptions = (query, kind, model, target) => {
   const queryObject = cds.odata.urlify(query, { kind, model })
   const reqOptions = {
     method: queryObject.method,
-    url: encodeURI(
-      queryObject.path
-        // ugly workaround for Okra not allowing spaces in ( x eq 1 )
-        .replace(/\( /g, '(')
-        .replace(/ \)/g, ')')
-    )
+    url: queryObject.path
+      // ugly workaround for Okra not allowing spaces in ( x eq 1 )
+      .replace(/\( /g, '(')
+      .replace(/ \)/g, ')')
   }
   if (queryObject.method !== 'GET' && queryObject.method !== 'HEAD') {
     reqOptions.data = kind === 'odata-v2' ? convertV2PayloadData(queryObject.body, target) : queryObject.body

package/libx/odata/cqn2odata.js

@@ -83,14 +83,10 @@ function _args(args) {
 
     if (hasValidProps(cur, 'func', 'args')) {
       res.push(`${cur.func}(${_args(cur.args)})`)
-    }
-
-    if (hasValidProps(cur, 'ref')) {
-      res.push(cur.ref.join('/'))
-    }
-
-    if (hasValidProps(cur, 'val')) {
-      res.push(formatVal(cur.val))
+    } else if (hasValidProps(cur, 'ref')) {
+      res.push(_format(cur))
+    } else if (hasValidProps(cur, 'val')) {
+      res.push(_format(cur))
     }
   }
 
@@ -98,13 +94,13 @@ function _args(args) {
 }
 
 const _in = (column, /* in */ collection, target, kind, isLambda) => {
-  const ref = isLambda ? [LAMBDA_VARIABLE, ...column.ref].join('/') : column.ref.join('/')
+  const ref = _format(column, null, target, kind, isLambda)
   // { val: [ 1, 2, 3 ] } or { list: [ { val: 1}, { val: 2}, { val: 3} ] }
   const values = collection.val || collection.list
   if (values && values.length) {
     // REVISIT: what about OData `in` operator?
-    const expressions = values.map(value => `${ref} eq ${_format(value, ref, target, kind, isLambda)}`)
-    return expressions.join(' or ')
+    const expressions = values.map(value => `${ref}%20eq%20${_format(value, ref, target, kind, isLambda)}`)
+    return expressions.join('%20or%20')
   }
 }
 
@@ -119,9 +115,10 @@ const _odataV2Func = (func, args) => {
 }
 
 const _format = (cur, element, target, kind, isLambda) => {
-  if (typeof cur !== 'object') return formatVal(cur, element, target, kind)
-  if (hasValidProps(cur, 'ref')) return isLambda ? [LAMBDA_VARIABLE, ...cur.ref].join('/') : cur.ref.join('/')
-  if (hasValidProps(cur, 'val')) return formatVal(cur.val, element, target, kind)
+  if (typeof cur !== 'object') return encodeURIComponent(formatVal(cur, element, target, kind))
+  if (hasValidProps(cur, 'ref'))
+    return encodeURIComponent(isLambda ? [LAMBDA_VARIABLE, ...cur.ref].join('/') : cur.ref.join('/'))
+  if (hasValidProps(cur, 'val')) return encodeURIComponent(formatVal(cur.val, element, 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')) {
@@ -156,7 +153,7 @@ function _xpr(expr, target, kind, isLambda) {
       } else if (isOrIsNotValue) {
         // REVISIT: "is" only used for null values?
         const operator = isOrIsNotValue[1] /* 'is not' */ ? 'ne' : 'eq'
-        res.push(...[operator, formatVal(isOrIsNotValue[2])])
+        res.push(...[operator, _format({ val: isOrIsNotValue[2] })])
       } else if (cur === 'between') {
         // ref gt low.val and ref lt high.val
         const between = [expr[i - 1], 'gt', expr[i + 1], 'and', expr[i - 1], 'lt', expr[i + 3]]
@@ -188,7 +185,7 @@ function _xpr(expr, target, kind, isLambda) {
     }
   }
 
-  return res.join(' ')
+  return res.join('%20')
 }
 
 const _keysOfWhere = (where, kind, target) => {
@@ -202,11 +199,11 @@ const _keysOfWhere = (where, kind, target) => {
   const res = []
   for (const cur of where) {
     if (hasValidProps(cur, 'ref')) {
-      res.push(cur.ref.join('/'))
+      res.push(_format(cur))
     } else if (hasValidProps(cur, 'val')) {
       // find previous ref
       const element = res[res.length - 2]
-      res.push(formatVal(cur.val, element, target, kind))
+      res.push(_format(cur, element, target, kind))
     } else if (cur === 'and') {
       res.push(',')
     } else {
@@ -267,15 +264,15 @@ const _parseColumnsV2 = (columns, prefix = []) => {
 
       if (hasValidProps(column, 'expand')) {
         const parsed = _parseColumnsV2(column.expand, [refName])
-        expand.push(refName, ...parsed.expand)
+        expand.push(encodeURIComponent(refName), ...parsed.expand)
         select.push(...parsed.select)
       } else {
-        select.push(refName)
+        select.push(encodeURIComponent(refName))
       }
     }
 
     if (column === '*') {
-      select.push(`${prefix.join('/')}/*`)
+      select.push(encodeURIComponent(`${prefix.join('/')}/*`))
     }
   }
 
@@ -288,7 +285,7 @@ const _parseColumns = columns => {
 
   for (const column of columns) {
     if (hasValidProps(column, 'ref')) {
-      let refName = column.ref.join('/')
+      let refName = _format(column)
       if (hasValidProps(column, 'expand')) {
         // REVISIT: incomplete, see test Foo?$expand=invoices($count=true;$expand=item($search="some"))
         if (!columns.some(c => !c.expand)) select.push(refName)
@@ -350,16 +347,16 @@ function $orderBy(orderBy) {
 
   for (const cur of orderBy) {
     if (hasValidProps(cur, 'ref', 'sort')) {
-      res.push(cur.ref.join('/') + ' ' + cur.sort)
+      res.push(_format(cur) + '%20' + cur.sort)
       continue
     }
 
     if (hasValidProps(cur, 'ref')) {
-      res.push(cur.ref.join('/'))
+      res.push(_format(cur))
     }
 
     if (hasValidProps(cur, 'func', 'sort')) {
-      res.push(`${cur.func}(${_args(cur.args)})` + ' ' + cur.sort)
+      res.push(`${cur.func}(${_args(cur.args)})` + '%20' + cur.sort)
       continue
     }
 
@@ -382,7 +379,7 @@ function parseSearch(search) {
 
     if (hasValidProps(cur, 'val')) {
       // search term must not be formatted
-      res.push(`"${cur.val}"`)
+      res.push(`"${encodeURIComponent(cur.val)}"`)
     }
 
     if (typeof cur === 'string') {
@@ -398,7 +395,7 @@ function parseSearch(search) {
 }
 
 function $search(search, kind) {
-  const expr = parseSearch(search).join(' ').replace('( ', '(').replace(' )', ')')
+  const expr = parseSearch(search).join('%20').replace('(%20', '(').replace('%20)', ')')
 
   if (expr) {
     // odata-v2 may support custom query option "search"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "5.9.0",
+  "version": "5.9.1",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -32,7 +32,7 @@
   "dependencies": {
     "@sap-cloud-sdk/core": "^1.41",
     "@sap-cloud-sdk/util": "^1.41",
-    "@sap/cds-compiler": "^2.4.4",
+    "@sap/cds-compiler": "^2.13.0",
     "@sap/cds-foss": "^3"
   },
   "husky": {