@sap/cds 7.0.2 → 7.1.0

package/libx/_runtime/fiori/generic/activate.js

@@ -11,7 +11,6 @@ const {
 const { readAndDeleteKeywords, isActiveEntityRequested, getKeyData } = require('../utils/where')
 const { isDraftRootEntity } = require('../../fiori/utils/csn')
 const { getColumns } = require('../../cds-services/services/utils/columns')
-
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _getRootCQN = (context, requestActiveData) => {
@@ -120,52 +119,49 @@ const fioriGenericActivate = async function (req, next) {
   if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
 
   const { draftData, activeData, adminData } = await _draftCompositionTree(this, req)
-
   if (!draftData) req.reject(404)
 
-  if (adminData.InProcessByUser !== req.user.id)
+  if (adminData.InProcessByUser !== req.user.id) {
     req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [adminData.InProcessByUser])
+  }
 
-  /*
-   * create or update
-   */
+  // create or update
   let query, event
   if (activeData) {
     readAndDeleteKeywords(['IsActiveEntity'], req.query.SELECT.from.ref[0].where)
     event = 'UPDATE'
-    // REVSIIT: setting data should be part of ql
+    // REVISIT: setting data should be part of ql
     query = UPDATE(req.target).where(req.query.SELECT.from.ref[0].where)
     query.UPDATE.data = draftData
-    query._activeData = activeData
   } else {
     event = 'CREATE'
     query = INSERT.into(req.target).entries(draftData)
   }
 
   // REVISIT: _draftMetadata
-  const r = new cds.Request({ event, query, data: draftData, _draftMetadata: adminData })
+  const request = new cds.Request({ event, query, data: draftData, _draftMetadata: adminData })
 
   // REVISIT: should not be necessary
-  r._ = Object.assign(r._, req._)
-  r._.params = req.params
-  r._.query = req.query
+  request._ = Object.assign(request._, req._)
+  request._.params = req.params
+  request._.query = req.query
 
   // use finally to preserve r.messages in success or error case
   let result
   try {
-    result = await this.dispatch(r)
+    result = await this.dispatch(request)
   } finally {
     // REVISIT: should not be necessary
-    if (r.messages) for (const m of r.messages) req.info(m)
+    if (request.messages) for (const m of request.messages) req.info(m)
   }
 
-  /*
-   * delete draft data
-   */
+  // delete draft data
   const deleteDraftAdminCqn = getDeleteDraftAdminCqn(adminData.DraftUUID)
   const draftTablesToDeleteFrom = [req.target.name + '_drafts']
-  for (const [entity] of getCompositionTargets(req.target, this).entries())
+  for (const [entity] of getCompositionTargets(req.target, this).entries()) {
     draftTablesToDeleteFrom.push(entity + '_drafts')
+  }
+
   await cds.db.tx(req).run([
     deleteDraftAdminCqn,
     ...draftTablesToDeleteFrom.map(dt => {
@@ -178,7 +174,6 @@ const fioriGenericActivate = async function (req, next) {
   // REVISIT: we need to use okra API here because it must be set in the batched request
   // status code must be set in handler to allow overriding for FE V2
   if (event === 'CREATE') req?._?.odataRes?.setStatusCode(201, { overwrite: true })
-
   return result
 }
 

package/libx/_runtime/fiori/generic/edit.js

@@ -33,10 +33,7 @@ const _getInsertAdminDataCQN = ({ user }, draftUUID, time) => {
 }
 
 const _getLockWhere = (where, columnsMap) => {
-  if (columnsMap.size === 0) {
-    return where
-  }
-
+  if (columnsMap.size === 0) return where
   const whereKeys = Object.keys(where)
   const lockWhere = {}
 
@@ -57,6 +54,7 @@ const _select = async (lockRecordCQN, draftExistsCQN, selectCQNs, req, dbtx) =>
     if (drafts.length) req.reject(409, 'DRAFT_ALREADY_EXISTS')
     req.reject(409, 'ENTITY_LOCKED')
   }
+
   const promisesResults = await Promise.allSettled([dbtx.run(draftExistsCQN), ...selectCQNs.map(cqn => dbtx.run(cqn))])
   const firstRejected = promisesResults.find(r => r.status === 'rejected')
   if (firstRejected) req.reject(firstRejected.reason)
@@ -165,7 +163,6 @@ const fioriGenericEdit = async function (req, next) {
   // REVISIT: we need to use okra API here because it must be set in the batched request
   // status code must be set in handler to allow overriding for FE V2
   req?._?.odataRes?.setStatusCode(201, { overwrite: true })
-
   return results[0][0]
 }
 

package/libx/_runtime/hana/streaming.js

@@ -18,7 +18,8 @@ const _loadStreamExtensionIfNeeded = () => {
 const streamExtension = _loadStreamExtensionIfNeeded()
 
 function hasStreamInsert(insert, model) {
-  if (!model) return true
+  if (!model) return false
+
   const name = insert.into.ref ? insert.into.ref[0] : insert.into
   const into = model.definitions[ensureNoDraftsSuffix(name)]
   if (!into) return false
@@ -38,9 +39,7 @@ function hasStreamInsert(insert, model) {
 }
 
 function hasStreamUpdate(update, model) {
-  if (!model) {
-    return true
-  }
+  if (!model) return false
 
   const entity = model.definitions[ensureNoDraftsSuffix((update.entity.ref && update.entity.ref[0]) || update.entity)]
   if (!entity) return false

package/libx/_runtime/remote/utils/client.js

@@ -49,11 +49,15 @@ const _executeHttpRequest = async ({ requestConfig, destination, destinationOpti
     requestOptions = { fetchCsrfToken: requestConfig._autoBatch ? csrfInBatch === true : csrf === true }
   }
 
-  LOG._debug &&
-    LOG.debug(`${requestConfig.method} ${destination.url || `<${destination.destinationName}>`}${requestConfig.url}`, {
-      headers: _sanitizeHeaders({ ...requestConfig.headers }),
-      data: requestConfig.data && SANITIZE_VALUES ? deepSanitize(requestConfig.data) : requestConfig.data
-    })
+  if (LOG._debug) {
+    const req2log = { headers: _sanitizeHeaders({ ...requestConfig.headers }) }
+    if (requestConfig.method !== 'GET' && requestConfig.method !== 'DELETE')
+      req2log.data = requestConfig.data && SANITIZE_VALUES ? deepSanitize(requestConfig.data) : requestConfig.data
+    LOG.debug(
+      `${requestConfig.method} ${destination.url || `<${destination.destinationName}>`}${requestConfig.url}`,
+      req2log
+    )
+  }
 
   // cloud sdk requires a new mechanism to differentiate the priority of headers
   // "custom" keeps the highest priority as before

package/libx/odata/afterburner.js

@@ -3,6 +3,7 @@ const cds = require('../_runtime/cds')
 const { where2obj, resolveFromSelect } = require('../_runtime/common/utils/cqn')
 const { findCsnTargetFor } = require('../_runtime/common/utils/csn')
 const normalizeTimestamp = require('../_runtime/common/utils/normalizeTimestamp')
+const { rewriteExpandAsterisk } = require('../_runtime/common/utils/rewriteAsterisks')
 
 const _addKeysDeep = (keys, keysCollector, ignoreManagedBacklinks) => {
   for (const keyName in keys) {
@@ -400,7 +401,7 @@ function _addKeys(columns, target) {
 }
 
 // remove duplicate * in expand (e.g. expand=*,*)
-function _removeDuplicateAsterix(columns) {
+function _removeDuplicateAsterisk(columns) {
   let hasExpandStar = false
   for (let i = columns.length - 1; i > 0; i--) {
     const column = columns[i]
@@ -423,7 +424,9 @@ function _processColumns(cqn, target) {
     if (target.kind === 'entity') entity = target
     else if (target.kind === 'action' && target.returns?.kind === 'entity') entity = target.returns
     if (!entity) return
-    _removeDuplicateAsterix(columns)
+    _removeDuplicateAsterisk(columns)
+
+    rewriteExpandAsterisk(columns, entity)
     if (cds.env.features.odata_new_parser) _addKeys(columns, entity)
   }
 

package/libx/rest/RestAdapter.js

@@ -194,12 +194,12 @@ const RestAdapter = function (srv) {
 
   // -----------------------------------------------------------------------------------------
   // error handling
-  router.use((err, req, res, next) => {
+  router.use(async (err, req, res, next) => {
     // REVISIT: should not be neccessary!
     // request may fail during processing or during commit -> both caught here
 
     // REVISIT: rollback needed if error occured before commit attempted -> how to distinguish?
-    cds.context?.tx?.rollback(err).catch(() => {}) // REVISIT: silently ?!?
+    await cds.context?.tx?.rollback(err).catch(() => {}) // REVISIT: silently ?!?
 
     next(err)
   })

package/libx/rest/middleware/error.js

@@ -39,13 +39,16 @@ const _log = err => {
 module.exports = (err, req, res, next) => {
   const { _srv: srv } = req
 
+  // REVISIT: invoking service.on('error') handlers needs a cleanup with new protocol adapters!!!
   // invoke srv.on('error', function (err, req) { ... }) here in special situations
   let ctx = cds.context
   if (!ctx) {
     // > error before req was dispatched
     ctx = new cds.Request({ req, res: req.res, user: req.user || new cds.User.Anonymous() })
+    for (const each of srv._handlers._error) each.handler.call(srv, err, ctx)
+  } else if (ctx._tx?._done !== 'rolled back') {
+    for (const each of srv._handlers._error) each.handler.call(srv, err, ctx)
   }
-  for (const each of srv._handlers._error) each.handler.call(srv, err, ctx)
 
   // log the error (4xx -> warn)
   _log(err)

package/libx/rest/middleware/operation.js

@@ -12,7 +12,7 @@ module.exports = async (_req, _res, next) => {
   try {
     const req = query
       ? new RestRequest({ query, event: operation.name, data, params: _params })
-      : new RestRequest({ event: operation.name.replace(`${srv.name}.`, ''), data, params: _params })
+      : new RestRequest({ event: operation.name.replace(`${srv.namespace}.`, ''), data, params: _params })
     result = await srv.dispatch(req)
   } catch (e) {
     return next(e)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "7.0.2",
+  "version": "7.1.0",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -33,8 +33,8 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@sap/cds-compiler": ">=3.9",
-    "@sap/cds-fiori": "*",
+    "@sap/cds-compiler": "^4",
+    "@sap/cds-fiori": "^1",
     "@sap/cds-foss": "^4"
   },
   "cds": {

package/lib/srv/protocols/graphql.js

@@ -1,30 +0,0 @@
-const GraphQLAdapter = require('@cap-js/graphql') // eslint-disable-line cds/no-missing-dependencies
-const express = require ('express') // eslint-disable-line cds/no-missing-dependencies
-
-function CDSGraphQLAdapter (options) {
-  const { services } = options
-
-  return express.Router()
-  .use (express.json()) //> required in the slug handlers and logger below
-
-  // convenience slug route for /graphql/srv/entity/id
-  .use ('/:path/:entity/:id?(%20:query)?', (req, _, next) => {
-    // TODO: add filter by id -> then remove the // eslint-disable-line
-    const { entity, query } = req.params // eslint-disable-line no-unused-vars
-    if (query) req.body = { query }
-    if (entity) req.body.query = req.body.query.replace(/{/, `{ ${entity} {`) +'}'
-    next() //> goes on below
-  })
-
-  // convenience slug route for /graphql/srv
-  .use ('/:path', (req, res, next) => {
-    const srv = services [req.params.path]
-    if (req.body) req.body.query = req.body.query.replace(/{/, `{ ${srv.name} {`) +'}'
-    next() //> goes on below
-  })
-
-  // the global /graphql route
-  .use (new GraphQLAdapter (options))
-}
-
-module.exports = CDSGraphQLAdapter