@sap/cds 7.0.0 → 7.0.1

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 7.0.1 - 2023-07-03
+
+### Fixed
+
+- Feature toggle detection in single tenant mode
+- Log output for OData $batch requests
+- Avoid "catastrophic backtracking" issue in okra's tokenizer
+- Transaction marked as committed too early
+
 ## Version 7.0.0 - 2023-06-21
 
 ### Added

package/lib/compile/load.js

@@ -13,8 +13,8 @@ module.exports = exports = function load (files, options) {
 
 exports.parsed = function cds_get (files, options, _flavor) { // NOSONAR
 
-  TRACE?.time('cds.load model ')
   const o = typeof options === 'string' ? { flavor:options } : options || {}
+  if (!o.silent) TRACE?.time('cds.load model ')
   if (!files) files = ['*']; else if (!Array.isArray(files)) files = [files]
   if (o.files || o.flavor === 'files') return cds.resolve(files,o)
   if (o.sources || o.flavor === 'sources') return _sources4 (cds.resolve(files,o))
@@ -32,7 +32,7 @@ exports.parsed = function cds_get (files, options, _flavor) { // NOSONAR
 
 const _finalize = (csn,o) => {
   if (!o.silent) cds.emit ('loaded', csn)
-  TRACE?.timeEnd('cds.load model ')
+  if (!o.silent) TRACE?.timeEnd('cds.load model ')
   return csn
 }
 

package/lib/srv/middlewares/ctx-model.js

@@ -8,7 +8,7 @@ module.exports = ()=> {
   return async function cds_context_model (req,res, next) {
     if (req.baseUrl.startsWith('/-/')) return next() //> our own tech services cannot be extended
     const ctx = cds.context
-    if (ctx.tenant) try {
+    if (ctx.tenant || ctx.features) try {
       // if (req.headers.features) ctx.user.features = req.headers.features //> currently done in basic-auth only
       ctx.model = req.__model = await model4 (ctx.tenant, ctx.features) // REVISIT: req.__model is because of Okra
     } catch (e) {

package/lib/srv/protocols/odata-v4.js

@@ -1,4 +1,4 @@
-const cds = require('../../index'), { User } = cds, { decodeURIComponent } = cds.utils
+const cds = require('../../index'), { User } = cds, { decodeURI } = cds.utils
 const libx = require('../../../libx/_runtime')
 const LOG = cds.log('odata')
 
@@ -6,10 +6,15 @@ module.exports = function ODataAdapter (srv) { return [
   (req, _, next) => {
     let u = req.user
     req.user = u instanceof User ? u : new User(u)
-    req.on ('dispatch', (eve) => {
-      LOG && LOG (req.method, req.baseUrl + decodeURIComponent(eve._path), eve._query||'')
-      if (LOG._debug && eve.query) LOG.debug (eve.query)
+
+    let url = decodeURI(req.originalUrl)
+    LOG && LOG (req.method, url, req.body||'')
+    if (/\$batch/.test(req.url))  req.on ('dispatch', (req) => {
+      let path = decodeURI(req._path)
+      LOG && LOG ('>', req.event, path, req._query||'')
+      if (LOG._debug && req.query) LOG.debug (req.query)
     })
+
     next()
   },
   libx.to.odata_v4 (srv)

package/lib/srv/srv-tx.js

@@ -132,10 +132,10 @@ class RootTransaction extends Transaction {
    * are informed by emitting 'succeeded' event to them all.
    */
   async commit (res) {
-    this._done = 'committed'
     try {
       await this.context.emit ('commit',res) //> allow custom handlers req.before('commit')
       await super.commit (res)
+      this._done = 'committed'
       await this.context.emit ('succeeded',res)
       await this.context.emit ('done')
     } catch (err) {

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriTokenizer.js

@@ -2,12 +2,9 @@
 
 const UriSyntaxError = require('../errors/UriSyntaxError')
 
-const IDENTIFIER =
-  '(?:(?:_|\\p{Letter}|\\p{Letter_Number})' +
-  '(?:_|\\p{Letter}|\\p{Letter_Number}|\\p{Decimal_Number}' +
-  '|\\p{Nonspacing_Mark}|\\p{Spacing_Mark}|\\p{Connector_Punctuation}|\\p{Format}){0,127})'
+const IDENTIFIER = '([_\\p{L}\\p{Nl}][_\\p{L}\\p{Nl}\\p{Nd}\\p{Mn}\\p{Mc}\\p{Pc}\\p{Cf}]{0,127})'
 const IDENTIFIER_REGEXP = new RegExp('^' + IDENTIFIER, 'u')
-const QUALIFIED_NAME_REGEXP = new RegExp('^' + IDENTIFIER + '(?:\\.' + IDENTIFIER + ')+', 'u')
+const QUALIFIED_NAME_REGEXP = new RegExp('^' + IDENTIFIER + '(\\.' + IDENTIFIER + ')+', 'u')
 const PARAMETER_ALIAS_NAME_REGEXP = new RegExp('^@' + IDENTIFIER, 'u')
 
 const BOOLEAN_VALUE_REGEXP = new RegExp('^(?:true|false)', 'i')
@@ -696,9 +693,9 @@ class UriTokenizer {
    * @private
    */
   _nextWithRegularExpression (regexp) {
-    const parsed = regexp.exec(this._parseString.substring(this._index))
-    if (!parsed) return false
-    this._index += parsed[0].length
+    const matched = this._parseString.substring(this._index).match(regexp)
+    if (!matched) return false
+    this._index += matched[0].length
     return true
   }
 

package/package.json

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

package/server.js

@@ -92,7 +92,7 @@ const defaults = {
 const path = require('path')
 const _app_serve = function (endpoint) { return {
   from: (pkg,folder) => {
-    folder = !folder ? pkg : path.resolve(require.resolve(pkg+'/package.json'),'../'+folder)
+    folder = !folder ? pkg : path.resolve(require.resolve(pkg+'/package.json',{paths:[cds.root]}),'../'+folder)
     this.use (endpoint, express.static(folder))
     if (!endpoint.endsWith('/webapp')) (this._app_links || (this._app_links = [])) .push (endpoint)
   }