@sap/cds 7.2.1 → 7.3.0

package/README.md

@@ -2,7 +2,7 @@
 
 The API package for the [SAP Cloud Application Programming Model (CAP)](https://cap.cloud.sap).
 
-See the [API documentation](https://cap.cloud.sap/docs/node.js/api) for more details.
+See the [API documentation](https://cap.cloud.sap/docs/node.js) for more details.
 
 ## How to Obtain Support
 

package/apis/core.d.ts

@@ -3,6 +3,9 @@ import { ReflectedModel, LinkedModel } from './reflect'
 import { CSN as csn, Definition } from './csn'
 
 type UserInput = string | { id: string; attr: Record<string, string>; roles: Record<string, string> } | User
+type Intersect<T extends readonly unknown[]> = T extends [infer Head, ...infer Tail]
+  ? Head & Intersect<Tail>
+  : unknown
 
 export type Association = Definition
 export type Composition = Association
@@ -26,8 +29,9 @@ export class User {
    * @deprecated Use https://cap.cloud.sap/docs/node.js/events#tenant instead
    */
   tenant: string | undefined
+
   attr: Record<string, string>
-  roles: Record<string, string>
+  roles: Array<string> | Record<string, string>
   static Privileged: typeof Privileged
   is(role: string): boolean
 }
@@ -112,9 +116,7 @@ declare class cds {
    *    }.prototype)
    */
   extend<T>(target: T): {
-    with<X, Y, Z>(x: X, y: Y, z: Z): T & X & Y & Z
-    with<X, Y>(x: X, y: Y): T & X & Y
-    with<X>(x: X): T & X
+    with<E extends readonly unknown[]>(...ext: E): T & Intersect<E>
   }
 
   /**

package/apis/services.d.ts

@@ -87,8 +87,18 @@ export class QueryAPI {
    * Starts or joins a transaction
    * @see [docs](https://cap.cloud.sap/docs/node.js/cds-tx)
    */
-  tx(context?: object): Transaction
-  transaction(context?: object): Transaction
+
+  tx: {
+    (fn: (tx: Transaction) => {}): Promise<unknown>
+    (context?: object): Transaction
+    (context: object, fn: (tx: Transaction) => {}): Promise<unknown>
+  }
+  
+  transaction: {
+    (fn: (tx: Transaction) => {}): Promise<unknown>
+    (context?: object): Transaction
+    (context: object, fn: (tx: Transaction) => {}): Promise<unknown>
+  }
 
   /**
    * @see [docs](https://cap.cloud.sap/docs/node.js/cds-tx#cds-spawn)
@@ -221,8 +231,8 @@ export class Service extends QueryAPI {
   // Provider API
   prepend(fn: ServiceImpl): Promise<this>
   on<T extends Constructable>(eve: EventArg, entity: T, handler: CRUDEventHandler.On<InstanceType<T>, InstanceType<T> | void | Error>): this
-  on<P,R>(boundAction: (args: P) => R, service: string, handler: ActionEventHandler<P, void | Error | R>): this
-  on<P,R>(action: (args: P) => R, handler: ActionEventHandler<P, void | Error | R>): this
+  on<F extends CdsFunction>(boundAction: F, service: string, handler: ActionEventHandler<F['__parameters'], void | Error | F['__returns']>): this
+  on<F extends CdsFunction>(unboundAction: F, handler: ActionEventHandler<F['__parameters'], void | Error | F['__returns']>): this
   on(eve: EventArg, entity: Target, handler: OnEventHandler): this
   on(eve: EventArg, handler: OnEventHandler): this
 
@@ -312,6 +322,16 @@ type Partial<T> = { [Key in keyof T]: undefined | T[Key] }
 // So we always have to expect scalars as well as arrays in some callbacks.
 type OneOrMany<T> = T | T[];
 
+// functions generated by cds-typer explicitly carry types for
+// parameters and return type, as their names are not accessible from
+// function signatures to the type system.
+// This meta information is required in .on action handlers.
+type CdsFunction = {
+  (...args: any[]): any,
+  __parameters: object,
+  __returns: unknown
+}
+
 type TypedRequest<T> = Omit<Request, 'data'> & { data: T }
 
 // https://cap.cloud.sap/docs/node.js/core-services#srv-on-before-after

package/apis/test.d.ts

@@ -24,13 +24,17 @@ declare class Axios {
 declare class DataUtil {
   delete(db?: Service): Promise<void>;
   reset(db?: Service): Promise<void>;
-  autoReset(enabled: boolean): this;
+  /** @deprecated */ autoReset(enabled: boolean): this;
 }
 
 declare class Test extends Axios {
+
+  test : Test
+
   run(cmd: string, ...args: string[]): this;
   in(...paths: string[]): this;
-  verbose(v: boolean): this;
+  silent(): this;
+  /** @deprecated */ verbose(v: boolean): this;
 
   get chai(): typeof chai;
   get expect(): typeof chai.expect;
@@ -38,6 +42,12 @@ declare class Test extends Axios {
   get data(): DataUtil;
   get cds(): typeof import('./cds').default;
 
+  log() : {
+    output: string
+    clear(): void
+    release(): void
+  }
+
   then(r: (args: { server: http.Server, url: string }) => void): void;
 
   // get sleep(): (ms: number) => Promise<void>;
@@ -56,12 +66,16 @@ declare class Test extends Axios {
 export = cds
 
 declare class cds {
-  /**
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/cds-test?q=cds.test#run)
-   */
-  test(projectDir: string): Test;
-  /**
-   * @see [capire docs](https://cap.cloud.sap/docs/node.js/cds-test?q=cds.test#run-2)
-   */
-  test(command: string, ...args: string[]): Test;
+  test: {
+    Test: typeof Test
+    /**
+     * @see [capire docs](https://cap.cloud.sap/docs/node.js/cds-test?q=cds.test#run)
+     */
+    (projectDir: string): Test;
+    /**
+     * @see [capire docs](https://cap.cloud.sap/docs/node.js/cds-test?q=cds.test#run-2)
+     */
+    (command: string, ...args: string[]): Test;
+    in (string) : Test
+  }
 }

package/bin/serve.js

@@ -128,6 +128,7 @@ module.exports = Object.assign ( serve, {
 
 
 const cds = require('../lib'), { exists, isfile, local, path } = cds.utils
+const COLORS = !!process.stdout.isTTY && !!process.stderr.isTTY && !process.env.NO_COLOR
 
 // provisional loggers, see _prepare_logging
 let log = console.log
@@ -201,7 +202,7 @@ async function serve (all=[], o={}) {
       _warn_if_cds_was_loaded_from_different_locations()
       const url = cds.server.url = `http://localhost:${server.address().port}`
       cds.emit ('listening', {server,url}) //> inform local listeners
-      _resolve (server)
+      _resolve ({ server, url })
     }
 
     const LOG = cds.log('cli|server')
@@ -256,9 +257,9 @@ function _prepare_logging () { // NOSONAR
 
   // print information when model is loaded
   cds.on ('loaded', (model)=>{
-    LOG.info (`loaded model from ${model.$sources.length} file(s):\n\x1b[2m`)
+    LOG.info (`loaded model from ${model.$sources.length} file(s):\n${COLORS ? '\x1b[2m' : ''}`)
     for (let each of model.$sources)  console.log (' ', local(each))
-    console.log ('\x1b[0m')
+    COLORS && console.log ('\x1b[0m')
   })
 
   // print information about each connected service

package/lib/auth/ias-auth.js

@@ -41,15 +41,14 @@ module.exports = function ias_auth(config) {
     .use((req, res, next) => {
       if (!('authInfo' in req)) return next()
 
-      if (req.tokenInfo.getClientId() === req.tokenInfo.getSubject()) //> grant_type === client_credentials or x509
-        req.user = new cds.User({
-          id: 'system',
-          roles: ['authenticated-user', 'system-user'],
-          attr: {}
-        })
-      else {
+      const payload = req.tokenInfo.getPayload()
+      if (req.tokenInfo.getClientId() === req.tokenInfo.getSubject()) {
+        //> grant_type === client_credentials or x509
+        const roles = ['authenticated-user', 'system-user']
+        if (payload.azp === config.credentials.clientid) roles.push('internal-user')
+        req.user = new cds.User({ id: 'system', roles, attr: {} })
+      } else {
         // add all unknown attributes to req.user.attr in order to keep public API small
-        const payload = req.tokenInfo.getPayload()
         const attributes = Object.keys(payload)
           .filter(k => !RESERVED_ATTRIBUTES.has(k))
           .reduce((attrs, k) => { attrs[k] = payload[k]; return attrs }, {})

package/lib/compile/cdsc.js

@@ -1,8 +1,4 @@
 const cds = require ('../index')
-const {cdsc,odata,sql,features} = cds.env
-const constraints = {
-  assertIntegrity: features.assert_integrity
-}
 const compile = require ('@sap/cds-compiler')
 const _4cdsc = Symbol('_4cdsc')
 
@@ -24,7 +20,7 @@ function _options4 (src, ...mappings) {
   // Optionally add .messages array to avoid compiler writing messages to stderr
   dst.messages = dst.messages || []
   // Finally override with options from cds.env.cdsc
-  return Object.assign(dst,cdsc)
+  return Object.assign(dst,cds.env.cdsc)
 }
 
 
@@ -38,6 +34,7 @@ function _options4 (src, ...mappings) {
 const _options = {for: Object.assign (_options4, {
 
   odata(o,_more) {
+    const odata = cds.env.odata
     if (o && o[_4cdsc]) return o
     let f = o && o.flavor || odata.flavor || o, flavor = odata.flavors && odata.flavors[f] || {}
     let v = o && o.version || flavor.version || odata.version   //> env.odata.flavors.version overrides env.odata.version!
@@ -66,8 +63,9 @@ const _options = {for: Object.assign (_options4, {
 
   sql(o,_env) {
     // REVISIT: compiler requires to only provide assertIntegrityType if defined
-    if(constraints.assertIntegrity) constraints.assertIntegrityType = features.assert_integrity_type
-    return _options4 ({ ...constraints, ..._env||sql, ...o }, {
+    let assertIntegrity = cds.env.features.assert_integrity
+    let constraints = assertIntegrity && { assertIntegrityType: cds.env.features.assert_integrity_type }
+    return _options4 ({ ...constraints, ..._env||cds.env.sql, ...o }, {
       sql_mapping  : 'names', //> legacy
       sqlDialect   : 'dialect', //> legacy
       sqlMapping   : 'names',

package/lib/compile/etc/csv.js

@@ -12,12 +12,19 @@ function read (res) {
 function parse (csv) {
   if (csv[0] === BOM)  csv = csv.slice(1)
   let sep
-  const lines = csv.split(/\s*\n/)
+  const lines = csv.split('\n')
   const rows = [], headers = []
-  for (let line of lines) {
+
+  let val, values=[]
+  let inString=false, quoted=false
+  for (let l = 0; l < lines.length; l++) {
+    const line = lines[l]
     if (!rows.length && _ignoreLine (line))  continue
     if (!sep)  [sep] = SEPARATOR.exec(line)||[';']
-    const values=[]; let val, currCol=0, c, inString=false, quoted=false
+    if (inString)  val += '\n' // overflow from last line
+    else val = undefined
+
+    let currCol=0, c
     for (let i=0; i<line.length; ) {
       c = line[i++]
       if (c === sep && !inString) {  // separator
@@ -39,19 +46,23 @@ function parse (csv) {
         val += c === '\\' ? '\\\\' : c
       }
     }
-    // remaining value
-    currCol++
-    if (!rows.length && val !== undefined)  headers.push(currCol)  // skip column if header value is empty
-    if ((val !== undefined || c === sep) && headers.includes(currCol))  values.push (_value4(val, quoted))
-    if (values.length > 0)  rows.push (values)
+
+    // finish line w/ remaining value
+    if (!inString || l === lines.length-1 ) { // unless unterminated string and more lines to come
+      currCol++
+      if (!rows.length && val !== undefined)  headers.push(currCol)  // skip column if header value is empty
+      if ((val !== undefined || c === sep) && headers.includes(currCol))  values.push (_value4(val, quoted))
+      if (values.length > 0)  { rows.push (values); values = [] }
+    }
   }
   return rows
 }
 
-function _value4 (val, quoted = false) { //NOSONAR
+function _value4 (val, quoted = false) {
+  if (quoted)  return val
   if (val)  val = val.trim()
-  if (!quoted && val === 'true') return true
-  if (!quoted && val === 'false') return false
+  if (val === 'true') return true
+  else if (val === 'false') return false
   else return val
 }
 

package/lib/dbs/cds-deploy.js

@@ -3,7 +3,7 @@ const cds = require('../index'), { local } = cds.utils
 const COLORS = !!process.stdout.isTTY && !!process.stderr.isTTY && !process.env.NO_COLOR
 const GREY = COLORS ? '\x1b[2m' : ''
 const RESET = COLORS ? '\x1b[0m' : ''
-let DEBUG // IMPORTANT: initialized later after await cds.plugins
+const DEBUG = cds.debug('deploy')
 
 /**
  * Implementation of `cds.deploy` common to all databases.
@@ -12,7 +12,6 @@ let DEBUG // IMPORTANT: initialized later after await cds.plugins
  * in initial data, if present.
  */
 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 || {}) {

package/lib/env/cds-env.js

@@ -18,7 +18,9 @@ class Config {
    */
   for (context, cwd, _defaults=true) {
     if (!cwd) cwd = this._home || require('..').root || process.cwd()
-    return new Config (context, cwd, _defaults)
+    let env = new Config (context, cwd, _defaults)
+    global.cds?.emit('env',env)
+    return env
   }
 
 
@@ -28,7 +30,10 @@ class Config {
   constructor (_context, _home, _defaults=true) {
     Object.assign (this, { _context, _home, _sources:[] })
 
-    // 0. determine profiles from NODE_ENV + CDS_ENV
+    // Capture stack trace to report cds.env usage before cds.test()
+    if (global.test) Error.captureStackTrace(this,Config.prototype.for)
+
+    // Determine profiles from NODE_ENV + CDS_ENV
     const { NODE_ENV, CDS_ENV } = process.env, profiles = []
     if (NODE_ENV) profiles.push (NODE_ENV)
     if (CDS_ENV) profiles.push (...CDS_ENV.split(/\s*,\s*/))
@@ -39,21 +44,17 @@ class Config {
     this._profiles._defined = new Set
     this._profiles._important = []
 
-    // 1. set compat requires default values
+    // Set compat requires default values
     if (_context === 'cds' && _defaults)  this.add (DEFAULTS, defaults)
     if (_context === 'cds' && _defaults)  compat (this)
     if (!_home)  return
 
-    // fill-in defaults to process.env, unless already defined => 4.
+    // Fill-in process.env from .env files...
     this._add_to_process_env (_home, 'default-env.json')
+    if (this._profiles.has('development')) this._add_to_process_env (_home, '.env')
 
-    // additional env for dev => 4.
-    if (!this._profiles.has('production')) {
-      this._add_to_process_env (_home, '.env')
-    }
-
-    // 2. read config sources in defined order
-    const sources = Config.sources(_home, _context)
+    // Read config sources in defined order
+    const sources = this.sources(_home, _context)
     for (let { path:dir, file, mapper = x=>x } of sources) {
       let src = path.join(dir,file)
       let json = _readJson(src,{paths:[_home]}); if (!json) continue
@@ -64,17 +65,17 @@ class Config {
       this.add (mapper(json), src)
     }
 
-    // 3. apply important (!) profiles from config sources
+    // Apply important (!) profiles from config sources
     for (let each of this._profiles._important) each()
     delete this._profiles._important
 
-    // 4. add process env before linking to allow things like CDS_requires_db=sql
+    // Add process env before linking to allow things like CDS_requires_db=sql
     this._add_process_env(_context, _home)
 
-    // 5. link dependent services
+    // Link cds.requires services to cds.requires.kinds
     this._link_required_services()
 
-    // 6. Add compatibility and correlations for mtx
+    // Add compatibility and correlations for mtx
     const db  = this.requires?.db
     if (this.requires?.db) {
       if (this.requires.multitenancy !== undefined)
@@ -84,10 +85,10 @@ class Config {
     }
     if (this.requires?.multitenancy && this.requires.db?.kind === 'hana' && !this.requires.db.vcap) Object.assign(this.requires.db, { vcap: { label: 'service-manager' } })
 
-    // 7. complete service configurations from cloud service bindings
+    // Complete service configurations from cloud service bindings
     this._add_cloud_service_bindings(process.env)
 
-    // 8. apply presets
+    // Apply presets
     presets (this)
 
 
@@ -99,18 +100,17 @@ class Config {
 
   /**
    * Get configuration sources
-   *
    * @param {string} home Project home
    * @param {string} context configuration context literal
    */
-  static sources (home, context = 'cds') {
+  sources (home, context = 'cds') {
     if (!home) throw new Error('Missing parameter "home".')
     if (context !== 'cds') return [
       { path: home, file: 'package.json', mapper: x => x[context] },
     ]
     const user_home = process.env.CDS_USER_HOME || require('os').homedir()
     return [
-      ...( global._plugins||[] ).map (root => ({
+      ...Object.keys(this.plugins).map (root => ({
         path: root, file: 'package.json', mapper: x => x.cds
       })),
       { path: user_home, file: '.cdsrc.json', mapper: x => x.cds||x },
@@ -126,6 +126,12 @@ class Config {
   }
 
 
+  get plugins() {
+    let DEV = this._profiles.has('development')
+    return super.plugins = require('../plugins').fetch(DEV)
+  }
+
+
   add (conf, /*from:*/ _src, profiles = this._profiles) {
     if (!conf)  return this
     if (_src)  this._sources.push (_src)

package/lib/env/defaults.js

@@ -1,5 +1,5 @@
+const { join } = require('path')
 const production = process.env.NODE_ENV === 'production'
-const path = require('path')
 
 const defaults = module.exports = {
 
@@ -14,9 +14,10 @@ const defaults = module.exports = {
     port: 4004,
   },
 
+  // kept for backwards compatibility
   schemas: {
-    'cds-rc.json': path.join(__dirname, 'schemas/cds-rc.json'),
-    'cds-package.json': path.join(__dirname, 'schemas/cds-package.json'),
+    'cds-rc.json': join(__dirname, 'schemas/cds-rc.json'),
+    'cds-package.json': join(__dirname, 'schemas/cds-package.json'),
   },
 
   features: {

package/lib/env/schema.js

@@ -0,0 +1,9 @@
+const cds = require('../index')
+const { join } = cds.utils.path
+
+
+module.exports = {
+    default4: async (name) => {
+        return cds.utils.read(join(__dirname, 'schemas', name), 'json')
+    }
+}