chore: changes after review

Author: DmitryAnansky

packages/core/src/rules/common/__tests__/path-params-defined.test.ts

@@ -351,7 +351,7 @@ describe('Oas3 path-params-defined', () => {
     `);
   });
 
-  it('should fail on too deep callback nesting with 4 levels', async () => {
+  it('should fail on too deep callback nesting with 2 levels', async () => {
     const document = parseYamlToDocument(
       outdent`
         openapi: 3.1.1
@@ -380,11 +380,6 @@ describe('Oas3 path-params-defined', () => {
                                   '{$request.body#/callbackUrl}':
                                     post:
                                       summary: Callback endpoint
-                                      callbacks:
-                                        onEvent:
-                                          '{$request.body#/callbackUrl}':
-                                            post:
-                                              summary: Callback endpoint
       `,
       'foobar.yaml'
     );
@@ -399,12 +394,12 @@ describe('Oas3 path-params-defined', () => {
         {
           "location": [
             {
-              "pointer": "#/paths/~1projects~1{projectId}/post/callbacks/onEvent/{$request.body#~1callbackUrl}/post/callbacks/onEvent/{$request.body#~1callbackUrl}/post/callbacks/onEvent/{$request.body#~1callbackUrl}/post/callbacks/onEvent/{$request.body#~1callbackUrl}/post",
+              "pointer": "#/paths/~1projects~1{projectId}/post/callbacks/onEvent/{$request.body#~1callbackUrl}/post/callbacks/onEvent/{$request.body#~1callbackUrl}/post/callbacks/onEvent/{$request.body#~1callbackUrl}",
               "reportOnKey": false,
               "source": "foobar.yaml",
             },
           ],
-          "message": "Maximum callback nesting depth (4) reached. Path parameter validation is limited beyond this depth to prevent infinite recursion.",
+          "message": "Maximum callback nesting depth (2) reached. Path parameter validation is limited beyond this depth to prevent infinite recursion.",
           "ruleId": "path-params-defined",
           "severity": "error",
           "suggest": [],

packages/core/src/rules/common/path-params-defined.ts

@@ -4,7 +4,7 @@ import type { Oas3Parameter } from '../../typings/openapi.js';
 import type { UserContext } from '../../walk.js';
 
 const pathRegex = /\{([a-zA-Z0-9_.-]+)\}+/g;
-const MAX_DEPTH = 4;
+const MAX_DEPTH = 2;
 
 type PathContext = {
   path: string;
@@ -16,7 +16,7 @@ type OperationHandlers = {
   enter: () => void;
   leave: (op: unknown, ctx: UserContext) => void;
   Parameter: (parameter: Oas2Parameter | Oas3Parameter, ctx: UserContext) => void;
-  Callback: {
+  Callback?: {
     PathItem: {
       enter: (node: object, ctx: UserContext) => void;
       leave: () => void;
@@ -28,7 +28,7 @@ type OperationHandlers = {
 
 export const PathParamsDefined: Oas3Rule | Oas2Rule = () => {
   const pathContext = { current: null as PathContext | null };
-  const operationParams = { current: null as Set<string> | null };
+  const currentOperationParams = new Set<string>();
 
   return {
     PathItem: {
@@ -41,7 +41,7 @@ export const PathParamsDefined: Oas3Rule | Oas2Rule = () => {
       Parameter(parameter: Oas2Parameter | Oas3Parameter, { report, location }: UserContext) {
         createPathItemParameterHandler(parameter, pathContext, report, location);
       },
-      Operation: createOperationHandlers(pathContext, operationParams),
+      Operation: createOperationHandlers(pathContext, currentOperationParams),
     },
   };
 };
@@ -109,16 +109,15 @@ const createEmptyOperationHandlers = (maxDepth: number): OperationHandlers => {
           enter: () => {},
           leave: () => {},
           Parameter: () => {},
-          Callback: {},
         },
       },
     },
-  } as unknown as OperationHandlers;
+  };
 };
 
 const createOperationHandlers = (
   pathContext: { current: PathContext | null },
-  operationParams: { current: Set<string> | null },
+  currentOperationParams: Set<string>,
   depth = 0
 ): OperationHandlers => {
   if (depth >= MAX_DEPTH) {
@@ -140,23 +139,23 @@ const createOperationHandlers = (
         createPathItemParameterHandler(parameter, pathContext, report, location);
       },
       get Operation() {
-        return createOperationHandlers(pathContext, operationParams, depth + 1);
+        return createOperationHandlers(pathContext, currentOperationParams, depth + 1);
       },
     };
   };
 
   return {
     enter() {
-      operationParams.current = new Set();
+      currentOperationParams = new Set();
     },
     leave(_op: unknown, { report, location }: UserContext) {
-      if (!pathContext.current || !operationParams.current) return;
+      if (!pathContext.current || !currentOperationParams) return;
 
-      collectPathParamsFromOperation(_op, operationParams.current);
+      collectPathParamsFromOperation(_op, currentOperationParams);
 
       validateRequiredPathParams(
         pathContext.current.templateParams,
-        operationParams.current,
+        currentOperationParams,
         pathContext.current.definedParams,
         pathContext.current.path,
         report,
@@ -165,10 +164,10 @@ const createOperationHandlers = (
     },
     Parameter(parameter: Oas2Parameter | Oas3Parameter, { report, location }: UserContext) {
       if (parameter.in === 'path' && parameter.name && pathContext.current) {
-        if (!operationParams.current) {
-          operationParams.current = new Set();
+        if (!currentOperationParams) {
+          currentOperationParams = new Set();
         }
-        operationParams.current.add(parameter.name);
+        currentOperationParams.add(parameter.name);
         validatePathParameter(
           parameter.name,
           pathContext.current.templateParams,