Merge branch 'main' of work.github.com:fullstack-development/nestjs-starter-kit into 20-paginate

Author: sodiqit-fsd

api/package.json

@@ -28,6 +28,8 @@
         "@medibloc/nestjs-request-context": "^1.0.0",
         "@nestjs/common": "^9.0.0",
         "@nestjs/core": "^9.0.0",
+        "@nestjs/jwt": "^9.0.0",
+        "@nestjs/passport": "^9.0.0",
         "@nestjs/platform-express": "^9.0.0",
         "@nestjs/schedule": "^2.1.0",
         "@prisma/client": "^3.14.0",
@@ -41,6 +43,7 @@
         "express": "^4.17.2",
         "node-fetch": "^2.6.7",
         "passport": "^0.4.1",
+        "passport-jwt": "^4.0.0",
         "prisma": "^3.14.0",
         "ramda": "^0.27.1",
         "reflect-metadata": "^0.1.13",
@@ -53,8 +56,6 @@
     "devDependencies": {
         "@golevelup/ts-jest": "^0.3.2",
         "@nestjs/cli": "^9.0.0",
-        "@nestjs/jwt": "^9.0.0",
-        "@nestjs/passport": "^9.0.0",
         "@nestjs/schematics": "^9.0.0",
         "@nestjs/testing": "^9.0.0",
         "@types/cookie-parser": "^1.4.2",
@@ -75,7 +76,6 @@
         "eslint-plugin-deprecation": "^1.2.0",
         "eslint-plugin-prettier": "^4.0.0",
         "jest": "28.1.3",
-        "passport-jwt": "^4.0.0",
         "prettier": "^2.3.2",
         "source-map-support": "^0.5.20",
         "supertest": "^6.1.3",

api/src/core/controller.core.ts

@@ -69,14 +69,14 @@ export const getRequestUser = (data: unknown, ctx: ExecutionContext) => {
 };
 export const User = createParamDecorator(getRequestUser);
 
-export function mapResponse<T, EI extends BaseError<unknown>, EO>(data: T | EI) {
+export function mapResponse<T, EI, EO>(data: T | BaseError<EI>) {
     return async (
-        onData: (data: Exclude<T, EI>) => ControllerResponse | Promise<ControllerResponse>,
-        onError?: (e: EI) => BaseError<EO> | Promise<BaseError<EO>>,
+        onData: (data: T) => ControllerResponse | Promise<ControllerResponse>,
+        onError?: (e: BaseError<EI>) => BaseError<EO> | Promise<BaseError<EO>>,
     ) =>
         isError(data)
             ? onError
                 ? Promise.resolve(onError(data))
                 : Promise.resolve(data)
-            : Promise.resolve(onData(data as Exclude<T, EI>));
+            : Promise.resolve(onData(data));
 }

api/src/core/errors.core.ts

@@ -40,7 +40,7 @@ export class BaseError<E> {
     }
 }
 
-export function isError<T, E>(value: T | BaseError<E>): value is BaseError<E> {
+export function isError<T, E, BE extends BaseError<E>>(value: T | BE): value is BE {
     return value instanceof BaseError;
 }