fix: cdimascio#626 op level params override path level

Author: cdimascio

package-lock.json

@@ -83,18 +83,22 @@ export class OpenAPIFramework {
       const absolutePath = path.resolve(origCwd, filePath);
       if (fs.existsSync(absolutePath)) {
         // Get document, or throw exception on error
-        return $refParser.mode === 'dereference'
-          ? $RefParser.dereference(absolutePath)
-          : $RefParser.bundle(absolutePath);
+        const doc =
+          $refParser.mode === 'dereference'
+            ? $RefParser.dereference(absolutePath)
+            : $RefParser.bundle(absolutePath);
+        return doc as Promise<OpenAPIV3.Document>;
       } else {
         throw new Error(
           `${this.loggingPrefix}spec could not be read at ${filePath}`,
         );
       }
     }
-    return $refParser.mode === 'dereference'
-      ? $RefParser.dereference(filePath)
-      : $RefParser.bundle(filePath);
+    const doc =
+      $refParser.mode === 'dereference'
+        ? $RefParser.dereference(filePath)
+        : $RefParser.bundle(filePath);
+    return doc as Promise<OpenAPIV3.Document>;
   }
 
   private sortApiDocTags(apiDoc: OpenAPIV3.Document): void {

src/framework/index.ts

@@ -331,9 +331,8 @@ export class SchemaPreprocessor {
         };
 
         for (const option of options) {
-          ancestor._discriminator.validators[option] = this.ajv.compile(
-            newSchema,
-          );
+          ancestor._discriminator.validators[option] =
+            this.ajv.compile(newSchema);
         }
       }
       //reset data
@@ -477,10 +476,18 @@ export class SchemaPreprocessor {
     if (v === parameters) return;
     v.parameters = v.parameters || [];
 
+    const match = (
+      pathParam: OpenAPIV3.ReferenceObject | OpenAPIV3.ParameterObject,
+      opParam: OpenAPIV3.ReferenceObject | OpenAPIV3.OperationObject,
+    ) =>
+      // if name or ref exists and are equal
+      (opParam['name'] && opParam['name'] === pathParam['name']) ||
+      (opParam['$ref'] && opParam['$ref'] === pathParam['$ref']);
+
     // Add Path level query param to list ONLY if there is not already an operation-level query param by the same name.
     for (const param of parameters) {
-      if (!(v.parameters.some(vparam => vparam["name"] === param["name"]))){
-          v.parameters.push(param);
+      if (!v.parameters.some((vparam) => match(param, vparam))) {
+        v.parameters.push(param);
       }
     }
   }