@sap/cds 6.2.3 → 6.3.1

package/lib/ql/INSERT.js

@@ -7,54 +7,55 @@ module.exports = class Query extends require('./Query') {
   }
 
   into (entity, ...data) {
-    this.INSERT.into = this._target_name4 (...arguments) // supporting tts
+    this[this.cmd].into = this._target_name4 (...arguments) // supporting tts
     if (data.length) this.entries(...data)
     return this
   }
 
   entries (...x) {
-    this.INSERT.entries = is_array(x[0]) ? x[0] : x
+    this[this.cmd].entries = is_array(x[0]) ? x[0] : x
     return this
   }
   columns (...x) {
-    this.INSERT.columns = is_array(x[0]) ? x[0] : x
+    this[this.cmd].columns = is_array(x[0]) ? x[0] : x
     return this
   }
   values (...x) {
-    this.INSERT.values = is_array(x[0]) ? x[0] : x
+    this[this.cmd].values = is_array(x[0]) ? x[0] : x
     return this
   }
   rows (...rows) {
     if (is_array(rows[0]) && is_array(rows[0][0])) rows = rows[0]
     if (!is_array(rows[0])) this._expected `Arguments ${{rows}} to be an array of arrays`
-    this.INSERT.rows = rows
+    this[this.cmd].rows = rows
     return this
   }
   _rows(rows, ...args) {
 
+    const INSERT = this.cmd
     if (Array.isArray(rows)) {
       // check if all the entries in the array are arrays
       if (rows.every(e => Array.isArray(e))) {
-        this.INSERT.rows = rows
+        this[INSERT].rows = rows
         // check if array contains one or multiple objects
       } else if (rows.every(e => typeof e === 'object')) {
-        this.INSERT.entries = rows
+        this[INSERT].entries = rows
         // the rows have been added as arguments
       } else if (args.length !== 0) {
         args.unshift(rows)
-        this.INSERT.rows = args
+        this[INSERT].rows = args
       } else {
-        this.INSERT.values = rows
+        this[INSERT].values = rows
       }
     } else if (typeof rows === 'object') {
-      this.INSERT.entries = rows
+      this[INSERT].entries = rows
     }
 
     return this
   }
   as (query) {
     if (!query || !query.SELECT) this._expected `${{query}} to be a CQN {SELECT} query object`
-    this.INSERT.as = query
+    this[this.cmd].as = query
     return this
   }
   valueOf() {

package/lib/ql/Query.js

@@ -5,16 +5,23 @@ class Query {
 
   constructor(_={}) { this[this.cmd] = _ }
 
+  alias (a) {
+    let _ = this[this.cmd] ;(_.from || _.into || _.entity).as = a
+    return this
+  }
+
   /** Creates a derived instance that initially inherits all properties. */
-  clone(){
-    const inherited = Object.create (this[this.cmd])
-    return {__proto__:this, [this.cmd]: inherited }
+  clone (_) {
+    const cmd = this.cmd || Object.keys(this)[0]
+    return {__proto__:this, [cmd]: {__proto__:this[cmd],..._} }
   }
 
-  flat(){
-    const flat = this[this.cmd]
-    for (let x=flat; x.__proto__;) Object.assign(flat, x = x.__proto__)
-    return new this.constructor (flat)
+  flat (q=this) {
+    let x = q.cmd || Object.keys(q)[0], y = q[x]
+    let protos = [y]; for (let o=y; o.__proto__;) protos.push (o = o.__proto__)
+    q[x] = Object.assign ({}, ...protos.reverse())
+    if (y.columns) for (let c of y.columns) if (c.SELECT) (this||Query.prototype).flat(c)
+    return q
   }
 
   /** Binds this query to be executed with the given service */

package/lib/ql/UPSERT.js

@@ -0,0 +1 @@
+module.exports = class Query extends require('./INSERT') {}

package/lib/ql/Whereable.js

@@ -43,7 +43,7 @@ class Query extends require('./Query') {
 }
 
 const predicate4 = (args, _clause) => {
-  if (args.length === 0) return; const x = args[0]
+  if (args.length === 0) return; /* else */ const x = args[0]
   if (x.raw) return parse.CXL(...args).xpr
   if (args.length === 1 && typeof x === 'object') {
     if (is_array(x)) return x
@@ -67,7 +67,11 @@ const _object_predicate = ([arg], _clause) => { // e.g. .where ({ID:4711, stock:
       continue
     }
     if (k === 'exists') {
-      pred.push(null, 'exists', ...predicate4([x],_clause))
+      pred.push(pred.length && 'and', 'exists', typeof x === 'object' ? x : { ref: x.split('.') })
+      continue
+    }
+    if (k === 'not exists') {
+      pred.push(pred.length && 'and', 'not', 'exists', typeof x === 'object' ? x : { ref: x.split('.') })
       continue
     }
     else pred.push('and', parse.expr(k))

package/lib/ql/cds-ql.js

@@ -11,12 +11,10 @@ require = path => { // eslint-disable-line no-global-assign
 }
 
 module.exports = Object.assign (_deprecated_srv_ql, { cdr: true,
-  Query, clone(q) {
-    const cmd = q.cmd || Object.keys(q)[0]
-    return {__proto__:q, [cmd]: {__proto__:q[cmd] }}
-  },
+  Query, clone: (q,_) => Query.prototype.clone.call(q,_),
   SELECT: require('./SELECT'),
   INSERT: require('./INSERT'),
+  UPSERT: require('./UPSERT'),
   UPDATE: require('./UPDATE'),
   DELETE: require('./DELETE'),
   CREATE: require('./CREATE'),

package/lib/req/request.js

@@ -38,6 +38,7 @@ class Request extends require('./event') {
     const q = this.query; if (this.query) { // IMPORTANT: Bulk queries don't have a _.query
       if (q.SELECT) return this._set ('path', _path4 (q.SELECT,'from'))
       if (q.INSERT) return this._set ('path', _path4 (q.INSERT,'into'))
+      if (q.UPSERT) return this._set ('path', _path4 (q.UPSERT,'into'))
       if (q.UPDATE) return this._set ('path', _path4 (q.UPDATE,'entity'))
       if (q.DELETE) return this._set ('path', _path4 (q.DELETE,'from'))
     }
@@ -104,6 +105,7 @@ const Http2Crud = {
 const SQL2Crud = {
   SELECT:   'READ',
   INSERT:   'CREATE',
+  UPSERT:   'UPSERT',
   UPDATE:   'UPDATE',
   DELETE:   'DELETE',
   BEGIN:    'BEGIN',

package/lib/srv/bindings.js

@@ -69,6 +69,7 @@ module.exports = class Bindings {
             }
         }
         cds.on ('shutdown', ()=>this.purge())
+        process.on ('exit', ()=>this.purge()) // last resort e.g. in case of errors
         return this.store()
     }
 

package/lib/srv/middlewares/cds-context.js

@@ -4,7 +4,7 @@ module.exports = ()=> {
 
   /** @type { import('express').Handler } */
   async function cds_context_provider (req, res, next) {
-    const ctx = new cds.EventContext
+    const ctx = {}
     ctx.http = { req, res }
     ctx.id = _id4(req)
     ctx.user = req.user

package/lib/srv/srv-dispatch.js

@@ -102,6 +102,7 @@ const _ensure_target = (srv,req) => {
     if (p) _ensure_fqn (req,'path',srv, p.startsWith('/') ? p.slice(1) : p)
     else if (q.SELECT) _ensure_fqn (q.SELECT,'from',srv)
     else if (q.INSERT) _ensure_fqn (q.INSERT,'into',srv)
+    else if (q.UPSERT) _ensure_fqn (q.UPSERT,'into',srv)
     else if (q.UPDATE) _ensure_fqn (q.UPDATE,'entity',srv)
     else if (q.DELETE) _ensure_fqn (q.DELETE,'from',srv)
   }

package/lib/srv/srv-tx.js

@@ -17,7 +17,7 @@ class NestedContext extends EventContext {
 /**
  * This is the implementation of the `srv.tx(req)` method. It constructs
  * a new Transaction as a derivate of the `srv` (i.e. {__proto__:srv})
- * @returns { Transaction & import('./srv-api') }
+ * @returns { Promise<Transaction & import('./srv-api')> }
  * @param { EventContext } ctx
  */
 function srv_tx (ctx,fn) { const srv = this
@@ -92,7 +92,7 @@ class Transaction {
 
     /*
      * srv.on('error', function (err, req) { ... })
-     * synchroneous modification of passed error only
+     * synchronous modification of passed error only
      * err is undefined if nested tx (cf. "root.before ('failed', ()=> this.rollback())")
      */
     if (err) for (const each of this._handlers._error) each.handler.call(this, err, this.context)
@@ -192,7 +192,7 @@ const _begin = async function (req) {
     return this.ready = this.__proto__.dispatch.call (this,req)
   // Protection against unintended tx.run() after root tx.commit/rollback()
   if (typeof this.ready === 'string' || !this.ready && this.context.tx._done) {
-    if (!cds_tx_protection) this.ready = this.begin() // compatibiliy to former behavior, which allowed tx.run() after commit/rollback
+    if (!cds_tx_protection) this.ready = this.begin() // compatibility to former behavior, which allowed tx.run() after commit/rollback
     else throw cds.error (
       `Transaction is ${this.ready || this.context.tx._done}, no subsequent .run allowed, without prior .begin`,
       { code: 'TRANSACTION_CLOSED' }

package/lib/utils/cds-utils.js

@@ -2,6 +2,7 @@ const cwd = process.env._original_cwd || process.cwd()
 const cds = require('../index')
 
 const ux = module.exports = exports = new class {
+  get inflect() { return super.inflect = require('./inflect') }
   get inspect() { return super.inspect = require('util').inspect }
   get uuid() { return super.uuid = require('@sap/cds-foss').uuid }
   get tar() { return super.tar = require('./tar') }
@@ -10,20 +11,50 @@ const ux = module.exports = exports = new class {
 const path = exports.path = require('path'), { dirname, extname, join, resolve, relative } = path
 const fs = exports.fs = Object.assign (ux,require('fs')) //> for compatibility
 
-exports.decodeURIComponent = s => { try { return decodeURIComponent(s) } catch { return s } }
-exports.decodeURI = s => { try { return decodeURI(s) } catch { return s } }
-
-exports.local = (file) => relative(cwd,file)
 
-exports.readdir = async function (x) {
-  const d = resolve (cds.root,x)
-  return fs.promises.readdir(d)
+/**
+ * Variant of `Object.keys()` which includes all keys inherited from the
+ * given object's prototypes.
+ */
+exports.Object_keys = o => ({
+  [Symbol.iterator]: function*(){ for (let k in o) yield k },
+  forEach(f){ let i=0; for (let k in o) f(k,i++,o) },
+  filter(f){ let i=0, r=[]; for (let k in o) f(k,i++,o) && r.push(k); return r },
+  map(f){ let i=0, r=[]; for (let k in o) r.push(f(k,i++,o)); return r },
+  some(f){ for (let k in o) if (f(k)) return true },
+  find(f){ for (let k in o) if (f(k)) return k },
+})
+
+
+/**
+ * Simple helper to always access results as arrays.
+ */
+exports.results = oa => {
+  return Array.isArray(oa) ? oa : oa != null ? [oa] : []
 }
 
-exports.stat = async function (x) {
-  const d = resolve (cds.root,x)
-  return fs.promises.stat(d)
+
+/**
+ * Should be used in data providers, i.e., db services to return single
+ * rows in response to SELECT.one queries.
+ */
+exports.chimera = oa => {
+  return Array.isArray(oa) ? oa : Object.defineProperties(oa,chimera)
 }
+const chimera = Object.getOwnPropertyDescriptors (class Chimera {
+  *[Symbol.iterator] (){ yield this }
+  forEach(f){ f(this,0,this) }
+  filter(f){ return f(this,0,this) ? [this] : [] }
+  map(f){ return [f(this,0,this)] }
+  some(f){ return f(this,0,this) }
+  find(f){ if (f(this,0,this)) return this }
+}.prototype)
+
+
+exports.decodeURIComponent = s => { try { return decodeURIComponent(s) } catch { return s } }
+exports.decodeURI = s => { try { return decodeURI(s) } catch { return s } }
+
+exports.local = (file) => relative(cwd,file)
 
 exports.exists = function exists (x) {
   if (x) {
@@ -50,6 +81,16 @@ exports.isfile = function isfile (x) {
   } catch(e){/* ignore */}
 }
 
+exports.stat = async function (x) {
+  const d = resolve (cds.root,x)
+  return fs.promises.stat(d)
+}
+
+exports.readdir = async function (x) {
+  const d = resolve (cds.root,x)
+  return fs.promises.readdir(d)
+}
+
 exports.read = async function read (file, _encoding) {
   const f = resolve (cds.root,file)
   const src = await fs.promises.readFile (f, _encoding !== 'json' && _encoding || 'utf8')
@@ -64,18 +105,37 @@ exports.write = function write (file, data, o) {
   return fs.mkdirp (dirname(f)).then (()=> fs.promises.writeFile (f,data,o))
 }
 
+exports.copy = function copy (x,y) {
+  if (arguments.length === 1) return {to:(...path) => copy(x,join(...path))}
+  const src = resolve (cds.root,x)
+  const dst = resolve (cds.root,y)
+  if (fs.promises.cp) return fs.promises.cp (src,dst,{recursive:true})
+  return fs.mkdirp (dirname(dst)) .then (async ()=>{
+    if (fs.isdir(src)) {
+      const entries = await fs.promises.readdir(src)
+      return Promise.all (entries.map (async each => {
+        const e = join (src,each)
+        const f = join (dst,each)
+        return copy (e,f)
+      }))
+    } else {
+      return fs.promises.copyFile (src,dst)
+    }
+  })
+}
+
 exports.mkdirp = async function (...path) {
   const d = resolve (cds.root,...path)
   await fs.promises.mkdir (d,{recursive:true})
   return d
 }
 
-exports.rmdir = (...path) => {
+exports.rmdir = async function (...path) {
   const d = resolve (cds.root,...path)
   return fs.promises.rm (d, {recursive:true})
 }
 
-exports.rimraf = (...path) => {
+exports.rimraf = async function (...path) {
   const d = resolve (cds.root,...path)
   return fs.promises.rm (d, {recursive:true,force:true})
 }
@@ -85,23 +145,6 @@ exports.rm = async function rm (x) {
   return fs.promises.rm(y)
 }
 
-exports.copy = async function copy (x,y) {
-  const src = resolve (cds.root,x)
-  const dst = resolve (cds.root,y)
-  if (fs.promises.cp) return fs.promises.cp (src,dst,{recursive:true})
-  await fs.mkdirp (dirname(dst))
-  if (fs.isdir(src)) {
-    const entries = await fs.promises.readdir(src)
-    return Promise.all (entries.map (async each => {
-      const e = join (src,each)
-      const f = join (dst,each)
-      return copy (e,f)
-    }))
-  } else {
-    return fs.promises.copyFile (src,dst)
-  }
-}
-
 exports.find = function find (base, patterns='*', filter=()=>true) {
   const files=[];  base = resolve (cds.root,base)
   if (typeof patterns === 'string')  patterns = patterns.split(',')
@@ -134,7 +177,9 @@ exports.find = function find (base, patterns='*', filter=()=>true) {
 }
 
 
-// internal utility to load a file through ESM or CommonJs.  TODO find a better place.
+/**
+ * Internal utility to load a file through ESM or CommonJs.  TODO find a better place.
+ */
 exports._import = id => require(id)
 if (typeof jest === 'undefined') {  // jest's ESM support is experimental: https://jestjs.io/docs/ecmascript-modules
   const { pathToFileURL } = require('url')

package/lib/utils/inflect.js

@@ -0,0 +1,24 @@
+const last = /\w+$/
+
+exports.singular4 = (dn,stripped) => {
+	let n = dn.name || dn; if (stripped) n = n.match(last)[0]
+	return dn['@singular'] || (
+		/.*species|news$/i.test(n) ? n  :
+		/.*ess$/.test(n) ?  n :      							// Address
+		/.*ees$/.test(n) ? n.slice(0, -1) : 			// Employees --> Employee
+		/.*[sz]es$/.test(n) ?  n.slice(0, -2) :
+		/.*[^aeiou]ies$/.test(n) ? n.slice(0, -3) + 'y' :     // Deliveries --> Delivery
+		/.*s$/.test(n) ?  n.slice(0, -1) :
+		n
+	)
+}
+
+exports.plural4 = (dn,stripped) => {
+	let n = dn.name || dn; if (stripped) n = n.match(last)[0]
+	return dn['@plural'] || (
+		/.*analysis|status|species|news$/i.test(n) ? n  :
+		/.*[^aeiou]y$/.test(n) ? n.slice(0,-1) + 'ies'  :
+		/.*(s|x|z|ch|sh)$/.test(n) ? n + 'es' :
+		n + 's'
+	)
+}

package/libx/_runtime/auth/strategies/ias-auth.js

@@ -30,7 +30,7 @@ module.exports = function ias_auth(config) {
        This is NOT recommended in production!
        `)
 
-    return
+    return (req, res, next) => next()
   }
 
   passport.use('IAS', new JWTStrategy(config.credentials))

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

@@ -133,7 +133,15 @@ const getErrorHandler = (crashOnError = true, srv) => {
 
     // add content id if not generated by okra ("~...")
     const contentId = odataReq.getOdataRequestId()
-    if (contentId && !contentId.match(/^~/)) err['@Core.ContentID'] = contentId
+    if (contentId && !contentId.match(/^~/)) {
+      err['@Core.ContentID'] = contentId
+      // UI5 expects us to add the content ID to each detail message
+      if (err.details) {
+        err.details.forEach(entry => {
+          entry['@Core.ContentID'] = contentId
+        })
+      }
+    }
 
     const { error, statusCode } = normalizeError(err, req)
     // REVISIT: We should also pass stack traces in development

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

@@ -19,12 +19,29 @@ const metadata = service => {
     const locale = odataRes.getContract().getLocale()
 
     try {
-      let edmx = cds.localize(
-        service.model,
-        locale,
-        // REVISIT: we could cache this in model._cached
-        cds.compile.to.edmx(service.model, { service: service.definition.name })
-      )
+      const { 'cds.xt.ModelProviderService': mps } = cds.services
+      // REVISIT: The following block should replaced with the one commented bellow after the next release of cds-mtxs.
+      // Currently lkg tests fail w/o the try-catch.
+      let edmx
+      try {
+        if (mps) edmx = await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
+        // eslint-disable-next-line no-empty
+      } catch (_) {}
+      if (!edmx)
+        edmx = cds.localize(
+          service.model,
+          locale,
+          cds.compile.to.edmx(service.model, { service: service.definition.name })
+        )
+      /*      
+      let edmx = mps
+        ? await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
+        : cds.localize(
+            service.model,
+            locale,
+            // REVISIT: we could cache this in model._cached
+            cds.compile.to.edmx(service.model, { service: service.definition.name })
+          ) */
       return next(null, toODataResult(edmx))
     } catch (e) {
       if (LOG._error) {

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

@@ -460,6 +460,7 @@ const read = service => {
 
     const changeset = odataReq.getAtomicityGroupId()
     const tx = changeset ? odataReq.getBatchApplicationData().txs[changeset] : service.tx(req)
+    // REVISIT: can be removed when pluggable middlewares are active
     cds.context = tx
 
     let result, err

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/validator/ValueValidator.js

@@ -85,6 +85,11 @@ class ValueValidator {
     this._mode = mode
   }
 
+  get property() {
+    return this._mode === 'decode' &&
+    this._valueConverter._propertyOrReturnType &&
+    this._valueConverter._propertyOrReturnType.getName()
+  }
   /**
    * Validates value of Edm.Binary type.
    * @param {Buffer} value - Edm.Binary value as base64 or base64url string
@@ -257,7 +262,10 @@ class ValueValidator {
           value +
           ' (JavaScript ' +
           typeof value +
-          '). The length of the ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
+          'The length of the ' +
           typeName +
           ' value must not be greater than the MaxLength facet value (' +
           maxLength +
@@ -344,7 +352,9 @@ class ValueValidator {
           value +
           ' (JavaScript ' +
           typeof value +
-          '). ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
           'The number of milliseconds does not correspond to the Precision facet value (' +
           precision +
           ').'
@@ -368,15 +378,16 @@ class ValueValidator {
     if (Number.isNaN(bigValue)) {
       throw this._valueError(value, 'Edm.Decimal', 'number or a string representing a number')
     }
-
     // check that the value has no more digits than specified for precision
     if (precision !== null && precision !== undefined && bigValue.c.length > precision) {
       throw new IllegalArgumentError(
-        'Invalid value ' +
+          'Invalid value ' +
           value +
           ' (JavaScript ' +
           typeof value +
-          '). ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
           'The specified Edm.Decimal value does not correspond to the Precision facet value (' +
           precision +
           ').'
@@ -397,7 +408,9 @@ class ValueValidator {
             value +
             ' (JavaScript ' +
             typeof value +
-            '). ' +
+            ')' +
+            (this.property ? ' for property "' + this.property + '"' : '') +
+            '. ' +
             'If Precision is equal to Scale, a single zero must precede the decimal point ' +
             'in the Edm.Decimal value.'
         )
@@ -413,7 +426,9 @@ class ValueValidator {
           value +
           ' (JavaScript ' +
           typeof value +
-          '). ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
           'The number of digits to the left of the decimal point must not be greater than ' +
           'Precision minus Scale, i.e., ' +
           (precision - scale) +
@@ -425,11 +440,13 @@ class ValueValidator {
     const decimalPart = bigValue.minus(integerPart)
     if (decimalPart.c.length > scale && !decimalPart.eq(0)) {
       throw new IllegalArgumentError(
-        'Invalid value ' +
+          'Invalid value ' +
           value +
           ' (JavaScript ' +
           typeof value +
-          '). ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
           'The specified Edm.Decimal value has more digits to the right of the decimal point ' +
           'than allowed by the Scale facet value (' +
           scale +
@@ -705,18 +722,13 @@ class ValueValidator {
    * @private
    */
   _valueError (value, typeName, requiredText) {
-    const property =
-      this._mode === 'decode' &&
-      this._valueConverter._propertyOrReturnType &&
-      this._valueConverter._propertyOrReturnType.getName()
-
     const msg =
       'Invalid value ' +
       (typeName.includes('Geo') ? JSON.stringify(value) : value) +
       ' (JavaScript ' +
       typeof value +
       ')' +
-      (property ? ' for property "' + property + '"' : '') +
+      (this.property ? ' for property "' + this.property + '"' : '') +
       '. ' +
       'A ' +
       requiredText +

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

@@ -58,7 +58,7 @@ const readAfterWrite = async (req, srv, { operation, isBefore } = { isBefore: fa
   // gracefully set location and no body if no read auth or not readable capability
   let result
   try {
-    const _req = new Request({ query, event: 'READ', _: req._ })
+    const _req = new Request({ query, event: 'READ', _: req._, params: req.params })
     result = await srv.dispatch(_req)
     if (result && req.target._isDraftEnabled) removeDraftUUIDIfNecessary(req)(result)
     if (result === null && !isBefore && (_isWriteWithResponse(req) || _isDraftAction(req))) {