- Simplified sort

- Updated axios client to use getHeaders when available

Author: Ferdi Koomen

src/openApi/v2/parser/sortByRequired.ts

@@ -1,23 +1,9 @@
 import type { OperationParameter } from '../../../client/interfaces/OperationParameter';
 
 export function sortByRequired(a: OperationParameter, b: OperationParameter): number {
-    const aIsRequiredWithoutDefaultValue = a.isRequired && a.default === undefined;
-    const bIsRequiredWithoutDefaultValue = b.isRequired && b.default === undefined;
-    const aIsRequiredWithDefaultValue = a.isRequired && a.default !== undefined;
-    const bIsRequiredWithDefaultValue = b.isRequired && b.default !== undefined;
-    const aIsOptionalWithDefaultValue = !a.isRequired && a.default !== undefined;
-    const bIsOptionalWithDefaultValue = !b.isRequired && b.default !== undefined;
-    const aIsOptionalWithoutDefaultValue = !a.isRequired && a.default === undefined;
-    const bIsOptionalWithoutDefaultValue = !b.isRequired && b.default === undefined;
-
-    if (aIsRequiredWithoutDefaultValue && !bIsRequiredWithoutDefaultValue) return -1;
-    if (bIsRequiredWithoutDefaultValue && !aIsRequiredWithoutDefaultValue) return 1;
-    if (aIsRequiredWithDefaultValue && !bIsRequiredWithDefaultValue) return -1;
-    if (bIsRequiredWithDefaultValue && !aIsRequiredWithDefaultValue) return 1;
-    if (aIsOptionalWithDefaultValue && !bIsOptionalWithDefaultValue) return -1;
-    if (bIsOptionalWithDefaultValue && !aIsOptionalWithDefaultValue) return 1;
-    if (aIsOptionalWithoutDefaultValue && !bIsOptionalWithoutDefaultValue) return -1;
-    if (bIsOptionalWithoutDefaultValue && !aIsOptionalWithoutDefaultValue) return 1;
-
+    const aNeedsValue = a.isRequired && a.default === undefined;
+    const bNeedsValue = b.isRequired && b.default === undefined;
+    if (aNeedsValue && !bNeedsValue) return -1;
+    if (bNeedsValue && !aNeedsValue) return 1;
     return 0;
 }

src/openApi/v3/parser/sortByRequired.ts

@@ -1,23 +1,9 @@
 import type { OperationParameter } from '../../../client/interfaces/OperationParameter';
 
 export function sortByRequired(a: OperationParameter, b: OperationParameter): number {
-    const aIsRequiredWithoutDefaultValue = a.isRequired && a.default === undefined;
-    const bIsRequiredWithoutDefaultValue = b.isRequired && b.default === undefined;
-    const aIsRequiredWithDefaultValue = a.isRequired && a.default !== undefined;
-    const bIsRequiredWithDefaultValue = b.isRequired && b.default !== undefined;
-    const aIsOptionalWithDefaultValue = !a.isRequired && a.default !== undefined;
-    const bIsOptionalWithDefaultValue = !b.isRequired && b.default !== undefined;
-    const aIsOptionalWithoutDefaultValue = !a.isRequired && a.default === undefined;
-    const bIsOptionalWithoutDefaultValue = !b.isRequired && b.default === undefined;
-
-    if (aIsRequiredWithoutDefaultValue && !bIsRequiredWithoutDefaultValue) return -1;
-    if (bIsRequiredWithoutDefaultValue && !aIsRequiredWithoutDefaultValue) return 1;
-    if (aIsRequiredWithDefaultValue && !bIsRequiredWithDefaultValue) return -1;
-    if (bIsRequiredWithDefaultValue && !aIsRequiredWithDefaultValue) return 1;
-    if (aIsOptionalWithDefaultValue && !bIsOptionalWithDefaultValue) return -1;
-    if (bIsOptionalWithDefaultValue && !aIsOptionalWithDefaultValue) return 1;
-    if (aIsOptionalWithoutDefaultValue && !bIsOptionalWithoutDefaultValue) return -1;
-    if (bIsOptionalWithoutDefaultValue && !aIsOptionalWithoutDefaultValue) return 1;
-
+    const aNeedsValue = a.isRequired && a.default === undefined;
+    const bNeedsValue = b.isRequired && b.default === undefined;
+    if (aNeedsValue && !bNeedsValue) return -1;
+    if (bNeedsValue && !aNeedsValue) return 1;
     return 0;
 }

src/templates/core/axios/getHeaders.hbs

@@ -3,12 +3,13 @@ async function getHeaders(options: ApiRequestOptions, formData?: FormData): Prom
     const username = await resolve(options, OpenAPI.USERNAME);
     const password = await resolve(options, OpenAPI.PASSWORD);
     const additionalHeaders = await resolve(options, OpenAPI.HEADERS);
+    const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {}
 
     const headers = Object.entries({
         Accept: 'application/json',
         ...additionalHeaders,
         ...options.headers,
-        ...formData?.getHeaders()
+        ...formHeaders,
     })
     .filter(([key, value]) => isDefined(value))
     .reduce((headers, [key, value]) => ({