@cap-js/cds-types 0.15.0 → 0.17.0

package/dist/cds-types.d.ts

@@ -1,6 +1,6 @@
 declare module '@sap/cds' {
 export * from "@sap/cds-dk";
-
+
 
 export type __any_ = classes.any_
 
@@ -64,13 +64,15 @@ export type __UUID = classes.UUID
 
 export type __Vector = classes.Vector
 
-class action extends any_<'action' | 'function'> {}
+class action extends any__2<'action' | 'function'> {}
 
 export interface ActionEventHandler<S, P, R> {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    (req: Omit<Request_2, 'data'> & { data: P, subject: S }, next: Function): Promise<R> | R
+    (req: ActionRequest<P, S>, next: Function): Promise<R> | R
 }
 
+export type ActionRequest<P, S> = Omit<Request_2, 'data'> & { data: P, subject: S }
+
 interface And {
     and: TaggedTemplateQueryPart<this>
     & ((predicate: object) => this)
@@ -88,11 +90,20 @@ export class Anonymous extends User {
 
 }
 
-const any: typeof any_;
+const any: typeof any__2;
+
+interface any_ {
+    kind?: kinds
+    /**
+     * only available when compiled with docs:true
+     * @see [capire docs](https://cap.cloud.sap/docs/cds/cdl#comments)
+     */
+    doc?: string
+}
 
-interface any_ extends csn.any_ {}
+interface any__2 extends csn.any_ {}
 
-class any_<K extends kinds = kinds> {
+class any__2<K extends kinds = kinds> {
     private _: K // break covariance
     constructor (...aspects: any[])
 
@@ -101,15 +112,6 @@ class any_<K extends kinds = kinds> {
     // is (kind: kinds | 'Association' | 'Composition'): boolean
 }
 
-interface any__2 {
-    kind?: kinds
-    /**
-     * only available when compiled with docs:true
-     * @see [capire docs](https://cap.cloud.sap/docs/cds/cdl#comments)
-     */
-    doc?: string
-}
-
 /**
  * The {@link https://expressjs.com/en/4x/api.html#app| express.js application} constructed by the server implementation.
  *
@@ -176,7 +178,27 @@ type Awaitable<T, I> = T & Promise<I>
 
 class Axios {
 
+    /**
+     * @deprecated Used to provide access to an `axios` instance used as HTTP client. From `@cap-js/cds-test` >=1 onwards, it no longer points to
+     * the real `axios` library, but to an emulated lookalike, mostly for backward compatibility.
+     * Install `axios` explicitly as a project dependency if you need the full feature set of it. In that case, the HTTP shortcuts will automatically
+     * use the installed `axios` instead of the emulated version.
+     */
     get axios (): import('axios').AxiosInstance
+
+    /**
+     * Provides default values for HTTP requests. To stay portable across different HTTP clients, it's recommended to only use these options,
+     * which cds.test supports across all clients:
+     * - `baseURL` as defined in Axios
+     * - `auth` as defined in Axios
+     * - `headers` as defined in Fetch API and Axios
+     * - `validateStatus` as defined in Axios (default: status >= 200 && status < 300)
+     *
+     * In addition, you can use all of the config options understood by the underlying HTTP client, that is, for Fetch API,
+     * its RequestInit options, and for Axios, its request config options.
+     */
+    get defaults (): import('axios').AxiosRequestConfig & RequestInit
+
     get: import('axios').AxiosInstance['get'] & TaggedTemplateRequest
 
     put: import('axios').AxiosInstance['put'] & TaggedTemplateRequest
@@ -343,6 +365,7 @@ namespace cds {
         CdsFunctions,
         HandlerFunction,
         CRUDEventHandler,
+        ActionRequest,
         ActionEventHandler,
         ResultsHandler,
         SpawnEvents,
@@ -351,7 +374,6 @@ namespace cds {
         SpawnOptions,
         context,
         tx,
-        entities,
         run,
         foreach,
         stream,
@@ -361,6 +383,7 @@ namespace cds {
         update,
         transaction,
         db,
+        entities,
         queued,
         unqueued,
         outboxed,
@@ -531,6 +554,7 @@ namespace cds_2 {
         CdsFunctions,
         HandlerFunction,
         CRUDEventHandler,
+        ActionRequest,
         ActionEventHandler,
         ResultsHandler,
         SpawnEvents,
@@ -539,7 +563,6 @@ namespace cds_2 {
         SpawnOptions,
         context,
         tx,
-        entities,
         run,
         foreach,
         stream,
@@ -549,6 +572,7 @@ namespace cds_2 {
         update,
         transaction,
         db,
+        entities,
         queued,
         unqueued,
         outboxed,
@@ -643,7 +667,7 @@ namespace classes {
         Column,
         Definitions,
         WithElements,
-        any_,
+        any__2 as any_,
         any,
         aspect,
         type,
@@ -870,9 +894,9 @@ export let context: EventContext | undefined;
 
 interface context_ extends csn.context {}
 
-class context_ extends any_ { }
+class context_ extends any__2 { }
 
-interface context_2 extends any__2 { }
+interface context_2 extends any_ { }
 
 namespace CQN {
     export {
@@ -972,7 +996,7 @@ namespace csn {
         Extension,
         Element,
         kinds,
-        any__2 as any_,
+        any_,
         context_2 as context,
         service_2 as service,
         type_2 as type,
@@ -1036,7 +1060,7 @@ class Decimal extends Float {
 }
 
 /**
- * @beta helper 
+ * @beta helper
  */
 type DeepPartial<T> = T extends object
 // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
@@ -1052,12 +1076,12 @@ type DeepPartial<T> = T extends object
  */
 type Definition = context_2 & service_2 & type_2 & struct_2 & entity_2 & Association_2
 
-type Definition_2 = any_
+type Definition_2 = any__2
 
 /**
  * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#iterable)
  */
-type Definitions<T extends any_ = any_> = IterableMap<T>
+type Definitions<T extends any__2 = any__2> = IterableMap<T>
 
 const delete_: Service['delete'];
 export { delete_ as delete };
@@ -1106,7 +1130,7 @@ export type EDMX = XML
 
 type Element = type_2 & struct_2 & Association_2
 
-export const entities: Service['entities'];
+export const entities: linked_2.LinkedCSN['entities'];
 
 /**
  * @see [capire](https://cap.cloud.sap/docs/node.js/cds-reflect#cds-entity)
@@ -1305,11 +1329,11 @@ export namespace env {
 /**
  * @see [capire](https://cap.cloud.sap/docs/node.js/cds-facade#cds-error)
  */
-export function error (code: number, message: string, details?: {stack?: unknown}, caller?: (...args: any[]) => unknown): Error
+export function error (status: number, message: string, details?: {stack?: unknown}, caller?: (...args: any[]) => unknown): Error
 
-export function error (message: string, details?: {code: number, stack?: unknown}, caller?: (...args: any[]) => unknown): Error
+export function error (message: string, details?: {status: number, stack?: unknown}, caller?: (...args: any[]) => unknown): Error
 
-export function error (details: {code: number, message: string}, caller?: (...args: any[]) => unknown): Error
+export function error (details: {status: number, message: string}, caller?: (...args: any[]) => unknown): Error
 
 export function error (string: TemplateStringsArray, ...args: any[]): Error
 
@@ -1348,7 +1372,11 @@ export class EventContext {
 
     id: string
 
-    locale: `${string}_${string}`
+    /**
+     * ISO 639-1 language code, optionally followed by an underscore and ISO 3166-1 alpha-2 country code, e.g. "en" or "en_US".
+     * May be `undefined` if the `AcceptLanguage` header is not set in the incoming request.
+     */
+    locale?: string
 
     timestamp: Date
 
@@ -1358,9 +1386,9 @@ export class EventContext {
 
 }
 
-export interface EventHandler {
+export interface EventHandler<E = any> {
     // (msg : types.EventMessage) : Promise<any> | any | void
-    (req: Request_2): Promise<any> | any | void
+    (req: Request_2<E>): Promise<any> | any | void
 }
 
 /**
@@ -1375,8 +1403,8 @@ export type expr_literal = { '=': string }
 
 type Expression<E extends string | number | bigint | boolean> = `${E}${WS}${Op}${WS}`
 
-type Expressions<L,E> = KVPairs<L, Expression<Exclude<keyof E, symbol>>, ColumnValue> extends true 
-? L 
+type Expressions<L,E> = KVPairs<L, Expression<Exclude<keyof E, symbol>>, ColumnValue> extends true
+? L
 // fallback: allow for any string. Important for when user renamed properties
 : KVPairs<L, Expression<string>, ColumnValue> extends true
 ? L
@@ -1408,7 +1436,7 @@ type Extension = {
 
 export type filename = string
 
-type Filter = string | (<T extends any_ = any_>(def: T) => boolean)
+type Filter = string | (<T extends any__2 = any__2>(def: T) => boolean)
 
 export type _flavor = 'parsed' | 'xtended' | 'inferred'
 
@@ -1488,7 +1516,7 @@ interface Having<T> {
     having: HavingWhere<this, T>
 }
 
-type HavingWhere<This, E> = 
+type HavingWhere<This, E> =
 /**
 * @param predicate - An object with keys that are valid fields of the target entity and values that are compared to the respective fields.
 * @example
@@ -1498,6 +1526,7 @@ type HavingWhere<This, E> =
 * ```
 */
 ((predicate: Partial<{[column in KeyOfTarget<This extends ConstructedQuery<infer E> ? E : never, never>]: any}>) => This)
+
 /**
 * @param expr - An array of expressions, where every odd element is a valid field of the target entity and every even element is a value that is compared to the respective field.
 * @example
@@ -1763,6 +1792,7 @@ export namespace linked {
 namespace linked_2 {
     export {
         ModelPart,
+        ModelPartFn,
         Definition_2 as Definition,
         LinkedCSN,
         classes
@@ -1781,13 +1811,13 @@ interface LinkedCSN extends Omit<csn.CSN, 'definitions'> {
      	 *   let entities = m.all('entity')        //> equivalent shortcut
      	 * ```
      	 */
-    each<T extends any_>(x: Filter, defs?: Definitions<T>): IterableIterator<T>
+    each<T extends any__2>(x: Filter, defs?: Definitions<T>): IterableIterator<T>
 
     /**
      	 * Fetches definitions matching the given filter, returning them in an array.
      	 * Convenience shortcut for `[...reflect.each('entity')]`
      	 */
-    all<T extends any_>(x: Filter, defs?: Definitions<T>): T[]
+    all<T extends any__2>(x: Filter, defs?: Definitions<T>): T[]
 
     /**
      	 * Fetches definitions matching the given filter, returning the first match, if any.
@@ -1796,7 +1826,7 @@ interface LinkedCSN extends Omit<csn.CSN, 'definitions'> {
      	 * @param x - the filter
      	 * @param defs - the definitions to fetch in, default: `this.definitions`
      	 */
-    find<T extends any_>(x: Filter, defs?: Definitions<T>): T | undefined
+    find<T extends any__2>(x: Filter, defs?: Definitions<T>): T | undefined
 
     /**
      	 * Calls the visitor for each definition matching the given filter.
@@ -1824,7 +1854,7 @@ interface LinkedCSN extends Omit<csn.CSN, 'definitions'> {
      	 * @param parent - either the parent itself or its fully-qualified name
      	 * @param filter - an optional filter to apply before picking a child
      	 */
-    childrenOf(parent: any | string, filter?: ((def: any_) => boolean)): Definitions
+    childrenOf(parent: any | string, filter?: ((def: any__2) => boolean)): Definitions
 
     /**
      	 * Provides convenient access to the model's top-level definitions.
@@ -1842,9 +1872,9 @@ interface LinkedCSN extends Omit<csn.CSN, 'definitions'> {
      	 * SELECT.from (Books) .where ({ID:11})
      	 * ```
      	 */
-    exports: IterableMap<any_>
-    definitions: IterableMap<any_>
-    entities: ModelPart<entity>
+    exports: IterableMap<any__2>
+    definitions: IterableMap<any__2>
+    entities: ModelPartFn<entity>
     services: ModelPart<service_>
 
 }
@@ -2022,6 +2052,7 @@ export type Middlewares = 'context' | 'trace' | 'auth' | 'ctx_model' | string
 
 export const middlewares: {
     add: (middleware: import('express').RequestHandler, pos?: XOR<XOR<{ at: number }, { after: Middlewares }>, { before: Middlewares }>) => void,
+    before: import('express').RequestHandler[],
 };
 
 /**
@@ -2067,7 +2098,12 @@ function mixin (...classes: (new () => any)[]): void
  */
 export let model: linked_2.LinkedCSN | undefined;
 
-type ModelPart<T extends any_> = IterableMap<T> & ((namespace: string) => IterableMap<T>)
+type ModelPart<T extends any__2> = IterableMap<T> & {
+    /** @deprecated undocumented variant that will be removed in cds^10 */
+    (namespace: string): IterableMap<T>,
+}
+
+type ModelPartFn<T extends any__2> = IterableMap<T> & ((namespace: string) => IterableMap<T>)
 
 namespace models {
     export {
@@ -2162,7 +2198,7 @@ export function on (event: 'connect', listener: (srv: Service) => void): _cds
 export function on (event: 'bootstrap', listener: (app: import('express').Application) => void): _cds
 
 /**
- 	 * Emitted before the model is compiled for usage in Node.js or Java runtime.
+ 	 * Emitted  the model is compiled for usage in Node.js or Java runtime.
  	 * @beta
  	 */
 export function on (event: 'compile.for.runtime', listener: (model: CSN) => void): _cds
@@ -2202,6 +2238,10 @@ export function on (event: 'listening', listener: (args: { server: import('http'
  	 */
 export function on (event: 'shutdown', listener: () => void): _cds
 
+export function once (event: 'loaded', listener: (model: CSN) => void): _cds
+
+export function once (event: 'connect', listener: (srv: Service) => void): _cds
+
 export function once (event: 'bootstrap', listener: (app: import('express').Application) => void): _cds
 
 export function once (event: 'compile.for.runtime', listener: (model: CSN) => void): _cds
@@ -2210,6 +2250,8 @@ export function once (event: 'compile.to.dbx', listener: (model: CSN) => void):
 
 export function once (event: 'compile.to.edmx', listener: (model: CSN) => void): _cds
 
+export function once (event: 'serving', listener: (srv: Service) => void): _cds
+
 export function once (event: 'served', listener: (all: cds_services) => void): _cds
 
 export function once (event: 'listening', listener: (args: { server: import('http').Server, url: string }) => void): _cds
@@ -2280,6 +2322,31 @@ P extends Record<string, any>[] = Record<string, any>[]
 
 export type predicate = _xpr
 
+/**
+ * @beta helper
+ * @example
+ * ```js
+ * const predicate: PredicateMap<Books> = {
+ *   title: 'foo',
+ *   or: {
+ *     price: { '>': 42 }
+ *   }
+ * }
+ * const result = await SELECT.from(Books).where(predicate)
+ * ```
+ * Note that you _have to_ explicitly type the predicate variable with `PredicateMap<T>`,
+ * as we can not offer this type as overload to `.where()` or `.having()`.
+ */
+type PredicateMap<T> = _PredicateMap<UnwrappedInstanceType<T>>
+
+/** @internal */
+type _PredicateMap<T> = {
+    [k in keyof Partial<T>]: (T[k] | Partial<{ [op in Op]: T[k] }>)
+}
+& { or?: _PredicateMap<T>, and?: _PredicateMap<T> }
+// disallow non-existing properties
+& { [key: string]: never }
+
 type Primitive = string | number | boolean | Date
 
 /** @private */
@@ -2336,6 +2403,7 @@ namespace ql {
     export {
         Query_2 as Query,
         QLExtensions,
+        PredicateMap,
         ConstructedQuery,
         StaticSELECT,
         QL,
@@ -2369,8 +2437,6 @@ type Query_2 = CQN.Query
 
 export class QueryAPI {
 
-    entities: linked_2.LinkedCSN['entities']
-
     /**
      * @see [docs](https://cap.cloud.sap/docs/node.js/core-services#crud-style-api)
      */
@@ -2449,9 +2515,9 @@ export class QueryAPI {
     transaction: QueryAPI['tx']
 
     tx: {
-        (fn: (tx: Transaction) => object): Promise<unknown>,
+        <T>(fn: (tx: Transaction) => T): Promise<Awaited<T>>,
         (context?: object): Transaction,
-        (context: object, fn: (tx: Transaction) => object): Promise<unknown>,
+        <T>(context: object, fn: (tx: Transaction) => T): Promise<Awaited<T>>,
     }
 
 }
@@ -2497,6 +2563,18 @@ D = any,
 P extends Record<string, any>[] = Record<string, any>[]
 > extends Event_2<D> {
 
+    messages: {message: string, numericSeverity: levels}[]
+
+    errors: {
+        code?: number,
+        message: string,
+        stack: string,
+        target?: string,
+        args?: unknown[],
+    }[]
+
+    results: D[]
+
     params: P
 
     method: string
@@ -2519,45 +2597,38 @@ P extends Record<string, any>[] = Record<string, any>[]
     /** @beta */
     reply (results: any, options: { mimetype?: string, filename?: string, [key: string]: any }): void
 
-    notify (code: number, message: string, target?: string, args?: any[]): Error
-
-    info (code: number, message: string, target?: string, args?: any[]): Error
-
-    warn (code: number, message: string, target?: string, args?: any[]): Error
-
-    error (code: number, message: string, target?: string, args?: any[]): Error
-
-    reject (code: number, message: string, target?: string, args?: any[]): never
-
-    notify (code: number, message: string, args?: any[]): Error
-
-    info (code: number, message: string, args?: any[]): Error
-
-    warn (code: number, message: string, args?: any[]): Error
-
-    error (code: number, message: string, args?: any[]): Error
-
-    reject (code: number, message: string, args?: any[]): never
-
+    // positional args
     notify (message: string, target?: string, args?: any[]): Error
+    notify (status: number, message?: string, target?: string, args?: any[]): Error
 
     info (message: string, target?: string, args?: any[]): Error
+    info (status: number, message?: string, target?: string, args?: any[]): Error
 
     warn (message: string, target?: string, args?: any[]): Error
+    warn (status: number, message?: string, target?: string, args?: any[]): Error
 
     error (message: string, target?: string, args?: any[]): Error
+    error (status: number, message?: string, target?: string, args?: any[]): Error
+    error (status: number, target?: string, args?: any[]): Error
 
     reject (message: string, target?: string, args?: any[]): never
+    reject (status: number, message?: string, target?: string, args?: any[]): never
 
-    notify (message: { code?: number | string, message: string, target?: string, args?: any[] }): Error
+    // single object arg
+    notify (message: { status?: number, code?: number | string, message: string, target?: string, args?: any[] }): Error
+    notify (message: { status?: number, code: number | string, message?: string, target?: string, args?: any[] }): Error
 
-    info (message: { code?: number | string, message: string, target?: string, args?: any[] }): Error
+    info (message: { status?: number, code?: number | string, message: string, target?: string, args?: any[] }): Error
+    info (message: { status?: number, code: number | string, message?: string, target?: string, args?: any[] }): Error
 
-    warn (message: { code?: number | string, message: string, target?: string, args?: any[] }): Error
+    warn (message: { status?: number, code?: number | string, message: string, target?: string, args?: any[] }): Error
+    warn (message: { status?: number, code: number | string, message?: string, target?: string, args?: any[] }): Error
 
-    error (message: { code?: number | string, message: string, target?: string, args?: any[], status?: number }): Error
+    error (message: { status?: number, code?: number | string, message: string, target?: string, args?: any[] }): Error
+    error (message: { status?: number, code: number | string, message?: string, target?: string, args?: any[] }): Error
 
-    reject (message: { code?: number | string, message: string, target?: string, args?: any[], status?: number }): never
+    reject (message: { status?: number, code?: number | string, message: string, target?: string, args?: any[] }): never
+    reject (message: { status?: number, code: number | string, message?: string, target?: string, args?: any[] }): never
 
 }
 export { Request_2 as Request }
@@ -2577,8 +2648,8 @@ export function resolve (files: '*' | filename | filename[]): filename[] | undef
 export interface ResultSet extends Array<object> {}
 
 export interface ResultsHandler {
-    (results: any[], req: Request_2): void
-    (each: any, req: Request_2): void
+    (results: any[], req: Request_2): unknown
+    (each: any, req: Request_2): unknown
 }
 
 export const root: string;
@@ -2653,24 +2724,25 @@ class SELECT_3<T, Q = SELECT_from> extends ConstructedQuery<T> {
     }
 
     /**
-     * If a parameter is given, the raw data stream is piped into it.
-     *
-     * If no parameter is given, the raw data stream is returned.
+     * Pipes the raw data stream into the given writable stream.
      * @param stream the writable stream to pipe the raw data into
      * @see [capire docs](https://cap.cloud.sap/docs/node.js/cds-ql#pipeline)
      * @since 9.3.0
      */
     pipeline(stream: import('node:stream').Writable): Promise<void>
     /**
-     * If a parameter is given, the raw data stream is piped into it.
-     *
-     * If no parameter is given, the raw data stream is returned.
-     * @see [capire docs](https://cap.cloud.sap/docs/node.js/cds-ql#pipeline)
-     * @since 9.3.0
-     * @returns Readable
+     * @deprecated use `.stream()` instead
      */
     pipeline(): Promise<import('node:stream').Readable>
 
+    /**
+     * Returns the raw data stream.
+     * @see [capire docs](https://cap.cloud.sap/docs/node.js/cds-ql#stream)
+     * @since 9.4.0
+     * @returns Readable
+     */
+    stream(): Promise<import('node:stream').Readable>
+
     /**
      * Calls the given callback function for each row in the result set.
      * @param cb the callback function to call for each row
@@ -2812,11 +2884,18 @@ export class Service extends QueryAPI {
     types: linked_2.ModelPart<linked_2.classes.type>
 
     /**
+     * @deprecated use {@link actions} instead
      * Provides access to the operations, i.e. actions and functions, exposed by a service
      * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
      */
     operations: linked_2.ModelPart<linked_2.classes.action>
 
+    /**
+     * Provides access to the actions and functions, exposed by a service
+     * @see [capire docs](https://cap.cloud.sap/docs/node.js/core-services)
+     */
+    actions: linked_2.ModelPart<linked_2.classes.action>
+
     /**
      * Acts like a parameter-less constructor. Ensure to call `await super.init()` to have the base class’s handlers added.
      * You may register own handlers before the base class’s ones, to intercept requests before the default handlers snap in.
@@ -2906,6 +2985,8 @@ export class Service extends QueryAPI {
     on<T extends Constructable>(eve: types.event, entity: T | T[], handler: CRUDEventHandler.On<InstanceType<T>>): this
     on<F extends CdsFunction>(boundAction: F, service: string, handler: ActionEventHandler<F['__self'], F['__parameters'], void | Error | F['__returns']>): this
     on<F extends CdsFunction>(unboundAction: F, handler: ActionEventHandler<F['__self'], F['__parameters'], void | Error | F['__returns']>): this
+    // event classes, generated by cds-typer
+    on<E extends {new (...args: any): any, kind: 'event'}>(eve: E, handler: EventHandler<InstanceType<E>>): this
     on (eve: types.event, entity: types.target, handler: OnEventHandler): this
     on (eve: types.event, handler: OnEventHandler): this
     on (eve: 'error', handler: OnErrorHandler): this
@@ -2985,7 +3066,7 @@ class service_ extends context_ {
     get protocols (): { [protocol in Protocol]?: boolean | undefined }
 }
 
-interface service_2 extends any__2 { }
+interface service_2 extends any_ { }
 
 export interface ServiceImpl {
     (this: Service, srv: Service): any
@@ -3142,12 +3223,24 @@ class Test extends Axios {
      */
     verbose (v: boolean): this
 
+    /**
+     * @deprecated Either use the {@link expect} property here or import `chai` in your test file.
+     */
     get chai (): typeof import('chai')
 
-    get expect (): typeof import('chai').expect
-
+    /**
+     * @deprecated Either use the {@link expect} property here or import `chai.assert` in your test file.
+     */
     get assert (): typeof import('chai').assert
 
+    /**
+     * The `expect` assertion from the `chai` assertion library.
+     *
+     * For Jest, this returns a built-in implementation that covers the most common matchers with the standard `chai` API.
+     * If your tests need more matchers, move to a different test runner such as Vitest, which supports ESM-only modules like `chai`.
+     */
+    get expect (): typeof import('chai').expect
+
     get data (): DataUtil
 
     get cds (): _cds_2
@@ -3212,9 +3305,9 @@ export const transaction: Service['transaction'];
  * @see [docs](https://cap.cloud.sap/docs/node.js/cds-tx)
  */
 export const tx: {
-    (fn: (tx: Transaction) => object): Promise<any>,
+    <T>(fn: (tx: Transaction) => T): Promise<T>,
     (context?: object): Transaction,
-    (context: object, fn: (tx: Transaction) => object): Promise<any>,
+    <T>(context: object, fn: (tx: Transaction) => T): Promise<T>,
 };
 
 export interface type extends Omit<csn.type, 'items'> {
@@ -3224,9 +3317,9 @@ export interface type extends Omit<csn.type, 'items'> {
     virtual?: boolean
 }
 
-export class type<K extends kinds = 'type'> extends any_<K> { }
+export class type<K extends kinds = 'type'> extends any__2<K> { }
 
-interface type_2 extends any__2 {
+interface type_2 extends any_ {
     type?: 'cds.Boolean' |
     'cds.UUID' | 'cds.String' | 'cds.LargeString' | 'cds.Binary' | 'cds.LargeBinary' | 'cds.Vector' |
     'cds.Integer' | 'cds.UInt8' | 'cds.Int16' | 'cds.Int32' | 'cds.Int64' | 'cds.Double' | 'cds.Decimal' |
@@ -3528,7 +3621,7 @@ class Vector extends Binary { }
 
 export const version: string;
 
-type Visitor = (def: any_, name: string, parent: any_, defs: Definitions) => void
+type Visitor = (def: any__2, name: string, parent: any__2, defs: Definitions) => void
 
 interface Where<T> {
     where: HavingWhere<this, T>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/cds-types",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "Type definitions for main packages of CAP, like `@sap/cds`",
   "repository": "github:cap-js/cds-types",
   "homepage": "https://cap.cloud.sap/",
@@ -50,14 +50,16 @@
     }
   },
   "devDependencies": {
-    "@cap-js/cds-test": "^0",
+    "@cap-js/cds-test": "^0 || ^1",
     "@cap-js/db-service": "^2.3.0",
     "@microsoft/api-extractor": "^7.52.8",
     "@sap/cds-dk": "^9",
     "@stylistic/eslint-plugin-js": "^4.0.1",
     "@stylistic/eslint-plugin-ts": "^4.0.1",
+    "@types/chai": "^5.2.3",
     "axios": "^1.6.2",
-    "eslint": "^9.2.0",
+    "eslint": "^10",
+    "globals": "^17.5.0",
     "typescript": "^5.4.5",
     "typescript-eslint": "^8.0.0-alpha.51"
   }