bootpress 9.0.2 → 9.1.0

package/README.md

@@ -61,13 +61,17 @@ class PostServiceImpl {
         return new HttpResponse(201, casted.id);
     }
     delete(deleteInQuery: string | undefined, idInQuery: string | undefined) {
-        const idx = deleteInQuery === "yes" ? this.posts.indexOf(as(idInQuery, "integer")) : -1;
-        if (idx > -1) {
-            this.#logDeleted(idInQuery);
-            return this.posts.splice(idx, 1);
-        }else {
-            throw new HttpError(404, "Post is not found")
+        if (deleteInQuery === "yes") {
+            const id = as(idInQuery, "integer");
+            const index = this.posts.indexOf(id);
+            if (index > -1) {
+                this.#logDeleted(idInQuery!);
+                return this.posts.splice(index, 1);
+            } else {
+                throw new HttpError(404, "Post is not found")
+            }
         }
+        throw new HttpError(400, "Bad Request");
     }
     // use private methods to  
     #logDeleted(id: number | string) {

package/helpers/index.d.ts

@@ -21,6 +21,7 @@ type JsSchema = {
 }
 
 type ArraySchema = [JsSchema]
+type TypedArraySchema<A extends ArraySchema> = TypedSchema<A[0]>
 
 type RemoveQuestionMark<T extends string> = T extends `${infer Prefix}?` ? Prefix : T;
 

package/index.d.ts

@@ -1,13 +1,17 @@
 import { Response, Request } from "express"
-import { ArraySchema, JsSchema, ValidTypeKeys, TypedSchema } from "./helpers"
+import { ArraySchema, JsSchema, ValidTypeKeys, TypedSchema, ValOf, TypedArraySchema } from "./helpers"
 
 type RequestHandler = (req: Request, res: Response) => void
-type RequsetHandlerWithArgs = <A extends any[]>(...args: A) => RequestHandler
-type RequsetHandlerWithFirstArg<T> = (arg1: T, ...rest: any[]) => RequestHandler
+type ArrayWithLastElement<L> = [...rest: any[], lastArg: L];
+type RequsetHandlerWithLastArg<T, F extends (...args: any) => RequestHandler = (...args: any[]) => RequestHandler, P extends ArrayWithLastElement<T> = Parameters<F>> = (...args: P) => RequestHandler;
 type NonEmptyArray = readonly [any, ...any[]];
-type ShiftRequestHandler<F extends (arg1: any, ...rest: any[]) => RequestHandler> = F extends (arg1: infer T, ...rest: infer U) => RequestHandler ? U extends NonEmptyArray ? (...rest: U) => RequestHandler : RequestHandler : RequestHandler
+type ShiftRequestHandler<F extends RequsetHandlerWithLastArg<any> | RequestHandler> =
+    F extends (arg1: infer T, ...rest: infer U) => RequestHandler ?
+    U extends NonEmptyArray ? (...rest: U) => RequestHandler : RequestHandler
+    : RequestHandler
 
-type RestedService<T extends Record<PropertyKey, any>> = { [K in keyof T]:
+type RestedService<T extends Record<PropertyKey, any>> = {
+    [K in keyof T]:
     T[K] extends Function
     ? (...args: Parameters<T[K]>) => RequestHandler
     : T[K]
@@ -15,21 +19,28 @@ type RestedService<T extends Record<PropertyKey, any>> = { [K in keyof T]:
 
 type InstanceOrClass<T extends Record<PropertyKey, any>> = T | (new () => T);
 
+type TypeValueOf<S extends ValidTypeKeys | JsSchema | TypedSchema<any> | ArraySchema> =
+    S extends ValidTypeKeys ? ValOf<S>
+    : S extends JsSchema ? TypedSchema<S>
+    : S extends TypedSchema<any> ? S
+    : S extends ArraySchema ? TypedArraySchema<S>
+    : never;
+
 declare function RestService<T extends Record<PropertyKey, any>>(service: InstanceOrClass<T>): RestedService<T>;
 declare function RestMethod<T>(callback: () => T): RequestHandler;
 declare function Restify(target: any, key: PropertyKey, desc: PropertyDescriptor): PropertyDescriptor;
 
-declare function PassBody<F extends RequsetHandlerWithFirstArg<any>>(serviceFunction: F): ShiftRequestHandler<F>
-declare function ParseBodyAs<T extends ValidTypeKeys | JsSchema | TypedSchema<any> | ArraySchema, F extends RequsetHandlerWithFirstArg<T>>(type: T): (serviceFunction: F) => ShiftRequestHandler<F>
-declare function PassBodyAs<T extends ValidTypeKeys | JsSchema | TypedSchema<any> | ArraySchema, F extends RequsetHandlerWithFirstArg<T>>(type: T): (serviceFunction: F) => ShiftRequestHandler<F>
-declare function PassAllParams<F extends RequsetHandlerWithFirstArg<string[]>>(serviceFunction: F): ShiftRequestHandler<F>
-declare function PassAllQueries<F extends RequsetHandlerWithFirstArg<string[]>>(serviceFunction: F): ShiftRequestHandler<F>
-declare function PassAllCookies<F extends RequsetHandlerWithFirstArg<string[]>>(serviceFunction: F): ShiftRequestHandler<F>
-declare function PassParam<F extends RequsetHandlerWithFirstArg<string | undefined>>(paramName: string): (serviceFunction: F) => ShiftRequestHandler<F>
-declare function PassQuery<F extends RequsetHandlerWithFirstArg<string | undefined>>(queryName: string): (serviceFunction: F) => ShiftRequestHandler<F>
-declare function PassCookie<F extends RequsetHandlerWithFirstArg<string | undefined>>(cookieName: string): (serviceFunction: F) => ShiftRequestHandler<F>
-declare function PassRequest<F extends RequsetHandlerWithFirstArg<Request>>(serviceFunction: F): ShiftRequestHandler<F>
-declare function PassResponse<F extends RequsetHandlerWithFirstArg<Response>>(serviceFunction: F): ShiftRequestHandler<F>
+declare function PassBody<F extends RequsetHandlerWithLastArg<any>>(serviceFunction: F): ShiftRequestHandler<F>
+declare function ParseBodyAs<S extends ValidTypeKeys | JsSchema | TypedSchema<any> | ArraySchema, T = TypeValueOf<S>>(type: S): <F extends RequsetHandlerWithLastArg<T>>(serviceFunction: F) => ShiftRequestHandler<F>
+declare function PassBodyAs<S extends ValidTypeKeys | JsSchema | TypedSchema<any> | ArraySchema, T = TypeValueOf<S>>(type: S): <F extends RequsetHandlerWithLastArg<T>>(serviceFunction: F) => ShiftRequestHandler<F>
+declare function PassAllParams<F extends RequsetHandlerWithLastArg<string[]>>(serviceFunction: F): ShiftRequestHandler<F>
+declare function PassAllQueries<F extends RequsetHandlerWithLastArg<string[]>>(serviceFunction: F): ShiftRequestHandler<F>
+declare function PassAllCookies<F extends RequsetHandlerWithLastArg<string[]>>(serviceFunction: F): ShiftRequestHandler<F>
+declare function PassParam(paramName: string): <F extends RequsetHandlerWithLastArg<string | undefined>>(serviceFunction: F) => ShiftRequestHandler<F>
+declare function PassQuery(queryName: string): <F extends RequsetHandlerWithLastArg<string | undefined>>(serviceFunction: F) => ShiftRequestHandler<F>
+declare function PassCookie(cookieName: string): <F extends RequsetHandlerWithLastArg<string | undefined>>(serviceFunction: F) => ShiftRequestHandler<F>
+declare function PassRequest<F extends RequsetHandlerWithLastArg<Request>>(serviceFunction: F): ShiftRequestHandler<F>
+declare function PassResponse<F extends RequsetHandlerWithLastArg<Response>>(serviceFunction: F): ShiftRequestHandler<F>
 
 export {
     RestService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootpress",
-  "version": "9.0.2",
+  "version": "9.1.0",
   "description": "REST service methods for express",
   "main": "index.js",
   "repository": {