Replace TypedRequest<T> with Request<T> (#358)

CHANGELOG.md

@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - Added missing properties for `log` in `cds.env`
 - Added overload for `service.read` to be called with a `ref`
 
+### Removed
+- [breaking] Removed type `TypedRequest<T>` and replaced it with just `Request<T>`
+
 ### Fixed
 
 - Use `Required` instead of `DeepRequired` in projection function to avoid complexity errors from TypeScript

apis/events.d.ts

@@ -32,11 +32,11 @@ export class EventContext {
 /**
  * @see [capire docs](https://cap.cloud.sap/docs/node.js/events)
  */
-export class Event extends EventContext {
+export class Event<T = unknown> extends EventContext {
 
   event: string
 
-  data: any
+  data: T
 
   headers: any
 
@@ -49,7 +49,7 @@ export class Event extends EventContext {
 /**
  * @see [capire docs](https://cap.cloud.sap/docs/node.js/events)
  */
-export class Request extends Event {
+export class Request<T = any> extends Event<T> {
 
   params: (string | object)[]
 

apis/services.d.ts

@@ -353,13 +353,11 @@ type CdsFunction = {
   __returns: any,
 }
 
-type TypedRequest<T> = Omit<Request, 'data'> & { data: T }
-
 // https://cap.cloud.sap/docs/node.js/core-services#srv-on-before-after
 declare namespace CRUDEventHandler {
-  type Before<P, R = P | void | Error> = (req: TypedRequest<P>) => Promise<R> | R
-  type On<P, R = P | void | Error> = (req: TypedRequest<P>, next: (...args: any[]) => Promise<R> | R) => Promise<R> | R
-  type After<P, R = P | void | Error> = (data: undefined | P, req: TypedRequest<P>) => Promise<R> | R
+  type Before<P, R = P | void | Error> = (req: Request<P>) => Promise<R> | R
+  type On<P, R = P | void | Error> = (req: Request<P>, next: (...args: any[]) => Promise<R> | R) => Promise<R> | R
+  type After<P, R = P | void | Error> = (data: undefined | P, req: Request<P>) => Promise<R> | R
 }
 
 // Handlers for actions try to infer the passed .data property

test/typescript/apis/project/cds-services.ts

@@ -1,4 +1,4 @@
-import cds, { Service, TypedRequest } from '@sap/cds'
+import cds, { Service, Request } from '@sap/cds'
 import { Bars, Bar, Foo, Foos, action } from './dummy'
 const model = cds.reflect({})
 const { Book: Books } = model.entities
@@ -216,10 +216,10 @@ srv.on('error', (err, req) => {
 })
 
 
-function isOne(p: TypedRequest<Foo> | Foo | undefined ) { if(!p) return; p instanceof Foo ? p.x.toFixed : p.data.x.toFixed}
-function isMany(p: TypedRequest<Foos> | Foos | undefined) { if(!p) return; p instanceof Foos ? p[0].x.toFixed : p.data[0].x.toFixed}
+function isOne(p: Request<Foo> | Foo | undefined ) { if(!p) return; p instanceof Foo ? p.x.toFixed : p.data.x.toFixed}
+function isMany(p: Request<Foos> | Foos | undefined) { if(!p) return; p instanceof Foos ? p[0].x.toFixed : p.data[0].x.toFixed}
 
-function isOneOfMany(p: TypedRequest<Foo | Bar> | Foo | Bar | undefined ) { 
+function isOneOfMany(p: Request<Foo | Bar> | Foo | Bar | undefined ) { 
   if(!p) return;
   if ("data" in p) {
     if (p.data instanceof Foo) p.data.x.toFixed;
@@ -229,7 +229,7 @@ function isOneOfMany(p: TypedRequest<Foo | Bar> | Foo | Bar | undefined ) {
     else p.name.split;
   }
 }
-function isManyOfMany(p: TypedRequest<Foos | Bars> | Foos | Bars | undefined) { 
+function isManyOfMany(p: Request<Foos | Bars> | Foos | Bars | undefined) { 
   if(!p) return;
   if ("data" in p) {
     if (p.data instanceof Foos) p.data[0].x.toFixed;