@sap/cds 7.0.0 → 7.0.2

package/CHANGELOG.md

@@ -4,6 +4,24 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 7.0.2 - 2023-07-06
+
+### Fixed
+
+- Glitch in `cds.deploy` if no change was applied
+- Detection of `.cdsrc-private.json` during startup
+- Respect capabilities annotation for draft events
+- `cds compile --to serviceinfo` returns correct service paths again
+
+## 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/for/lean_drafts.js

@@ -72,6 +72,9 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
     if (draft['@readonly']) draft['@readonly'] = undefined
     if (draft['@insertonly']) draft['@insertonly'] = undefined
     if (draft['@restrict']) draft['@restrict'] = undefined
+    if ('@Capabilities.DeleteRestrictions.Deletable' in draft) draft['@Capabilities.DeleteRestrictions.Deletable'] = undefined
+    if ('@Capabilities.InsertRestrictions.Insertable' in draft) draft['@Capabilities.InsertRestrictions.Insertable'] = undefined
+    if ('@Capabilities.UpdateRestrictions.Updatable' in draft) draft['@Capabilities.UpdateRestrictions.Updatable'] = undefined
 
     // Recursively add drafts for compositions
     for (const each in draft.elements) {

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/compile/to/srvinfo.js

@@ -35,15 +35,31 @@ module.exports = (model, options={}) => {
     }
   }
   function _makeNode(service) {
+    const path = _effectiveNodePath(service)
     return {
       name: service.name,
-      urlPath: _url4 (cds.service.path4(service)),
+      urlPath: _url4 (path),
       destination: 'srv-api', // the name to register in xs-app.json
       runtime: 'Node.js',
       location: service.$location
     }
   }
 
+  // TODO use a function from cds.service... instead
+  function _effectiveNodePath(service) {
+    if (service['@path']?.[0] === '/') { // absolute path given
+      return service['@path']
+    }
+    const { ProtocolAdapter } = cds.service.protocols
+    const prots = ProtocolAdapter.protocols4(service)
+    const prot = prots.find(p => p.kind.startsWith('odata')) || prots[0] // prefer odata for compat. reasons
+    if (prot.path && prot.path.startsWith('/')) {
+      return prot.path
+    }
+    const rootPath = cds.env.requires.middlewares ? ProtocolAdapter.protocols[prot.kind]?.path || '' : ''
+    return join(rootPath, prot.path || cds.service.path4(service))
+  }
+
    // the URL path that is *likely* effective at runtime
   function _url4 (p) {
     return normalize (p.replace(/^\/+/, '') + '/') //> /foo/bar  ->  foo/bar/

package/lib/dbs/cds-deploy.js

@@ -15,7 +15,7 @@ module.exports = exports = function cds_deploy (model,options,csvs) {
   DEBUG = cds.debug('deploy')
   return {
     /** @param {import('@sap/cds/lib/srv/srv-api')} db */
-    async to(db, o = options || cds.options || {}) {
+    async to(db, o = options || {}) {
 
       const TRACE = cds.debug('trace')
       TRACE?.time('cds.deploy db  ')
@@ -90,8 +90,8 @@ exports.create = async function cds_deploy_create (db, csn=db.model, o) {
       } else {
         await db.run(`UPDATE cds_model SET csn = ?`, after)
       }
-      db.options.schema_evolution = 'auto' // for updating package.json
     }
+    o.schema_evolution = 'auto' // for INSERT_from4 below
     // cds deploy --model-only > fills in table cds_model above
     if (o['model-only']) return o.dry && console.log(after)
     // cds deploy -- with auto schema evolution > upgrade by applying delta to former model
@@ -253,9 +253,6 @@ exports.resources = async function cds_deploy_resources (csn, opts) {
   const folders = await cds_deploy_resources.folders(csn, opts)
   const found={}, ts = process.env.CDS_TYPESCRIPT
   for (let folder of folders) {
-    // fetching init.js files
-    const init_js = ts && isfile(folder,'init.ts') || isfile(folder,'init.js')
-    if (init_js) found[init_js] = '*'
     // fetching .csv and .json files
     for (let each of ['data','csv']) {
       const subdir = isdir(folder,each); if (!subdir) continue
@@ -281,6 +278,9 @@ exports.resources = async function cds_deploy_resources (csn, opts) {
         }
       }
     }
+    // fetching init.js files -> Note: after .csv files to have that on top, when processing in .reverse order
+    const init_js = ts && isfile(folder,'init.ts') || isfile(folder,'init.js')
+    if (init_js) found[init_js] = '*'
   }
   return found
 }
@@ -341,7 +341,7 @@ const _queries4 = (db,csn) => !db.cqn2sql ? q => q : q => {
 
 
 const INSERT_from4 = (db,o) => {
-  const schevo = db.options?.schema_evolution === 'auto' || cds.env.requires.db?.schema_evolution === 'auto' || o?.schema_evolution === 'auto'
+  const schevo = o?.schema_evolution === 'auto' || db.options.schema_evolution === 'auto'
   const INSERT_into = (schevo ? UPSERT : INSERT).into
   return (file) => ({
     '.json': { into (entity, json) {

package/lib/env/cds-env.js

@@ -113,14 +113,14 @@ class Config {
       ...( global._plugins||[] ).map (root => ({
         path: root, file: 'package.json', mapper: x => x.cds
       })),
-      { path: user_home, file: '.cdsrc.json' },
-      { path: home, file: '.cdsrc-private.json' },
-      { path: home, file: '.cdsrc.json' },
+      { path: user_home, file: '.cdsrc.json', mapper: x => x.cds||x },
+      { path: home, file: '.cdsrc.json', mapper: x => x.cds||x },
       { path: home, file: 'package.json', mapper: _package_json },
+      { path: home, file: '.cdsrc-private.json', mapper: x => x.cds||x },
     ]
     function _package_json (pkg) { // fill cds.extends from .extends
       let cds = pkg.cds
-      if (pkg.extends) (cds||(cds={})).extends = pkg.extends
+      if (pkg.extends) (cds??={}).extends = pkg.extends
       return cds
     }
   }
@@ -434,7 +434,7 @@ class Config {
 function _add_static_profiles (_home, profiles) {
   for (let src of ['package.json', '.cdsrc.json']) try {
     const conf = require(path.join(_home,src))
-    const cds = src === '.cdsrc.json' ? conf : conf.cds
+    const cds = src === 'package.json' ? conf.cds : conf.cds||conf
     if (cds?.profiles) return profiles.push(...cds.profiles)
     if (cds?.profile) return profiles.push(cds.profile)
   } catch (e) { if (e.code !== 'MODULE_NOT_FOUND') throw e }

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/libx/_runtime/fiori/lean-draft.js

@@ -856,10 +856,13 @@ function expandStarStar(target, recursion = new Map()) {
 
 async function onNew(req) {
   LOG.debug('new draft')
+  if (req.target.actives['@Capabilities.InsertRestrictions.Insertable'] === false || req.target.actives['@readonly'])
+    req.reject(405)
   const isDirectAccess = typeof req.query.INSERT.into === 'string' || req.query.INSERT.into.ref?.length === 1
   // Only allowed for pseudo draft roots (entities with this action)
   if (isDirectAccess && !req.target.actives['@Common.DraftRoot.ActivationAction'])
     req.reject(403, 'DRAFT_MODIFICATION_ONLY_VIA_ROOT')
+
   let DraftUUID
   if (isDirectAccess) DraftUUID = cds.utils.uuid()
   else {
@@ -929,6 +932,12 @@ async function onEdit(req) {
   if (req.query.SELECT.from.ref.length > 1 || draftParams.IsActiveEntity !== true) {
     req.reject(400, 'Action "draftEdit" can only be called on the root active entity')
   }
+  if (
+    req.target['@Capabilities.UpdateRestrictions.Updatable'] === false ||
+    req.target['@insertonly'] ||
+    req.target['@readonly']
+  )
+    req.reject(405)
   const targetWhere = req.query.SELECT.from.ref[0].where
 
   if (draftParams.IsActiveEntity !== true) req.reject(400)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "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)
   }