doing changes for custom options in middlewares

nicolasmelo1 · nicolasmelo1 · commit d35da30eebb0 · 2025-03-14T22:49:30.000-03:00
diff --git a/build/tsconfig.types.json b/build/tsconfig.types.json
@@ -4,7 +4,7 @@
     "declarationMap": true, /* go to js file when using IDE functions like. "Go to Definition" in VSCode */
     "emitDeclarationOnly": true,
     "allowJs": true,
-    "incremental": true,
+    "incremental": false,
     "outDir": "./dist/src",
     "preserveSymlinks": true,
     "target": "ES2020",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
diff --git a/libs/express-adapter/package.json b/libs/express-adapter/package.json
@@ -20,12 +20,8 @@
   },
   "scripts": {
     "clear": "rimraf ./dist",
-    "build:types": "tsc --project tsconfig.types.json",
-    "build:cjs:esm": "tsup ./src --out-dir ./dist/src --format cjs,esm --silent --no-splitting",
-    "build": "pnpm run clear && pnpm run build:cjs:esm && pnpm run build:types",
-    "build:types:watch": "tsc --project tsconfig.types.json --watch --preserveWatchOutput",
-    "build:cjs:esm:watch": "tsup ./src --out-dir ./dist/src --format cjs,esm --watch --silent --no-splitting",
-    "build:watch": "pnpm run build:cjs:esm:watch & pnpm run build:types:watch"
+    "build": "tsup ./src --out-dir ./dist/src --format cjs,esm --dts --tsconfig tsconfig.types.json --clean --silent --no-splitting",
+    "build:watch": "tsup ./src --out-dir ./dist/src --format cjs,esm --dts --tsconfig tsconfig.types.json --clean --watch --silent --no-splitting"
   },
   "type": "module",
   "repository": {
diff --git a/libs/express-adapter/src/router.ts b/libs/express-adapter/src/router.ts
@@ -17,14 +17,16 @@ export const routerAdapter = serverRouterAdapter({
   parseHandlers(_, initializedServer: Express, path, handlers: ParseHandlersServer<RequestHandler[]>, __, handler404) {
     // This will initialize the server routes.
     initializedServer.all(path, (req: Request, res: Response) => {
-      let currentMiddlewareIndex = 0;
+      let currentMiddlewareIndex = -1;
 
       const runMiddlewares = (methodType: MethodTypes | 'all', req: Request, res: Response) => {
         const next = () => {
-          if (handlers.get(methodType)?.options?.[currentMiddlewareIndex])
+          currentMiddlewareIndex = Number(currentMiddlewareIndex) + 1;
+          if (handlers.get(methodType)?.options?.[currentMiddlewareIndex]) {
             handlers.get(methodType)?.options?.[currentMiddlewareIndex]?.(req, res, next);
-          else handlers.get(methodType)?.handler({ req, res });
-          currentMiddlewareIndex++;
+          } else {
+            handlers.get(methodType)?.handler({ req, res });
+          }
         };
 
         next();
diff --git a/libs/express-adapter/tsconfig.types.json b/libs/express-adapter/tsconfig.types.json
@@ -3,6 +3,7 @@
   "compilerOptions": {
     "declaration": true /* Generate d.ts files */,
     "esModuleInterop": true,
+    "emitDeclarationOnly": false,
     "allowSyntheticDefaultImports": true,
     "rootDir": "./src",
     "outDir": "./dist/src",
diff --git a/libs/vercel-adapter/package.json b/libs/vercel-adapter/package.json
@@ -20,12 +20,8 @@
   },
   "scripts": {
     "clear": "rimraf ./dist",
-    "build:types": "tsc --project tsconfig.types.json",
-    "build:cjs:esm": "tsup ./src --out-dir ./dist/src --format cjs,esm --silent --no-splitting",
-    "build": "pnpm run clear && pnpm run build:cjs:esm && pnpm run build:types",
-    "build:types:watch": "tsc --project tsconfig.types.json --watch --preserveWatchOutput",
-    "build:cjs:esm:watch": "tsup ./src --out-dir ./dist/src --format cjs,esm --watch --silent --no-splitting",
-    "build:watch": "pnpm run build:cjs:esm:watch & pnpm run build:types:watch"
+    "build": "tsup ./src --out-dir ./dist/src --format cjs,esm --dts --tsconfig tsconfig.types.json --clean --silent --no-splitting",
+    "build:watch": "tsup ./src --out-dir ./dist/src --format cjs,esm --dts --tsconfig tsconfig.types.json --clean --watch --silent --no-splitting"
   },
   "type": "module",
   "repository": {
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "rimraf": "^6.0.1",
     "tsup": "^8.2.4",
     "tsx": "^4.19.3",
-    "turbo": "^2.4.2",
+    "turbo": "^2.4.4",
     "typescript": "^5.5.4",
     "typescript-eslint": "^8.24.1"
   }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -30,12 +30,8 @@
   "scripts": {
     "copy:templates": "copyfiles -u 1 \"templates/**/*\" ../../bin/templates/app",
     "clear": "rimraf ./dist",
-    "build:types": "tsc --project tsconfig.types.json",
-    "build:cjs:esm": "tsup ./src --out-dir ./dist/src --format cjs,esm --silent --no-splitting",
-    "build": "pnpm run clear && pnpm run build:cjs:esm && pnpm run build:types",
-    "build:types:watch": "tsc --project tsconfig.types.json --watch --preserveWatchOutput",
-    "build:cjs:esm:watch": "tsup ./src --out-dir ./dist/src --format cjs,esm --watch --silent --no-splitting",
-    "build:watch": "pnpm run build:cjs:esm:watch & pnpm run build:types:watch"
+    "build": "tsup ./src --out-dir ./dist/src --format cjs,esm --dts --tsconfig tsconfig.types.json --clean --silent --no-splitting",
+    "build:watch": "tsup ./src --out-dir ./dist/src --format cjs,esm --dts --tsconfig tsconfig.types.json --watch --silent --no-splitting"
   },
   "type": "module",
   "author": "Nicolas Leal",
diff --git a/packages/server/__tests__/package.json b/packages/server/__tests__/package.json
@@ -21,14 +21,15 @@
     "@palmares/node-std": "workspace:*",
     "@palmares/server": "workspace:*",
     "@palmares/tests": "workspace:*",
+    "cors": "^2.8.5",
     "drizzle-kit": "^0.30.5",
     "drizzle-orm": "^0.39.3"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.11",
-    "better-sqlite3": "^11.8.1",
     "@types/cors": "^2.8.17",
     "@types/supertest": "^6.0.2",
+    "better-sqlite3": "^11.8.1",
     "eslint": "^9.9.1",
     "supertest": "^7.0.0",
     "ts-jest-mock-import-meta": "^1.2.0",
diff --git a/packages/server/__tests__/src/core/index.ts b/packages/server/__tests__/src/core/index.ts
@@ -1,15 +1,29 @@
 import { domain } from '@palmares/core';
-import { Response, path, serverDomainModifier } from '@palmares/server';
+import { Response, middleware, path, serverDomainModifier } from '@palmares/server';
 import { testDomainModifier } from '@palmares/tests';
+import cors from 'cors';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const route = path('/test').get(() => {
-  console.log('hello');
-  return Response.json({ message: 'hello' }, { status: 200 });
+
+const testMiddleware = middleware({
+  options: {
+    customOptions: [cors()]
+  }
 });
+const route = path('/test')
+  .middlewares([testMiddleware])
+  .get(
+    (req) => {
+      console.log(req.serverData().req.params);
+      return Response.json({ message: 'hello' }, { status: 200 });
+    },
+    {
+      customOptions: [cors()]
+    }
+  );
 
 export default domain('testingExpressServer', __dirname, {
   modifiers: [serverDomainModifier, testDomainModifier] as const,
diff --git a/packages/server/__tests__/src/core/test.test.ts b/packages/server/__tests__/src/core/test.test.ts
@@ -1,4 +1,4 @@
-import ExpressServerAdapter from '@palmares/express-adapter';
+import { ExpressServerAdapter } from '@palmares/express-adapter';
 import { getAdapterServer, loadServerWhenTesting } from '@palmares/server';
 import { beforeAll, describe } from '@palmares/tests';
 import supertest from 'supertest';
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -20,12 +20,8 @@
   },
   "scripts": {
     "clear": "rimraf ./dist",
-    "build:types": "tsc --project tsconfig.types.json",
-    "build:cjs:esm": "tsup ./src --out-dir ./dist/src --format cjs,esm --silent --no-splitting",
-    "build": "pnpm run clear && pnpm run build:cjs:esm && pnpm run build:types",
-    "build:types:watch": "tsc --project tsconfig.types.json --watch --preserveWatchOutput",
-    "build:cjs:esm:watch": "tsup ./src --out-dir ./dist/src --format cjs,esm --watch --silent --no-splitting",
-    "build:watch": "pnpm run build:cjs:esm:watch & pnpm run build:types:watch"
+    "build": "tsup ./src --out-dir ./dist/src --format cjs,esm --dts --tsconfig tsconfig.types.json --clean --silent --no-splitting",
+    "build:watch": "tsup ./src --out-dir ./dist/src --format cjs,esm --dts --tsconfig tsconfig.types.json --watch --silent --no-splitting"
   },
   "type": "module",
   "repository": {
diff --git a/packages/server/src/app/utils.ts b/packages/server/src/app/utils.ts
@@ -377,6 +377,46 @@ 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
+  if (originalCustomOptions) options.customOptions = undefined;
+  for (const middleware of middlewares) {
+    // eslint-disable-next-line ts/no-unnecessary-condition
+    if (middleware.options?.customOptions) {
+      // eslint-disable-next-line ts/no-unnecessary-condition
+      if (options.customOptions)
+        options.customOptions = mergeDeep(options.customOptions, middleware.options.customOptions);
+      else options.customOptions = middleware.options.customOptions;
+    }
+  }
+  // eslint-disable-next-line ts/no-unnecessary-condition
+  if (originalCustomOptions) options.customOptions = mergeDeep(options.customOptions, originalCustomOptions);
+}
 /**
  * Responsible for wrapping the handler and the middlewares into a single function that will be called when a
  * request is made to the server.
@@ -404,7 +444,10 @@ function wrapHandlerAndMiddlewares(
   handler500?: AllServerSettingsType['servers'][string]['handler500'],
   validation?: AllServerSettingsType['servers'][string]['validation']
 ) {
-  const wrappedHandler = async (serverRequestAndResponseData: any) => { 
+  if (options === undefined) options = {};
+  console.log(options);
+  if (server.$$type === '$PServerAdapter') mergeCustomOptionsFromMiddlewaresAndHandlers(middlewares, options);
+  const wrappedHandler = async (serverRequestAndResponseData: any) => {
     const startTime = new Date().getTime();
     let request = appendTranslatorToRequest(
       new Request(),
@@ -766,14 +809,14 @@ export async function* getAllRouters(
     (serverAdapter as ServerlessAdapter)?.$$type === '$PServerlessAdapter' &&
     typeof options?.serverless?.use === 'object';
 
-    const isGeneratingServerless =
+  const isGeneratingServerless =
     // eslint-disable-next-line ts/no-unnecessary-condition
     (serverAdapter as ServerlessAdapter)?.$$type === '$PServerlessAdapter' && options?.serverless?.generate === true;
-    
+
   const translatePath = translatePathFactory(serverAdapter, customServerInstance);
   const existsRootMiddlewares = Array.isArray(settings.middlewares) && settings.middlewares.length > 0;
   const rootRouterCompletePaths = await getRootRouterCompletePaths(domains, settings, settings.debug === true);
-  
+
   for (const [path, router] of rootRouterCompletePaths) {
     // eslint-disable-next-line ts/no-unnecessary-condition
     const handlerByMethod = Object.entries(router.handlers || {});
@@ -1035,7 +1078,7 @@ export async function initializeRouters(
       settings.handler500
     );
   }
-  
+
   if (serverAdapter.routers.parseHandlers || useServerless) {
     const routers = getAllRouters(domains, settings, allSettings, serverAdapter, customServerInstance, {
       serverless: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`	`"rimraf": "^6.0.1",`
`76`	`76`	`"tsup": "^8.2.4",`
`77`	`77`	`"tsx": "^4.19.3",`
`78`		`- "turbo": "^2.4.2",`
	`78`	`+ "turbo": "^2.4.4",`
`79`	`79`	`"typescript": "^5.5.4",`
`80`	`80`	`"typescript-eslint": "^8.24.1"`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import ExpressServerAdapter from '@palmares/express-adapter';`
	`1`	`+import { ExpressServerAdapter } from '@palmares/express-adapter';`
`2`	`2`	`import { getAdapterServer, loadServerWhenTesting } from '@palmares/server';`
`3`	`3`	`import { beforeAll, describe } from '@palmares/tests';`
`4`	`4`	`import supertest from 'supertest';`