@sap/cds 7.3.1 → 7.4.0

package/apis/services.d.ts

@@ -1,23 +1,21 @@
-import { SELECT, INSERT, UPDATE, DELETE, CQNQuery, Query, ConstructedQuery, UPSERT } from './ql'
+import { SELECT, INSERT, UPDATE, DELETE, Query, ConstructedQuery, UPSERT } from './ql'
 import { Awaitable } from './ql'
 import { ArrayConstructable, Constructable } from './internal/inference'
-import { LinkedModel, Definition, Definitions } from './reflect'
-import { csn } from './csn'
-import { User } from './core'
-import * as express from "express"
-import { ref } from './cqn'
-// import { Service } from './cds'
+import { LinkedCSN, LinkedDefinition, Definitions } from './linked'
+import { CSN } from './csn'
+import { EventContext } from './events'
+import { Request } from './events'
 
 export class QueryAPI {
 
-  entities : LinkedModel['entities']
+  entities : LinkedCSN['entities']
 
   /**
    * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
    */
   read: {
     <T extends ArrayConstructable<any>>(entity: T, key?: any): Awaitable<SELECT<T>, InstanceType<T>>
-    <T>(entity: Definition | string, key?: any): SELECT<T>
+    <T>(entity: LinkedDefinition | string, key?: any): SELECT<T>
   }
 
   /**
@@ -25,7 +23,7 @@ export class QueryAPI {
    */
   create: {
     <T extends ArrayConstructable<any>>(entity: T, key?: any): INSERT<T>
-    <T>(entity: Definition | string, key?: any): INSERT<T>
+    <T>(entity: LinkedDefinition | string, key?: any): INSERT<T>
   }
 
   /**
@@ -49,7 +47,7 @@ export class QueryAPI {
    */
   update: {
     <T extends ArrayConstructable<any>>(entity: T, key?: any): UPDATE<T>
-    <T>(entity: Definition | string, key?: any): UPDATE<T>
+    <T>(entity: LinkedDefinition | string, key?: any): UPDATE<T>
   }
 
   /**
@@ -64,7 +62,7 @@ export class QueryAPI {
   /**
    * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
    */
-  delete<T>(entity: Definition | string, key?: any): DELETE<T>
+  delete<T>(entity: LinkedDefinition | string, key?: any): DELETE<T>
 
   /**
    * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#srv-foreach-entity)
@@ -76,7 +74,7 @@ export class QueryAPI {
    */
   stream: {
     (column: string): {
-      from(entity: Definition | string): {
+      from(entity: LinkedDefinition | string): {
         where(filter: any): ReadableStream
       }
     }
@@ -93,7 +91,7 @@ export class QueryAPI {
     (context?: object): Transaction
     (context: object, fn: (tx: Transaction) => {}): Promise<unknown>
   }
-  
+
   transaction: {
     (fn: (tx: Transaction) => {}): Promise<unknown>
     (context?: object): Transaction
@@ -103,20 +101,18 @@ export class QueryAPI {
   /**
    * @see [docs](https://cap.cloud.sap/docs/node.js/cds-tx#cds-spawn)
    */
-  spawn(options: Options, fn: (tx: Transaction) => {}): SpawnEventEmitter
+  spawn(options: {
+    [key: string]: any
+    every?: number
+    after?: number
+  }, fn: (tx: Transaction) => {}): SpawnEventEmitter
 
   /**
    * @see [docs](https://cap.cloud.sap/docs/node.js/cds-tx#event-contexts
    */
-  context:  ContextProperties
+  context?: EventContext
 }
 
-type ContextProperties = {
-  id?: string
-  http?: {req: express.Request, res: express.Response}
-  tenant? : string,
-  user? : User | string
-}
 
 /**
  * Class cds.Service
@@ -125,7 +121,7 @@ type ContextProperties = {
 export class Service extends QueryAPI {
   constructor(
     name: string,
-    model: csn,
+    model: CSN,
     options: {
       kind: string
       impl: string | ServiceImpl
@@ -141,7 +137,7 @@ export class Service extends QueryAPI {
    * The model from which the service's definition was loaded
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
    */
-  model: LinkedModel
+  model: LinkedCSN
 
   /**
    * Provides access to the entities exposed by a service
@@ -179,8 +175,8 @@ export class Service extends QueryAPI {
    * @see [capire docs](https://cap.cloud.sap/docs/core-services#srv-emit-event)
    */
   emit: {
-    <T = any>(details: { event: EventArg; data?: object; headers?: object }): Promise<T>
-    <T = any>(event: EventArg, data?: object, headers?: object): Promise<T>
+    <T = any>(details: { event: types.event; data?: object; headers?: object }): Promise<T>
+    <T = any>(event: types.event, data?: object, headers?: object): Promise<T>
   }
 
   /**
@@ -188,93 +184,84 @@ export class Service extends QueryAPI {
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#srv-send-request)
    */
   send: {
-    <T = any>(event: EventArg, path: string, data?: object, headers?: object): Promise<T>
-    <T = any>(event: EventArg, data?: object, headers?: object): Promise<T>
-    <T = any>(details: { event: EventArg; data?: object; headers?: object }): Promise<T>
+    <T = any>(event: types.event, path: string, data?: object, headers?: object): Promise<T>
+    <T = any>(event: types.event, data?: object, headers?: object): Promise<T>
+    <T = any>(details: { event: types.event; data?: object; headers?: object }): Promise<T>
     <T = any>(details: { query: ConstructedQuery; data?: object; headers?: object }): Promise<T>
-    <T = any>(details: { method: EventName; path: string; data?: object; headers?: object }): Promise<T>
-    <T = any>(details: { event: EventName; entity: Definition | string; data?: object; params?: object }): Promise<T>
+    <T = any>(details: { method: types.eventName; path: string; data?: object; headers?: object }): Promise<T>
+    <T = any>(details: { event: types.eventName; entity: LinkedDefinition | string; data?: object; params?: object }): Promise<T>
   }
 
   /**
    * Constructs and sends a GET request.
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#rest-style-api)
    */
-  get<T = any>(entityOrPath: Target, data?: object): Promise<T>
+  get<T = any>(entityOrPath: types.target, data?: object): Promise<T>
   /**
    * Constructs and sends a POST request.
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#rest-style-api)
    */
-  post<T = any>(entityOrPath: Target, data?: object): Promise<T>
+  post<T = any>(entityOrPath: types.target, data?: object): Promise<T>
   /**
    * Constructs and sends a PUT request.
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#rest-style-api)
    */
-  put<T = any>(entityOrPath: Target, data?: object): Promise<T>
+  put<T = any>(entityOrPath: types.target, data?: object): Promise<T>
   /**
    * Constructs and sends a PATCH request.
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services#rest-style-api)
    */
-  patch<T = any>(entityOrPath: Target, data?: object): Promise<T>
+  patch<T = any>(entityOrPath: types.target, data?: object): Promise<T>
   /**
    * Constructs and sends a DELETE request.
    */
   delete: {
-    <T = any>(entityOrPath: Target, data?: object): DELETE<T>
+    <T = any>(entityOrPath: types.target, data?: object): DELETE<T>
     <T extends ArrayConstructable<any>>(entity: T, key?: any): DELETE<T>
-    <T>(entity: Definition | string, key?: any): DELETE<T>
+    <T>(entity: LinkedDefinition | string, key?: any): DELETE<T>
   }
 
   // The central method to dispatch events
-  dispatch(msg: Event): Promise<any>
+  dispatch(msg: types.event): Promise<any>
 
   // 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<T extends Constructable>(eve: types.event, entity: T, handler: CRUDEventHandler.On<InstanceType<T>, InstanceType<T> | void | Error>): 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
-
-
-  // onSucceeded (eve: Events, entity: Target, handler: EventHandler): this
-  // onSucceeded (eve: Events, handler: EventHandler): this
-  // onFailed (eve: Events, entity: Target, handler: EventHandler): this
-  // onFailed (eve: Events, handler: EventHandler): this
-  before<T extends Constructable>(eve: EventArg, entity: T, handler: CRUDEventHandler.Before<InstanceType<T>, InstanceType<T> | void | Error>): this
-  before(eve: EventArg, entity: Target, handler: EventHandler): this
-  before(eve: EventArg, handler: EventHandler): this
-  after<T extends Constructable>(eve: EventArg, entity: T, handler: CRUDEventHandler.After<InstanceType<T>, InstanceType<T> | void | Error>): this
-  after(eve: EventArg, entity: Target, handler: ResultsHandler): this
-  after(eve: EventArg, handler: ResultsHandler): this
-  reject(eves: EventArg, ...entity: Target[]): this
-}
-
-export interface Transaction extends Service {
-  commit(): Promise<void>
-  rollback(): Promise<void>
+  on(eve: types.event, entity: types.target, handler: OnEventHandler): this
+  on(eve: types.event, handler: OnEventHandler): this
+
+
+  // onSucceeded (eve: types.Events, entity: types.Target, handler: types.EventHandler): this
+  // onSucceeded (eve: types.Events, handler: types.EventHandler): this
+  // onFailed (eve: types.Events, entity: types.Target, handler: types.EventHandler): this
+  // onFailed (eve: types.Events, handler: types.EventHandler): this
+  before<T extends Constructable>(eve: types.event, entity: T, handler: CRUDEventHandler.Before<InstanceType<T>, InstanceType<T> | void | Error>): this
+  before(eve: types.event, entity: types.target, handler: EventHandler): this
+  before(eve: types.event, handler: EventHandler): this
+  after<T extends Constructable>(eve: types.event, entity: T, handler: CRUDEventHandler.After<InstanceType<T>, InstanceType<T> | void | Error>): this
+  after(eve: types.event, entity: types.target, handler: ResultsHandler): this
+  after(eve: types.event, handler: ResultsHandler): this
+  reject(eves: types.event, ...entity: types.target[]): this
 }
 
 export class ApplicationService extends Service {}
 export class MessagingService extends Service {}
 export class RemoteService extends Service {}
 export class DatabaseService extends Service {
-  deploy(model?: csn | string): Promise<csn>
+  deploy(model?: CSN | string): Promise<CSN>
   begin(): Promise<void>
   commit(): Promise<void>
   rollback(): Promise<void>
 }
 
-export interface ResultSet extends Array<{}> {}
 
-declare class cds {
+export default class cds {
   /**
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
    */
   Service: typeof Service
-  Request: typeof Request
-  Event: typeof Event
-  EventContext: typeof EventContext
 
   /**
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/app-services)
@@ -297,16 +284,24 @@ declare class cds {
   DatabaseService: typeof DatabaseService
 }
 
-export interface ServiceImpl {
+
+interface Transaction extends Service {
+  commit(): Promise<void>
+  rollback(): Promise<void>
+}
+
+interface ResultSet extends Array<{}> {}
+
+interface ServiceImpl {
   (this: Service, srv: Service): any
 }
 
-export interface EventHandler {
-  // (msg : EventMessage) : Promise<any> | any | void
+interface EventHandler {
+  // (msg : types.EventMessage) : Promise<any> | any | void
   (req: Request): Promise<any> | any | void
 }
 
-export interface OnEventHandler {
+interface OnEventHandler {
   (req: Request, next: Function): Promise<any> | any | void
 }
 
@@ -335,7 +330,7 @@ type CdsFunction = {
 type TypedRequest<T> = Omit<Request, 'data'> & { data: T }
 
 // https://cap.cloud.sap/docs/node.js/core-services#srv-on-before-after
-export namespace CRUDEventHandler {
+declare namespace CRUDEventHandler {
   type Before<P,R> = (req: TypedRequest<P>) => Promise<R> | R
   type On<P,R> = (req: TypedRequest<P>, next: (...args: any) => Promise<R> | R) => Promise<R> | R
   type After<P,R> = (data: undefined | P, req: TypedRequest<P>) => Promise<R> | R
@@ -345,7 +340,7 @@ export namespace CRUDEventHandler {
 // as strictly as possible and therefore have to remove
 // { data: any } (inherited EventMessage} with a more restricted
 // type, based on the parameters of the action.
-export interface ActionEventHandler<P,R> {
+interface ActionEventHandler<P,R> {
   (req: Omit<Request, 'data'> & { data: P }, next: Function): Promise<R> | R
 }
 
@@ -361,27 +356,6 @@ interface ResultsHandler {
   (each: any, req: Request): void
 }
 
-/**
- * Represents the invocation context of incoming request and event messages.
- * @see [capire docs](https://cap.cloud.sap/docs/node.js/requests)
- */
-export class EventContext {
-  timestamp: Date
-  locale: string
-  id: string
-  user: User
-  tenant: string
-}
-
-/**
- * @see [capire docs](https://cap.cloud.sap/docs/node.js/requests)
- */
-export class Event extends EventContext {
-  event: string
-  data: any
-  headers: {}
-}
-
 interface SpawnEvents {
   'succeeded': (res: any) => void
   'failed': (error: any) => void
@@ -399,57 +373,12 @@ declare class SpawnEventEmitter {
   timer: any
 }
 
-interface Options {
-  [key: string]: any
-  every?: number
-  after?: number
-}
-
-/**
- * @see [capire docs](https://cap.cloud.sap/docs/node.js/requests)
- */
-export class Request extends Event {
-  params: (string | {})[]
-  method: string
-  path: string
-  target: Definition
-  /**
-   * Shortcut to {@link target.name}
-   *
-   * @see https://cap.cloud.sap/docs/node.js/events#req-entity
-   */
-  entity: string
-  query: CQNQuery
-  subject: ref
-
-  reply(results: any): void
-
-  notify(code: number, message: string, target?: string, args?: {}): Error
-  info(code: number, message: string, target?: string, args?: {}): Error
-  warn(code: number, message: string, target?: string, args?: {}): Error
-  error(code: number, message: string, target?: string, args?: {}): Error
-  reject(code: number, message: string, target?: string, args?: {}): Error
-
-  notify(message: string, target?: string, args?: {}): Error
-  info(message: string, target?: string, args?: {}): Error
-  warn(message: string, target?: string, args?: {}): Error
-  error(message: string, target?: string, args?: {}): Error
-  reject(message: string, target?: string, args?: {}): Error
-
-  notify(message: { code?: number | string; message: string; target?: string; args?: {} }): Error
-  info(message: { code?: number | string; message: string; target?: string; args?: {} }): Error
-  warn(message: { code?: number | string; message: string; target?: string; args?: {} }): Error
-  error(message: { code?: number | string; message: string; target?: string; args?: {}, status?: number }): Error
-  reject(message: { code?: number | string; message: string; target?: string; args?: {}, status?: number }): Error
+declare namespace types {
+  type event = eventName | eventName[]
+  type eventName = (string & {})
+    | 'CREATE' | 'READ' | 'UPDATE' | 'DELETE'
+    | 'NEW' | 'EDIT' | 'PATCH' | 'SAVE'
+    | 'GET' | 'PUT' | 'POST' | 'PATCH' | 'DELETE'
+    | 'COMMIT' | 'ROLLBACK'
+  type target = string | LinkedDefinition | ArrayConstructable<any>
 }
-
-export default cds
-
-type EventArg = EventName | EventName[]
-type EventName = (CRUD | TX | HTTP | DRAFT) | (CustomOp & {})
-type CRUD = 'CREATE' | 'READ' | 'UPDATE' | 'DELETE'
-type DRAFT = 'NEW' | 'EDIT' | 'PATCH' | 'SAVE'
-type HTTP = 'GET' | 'PUT' | 'POST' | 'PATCH' | 'DELETE'
-type TX = 'COMMIT' | 'ROLLBACK'
-type CustomOp = string
-type Target = string | Definition | ArrayConstructable<any>

package/apis/test.d.ts

@@ -40,7 +40,7 @@ declare class Test extends Axios {
   get expect(): typeof chai.expect;
   get assert(): typeof chai.assert;
   get data(): DataUtil;
-  get cds(): typeof import('./cds').default;
+  get cds(): typeof import('./cds')
 
   log() : {
     output: string

package/bin/serve.js

@@ -191,6 +191,9 @@ async function serve (all=[], o={}) {
   // bootstrap server from project-local server.js or from @sap/cds/server.js
   const server = await cds_server(o)
 
+  // increase keep-alive timeout for CF (gorouter wants >90s)
+  if (process.env.VCAP_APPLICATION?.cf_api) server.keepAliveTimeout = 91 * 1000
+
   // return a promise which resolves to the created http server when listening
   return cds.server.listening = new Promise ((_resolve,_reject) => {
 

package/lib/compile/cds-compile.js

@@ -15,7 +15,6 @@ const compile = module.exports = Object.assign (cds_compile, {
   to: new class {
     get csn() { return super.csn = require('./to/csn') }
     get cdl() { return super.cdl = require('./to/cdl') }
-    get gql() { return super.gql = require('./to/gql') }
     get yml() { return super.yml = require('./to/yaml') }
     get yaml() { return super.yaml = require('./to/yaml') }
     get json() { return super.json = require('./to/json') }
@@ -26,7 +25,8 @@ const compile = module.exports = Object.assign (cds_compile, {
     get hdbtable() { return super.hdbtable = compile.to.sql.hdbtable }
     get hdbtabledata() { return super.hdbtabledata = require('./to/hdbtabledata') }
     get serviceinfo() { return super.serviceinfo = require('./to/srvinfo') } //> REVISIT: move to CLI
-    get graphql() { return super.graphql = require('./to/gql') } //> REVISIT: move to gql CLI plugin
+    get gql() { return super.gql = require('./to/gql') } //> REVISIT: moved to @cap-js/graphql, remove with cds^8
+    get graphql() { return super.graphql = require('./to/gql') } //> REVISIT: moved to @cap-js/graphql, remove with cds^8
   },
 
 })

package/lib/compile/to/edm.js

@@ -3,9 +3,14 @@ const cds = require ('../../index')
 
 if (cds.env.features.precompile_edms !== false) {
   const _precompiled = new WeakMap
-  cdsc.to.edm = Object.assign ((csn,o)=>{
-    if (!_precompiled.has(csn)) _precompiled.set (csn, cdsc.to.edm.all (csn,o))
-    return _precompiled.get(csn) [o.service]
+  cdsc.to.edm = Object.assign((csn, o) => {
+    if (o.to === 'openapi') return cdsc.to.edm.all(csn, o)[o.service]
+    if (!_precompiled.has(csn)) {
+      // only for services that are served via odata
+      const serviceNames = o.serviceNames || Object.values(csn.definitions).filter(d => d.kind === 'service' && d.endpoints?.some(e => e.kind.match(/odata/i))).map(d => d.name)
+      _precompiled.set(csn, cdsc.to.edm.all(csn, Object.assign({ serviceNames }, o)))
+    }
+    return _precompiled.get(csn)[o.service]
   }, { all: cdsc.to.edm.all })
 }
 

package/lib/compile/to/gql.js

@@ -1,8 +1,12 @@
 const cds = require ('../..')
+const LOG = cds.log()
 // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
 const { SchemaGenerator } = require('@cap-js/graphql/lib/schema')
 
+// REVISIT: remove module with cds^8
 function cds_compile_to_gql (csn) {
+  LOG._warn && LOG.warn('WARNING: cds.compile.to.gql and .to.graphql will require @cap-js/graphql >= 0.9.0 with an upcoming release. Please update your dependency.')
+
   const m = cds.linked(csn)
   const services = Object.fromEntries(m.services.map(s => [s.name, new cds.ApplicationService(s.name, m)]))
   return new SchemaGenerator().generate(services).printSchema()

package/lib/dbs/cds-deploy.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 const cds = require('../index'), { local } = cds.utils
+const crypto = require('crypto')
 const COLORS = !!process.stdout.isTTY && !!process.stderr.isTTY && !process.env.NO_COLOR
 const GREY = COLORS ? '\x1b[2m' : ''
 const RESET = COLORS ? '\x1b[0m' : ''
@@ -211,7 +212,7 @@ exports.init = async function cds_deploy_init (db, csn=db.model, o, srces, log=(
     const m = tx.model = cds.compile.for.nodejs(csn) //> use correct model while deploying
     const data = await exports.data (m,srces)
     const query = _queries4 (db,m)
-    const INSERT_from = INSERT_from4 (db,o)
+    const INSERT_from = INSERT_from4 (db,m,o)
 
     for await (let [ file, entity, src ] of data) {
       log (file)
@@ -344,21 +345,67 @@ const _queries4 = (db,csn) => !db.cqn2sql ? q => q : q => {
 }
 
 
-const INSERT_from4 = (db,o) => {
+const INSERT_from4 = (db,m,o) => {
   const schevo = o?.schema_evolution === 'auto' || db.options.schema_evolution === 'auto'
   const INSERT_into = (schevo ? UPSERT : INSERT).into
   return (file) => ({
     '.json': { into (entity, json) {
       let records = JSON.parse(json)
-      if (records.length > 0) return INSERT_into(entity).entries(records)
+      if (records.length > 0) {
+        fill_ID_texts_json(records, m, entity)
+        return INSERT_into(entity).entries(records)
+      }
     }},
     '.csv': { into (entity, csv) {
       let [cols, ...rows] = cds.parse.csv(csv)
-      if (rows.length > 0) return INSERT_into(entity).columns(cols).rows(rows)
+      if (rows.length > 0) {
+        fill_ID_texts_csv(cols, rows, m, entity)
+        return INSERT_into(entity).columns(cols).rows(rows)
+      }
     }},
   }) [path.extname(file)]
 }
 
+const fill_ID_texts_json = (records, m, entity) => {
+  const baseKey = idTextsBaseKey(m, entity)
+  if (baseKey) {
+    records.forEach(record => {
+      if (!record.ID_texts) {
+        record.ID_texts = hashedUUID(record[baseKey], record.locale)
+      }
+    })
+  }
+}
+
+const fill_ID_texts_csv = (cols, rows, m, entity) => {
+  const baseKey = idTextsBaseKey(m, entity)
+  if (baseKey && !cols.find(r => r.toLowerCase() === 'id_texts')) { // and no such column in csv?
+    DEBUG?.(`adding ID_texts for ${entity}`)
+    const indexBaseKey = cols.findIndex(c => c.toLowerCase() === baseKey.toLowerCase())
+    const indexLocale = cols.findIndex(c => c.toLowerCase() === 'locale')
+    rows.forEach(row => {
+      const idtexts = hashedUUID(row[indexBaseKey], row[indexLocale])
+      row.push(idtexts)
+    })
+    cols.push('ID_texts')
+  }
+}
+
+const idTextsBaseKey = (m, entity) => {
+  let base
+  if (m.definitions[entity]?.keys?.ID_texts  // ID_text key?
+      && /(.+)[._]texts$/.test(entity) && (base = m.definitions[RegExp.$1])) { // in a .text entity?
+    const baseKey = Object.keys(base.keys)[0]  // base entity's key is usually, but not always 'ID'
+    return baseKey
+  }
+}
+
+const hashedUUID = (...values) => {
+  const sum = values.reduce((acc, curr) => acc + curr, '')
+  const h = crypto.createHash('md5').update(sum).digest('hex')
+  return h.slice(0, 8) + '-' + h.slice(8, 12) + '-' + h.slice(12, 16) + '-' + h.slice(16, 20) + '-' + h.slice(20)
+}
+
 const _skip = e => !e || e['@cds.persistence.skip'] === true
 
 
@@ -385,3 +432,4 @@ if (!module.parent) (async () => {
     await db?.disconnect?.()
   }
 })().catch(console.error)
+

package/lib/env/cds-requires.js

@@ -160,6 +160,24 @@ const _databases = {
 }
 
 
+const _outbox = {
+
+  outbox: {
+    kind: "persistent-outbox",
+    parallel: true
+  },
+
+  "in-memory-outbox": {},
+  "persistent-outbox": {
+    model: "@sap/cds/srv/outbox",
+    maxAttempts: 20,
+    chunkSize: 100,
+    storeLastError: true
+  }
+
+}
+
+
 const _messaging = {
 
   "local-messaging": {
@@ -167,9 +185,9 @@ const _messaging = {
     local: true
   },
   "file-based-messaging": {
-    outbox: {},
     impl: `${_runtime}/messaging/file-based.js`,
-    file:'~/.cds-msg-box'
+    file:'~/.cds-msg-box',
+    outbox: true
   },
   "default-messaging": {
     "[development]": { kind: "local-messaging" },
@@ -186,19 +204,19 @@ const _messaging = {
     kind: "enterprise-messaging-amqp",
   },
   "enterprise-messaging-http": {
-    outbox: {},
     deployForProvider: true,
     impl: `${_runtime}/messaging/enterprise-messaging.js`,
     vcap: { label: "enterprise-messaging" },
+    outbox: true
   },
   "enterprise-messaging-amqp": {
-    outbox: {},
     impl: `${_runtime}/messaging/enterprise-messaging-shared.js`,
     vcap: { label: "enterprise-messaging" },
+    outbox: true
   },
   'message-queuing': {
-    outbox: {},
-    impl: `${_runtime}/messaging/message-queuing.js`
+    impl: `${_runtime}/messaging/message-queuing.js`,
+    outbox: true
   },
   "composite-messaging": {
     impl: `${_runtime}/messaging/composite.js`
@@ -212,15 +230,8 @@ const _messaging = {
   "redis-messaging": {
     impl: `${_runtime}/messaging/redis-messaging.js`,
     vcap: { label: "redis-cache" },
-    outbox: {}
-  },
-
-  "persistent-outbox": {
-    model: "@sap/cds/srv/outbox",
-    maxAttempts: 20,
-    chunkSize: 100,
-    storeLastError: true
-  },
+    outbox: true
+  }
 
 }
 
@@ -242,6 +253,7 @@ exports.kinds = {
   ..._authentication_strategies,
   ..._databases,
   ..._services,
+  ..._outbox,
   ..._messaging,
   ..._platform_services,
 }

package/lib/env/defaults.js

@@ -43,6 +43,7 @@ const defaults = module.exports = {
     preview: !production,
     routes: !production,
     lean_draft: true,
+    wrap_multiple_errors: true, // switch default with cds 8
     draft_compat: undefined,
     '[better-sqlite]': { lean_draft: true },
     '[lean-draft]': { lean_draft: true },

package/lib/env/schemas/index.js

@@ -0,0 +1,10 @@
+const { readFile } = require('fs').promises
+const { join } = require('path')
+
+module.exports = new class {
+    async default4(name) {
+        let file = join(__dirname, name)
+        let json = await readFile(file, 'utf8')
+        return JSON.parse(json)
+    }
+}