fix(client-axios): stabilize beforeRequest typing across strictFunctionTypes

Author: tomvdv

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/clean-false/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/import-file-extension-ts/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-node16-sdk/client/client.gen.ts

@@ -35,7 +35,9 @@ export const createClient = (config: Config = {}): Client => {
     return getConfig();
   };
 
-  const beforeRequest = async (options: RequestOptions) => {
+  const beforeRequest = async <TData = unknown, Url extends string = string>(
+    options: RequestOptions<TData, boolean, Url>,
+  ) => {
     const opts = {
       ..._config,
       ...options,
@@ -58,14 +60,13 @@ export const createClient = (config: Config = {}): Client => {
       opts.body = opts.bodySerializer(opts.body);
     }
 
-    const url = buildUrl(opts);
+    const url = buildUrl(opts as RequestOptions<unknown, boolean, string>);
 
     return { opts, url };
   };
 
   // @ts-expect-error
   const request: Client['request'] = async (options) => {
-    // @ts-expect-error
     const { opts, url } = await beforeRequest(options);
     try {
       // assign Axios here for consistency with fetch