@sap/cds 7.0.1 → 7.0.2

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.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

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/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/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.1",
+  "version": "7.0.2",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [