ts3.8 fixes

Author: isaacs

packages/core/src/integrations/express/index.ts

@@ -244,7 +244,8 @@ export function expressErrorHandler(options?: ExpressHandlerOptions): ExpressErr
  */
 export function setupExpressErrorHandler(
   app: {
-    use: (middleware: ExpressMiddleware | ExpressErrorMiddleware) => unknown;
+    //oxlint-disable-next-line no-explicit-any
+    use: (middleware: any) => unknown;
   },
   options?: ExpressHandlerOptions,
 ): void {

packages/core/src/integrations/express/types.ts

@@ -1,6 +1,7 @@
 import type { RequestEventData } from '../../types-hoist/request';
 import type { SpanAttributes } from '../../types-hoist/span';
 
+export const kLayerPatched: unique symbol = Symbol('express-layer-patched');
 export const ATTR_EXPRESS_NAME = 'express.name';
 export const ATTR_HTTP_ROUTE = 'http.route';
 export const ATTR_EXPRESS_TYPE = 'express.type';
@@ -23,8 +24,9 @@ export type ExpressModuleExport = ExpressExport | { default: ExpressExport };
 export interface ExpressRequest extends RequestEventData {
   originalUrl: string;
   route: unknown;
-  application: ExpressApplication;
-  res: ExpressResponse;
+  // Note: req.res is typed as optional (only present after middleware init).
+  // mark optional to preserve compat with express v4 types.
+  res?: ExpressResponse;
 }
 
 // just a minimum type def for what we need, since this also needs to
@@ -101,8 +103,6 @@ export type ExpressRouter = {
   use(...handlers: unknown[]): unknown;
 };
 
-export const kLayerPatched: unique symbol = Symbol('express-layer-patched');
-
 export type IgnoreMatcher = string | RegExp | ((name: string) => boolean);
 
 export type ExpressIntegrationOptions = {

packages/core/src/integrations/express/utils.ts

@@ -50,7 +50,7 @@ export const satisfiesPattern = (constant: string, pattern: IgnoreMatcher): bool
  * @param error - User-provided error value
  * @returns Both an Error or string representation of the value and an error message
  */
-export const asErrorAndMessage = (error: unknown): [error: string | Error, message: string] =>
+export const asErrorAndMessage = (error: unknown): [string | Error, string] =>
   error instanceof Error ? [error, error.message] : [String(error), String(error)];
 
 /**
@@ -118,7 +118,7 @@ export const getRouterPath = (path: string, layer: ExpressLayer): string => {
     return `${path}${stackLayer.route.path}`;
   }
 
-  if (Array.isArray(stackLayer?.handle?.stack)) {
+  if (stackLayer && Array.isArray(stackLayer?.handle?.stack)) {
     return getRouterPath(path, stackLayer);
   }
 
@@ -142,7 +142,7 @@ export const isLayerIgnored = (
   if (Array.isArray(config?.ignoreLayersType) && config?.ignoreLayersType?.includes(type)) {
     return true;
   }
-  if (Array.isArray(config?.ignoreLayers) === false) return false;
+  if (!Array.isArray(config?.ignoreLayers)) return false;
   try {
     for (const pattern of config.ignoreLayers) {
       if (satisfiesPattern(name, pattern)) {

packages/node/src/integrations/tracing/express.ts

@@ -25,7 +25,8 @@ const INTEGRATION_NAME = 'Express';
 const SUPPORTED_VERSIONS = ['>=4.0.0 <6'];
 
 export function setupExpressErrorHandler(
-  app: { use: (middleware: ExpressMiddleware | ExpressErrorMiddleware) => unknown },
+  //oxlint-disable-next-line no-explicit-any
+  app: { use: (middleware: any) => unknown },
   options?: ExpressHandlerOptions,
 ): void {
   coreSetupExpressErrorHandler(app, options);