fix express middlewares on middlewares of palmares

Author: nicolasmelo1

docs/examples/mainpage/src/favoritetools/express.ts

@@ -4,44 +4,27 @@ import { path, Response, middleware } from '@palmares/server';
 import { User } from './database';
 import { userSchema } from './schemas';
 
-const companyMiddleware = middleware({
-  request: async (request) => {
-    return request.clone({
-      context: {
-        company: {
-          id: 1
-        }
-      }
-    });
-  }
+// You already know how to create express middlewares, so just use it.
+const expressMiddleware = (req, res, next) => {
+  req.user = 'admin';
+  next();
+};
+
+// You can assign the middleware as customOption
+// Remember, this middleware is for express
+const adminOnlyMiddleware = middleware({
+  customOptions: [expressMiddleware()]
 });
 
 export const usersRoute = path('/users')
-  .middlewares([companyMiddleware])
+  .middlewares([adminOnlyMiddleware])
   .get(async (request) => {
-    const users = await User.default.get((qs) =>
-      qs.where({
-        companyId: request.context.company.id
-      })
-    );
-    return Response.json({ users });
-  })
-  .post(async (request) => {
-    const validationResp = await userSchema.validate((await request.json()) as any, {});
-    if (!validationResp.isValid) {
-      return Response.json(
-        {
-          success: false,
-          errors: validationResp.errors
-        },
-        { status: 400 }
-      );
+    // You can access the request data from Express.js from the request object
+    const { req, res } = request.serverData();
+    if (req.user !== 'admin') {
+      return Response.json({ message: 'You are not admin' }, { status: 403 });
     }
-    return Response.json({ success: true, data: await validationResp.save() });
-  })
-  .nested((path) => [
-    path('/<id: number>').get(async (request) => {
-      const user = await User.default.get((qs) => qs.where({ id: request.params.id }));
-      return Response.json({ user: user[0] });
-    })
-  ]);
+
+    // You can respond with the `res` object from Express.js
+    return res.json({ message: 'You are admin' });
+  });

packages/server/__tests__/src/core/index.ts

@@ -10,7 +10,12 @@ const __dirname = dirname(__filename);
 
 const testMiddleware = middleware({
   options: {
-    customOptions: [cors()]
+    customOptions: [
+      (req, res, next) => {
+        req.params.test2 = 'test';
+        next();
+      }
+    ]
   }
 });
 const route = path('/test')
@@ -21,7 +26,12 @@ const route = path('/test')
       return Response.json({ message: 'hello' }, { status: 200 });
     },
     {
-      customOptions: [cors()]
+      customOptions: [
+        (req, res, next) => {
+          req.params.test = 'test';
+          next();
+        }
+      ]
     }
   );
 

packages/server/src/app/utils.ts

@@ -19,6 +19,7 @@ import { Response } from '../response';
 import { HTTP_404_NOT_FOUND, HTTP_500_INTERNAL_SERVER_ERROR, isRedirect } from '../response/status';
 import { AsyncGeneratorFunction, GeneratorFunction } from '../response/utils';
 import { path } from '../router';
+import { mergeDeep } from '../utils/merge-deep';
 import { setServerAdapterInstance } from '../utils/store-server';
 
 import type { ServerAdapter } from '../adapters';
@@ -377,30 +378,6 @@ function translatePathFactory(serverAdapter: ServerAdapter | ServerlessAdapter,
   };
 }
 
-function mergeDeep(...objects: any[]) {
-  const isObject = (obj: any) => obj && typeof obj === 'object';
-  return objects.reduce(
-    (prev, obj) => {
-      const keys = Array.isArray(obj) ? Array.from({ length: obj.length }).map((_, index) => index) : Object.keys(obj);
-      keys.forEach((key) => {
-        const keyAsNumber = Number(key);
-        const actualKeyValue = isNaN(keyAsNumber) === false ? Number(key) : key;
-        const pVal = prev[actualKeyValue];
-        const oVal = obj[actualKeyValue];
-        if (Array.isArray(pVal) && Array.isArray(oVal)) {
-          prev[actualKeyValue] = pVal.concat(...oVal);
-        } else if (isObject(pVal) && isObject(oVal)) {
-          prev[actualKeyValue] = mergeDeep(pVal, oVal);
-        } else {
-          prev[actualKeyValue] = oVal;
-        }
-      });
-      return prev;
-    },
-    Array.isArray(objects[0]) ? [] : {}
-  );
-}
-
 function mergeCustomOptionsFromMiddlewaresAndHandlers(middlewares: Middleware[], options: RouterOptionsType) {
   const originalCustomOptions = options.customOptions;
   // eslint-disable-next-line ts/no-unnecessary-condition
@@ -410,6 +387,7 @@ function mergeCustomOptionsFromMiddlewaresAndHandlers(middlewares: Middleware[],
     if (middleware.options?.customOptions) {
       // eslint-disable-next-line ts/no-unnecessary-condition
       if (options.customOptions)
+        // eslint-disable-next-line ts/no-unnecessary-condition
         options.customOptions = mergeDeep(options.customOptions, middleware.options.customOptions);
       else options.customOptions = middleware.options.customOptions;
     }
@@ -445,7 +423,6 @@ function wrapHandlerAndMiddlewares(
   validation?: AllServerSettingsType['servers'][string]['validation']
 ) {
   if (options === undefined) options = {};
-  console.log(options);
   if (server.$$type === '$PServerAdapter') mergeCustomOptionsFromMiddlewaresAndHandlers(middlewares, options);
   const wrappedHandler = async (serverRequestAndResponseData: any) => {
     const startTime = new Date().getTime();

packages/server/src/utils/merge-deep.ts

@@ -0,0 +1,41 @@
+export function mergeDeep<TData extends any[]>(...objects: TData): TData[number] {
+  const isObject = (object: any) => object && typeof object === 'object' && !Array.isArray(object);
+
+  if (objects.length < 1) return {};
+  if (objects.length === 1) return objects[0];
+
+  const firstNonNullObj = objects.find((object) => object != null);
+  const resultIsArray = Array.isArray(firstNonNullObj);
+
+  const result = resultIsArray ? ([] as any) : ({} as any);
+
+  for (const currentObject of objects) {
+    if (currentObject == null) continue; // Skip null/undefined objects
+
+    if (Array.isArray(currentObject)) {
+      if (resultIsArray) {
+        currentObject.forEach((item) => result.push(item));
+      } else {
+        currentObject.forEach((item, index) => {
+          const existingValueAtIndex = result[index];
+          const isDeepMergeNeeded = isObject(item) && isObject(existingValueAtIndex);
+
+          if (isDeepMergeNeeded) result[index] = mergeDeep(existingValueAtIndex, item);
+          else result[index] = item;
+        });
+      }
+    } else if (isObject(currentObject)) {
+      Object.keys(currentObject).forEach((key) => {
+        const existingValue = result[key];
+        const newValue = currentObject[key];
+        const areBothObjects = isObject(existingValue) && isObject(newValue);
+        const areBothArrays = Array.isArray(existingValue) && Array.isArray(newValue);
+
+        if (areBothObjects || areBothArrays) result[key] = mergeDeep(existingValue, newValue);
+        else result[key] = newValue;
+      });
+    }
+  }
+
+  return result;
+}