@sap/cds 5.9.1 → 5.9.2

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.2 - 2022-04-07
+
+### Fixed
+
+- i18n translation for errors did not work correctly in some cases
+- Normalization in custom `getRestrictions`
+- Throw exception by `INSERT` into HANA queries if number of provided rows deviates from number of affected rows returned by hdb to prevent data losses
+- Handler detection for extended services
+- Speed-up in localization handling
+- Draft: navigation via an association to many from a non-draft enabled entity to a draft-enabled entity
+- Limited support of `SELECT` queries with operator expressions (`xpr`)
+
 ## Version 5.9.1 - 2022-03-31
 
 ### Fixed

package/lib/compile/etc/_localized.js

@@ -97,8 +97,8 @@ function unfold_csn (m) { // NOSONAR
 
 
 const $localized = '$$localized', _is_localized = (d,_path={}) => {
-	if (d.own($localized)) return true
-	if (!d.elements || d.name.endsWith('.texts')) return false
+	if (typeof d.own($localized) === 'boolean') return d.own($localized)
+	if (!d.elements || d.name.endsWith('.texts')) return d.set($localized,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]
@@ -106,6 +106,7 @@ const $localized = '$$localized', _is_localized = (d,_path={}) => {
 			return d.set($localized,true)
 		}
 	}
+  return d.set($localized,false)
 }
 
 

package/lib/connect/bindings.js

@@ -1,4 +1,4 @@
-const DEBUG = /\b(y|all|serve)\b/.test (process.env.DEBUG) && console.warn
+const DEBUG = /\b(y|all|serve|bindings)\b/.test (process.env.DEBUG) && console.warn
 // || console.debug
 
 const cds = require ('..')

package/lib/connect/index.js

@@ -1,5 +1,4 @@
 const cds = require('..'), {one_model} = cds.env.features, LOG = cds.log('cds.connect')
-const factory = require('../serve/factory')
 const _pending = cds.services._pending || {} // used below to chain parallel connect.to(<same>)
 
 /**
@@ -22,7 +21,7 @@ const connect = module.exports = async function cds_connect (options) {
  * @returns { Promise<import('../serve/Service-api')> }
  */
 connect.to = async (datasource, options) => {
-  let Service = factory, _done = x=>x
+  let Service = cds.service.factory, _done = x=>x
   if (typeof datasource === 'object') [options,datasource] = [datasource]
   else if (datasource) {
     if (datasource._is_service_class) [ Service, datasource ] = [ datasource, datasource.name ]
@@ -33,7 +32,7 @@ connect.to = async (datasource, options) => {
     // queue parallel requests to a single promise, to avoid creating multiple services
     _pending[datasource] = new Promise (r=>_done=r).finally(()=>{ delete _pending[datasource] })
   }
-  const o = Service === factory ? options4 (datasource, options) : {}
+  const o = Service === cds.service.factory ? options4 (datasource, options) : {}
   const m = await model4 (o)
   // check if required service definition exists
   const required = cds.requires[datasource]

package/lib/env/requires.js

@@ -1,4 +1,4 @@
-const _runtime = '../../libx/_runtime'
+const _runtime = '@sap/cds/libx/_runtime'
 
 exports = module.exports = {
 

package/lib/index.js

@@ -12,6 +12,7 @@ if (global.cds) Object.assign(module,{exports:global.cds}) ; else {
       /** @type {{ [path:string] : Service }} */ paths: {},
       /** @type Service[] */ providers: [],
       factory: require ('./serve/factory'),
+      adapters: require ('./serve/adapters'),
       bindings: require ('./connect/bindings'),
     })}
     /** @type {import './req/context'} */

package/lib/serve/adapters.js

@@ -1,11 +1,11 @@
 const lib = require('../../libx/_runtime')
 const registry = {
-  rest: lib.to.old_rest,
-  new_rest: lib.to.new_rest,
-  odata: lib.to.odata_v4,
-  odata_v2: lib.to.odata_v4,
-  odata_v4: lib.to.odata_v4,
-  fiori: lib.to.odata_v4,
+  get rest() { return lib.to.old_rest },
+  get new_rest() { return lib.to.new_rest },
+  get odata() { return lib.to.odata_v4 },
+  get odata_v2() { return lib.to.odata_v4 },
+  get odata_v4() { return lib.to.odata_v4 },
+  get fiori() { return lib.to.odata_v4 },
 }
 
 

package/lib/serve/factory.js

@@ -1,5 +1,6 @@
-const cds = require('..')
-const { path, isfile } = cds.utils
+const cds = require('..'), { path, isfile } = cds.utils
+const paths = Array.from (new Set ([ cds.root, ...require.resolve.paths('x') ]))
+const DEBUG = cds.debug('srv.factory'); DEBUG && DEBUG ({ 'cds.root':cds.root, paths })
 
 /** @typedef {import('./Service-api')} Service @type { (()=>Service) & (new()=>Service) } */
 const ServiceFactory = function (name, model, options) { //NOSONAR
@@ -8,6 +9,7 @@ const ServiceFactory = function (name, model, options) { //NOSONAR
   const serve = !cds.requires[name] || o.mocked
   const defs = !model ? {[name]:{}} : model.definitions || cds.error (`Invalid argument for 'model': ${model}`)
   const def = !name || name === 'db' ? {} : defs[name] || {}
+  DEBUG && DEBUG ({ name, definition:def, options:o })
 
   let it /* eslint-disable no-cond-assign */
   if (it = o.with)                 return _use (it) // from cds.serve (<options>)
@@ -27,21 +29,24 @@ const ServiceFactory = function (name, model, options) { //NOSONAR
 
   function _required() {
     const kind = o.kind = serve && def['@kind'] || o.kind || 'app-service'
-    if (_required[kind]) return _required[kind]
+    if (_require[kind]) return _require[kind]
     const {impl} = cds.requires[kind] || cds.error (`No configuration found for 'cds.requires.${kind}'`)
-    return _required[kind] = _require (impl || cds.error (`No 'impl' configured for 'cds.requires.${kind}'`))
+    DEBUG && DEBUG ('requires',{kind,impl})
+    return _require[kind] = _require (impl || cds.error (`No 'impl' configured for 'cds.requires.${kind}'`))
   }
 }
 
 const _require = (it,d) => {
-  if (it.startsWith('@sap/cds/')) it = cds.home + it.slice(8)    //> for local tests in @sap/cds dev
-  else if (it.startsWith('./')) it = _relative (d, it.slice(2)) //> relative to <service>.cds
-  else if (it.startsWith('//')) it = path.resolve (cds.root,it.slice(2)) //> relative to cds.root
-  try { var resolved = require.resolve(it) } catch(e) {
+  DEBUG && d && DEBUG ('requires',{ service: d.name, source:_source(d), impl:it })
+  if (it.startsWith('@sap/cds/')) it = cds.home + it.slice(8)  //> for local tests in @sap/cds dev
+  if (it.startsWith('./')) it = _relative (d,it.slice(2))     //> relative to <service>.cds
+  try { var resolved = require.resolve(it,{paths}) } catch(e) {
     try { resolved = require.resolve(it = path.resolve(cds.root,it)) } catch(e) { // for compatibility
+      DEBUG && DEBUG (`Failed loading service implementation from '${it}'`, { 'cds.root':cds.root, paths })
       throw cds.error(`Failed loading service implementation from '${it}'`)
     }
   }
+  DEBUG && DEBUG({resolved})
   return require(resolved)
 }
 
@@ -59,7 +64,7 @@ const sibling = (d) => {
     let found
     if (process.env.CDS_TYPESCRIPT === 'true') found = isfile(path.join(home, each, file + '.ts'))
     if (!found) found = isfile(path.join(home, each, file + '.js'))
-    if (found)  return found
+    if (found)  return found //> equiv to '.'+found.slice(home.length)
   }
 }
 

package/lib/serve/index.js

@@ -1,6 +1,6 @@
-const { ProtocolAdapter } = require('./adapters')
-const { Service } = require('./factory')
 const cds = require ('..')
+const { ProtocolAdapter } = cds.service.adapters
+const { Service } = cds.service.factory
 const _ready = Symbol(), _pending = cds.services._pending || {}
 
 /** @param som - a service name or a model (name or csn) */
@@ -54,7 +54,8 @@ function cds_serve (som, _options) { // NOSONAR
     // Shortcut for directly passed service classes
     if (o.service && o.service._is_service_class) {
       const Service = o.service, d = { name: o.service.name }
-      return all.push (_new (Service, d,csn,o))
+      const srv = _new (Service, d,csn,o)
+      return all.push (srv)
     }
 
     // Get relevant service definitions from model...

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

@@ -66,7 +66,12 @@ function _log(level, arg) {
 
     // reduce 4xx to warning
     if (isClientError(obj)) {
-      if (!LOG._warn) return
+      if (!LOG._warn) {
+        // restore
+        obj.message = _message
+        if (_details) obj.details = _details
+        return
+      }
       level = 'warn'
     }
   }

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

@@ -1,5 +1,6 @@
 const cds = require('../../../../cds')
 const OData = require('../OData')
+const DEBUG = cds.debug('extensibility')
 
 const { alias2ref } = require('../../../../common/utils/csn')
 const { BASE_TENANT } = require('../../../../common/utils/extensibilityUtils')
@@ -17,14 +18,18 @@ function createOdataService(service) {
   return odataService
 }
 
-const { Service } = require('../../../../../../lib/serve/factory')
-async function createNewService(name, csn, defaultOptions) {
-  const options = Object.assign({}, defaultOptions)
-  const service = new Service(name, csn, options)
-  if (!service.path) service.path = cds.service.path4(service)
+async function createNewService(name, model, options) {
+  const { constructor: Service, path } = cds.services[name]
+  const service = new Service(name, model, { ...options }) // cloning options to be safe
   if (service.init) await service.prepend(service.init)
   if (options.impl) await service.prepend(options.impl)
-
+  if (path) service.path = path
+  DEBUG &&
+    DEBUG('Created tenant-specific service:', service.name, '= new', Service.name, {
+      _handlers: {
+        on: service._handlers.on.map(h => ({ on: h.on, handler: () => {} }))
+      }
+    })
   return createOdataService(service)
 }
 

package/libx/_runtime/cds-services/services/Service.js

@@ -8,7 +8,7 @@ const { postProcess } = require('../../common/utils/postProcessing')
 const _isSimpleCqnQuery = q => typeof q === 'object' && q !== null && !Array.isArray(q) && Object.keys(q).length > 0
 
 // for getRestrictions()
-const { getNormalizedRestrictions, getApplicableRestrictions } = require('./utils/restrictions')
+const { getNormalizedRestrictions, getApplicableRestrictions } = require('../../common/generic/auth/restrictions.js')
 const WRITE_EVENTS = { CREATE: 1, NEW: 1, UPDATE: 1, PATCH: 1, DELETE: 1, CANCEL: 1, EDIT: 1 }
 const CRUD = Object.assign({ READ: 1 }, WRITE_EVENTS)
 

package/libx/_runtime/common/generic/auth/restrict.js

@@ -2,6 +2,7 @@ const cds = require('../../../cds')
 
 const { reject, getRejectReason, resolveUserAttrs, getAuthRelevantEntity } = require('./utils')
 const { DRAFT_EVENTS, MOD_EVENTS } = require('./constants')
+const { getNormalizedPlainRestrictions } = require('./restrictions')
 
 const { cqn2cqn4sql } = require('../../utils/cqn2cqn4sql')
 
@@ -250,7 +251,8 @@ async function handler(req) {
     // > no applicable restrictions -> 403
     reject(req, getRejectReason(req, '@restrict', definition))
   }
-
+  // normalize
+  restrictions = getNormalizedPlainRestrictions(restrictions, definition)
   // at least one if the user's roles grants unrestricted access => done
   if (restrictions.some(restrict => !restrict.where)) return
 

package/libx/_runtime/{cds-services/services/utils → common/generic/auth}/restrictions.js

@@ -72,7 +72,14 @@ const getApplicableRestrictions = (restrictions, event, user) => {
   })
 }
 
+const getNormalizedPlainRestrictions = (restrictions, definition) => {
+  const result = []
+  for (const restriction of restrictions) _addNormalizedRestrict(restriction, result, definition)
+  return result
+}
+
 module.exports = {
   getNormalizedRestrictions,
-  getApplicableRestrictions
+  getApplicableRestrictions,
+  getNormalizedPlainRestrictions
 }

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

@@ -501,8 +501,9 @@ const _convertNotEqual = (container, partName = 'where') => {
         }
       }
 
-      if (el && el.SELECT) {
-        _convertNotEqual(el.SELECT, partName)
+      if (el) {
+        if (el.SELECT) _convertNotEqual(el.SELECT, partName)
+        if (el.xpr) _convertNotEqual(el, 'xpr')
       }
     })
 
@@ -715,6 +716,10 @@ const _convertToOneEqNullInFilter = (query, target) => {
 
 // eslint-disable-next-line complexity
 const _convertSelect = (query, model, _options) => {
+  const { _initial } = _options
+  if (_initial) {
+    delete _options._initial
+  }
   const options = Object.assign(
     {
       _4db: _options.service instanceof cds.DatabaseService,
@@ -730,9 +735,6 @@ const _convertSelect = (query, model, _options) => {
     query.SELECT.from = _convertSelect(query.SELECT.from, model, options)
   }
 
-  // REVISIT: a temporary workaround for xpr from new parser
-  if (cds.env.features.odata_new_parser) _flattenCQN(query)
-
   // lambda functions
   convertWhereExists(query.SELECT, model, options)
 
@@ -793,6 +795,9 @@ const _convertSelect = (query, model, _options) => {
     }
   }
 
+  // temporary workaround for xpr - cds v5.9.2 only
+  if (_initial) _flattenCQN(query)
+
   return query
 }
 
@@ -932,7 +937,7 @@ const _convertUpdate = (query, model, options) => {
  */
 const cqn2cqn4sql = (query, model, options = { suppressSearch: false }) => {
   if (query.SELECT) {
-    return _convertSelect(query, model, options)
+    return _convertSelect(query, model, Object.assign(options, { _initial: true }))
   }
 
   if (query.UPDATE) {

package/libx/_runtime/fiori/generic/readOverDraft.js

@@ -67,19 +67,22 @@ const _shouldReadOverDraft = (req, definitions) => {
   const rootEntityName = typeof firstFromRef === 'string' ? firstFromRef : firstFromRef.id
   const rootEntity = definitions[rootEntityName]
 
-  // read over the draft only if the root entity is draft-enabled and
-  // the navigation starts with a draft entity (IsActiveEntity=false)
-  if (!!rootEntity._isDraftEnabled && isActiveEntityRequested(firstFromRef.where)) return false
+  // read over the draft only if the root entity is draft-enabled
+  if (!rootEntity._isDraftEnabled) return false
 
-  // read over the draft if the navigation target is an association and
-  // only if it isn't annotated with @odata.draft.enclosed
-  const pathSegments = fromRef.map(path => (typeof path === 'string' ? path : path.id))
+  // read over the draft only if the navigation starts from a draft entity, e.g.,
+  // /Books(ID=1, IsActiveEntity=false)
+  if (isActiveEntityRequested(firstFromRef.where)) return false
 
+  const pathSegments = fromRef.map(path => (typeof path === 'string' ? path : path.id))
   const excludeAssoc = assoc => {
     if (assoc.name === 'DraftAdministrativeData' || assoc.name === 'SiblingEntity') return true
     return false
   }
 
+  // Read over the draft only if:
+  // - the navigation target is an association and
+  // - isn't annotated with the @odata.draft.enclosed annotation
   return _hasNavToNonDraftEnclosedAssoc(pathSegments, definitions, excludeAssoc)
 }
 

package/libx/_runtime/hana/execute.js

@@ -280,11 +280,28 @@ function executeInsertCQN(model, dbc, query, user, locale, txTimestamp) {
   }
 
   return _executeSimpleSQL(dbc, sql, values).then(affectedRows => {
+    const entriesOrRows = query.INSERT.entries || query.INSERT.rows
+    const affectedRowsCount = Array.isArray(affectedRows)
+      ? affectedRows.reduce((sum, rows) => sum + rows, 0)
+      : affectedRows
+    if (entriesOrRows && entriesOrRows.length !== affectedRowsCount) {
+      LOG._warn &&
+        LOG.warn(
+          `INSERT input deviates from affected rows (input: ${entriesOrRows.length}, affectedRows: ${affectedRowsCount})`,
+          {
+            sql,
+            args: values && values.length,
+            values,
+            query
+          }
+        )
+      throw new Error('Possible data loss by INSERT into HANA db. Please, update a corresponding HANA driver.')
+    }
     // InsertResult needs an object per row with its values
     // query.INSERT.values -> one row
     if (query.INSERT.values) return [{ affectedRows: 1, values: [values] }]
     // query.INSERT.entries or .rows -> multiple rows
-    if (query.INSERT.entries || query.INSERT.rows) return values.map(v => ({ affectedRows: 1, values: v }))
+    if (entriesOrRows) return values.map(v => ({ affectedRows: 1, values: v }))
     // INSERT into SELECT
     return [{ affectedRows }]
   })

package/package.json

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