@sap/cds 6.6.2 → 6.7.1

package/libx/_runtime/hana/pool.js

@@ -1,3 +1,5 @@
+// REVISIT: Remove @sap/instance-manager compat with CDS 7
+
 const cds = require('../cds')
 const LOG = cds.log('pool|db')
 
@@ -15,7 +17,10 @@ function multiTenantServiceManager() {
     if (e.code === 'MODULE_NOT_FOUND') return null
     else throw e
   }
-  return cds.env.requires['cds.xt.DeploymentService']?.['old-instance-manager'] ? null : cds.xt?.serviceManager
+  const oldIm =
+    cds.requires.multitenancy?.['old-instance-manager'] ??
+    cds.env.requires?.['cds.xt.DeploymentService']?.['old-instance-manager']
+  return oldIm ? null : cds.xt?.serviceManager
 }
 
 function multiTenantInstanceManager(config = cds.env.requires.db) {
@@ -78,7 +83,10 @@ async function credentials4(tenant, db) {
       : singleTenantInstanceManager(opts)
   }
 
-  if (cds.xt?.serviceManager && !cds.env.requires['cds.xt.DeploymentService']?.['old-instance-manager']) {
+  const oldIm =
+    cds.requires.multitenancy?.['old-instance-manager'] ??
+    cds.env.requires?.['cds.xt.DeploymentService']?.['old-instance-manager']
+  if (cds.xt?.serviceManager && !oldIm) {
     return (await db._instance_manager.get(tenant, { disableCache: true })).credentials
   }
 

package/libx/_runtime/hana/search2cqn4sql.js

@@ -6,7 +6,7 @@ const { addAliasToExpression } = require('../db/utils/generateAliases')
 const targetAlias = 'Target'
 const textsAlias = 'Texts'
 const _generateKeysWhereCondition = (entity, alias1, alias2) => {
-  const keys = Object.keys(entity.keys).filter(k => !entity.keys[k].isAssociation)
+  const keys = Object.keys(entity.keys).filter(k => !entity.keys[k].isAssociation && !entity.keys[k].virtual)
   const where = []
   keys.forEach(key => {
     if (where.length > 0) where.push('and')

package/libx/_runtime/messaging/common-utils/AMQPClient.js

@@ -31,7 +31,12 @@ const emit = ({ data, event: topic, headers = {} }, stream, prefix, LOG) =>
   new Promise((resolve, reject) => {
     LOG._info && LOG.info('Emit', { topic })
     const message = { ...headers, data }
-    const payload = { chunks: [Buffer.from(JSON.stringify(message))], type: 'application/json' }
+    const payload = {
+      chunks: [Buffer.from(JSON.stringify(message))],
+      type: ['id', 'source', 'specversion', 'type'].every(el => el in headers)
+        ? 'application/cloudevents+json'
+        : 'application/json'
+    }
     const msg = {
       done: resolve,
       failed: e => {

package/libx/_runtime/messaging/enterprise-messaging.js

@@ -82,6 +82,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
 
   // New mtx based on @sap/cds-mtxs
   async addMTXSHandlers() {
+    // REVISIT: Is that tested with MTX services in sidecar?
     const deploymentSrv = await cds.connect.to('cds.xt.DeploymentService')
     const provisioningSrv = await cds.connect.to('cds.xt.SaasProvisioningService')
     deploymentSrv.impl(() => {

package/libx/_runtime/remote/Service.js

@@ -1,19 +1,6 @@
 const cds = require('../cds')
 const LOG = cds.log('remote')
 
-// REVISIT: use cds.log's logger in cloud sdk
-
-// disable sdk logger if not in debug mode
-if (!LOG._debug) {
-  try {
-    // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
-    const sdkUtils = require('@sap-cloud-sdk/util')
-    sdkUtils.setGlobalLogLevel('error')
-  } catch (err) {
-    /* might fail in cds repl due to winston's exception handler, see cap/issues#10134 */
-  }
-}
-
 const { resolveView, getTransition, restoreLink, findQueryTarget } = require('../common/utils/resolveView')
 const { postProcess } = require('../common/utils/postProcessing')
 const { getKind, run, getDestination, getAdditionalOptions, getReqOptions } = require('./utils/client')
@@ -165,6 +152,7 @@ const resolvedTargetOfQuery = q => {
   return transitions.length && [transitions.length - 1].target
 }
 let logged
+let sdkLoggerDisabled
 class RemoteService extends cds.Service {
   init() {
     if (!this.options.credentials) {
@@ -186,6 +174,21 @@ class RemoteService extends cds.Service {
           'Configuration option "cds.env.features.fetch_csrf" is deprecated.\n Please use "csrf"/"csrfInBatch" as described in https://cap.cloud.sap/docs/node.js/remote-services'
         )
     }
+
+    // REVISIT: use cds.log's logger in cloud sdk
+
+    // disable sdk logger if not in debug mode
+    if (!LOG._debug && !sdkLoggerDisabled) {
+      try {
+        // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
+        const sdkUtils = require('@sap-cloud-sdk/util')
+        sdkUtils.setGlobalLogLevel('error')
+        // disable sdk logger once
+        sdkLoggerDisabled = true
+      } catch (err) {
+        /* might fail in cds repl due to winston's exception handler, see cap/issues#10134 */
+      }
+    }
     // REVISIT: remove cds.env.features.fetch_csrf in next major ^7
     this.csrf = cds.env.features.fetch_csrf || this.options.csrf
     this.csrfInBatch = this.options.csrfInBatch

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

@@ -483,7 +483,12 @@ const getReqOptions = (req, query, service) => {
     for (const k in originalHeaders) if (k.match(/^dwc-/)) reqOptions.headers[k] = originalHeaders[k]
   }
 
-  if (reqOptions.data && reqOptions.method !== 'GET' && reqOptions.method !== 'HEAD') {
+  if (
+    reqOptions.data &&
+    reqOptions.method !== 'GET' &&
+    reqOptions.method !== 'HEAD' &&
+    !(reqOptions.data instanceof require('stream').Readable)
+  ) {
     if (typeof reqOptions.data === 'object' && !Buffer.isBuffer(reqOptions.data)) {
       reqOptions.headers['content-type'] = 'application/json'
       reqOptions.headers['content-length'] = Buffer.byteLength(JSON.stringify(reqOptions.data))

package/libx/_runtime/sqlite/Service.js

@@ -75,8 +75,7 @@ module.exports = class SQLiteDatabase extends DatabaseService {
     this.before(['CREATE', 'UPDATE'], '*', this._input) // > has to run before rewrite
     this.before(['CREATE', 'READ', 'UPDATE', 'DELETE', 'UPSERT'], '*', this._rewrite)
 
-    if (cds.env.features.lean_draft && cds.db?.kind !== 'better-sqlite')
-      this.before('READ', '*', convertDraftAdminPathExpression)
+    if (cds.env.fiori.lean_draft && !cds.db?.cqn2sql) this.before('READ', '*', convertDraftAdminPathExpression)
     this.before('READ', '*', convertAssocToOneManaged)
     this.before('READ', '*', localized) // > has to run after rewrite
     this.before('READ', '*', this._virtual)
@@ -103,6 +102,9 @@ module.exports = class SQLiteDatabase extends DatabaseService {
   }
 
   getDbUrl(tenant) {
+    return this.url4(tenant)
+  }
+  url4(tenant) {
     const credentials = this.options.credentials || this.options || {}
     let dbUrl = credentials.database || credentials.url || credentials.host || ':memory:'
 
@@ -123,7 +125,7 @@ module.exports = class SQLiteDatabase extends DatabaseService {
     const tenant = isMultitenant && arg && (typeof arg === 'string' ? arg : arg.tenant || (arg.user && arg.user.tenant))
     let dbc = this.dbcs.get(tenant)
     if (!dbc) {
-      const dbUrl = this.getDbUrl(tenant)
+      const dbUrl = this.url4(tenant)
 
       dbc = await _new(dbUrl)
 
@@ -152,62 +154,6 @@ module.exports = class SQLiteDatabase extends DatabaseService {
     else dbc._busy = false
   }
 
-  /*
-   * deploy
-   */
-  // REVISIT: make tenant aware
-  async deploy(model, options = {}) {
-    let createEntities = cds.compile.to.sql(model, options)
-    if (createEntities.length === 0) return // > nothing to deploy
-
-    let dropViews = []
-    let dropTables = []
-    for (const each of createEntities) {
-      const [, table, entity] = each.match(/^CREATE (?:(TABLE)|VIEW)\s+"?([^\s"(]+)"?/im) || []
-      if (table) dropTables.push({ DROP: { entity } })
-      else dropViews.push({ DROP: { view: entity } })
-    }
-
-    // H2 is picky on the order
-    dropTables.reverse()
-    dropViews.reverse()
-
-    if (options.dry) {
-      // do not use cds.log() here!
-      const log = console.log // eslint-disable-line no-console
-      for (const {
-        DROP: { view }
-      } of dropViews) {
-        log('DROP VIEW IF EXISTS ' + view + ';')
-      }
-      log()
-      for (const {
-        DROP: { entity }
-      } of dropTables) {
-        log('DROP TABLE IF EXISTS ' + entity + ';')
-      }
-      log()
-      for (const each of createEntities) log(each + '\n')
-      return
-    }
-
-    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
-      const [ext] = await tx.run(`SELECT 1 from sqlite_master where name='cds_xt_Extensions'`)
-      if (ext) {
-        // Poor man's schema evolution for MTX upgrade operations
-        createEntities = createEntities.filter(ct => !ct.match(/^CREATE TABLE cds_xt_Extensions/im))
-        dropTables = dropTables.filter(dt => dt.DROP.entity !== 'cds_xt_Extensions')
-      }
-      await tx.run(dropViews)
-      await tx.run(dropTables)
-      await tx.run(createEntities)
-    })
-
-    return true
-  }
-
   async disconnect(tenant) {
     this.dbcs.delete(tenant)
   }

package/libx/_runtime/sqlite/convertDraftAdminPathExpression.js

@@ -1,6 +1,7 @@
 const cds = require('../cds')
 
 function sqliteConvertDraftAdminPathExpression(req) {
+  if (req.query?.SELECT?.from?.SET) return // not supported, won't happen in draft
   if (
     !req.query?.SELECT ||
     !req.query?._target?.name?.endsWith('.drafts') ||

package/libx/_runtime/sqlite/customBuilder/CustomUpsertBuilder.js

@@ -31,8 +31,8 @@ class CustomUpsertBuilder extends InsertBuilder {
       if (!keys.includes(col_)) updates.push(`${sqlColumn}=excluded.${sqlColumn}`)
     })
     const conflict = updates.length
-      ? ` ON CONFLICT(${keys}) DO UPDATE SET ` + updates.join(', ')
-      : ` ON CONFLICT(${keys}) DO NOTHING`
+      ? ` ON CONFLICT (${keys}) DO UPDATE SET ` + updates.join(', ')
+      : ` ON CONFLICT (${keys}) DO NOTHING`
 
     this._outputObj.sql = this._outputObj.sql + conflict
     return this._outputObj

package/libx/_runtime/sqlite/execute.js

@@ -109,7 +109,9 @@ function _processExpand(model, dbc, cqn, user, locale, txTimestamp) {
 function executeSelectCQN(model, dbc, query, user, locale, txTimestamp) {
   if (hasExpand(query)) {
     // expand: '**' or '*3' is handled by new impl
-    if (query.SELECT.columns.some(c => c.expand && typeof c.expand === 'string' && /^\*{1}[\d|*]+/.test(c.expand))) {
+    if (
+      query.SELECT.columns.some(c => c.expand && typeof c.expand[0] === 'string' && /^\*{1}[\d|*]+/.test(c.expand[0]))
+    ) {
       return expandV2(model, dbc, query, user, locale, txTimestamp, executeSelectCQN)
     }
     return _processExpand(model, dbc, query, user, locale, txTimestamp)

package/libx/_runtime/types/api.js

@@ -2,7 +2,7 @@
 
 /**
  * @typedef {object} ColumnRef
- * @property {Array<string>} ref
+ * @property {string[]} ref
  * @property {function} func
  */
 
@@ -18,7 +18,7 @@
  * @property {*} value
  * @property {Array} errors
  * @property {string} [key]
- * @property {pathSegment[]} [pathSegments]
+ * @property {pathSegmentInfo[]} [pathSegmentsInfo]
  * @property {string} event
  */
 
@@ -64,6 +64,15 @@
  * @property {TemplateProcessorPathOptions} [pathOptions=null]
  */
 
+/**
+ * @typedef {object} pathSegmentInfo
+ * @property {string} key
+ * @property {string[]} keyNames
+ * @property {object} row
+ * @property {object} elements
+ * @property {string[]} draftKeys
+ */
+
 /**
  * @typedef {object} templateElementInfo
  * @property {object} row
@@ -72,7 +81,7 @@
  * @property {boolean} plain
  * @property {entity} target
  * @property {boolean} isRoot
- * @property {Array<String>} [pathSegments]
+ * @property {string[] | Array<pathSegmentInfo>} [pathSegmentsInfo]
  */
 
 // Search

package/libx/odata/afterburner.js

@@ -266,7 +266,7 @@ function _processSegments(from, model, namespace, cqn) {
         ref[i].where = undefined
         if (ref[i + 1] !== 'Set') {
           // /Set is missing
-          throw new Error(`Incorrect call to a view with parameter "${current.name}"`)
+          throw cds.error(`Invalid call to "${current.name}". You need to navigate to Set`, { status: 400, code: 400 })
         }
         ref[++i] = null
       } else if (current.kind === 'entity') {
@@ -371,11 +371,46 @@ function _processSegments(from, model, namespace, cqn) {
 
 const AGGREGATION_DEFAULT = '@Aggregation.default'
 
+function _addKeys(columns, target) {
+  let hasAggregatedColumn = false,
+    hasStarColumn = false
+  for (let k = 0; k < columns.length; k++) {
+    if (columns[k] === '*') hasStarColumn = true
+    else if (columns[k].func || columns[k].func === null) hasAggregatedColumn = true
+    // Add keys to (sub-)expands
+    else if (columns[k].expand && columns[k].expand[0] !== '*')
+      _addKeys(columns[k].expand, target.elements[columns[k].ref]._target)
+  }
+
+  // Don't add keys to queries with calculated properties, especially aggregations
+  // REVISIT Clarify if keys should be added for queries containing non-aggregating func columns
+  if (hasAggregatedColumn) return
+
+  if (hasStarColumn) return
+
+  const keys = _keysOf(target)
+
+  for (const key of keys) {
+    if (!columns.some(c => (typeof c === 'string' ? c === key : c.ref?.[0] === key))) columns.push({ ref: [key] })
+  }
+}
+
 function _processColumns(cqn, target) {
   if (cqn.SELECT.from.SELECT) _processColumns(cqn.SELECT.from, target)
 
   const columns = cqn.SELECT.columns
 
+  // REVISIT Keys should be added only in case of odata, not e.g. rest.
+  // Currently odata is detected via odata_new_parser flag -> find a better indicator.
+  if (columns && !cqn.SELECT.groupBy && cds.env.features.odata_new_parser) {
+    let entity
+    if (target.kind === 'entity') entity = target
+    else if (target.kind === 'action' && target.returns?.kind === 'entity') entity = target.returns
+    if (!entity) return
+
+    _addKeys(columns, entity)
+  }
+
   if (!Array.isArray(columns)) return
 
   let aggrProp, aggrElem
@@ -409,7 +444,7 @@ const _checkAllKeysProvided = (params, entity) => {
   if (isView) {
     // view with params
     if (params === undefined) {
-      throw new Error(`Incorrect call to a view with parameter "${entity.name}"`)
+      throw cds.error(`Invalid call to "${entity.name}". You need to navigate to Set`, { status: 400, code: 400 })
     } else if (Object.keys(params).length === 0) {
       throw new Error('KEY_EXPECTED')
     }
@@ -441,6 +476,7 @@ const _checkAllKeysProvided = (params, entity) => {
 
 function _4service(service) {
   const { namespace, model } = service
+  if (!model) return cqn => cqn
 
   return cqn => {
     const from = resolveFromSelect(cqn)

package/libx/odata/cqn2odata.js

@@ -1,4 +1,5 @@
 const { formatVal } = require('./utils')
+const cds = require('../_runtime/cds')
 
 const OPERATORS = {
   '=': 'eq',
@@ -253,7 +254,7 @@ function _getQueryTarget(entity, propOrEntity, model) {
 
 const _params = (args, kind, target) => {
   if (!args) {
-    throw new Error(`Incorrect call to a view with parameter "${target.name}"`)
+    throw cds.error(`Invalid call to "${target.name}". You need to navigate to Set`, { status: 400, code: 400 })
   }
   const params = Object.keys(args)
   if (params.length !== Object.keys(target.params).length) {
@@ -345,7 +346,7 @@ const _parseColumns = columns => {
       } else {
         select.push(refName)
       }
-    } else if (hasValidProps(column, 'expand') && column.expand === '*') {
+    } else if (hasValidProps(column, 'expand') && column.expand[0] === '*') {
       expand.push('*')
     }
     if (column === '*') {

package/libx/odata/grammar.pegjs

@@ -408,7 +408,6 @@
       		throw err;
         }
         if (SELECT.columns) {
-          if (SELECT.expand === '*') SELECT.expand = []
           for (const col of SELECT.columns) {
             if (!SELECT.expand.find(_compareRefs(col))) SELECT.expand.push(col)
           }
@@ -423,10 +422,13 @@
    = (OPEN {
         stack.push (SELECT)
         SELECT = SELECT.expand[SELECT.expand.length-1]
-        SELECT.expand = '*' // by default expand everything
+        SELECT.expand = []
       }) 
       expandQueryOptions? 
       (CLOSE {
+        if (!SELECT.expand.length) {
+          SELECT.expand.push('*') // by default expand everything
+        }
         SELECT = stack.pop()
       })
     
@@ -436,7 +438,7 @@
   = (
       c:('*' / ref) {
         const col = c === '*' ? {} : c
-        col.expand = '*'
+        col.expand = ['*']
         if (!Array.isArray(SELECT.expand)) SELECT.expand = []
         if (!SELECT.expand.find(_compareRefs(col))) SELECT.expand.push(col)
         return col