@sap/cds 6.1.0 → 6.1.3

package/libx/_runtime/sqlite/Service.js

@@ -187,11 +187,13 @@ module.exports = class SQLiteDatabase extends DatabaseService {
       return
     }
 
-    const tx = this.transaction()
-    await tx.run(dropViews)
-    await tx.run(dropTables)
-    await tx.run(createEntities)
-    await tx.commit()
+    await this.run(async tx => {
+      // This starts a new transaction if called from CLI, while joining
+      // existing root tx, e.g. when called from DeploymenrService
+      await tx.run(dropViews)
+      await tx.run(dropTables)
+      await tx.run(createEntities)
+    })
 
     return true
   }

package/libx/_runtime/sqlite/execute.js

@@ -19,31 +19,47 @@ const SANITIZE_VALUES = process.env.NODE_ENV === 'production' && cds.env.log.san
  * -> only if DEBUG (which should not be used in production)
  */
 const DEBUG = cds.debug('sqlite')
-const _captureStack = DEBUG
-  ? () => {
-      const o = {}
-      Error.captureStackTrace(o, _captureStack)
-      return o
+const _exec = DEBUG
+  ? (dbc, op, ...args) => {
+      const callback = args[args.length - 1]
+      const captured = {}
+      Error.captureStackTrace(captured, _exec)
+      args[args.length - 1] = function (err) {
+        if (err) {
+          err.message += ' in: \n' + args[0]
+          err.query = args[0]
+          if (args.length > 2) err.values = SANITIZE_VALUES ? ['***'] : args[1]
+          err.stack =
+            err.message +
+            captured.stack
+              .slice(5)
+              .replace(/at( _exec)? /, 'at SQLite.' + op + ' ')
+              .replace(/\s+at new Promise .*\n.*/, '')
+        }
+        callback.apply(this, arguments)
+      }
+      return dbc[op](...args)
+    }
+  : (dbc, op, ...args) => {
+      const callback = args[args.length - 1]
+      args[args.length - 1] = function (err) {
+        if (err) {
+          err.message += ' in: \n' + args[0]
+          err.query = args[0]
+          if (args.length > 2) err.values = SANITIZE_VALUES ? ['***'] : args[1]
+        }
+        callback.apply(this, arguments)
+      }
+      return dbc[op](...args)
     }
-  : () => undefined
-
-const _augmented = (err, sql, values, o) => {
-  err.query = sql
-  if (values) err.values = SANITIZE_VALUES ? ['***'] : values
-  err.message += ' in: \n' + sql
-  if (o) err.stack = err.message + o.stack.slice(5)
-  return err
-}
 
 function _executeSimpleSQL(dbc, sql, values) {
   LOG._debug &&
     LOG.debug(coloredTxCommands[sql] || sql, Array.isArray(values) ? (SANITIZE_VALUES ? ['***'] : values) : '')
 
   return new Promise((resolve, reject) => {
-    const o = _captureStack()
-    dbc.run(sql, values, function (err) {
-      if (err) return reject(_augmented(err, sql, values, o))
-
+    _exec(dbc, 'run', sql, values, function (err) {
+      if (err) return reject(err)
       resolve(this.changes)
     })
   })
@@ -53,9 +69,8 @@ function executeSelectSQL(dbc, sql, values, isOne, postMapper) {
   LOG._debug && LOG.debug(sql, SANITIZE_VALUES ? ['***'] : values)
 
   return new Promise((resolve, reject) => {
-    const o = _captureStack()
-    dbc[isOne ? 'get' : 'all'](sql, values, (err, result) => {
-      if (err) return reject(_augmented(err, sql, values, o))
+    _exec(dbc, isOne ? 'get' : 'all', sql, values, (err, result) => {
+      if (err) return reject(err)
 
       // REVISIT
       // .get returns undefined if nothing in db
@@ -140,9 +155,8 @@ const _executeBulkInsertSQL = (dbc, sql, values) =>
     }
 
     LOG._debug && LOG.debug(sql, SANITIZE_VALUES ? ['***'] : values)
-    const o = _captureStack()
-    const stmt = dbc.prepare(sql, err => {
-      if (err) return reject(_augmented(err, sql, values, o))
+    const stmt = _exec(dbc, 'prepare', sql, err => {
+      if (err) return reject(err)
 
       if (!Array.isArray(values[0])) values = [values]
 
@@ -159,7 +173,7 @@ const _executeBulkInsertSQL = (dbc, sql, values) =>
             if (!isFinalized) {
               isFinalized = true
               stmt.finalize()
-              return reject(_augmented(err, sql, each, o))
+              return reject(err)
             }
           }
 
@@ -212,9 +226,8 @@ function executeInsertSQL(dbc, sql, values, query) {
   LOG._debug && LOG.debug(sql, SANITIZE_VALUES ? ['***'] : values)
 
   return new Promise((resolve, reject) => {
-    const o = _captureStack()
-    dbc.run(sql, values, function (err) {
-      if (err) return reject(_augmented(err, sql, values, o))
+    _exec(dbc, 'run', sql, values, function (err) {
+      if (err) return reject(err)
 
       // InsertResult needs an object per row with its values
       if (query && values.length > 0) {

package/libx/odata/cqn2odata.js

@@ -200,8 +200,12 @@ const _keysOfWhere = (where, kind, target) => {
   if (where.length === 3) {
     const [left, op, right] = where
     if (op === '=' && (('val' in left && right.ref) || (left.ref && 'val' in right))) {
-      if ('val' in left) return `(${formatVal(left.val, right.ref.join('/'), target, kind)})`
-      return `(${formatVal(right.val, left.ref.join('/'), target, kind)})`
+      const formattedValue =
+        'val' in left
+          ? formatVal(left.val, right.ref.join('/'), target, kind)
+          : formatVal(right.val, left.ref.join('/'), target, kind)
+
+      return `(${encodeURIComponent(formattedValue)})`
     }
   }
 

package/libx/rest/RestAdapter.js

@@ -117,8 +117,7 @@ const RestAdapter = function(srv) {
   // begin tx
   router.use((req, res, next) => { // REVISIT: -> move to actual handler(s)
     // create tx and set as cds.context
-    // REVISIT: req._tx should not be used like that!
-    req.tx = cds.context = srv.tx({ user: req.user, req, res })
+    cds.context = srv.tx(new cds.EventContext({ user: req.user, req, res }))
     next()
   })
 
@@ -148,8 +147,7 @@ const RestAdapter = function(srv) {
 
     // unfortunately, express doesn't catch async errors -> try catch needed
     try {
-      // REVISIT: req._tx should not be used like that!
-      await req.tx.commit(result)
+      await cds.context?.tx?.commit(result)
     } catch (e) {
       return next(e)
     }
@@ -179,8 +177,7 @@ const RestAdapter = function(srv) {
     // request may fail during processing or during commit -> both caught here
 
     // REVISIT: rollback needed if error occured before commit attempted -> how to distinguish?
-    // REVISIT: req._tx should not be used like that!
-    if (req.tx) req.tx.rollback(err).catch(() => {}) // REVISIT: silently ?!?
+    cds.context?.tx?.rollback(err).catch(() => {}) // REVISIT: silently ?!?
 
     next(err)
   })

package/libx/rest/middleware/input.js

@@ -1,10 +1,9 @@
 // const cds = require('../../_runtime/cds')
 const getTemplate = require('../../_runtime/common/utils/template')
 const templateProcessor = require('../../_runtime/common/utils/templateProcessor')
-const { checkStaticElementByKey, assertNotNullError } = require('../../_runtime/cds-services/util/assert')
+const { checkStaticElementByKey } = require('../../_runtime/cds-services/util/assert')
 const { MULTIPLE_ERRORS } = require('../../_runtime/common/error/constants')
 
-
 //
 // REVISIT: We need to decipher what we are doing here...
 //
@@ -20,7 +19,7 @@ const _picker = () => {
 }
 
 const _processorFn = errors => {
-  return ({ row, key, plain: categories, target, element }) => {
+  return ({ row, key, plain: categories, target }) => {
     // REVISIT move validation to generic asserter => see PR 717
     if (categories['static_validation'] && row[key] != null) {
       const validations = checkStaticElementByKey(target, key, row[key])

package/package.json

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

package/srv/extensibility-service.cds

@@ -1,5 +1,5 @@
+// using { cds.xt.TAR } from './model-provider'; //> IMPORTANT: don't add this as it will cause services loaded twice
 using { cds.xt.Extensions } from './extensions';
-using { cds.xt.TAR } from './model-provider';
 
 @protocol: 'rest'
 @(requires : 'authenticated-user')
@@ -8,7 +8,8 @@ service cds.xt.ExtensibilityService @(path:'/-/cds/extensibility', impl:'@sap/cd
   // TODO: async jobs
 
   type ActivationLevel : Extensions:activated;
-  type CSN: String; // REVISIT: should reuse cds.xt.CSN
+  type TAR : LargeBinary;
+  type CSN : String; // REVISIT: should reuse cds.xt.CSN
   type CSN_OR_CDL: String;
 
   // UIFLEX API
@@ -46,7 +47,7 @@ service cds.xt.ExtensibilityService @(path:'/-/cds/extensibility', impl:'@sap/cd
 
   @(requires : ['cds.ExtensionDeveloper'])
   action push (
-    extension : TAR,
+    extension : LargeBinary, // REVISIT: Using TAR here leads to a strange type check failure
     tag       : Extensions:tag
     // activate  : ActivationLevel
   );

package/srv/model-provider.js

@@ -109,7 +109,7 @@ module.exports = class ModelProviderService extends cds.ApplicationService {
       const extensions = !base && await _getExtensions4 (req.data.tenant)
       if (!extensions && checkExt) req.reject(404, 'Missing extensions')
 
-      const features = !toggles ? [] : toggles === '*' || toggles.includes('*') ? [fts] : toggles.map (f => fts.replace('*',f))
+      const features = (!toggles || !main.requires.toggles) ? [] : toggles === '*' || toggles.includes('*') ? [fts] : toggles.map (f => fts.replace('*',f))
       const models = cds.resolve (['*',...features], main); if (!models) return
 
       DEBUG && DEBUG ('loading models for', { tenant, toggles } ,'from', models.map (cds.utils.local))

package/srv/mtx.js

@@ -8,19 +8,28 @@ class MTXServices extends cds.Service { async init(){
   }
   // else...
   DEBUG && DEBUG ('bootstrapping MTX services...')
+  let defs = cds.model.definitions
   let sources = []
-  if (cds.requires.multitenancy) {
-    if (!('cds.xt.DeploymentService' in cds.requires)) {
-      sources.push('@sap/cds-mtxs/srv/deployment-service')
-      if (!('cds.xt.SaasProvisioningService' in cds.requires)) sources.push('@sap/cds-mtxs/srv/cf/saas-provisioning-service')
-    }
+
+  if (cds.requires.multitenancy && !('cds.xt.SaasProvisioningService' in defs)) {
+    sources.push('@sap/cds-mtxs/srv/cf/saas-provisioning-service')
+    sources.push('@sap/cds/srv/model-provider')
+  }
+
+  if (cds.requires.multitenancy && !('cds.xt.DeploymentService' in defs)) {
+    sources.push('@sap/cds-mtxs/srv/deployment-service')
+    sources.push('@sap/cds/srv/model-provider')
   }
-  if (cds.requires.extensibility) {
-    if (!('cds.xt.ExtensibilityService' in cds.requires)) sources.push('@sap/cds/srv/extensibility-service')
+
+  if (cds.requires.extensibility && !('cds.xt.ExtensibilityService' in defs)) {
+    sources.push('@sap/cds/srv/extensibility-service')
+    sources.push('@sap/cds/srv/model-provider')
   }
-  if (cds.requires.toggles) {
-    if (!('cds.xt.ModelProviderService' in cds.requires)) sources.push('@sap/cds/srv/model-provider')
+
+  if (cds.requires.toggles && !('cds.xt.ModelProviderService' in defs)) {
+    sources.push('@sap/cds/srv/model-provider')
   }
+
   let models = cds.resolve(sources); if (!models) return
   let base = cds.model.$sources; models = models.filter(m => !base.includes(m))
   if (models.length) return cds.serve(models).in(cds.app)

package/libx/_runtime/db/utils/propagateForeignKeys.js

@@ -1,93 +0,0 @@
-const cds = require('../../cds')
-
-const { prefixForStruct } = require('../../common/utils/csn')
-
-const _autoGenerate = e => e && e.isUUID && e.key
-
-const _generateParentField = ({ parentElement }, row) => {
-  if (_autoGenerate(parentElement) && !row[parentElement.name]) {
-    row[parentElement.name] = cds.utils.uuid()
-  }
-}
-
-const _generateChildField = ({ deep, childElement }, childRow) => {
-  if (deep) {
-    _generateChildField(deep.propagation, childRow[deep.targetName])
-  } else if (_autoGenerate(childElement) && childRow && !childRow[childElement.name]) {
-    childRow[childElement.name] = cds.utils.uuid()
-  }
-}
-
-const _getNestedVal = (row, prefix) => {
-  let val = row
-  const splitted = prefix.split('_')
-  splitted.pop() // remove last `_`
-  let k = ''
-
-  while (splitted.length > 0) {
-    k += splitted.shift()
-    if (k in val) {
-      val = val[k]
-      k = ''
-    } else {
-      k += '_'
-    }
-  }
-
-  return val
-}
-
-const _propagateToChid = ({ parentElement, childElement, parentFieldValue }, row, childRow) => {
-  if (!childElement) return
-  if (parentElement) {
-    const prefix = prefixForStruct(parentElement)
-    if (prefix) {
-      const nested = _getNestedVal(row, prefix)
-      childRow[childElement.name] = nested[parentElement.name]
-    } else {
-      childRow[childElement.name] = row[parentElement.name]
-    }
-  } else if (parentFieldValue !== undefined) {
-    childRow[childElement.name] = parentFieldValue
-  }
-}
-
-const _propagateToParent = ({ parentElement, childElement, deep }, childRow, row) => {
-  if (deep) {
-    _propagateToParent(deep.propagation, childRow[deep.targetName], childRow)
-  }
-  if (parentElement && childElement && childRow && childElement.name in childRow) {
-    row[parentElement.name] = childRow[childElement.name]
-  }
-}
-
-module.exports = (tKey, row, foreignKeyPropagations, isCompositionEffective) => {
-  if (row[tKey] === null) {
-    for (const foreignKeyPropagation of foreignKeyPropagations) {
-      if (!foreignKeyPropagation.fillChild) row[foreignKeyPropagation.parentElement.name] = null
-    }
-    if (!isCompositionEffective) delete row[tKey]
-    return
-  }
-
-  const childRows = Array.isArray(row[tKey]) ? row[tKey] : [row[tKey]]
-
-  for (const childRow of childRows) {
-    if (!childRow) return
-
-    for (const foreignKeyPropagation of foreignKeyPropagations) {
-      if (foreignKeyPropagation.fillChild) {
-        // propagate or generate in parent
-        const pk = foreignKeyPropagation.parentElement && foreignKeyPropagation.parentElement.name
-        if (pk && !(pk in row)) _propagateToParent(foreignKeyPropagation, childRow, row)
-        if (!(pk in row)) _generateParentField(foreignKeyPropagation, row)
-
-        if (isCompositionEffective) _propagateToChid(foreignKeyPropagation, row, childRow)
-      } else {
-        _generateChildField(foreignKeyPropagation, childRow)
-        _propagateToParent(foreignKeyPropagation, childRow, row)
-      }
-    }
-  }
-  if (!isCompositionEffective) delete row[tKey]
-}