typedapi-client-helpers 0.1.11 → 0.1.12

package/README.md

@@ -68,7 +68,7 @@ Configuration can be supplied in the `config` section of your `package.json`, wi
 | `apiOutput`                     | `src/api`                                        | Directory where the generated API files are written.                                                                           |
 | `typedApiUseTypeOnlyImports`    | `false`                                          | Generates `import type` statements for imports that are only used as types.                                                    |
 | `typedApiUseFilterFormValues`   | `false`                                          | Generates paginated methods that accept `FilterFormValues[]`, page values, and sort values instead of a prebuilt query object. |
-| `typedApiDefaultFunctionsPath`  | `src/defaultApiFunctions`                        | Import path used by generated method files for shared success and error handlers.                                              |
+| `typedApiDefaultFunctionsPath`  | `defaultApiFunctions`                            | Import path used by generated method files for shared success and error handlers.                                              |
 | `typedApiDefaultSuccessHandler` | `handleGoodResult`                               | Name of the default success handler function imported into generated methods.                                                  |
 | `typedApiDefaultErrorHandler`   | `handleErrors`                                   | Name of the default error handler function imported into generated methods.                                                    |
 
@@ -118,12 +118,12 @@ src/
     └── index.ts
 ```
 
-| Folder or file           | Description                                                                                                     |
-| ------------------------ | --------------------------------------------------------------------------------------------------------------- |
-| `generated/`             | Raw client, models, route classes, and HTTP client generated by `swagger-typescript-api`.                       |
-| `methods/`               | Typed wrapper methods generated by this package. These call the raw generated client and return `ApiResult<T>`. |
-| `index.ts`               | Barrel file that exports generated contracts, HTTP client types, and wrapper methods.                           |
-| `defaultApiFunctions.ts` | Optional shared success and error handlers created when the configured default handler file does not exist.     |
+| Folder or file           | Description                                                                                                               |
+| ------------------------ | ------------------------------------------------------------------------------------------------------------------------- |
+| `generated/`             | Raw client, models, and HTTP client generated by `swagger-typescript-api`. Route type files are removed after generation. |
+| `methods/`               | Typed wrapper methods generated by this package. These call the raw generated client and return `ApiResult<T>`.           |
+| `index.ts`               | Barrel file that exports generated contracts, HTTP client types, and wrapper methods.                                     |
+| `defaultApiFunctions.ts` | Optional shared success and error handlers created when the configured default handler file does not exist.               |
 
 ## Calling generated methods
 
@@ -148,36 +148,84 @@ Checking `result.ok` narrows the result automatically.
 
 ## Generated method argument order
 
-Generated wrappers preserve the original generated API arguments and then add optional wrapper-only arguments at the end.
+Generated wrappers preserve the original generated API arguments and then add an optional method options object.
 
 For query methods:
 
 ```ts
-await getSuppliers(query, onSuccess, onError, params);
+await getSuppliers(query, {
+  onSuccess,
+  onError,
+  params,
+});
+```
+
+For query methods without a query object, pass `undefined` as the first argument when you want to provide options:
+
+```ts
+await exportPartners(undefined, {
+  onError: handleError,
+});
 ```
 
 For non-query methods:
 
 ```ts
-await updateSupplier(id, body, onSuccess, onError, params);
+await updateSupplier(id, body, {
+  onSuccess,
+  onError,
+  params,
+});
+```
+
+For multipart/form-data methods:
+
+```ts
+await uploadSupplierLogo(data, {
+  onSuccess,
+  onError,
+  params,
+});
 ```
 
 For filter-form paginated methods when `typedApiUseFilterFormValues` is enabled:
 
 ```ts
-await getSuppliers(
-  filters,
-  page,
-  pageSize,
-  sortBy,
-  sortDirection,
+await getSuppliers(filters, page, pageSize, sortBy, sortDirection, {
   onSuccess,
   onError,
   params,
-);
+});
 ```
 
-The final `params` object is forwarded to the generated HTTP client and can contain values such as headers or other request options.
+The `params` property is forwarded to the generated HTTP client and can contain values such as headers or other request options.
+
+Every generated wrapper method gets its own options type. The type name is based on the method name.
+
+```ts
+export type GetSuppliersOptions = {
+  onSuccess?: ApiSuccessHandler<GetSuppliersResponse>;
+  onError?: ApiErrorHandler<GetSuppliersError>;
+  params?: RequestParams;
+};
+```
+
+Examples of generated option type names:
+
+```ts
+GetSuppliersOptions;
+CreateSupplierOptions;
+UpdateSupplierOptions;
+ExportPartnersOptions;
+```
+
+This makes it possible to pass only `onError` without also passing `onSuccess`.
+
+```ts
+await getSuppliers(undefined, {
+  onError: handleError,
+});
+```
 
 ## Success and error callbacks
 
@@ -195,28 +243,98 @@ function onError(result: ApiErrorResult<SupplierListResponse>) {
   console.error(result.status, result.error);
 }
 
-await getSuppliers({ pageNumber: 1, pageSize: 25 }, onSuccess, onError);
+await getSuppliers(
+  { pageNumber: 1, pageSize: 25 },
+  {
+    onSuccess,
+    onError,
+  },
+);
 ```
 
 The generated method still returns `ApiResult<T>` after callbacks run.
 
+You can also pass only one callback.
+
+```ts
+await getSuppliers(
+  { pageNumber: 1, pageSize: 25 },
+  {
+    onError,
+  },
+);
+```
+
+When default handlers are configured, generated methods use them when no method-specific callback is supplied.
+
+```ts
+await getSuppliers(
+  { pageNumber: 1, pageSize: 25 },
+  {
+    onSuccess: customSuccessHandler,
+  },
+);
+```
+
+In this example, the custom success handler is used for success results, and the configured default error handler is still used for error results.
+
 ## Custom request parameters
 
-The final wrapper argument can contain request parameters supported by the generated HTTP client.
+The method options object can contain request parameters supported by the generated HTTP client.
 
 ```ts
 const result = await getSuppliers(
   { pageNumber: 1, pageSize: 25 },
-  undefined,
-  undefined,
   {
-    headers: {
-      Authorization: `Bearer ${token}`,
+    params: {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    },
+  },
+);
+```
+
+Request parameters can also be combined with callbacks.
+
+```ts
+const result = await getSuppliers(
+  { pageNumber: 1, pageSize: 25 },
+  {
+    onError: handleError,
+    params: {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
     },
   },
 );
 ```
 
+## Query methods without required filters
+
+Some generated API methods require a query object at the raw generated client level, even when all query properties are optional.
+
+The wrapper methods allow the query argument to be omitted. Internally, they pass an empty object to the raw generated method.
+
+```ts
+await exportPartners();
+```
+
+is handled like:
+
+```ts
+await exportPartners({});
+```
+
+When you want to pass options but no query, pass `undefined` as the first argument.
+
+```ts
+await exportPartners(undefined, {
+  onError: handleError,
+});
+```
+
 ## Filter-form generation
 
 Set `typedApiUseFilterFormValues` to `true` to generate paginated methods that accept filter form values.
@@ -248,6 +366,19 @@ const filters: FilterFormValues<GetSuppliersQuery>[] = [
 const result = await getSuppliers(filters, 1, 25, "name", "Ascending");
 ```
 
+You can also pass method options as the final argument.
+
+```ts
+const result = await getSuppliers(filters, 1, 25, "name", "Ascending", {
+  onError: handleError,
+  params: {
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+  },
+});
+```
+
 Empty filter values are ignored by `buildQuery`.
 
 ## Multipart uploads
@@ -278,29 +409,30 @@ Arrays are appended as repeated fields, files keep their filename, primitives be
 
 ### Filter and sort types
 
-| Export                     | Description                                                                                                      |
-| -------------------------- | ---------------------------------------------------------------------------------------------------------------- |
-| `FilterType`               | Union of supported filter input types: number, date, string, timespan, boolean, boolean-button, and OptionValue. |
-| `OptionValue`              | Option object with a display `name` and submitted `value`.                                                       |
-| `FilterFormValues<TQuery>` | Configuration object for one filter field mapped to a query property.                                            |
-| `SortType`                 | UI sort state: Default, Neutral, Ascending, or Descending.                                                       |
-| `SortDirection`            | Sort direction value accepted by generated query objects. Supports string or number values.                      |
-| `ApiSortDirection`         | Sort direction values accepted by the generated API: Default, Ascending, or Descending.                          |
-| `sortTypes`                | Constant list of all supported UI sort states.                                                                   |
+| Export                     | Description                                                                                 |
+| -------------------------- | ------------------------------------------------------------------------------------------- |
+| `FilterType`               | Union of supported filter input types used by generated filter-form methods.                |
+| `OptionValue`              | Option object with a display `name` and submitted `value`.                                  |
+| `FilterFormValues<TQuery>` | Configuration object for one filter field mapped to a query property.                       |
+| `SortType`                 | UI sort state: Default, Neutral, Ascending, or Descending.                                  |
+| `SortDirection`            | Sort direction value accepted by generated query objects. Supports string or number values. |
+| `ApiSortDirection`         | Sort direction values accepted by the generated API: Default, Ascending, or Descending.     |
+| `sortTypes`                | Constant list of all supported UI sort states.                                              |
 
 ### Callback and method types
 
-| Export                          | Description                                                                                  |
-| ------------------------------- | -------------------------------------------------------------------------------------------- |
-| `ApiSuccessHandler<TResponse>`  | Callback type for successful API results.                                                    |
-| `ApiErrorHandler<TResponse>`    | Callback type for failed API results.                                                        |
-| `ApiMethodCallbacks<TResponse>` | Object shape for optional success callback, error callback, and request params.              |
-| `ExtractResponse<T>`            | Extracts the response body type from a generated method promise.                             |
-| `ExtractError<T>`               | Extracts the error body type from a generated method promise.                                |
-| `UnwrapArray<T>`                | Extracts the item type from an array, otherwise keeps the original type.                     |
-| `ExtractDataIfPaginated<T>`     | Extracts the item type from a `{ data?: T[] }` paginated response.                           |
-| `SortableKeys<T>`               | Produces keys that can be used as sortable fields for a response type.                       |
-| `WithoutRequestParams<T>`       | Removes a trailing optional `RequestParams` argument from a generated method argument tuple. |
+| Export                                                  | Description                                                                                                      |
+| ------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
+| `ApiSuccessHandler<TResponse>`                          | Callback type for successful API results.                                                                        |
+| `ApiErrorHandler<TResponse>`                            | Callback type for failed API results.                                                                            |
+| `ApiMethodCallbacks<TResponse>`                         | Object shape containing optional `onSuccess`, `onError`, and `params` properties.                                |
+| Generated method options, such as `GetSuppliersOptions` | Per-method options object generated for wrapper methods. Contains optional `onSuccess`, `onError`, and `params`. |
+| `ExtractResponse<T>`                                    | Extracts the response body type from a generated method promise.                                                 |
+| `ExtractError<T>`                                       | Extracts the error body type from a generated method promise.                                                    |
+| `UnwrapArray<T>`                                        | Extracts the item type from an array, otherwise keeps the original type.                                         |
+| `ExtractDataIfPaginated<T>`                             | Extracts the item type from a `{ data?: T[] }` paginated response.                                               |
+| `SortableKeys<T>`                                       | Produces keys that can be used as sortable fields for a response type.                                           |
+| `WithoutRequestParams<T>`                               | Removes a trailing optional `RequestParams` argument from a generated method argument tuple.                     |
 
 ### HTTP types
 
@@ -311,16 +443,16 @@ Arrays are appended as repeated fields, files keep their filename, primitives be
 
 ### Utility functions
 
-| Export                             | Description                                                                                                 |
-| ---------------------------------- | ----------------------------------------------------------------------------------------------------------- |
-| `buildQuery<TQuery, TSortModel>()` | Builds a query object from filter form values, page values, and sort values.                                |
-| `extractArgsCallbacksAndParams()`  | Splits wrapper arguments into original API arguments, success callback, error callback, and request params. |
-| `extractArgsToastsAndParams()`     | Backwards-compatible extractor for wrapper arguments with success/error handlers and request params.        |
-| `handleApiResponse()`              | Executes a generated API call and converts the response or thrown error into `ApiResult<T>`.                |
-| `HandleApiResponseOptions<T>`      | Options object for passing success and error callbacks to `handleApiResponse`.                              |
-| `getSortTypeFromSortDirection()`   | Converts an API sort direction into a UI `SortType`.                                                        |
-| `getSortDirectionFromSortType()`   | Converts a UI `SortType` into an API sort direction.                                                        |
-| `toFormData()`                     | Converts an object payload into `FormData`.                                                                 |
+| Export                             | Description                                                                                          |
+| ---------------------------------- | ---------------------------------------------------------------------------------------------------- |
+| `buildQuery<TQuery, TSortModel>()` | Builds a query object from filter form values, page values, and sort values.                         |
+| `extractArgsCallbacksAndParams()`  | Backwards-compatible helper for older generated files that used positional callbacks.                |
+| `extractArgsToastsAndParams()`     | Backwards-compatible extractor for wrapper arguments with success/error handlers and request params. |
+| `handleApiResponse()`              | Executes a generated API call and converts the response or thrown error into `ApiResult<T>`.         |
+| `HandleApiResponseOptions<T>`      | Options object for passing success and error callbacks to `handleApiResponse`.                       |
+| `getSortTypeFromSortDirection()`   | Converts an API sort direction into a UI `SortType`.                                                 |
+| `getSortDirectionFromSortType()`   | Converts a UI `SortType` into an API sort direction.                                                 |
+| `toFormData()`                     | Converts an object payload into `FormData`.                                                          |
 
 ### Default callback functions
 
@@ -338,8 +470,6 @@ Additional README files are included in these folders:
 | `src/interfaces/README.md` | Documents exported interfaces and result/filter/sort types. |
 | `src/types/README.md`      | Documents helper types used by generated wrapper methods.   |
 | `src/utils/README.md`      | Documents runtime helper functions.                         |
-| `scripts/README.md`        | Documents the API generator script.                         |
-| `bin/README.md`            | Documents the command-line entry point.                     |
 
 ## Build the package
 
@@ -355,4 +485,6 @@ npm run generate:api
 
 ## Notes
 
-Generated files inside `src/api` and `dist/api` depend on the Swagger document used during generation. Their exact method names, model names, and route files will change when the OpenAPI document changes.
+Generated files inside `src/api` and `dist/api` depend on the Swagger document used during generation. Their exact method names and model names will change when the OpenAPI document changes.
+
+Generated route type files ending in `Route.ts` are removed from the generated output.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typedapi-client-helpers",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "Reusable typed OpenAPI client helpers.",
   "type": "module",
   "main": "./dist/index.js",

package/scripts/generate-api-minimal.mjs

@@ -33,7 +33,8 @@ const config = {
 const swaggerFile =
   process.env.SWAGGER_FILE ??
   process.env.npm_config_swagger_file ??
-  config.swaggerFile;
+  config.swaggerFile ?? 
+  "swagger/swagger.json";
 
 const swaggerUrl =
   process.env.SWAGGER_URL ??
@@ -50,6 +51,7 @@ const apiRoot = path.resolve(
     config.apiOutput ??
     "src/api",
 );
+
 const generatedDir = path.join(apiRoot, "generated");
 const methodsDir = path.join(apiRoot, "methods");
 
@@ -110,6 +112,10 @@ function toQueryName(methodName) {
   return `${pascalCase(methodName)}Query`;
 }
 
+function toOptionsName(methodName) {
+  return `${pascalCase(methodName)}Options`;
+}
+
 function cleanDirectory(directory) {
   if (fs.existsSync(directory)) {
     fs.rmSync(directory, { recursive: true, force: true });
@@ -157,6 +163,7 @@ async function generateOpenApiClient() {
   }
 
   await generateApi(generateOptions);
+
   removeGeneratedRouteFiles();
 }
 
@@ -226,7 +233,6 @@ ${createImportStatement({
   typeOnly: true,
 })}
 
-
 export function ${defaultSuccessHandlerName}<T>(
   _response: ApiSuccessResult<T>,
 ): void | Promise<void> {
@@ -374,102 +380,97 @@ function getAllTsFiles(dir) {
   return results;
 }
 
-async function convertGeneratedUploadMethods(apiDir) {
-  const tsFiles = getAllTsFiles(apiDir);
-  let changedMethods = 0;
-
-  console.log(
-    `Checking ${tsFiles.length} generated TypeScript files for multipart methods...`,
-  );
+function getGeneratedMethods(source) {
+  const methodRegex = /^\s*(\w+)\s*=\s*\(/gm;
+  const matches = [...source.matchAll(methodRegex)];
 
-  for (const filePath of tsFiles) {
-    if (
-      filePath.endsWith("data-contracts.ts") ||
-      filePath.endsWith("http-client.ts")
-    ) {
-      continue;
-    }
+  return matches.map((match, index) => {
+    const methodName = match[1];
+    const startIndex = match.index ?? 0;
+    const endIndex =
+      index + 1 < matches.length ? matches[index + 1].index : source.length;
 
-    const originalContent = fs.readFileSync(filePath, "utf8");
+    const methodSource = source.slice(startIndex, endIndex);
 
-    const methodRegex =
-      /(\b\w+\s*=\s*\(\s*data\s*:\s*)([^,\n]+)(,\s*params\s*:\s*RequestParams\s*=\s*\{\}\s*,?\s*\)\s*=>\s*this\.request<[\s\S]*?type:\s*ContentType\.FormData,[\s\S]*?\}\);)/g;
+    return {
+      methodName,
+      methodSource,
+      isFormData: methodSource.includes("type: ContentType.FormData"),
+    };
+  });
+}
 
-    let fileChanges = 0;
+function splitTopLevelArguments(value) {
+  const args = [];
+  let current = "";
+  let depth = 0;
+  let quote = "";
 
-    const updatedContent = originalContent.replace(
-      methodRegex,
-      (_match, start, currentType, rest) => {
-        console.log(
-          `  Replacing multipart payload type "${currentType.trim()}" with FormData`,
-        );
+  for (let index = 0; index < value.length; index++) {
+    const char = value[index];
+    const previousChar = value[index - 1];
 
-        fileChanges++;
-        changedMethods++;
+    if (quote) {
+      current += char;
 
-        return `${start}FormData${rest}`;
-      },
-    );
+      if (char === quote && previousChar !== "\\") {
+        quote = "";
+      }
 
-    if (fileChanges > 0) {
-      await writeFormattedFile(filePath, updatedContent);
+      continue;
+    }
 
-      console.log(
-        `Updated ${fileChanges} multipart method(s) in ${path.relative(
-          process.cwd(),
-          filePath,
-        )}`,
-      );
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      current += char;
+      continue;
     }
-  }
 
-  if (changedMethods === 0) {
-    throw new Error(
-      "No multipart methods were converted. Check the generated method format and output directory.",
-    );
-  }
+    if (char === "(" || char === "{" || char === "[" || char === "<") {
+      depth++;
+      current += char;
+      continue;
+    }
 
-  console.log(`Converted ${changedMethods} multipart method(s) to FormData.`);
-}
+    if (char === ")" || char === "}" || char === "]" || char === ">") {
+      depth--;
+      current += char;
+      continue;
+    }
 
-function isMultipartMethod(source, methodName) {
-  const startPattern = new RegExp(`\\b${methodName}\\s*=\\s*\\(`);
+    if (char === "," && depth === 0) {
+      if (current.trim()) {
+        args.push(current.trim());
+      }
 
-  const startMatch = startPattern.exec(source);
+      current = "";
+      continue;
+    }
 
-  if (!startMatch) {
-    return false;
+    current += char;
   }
 
-  const nextMethodPattern = /^\s*\w+\s*=\s*\(/gm;
-  nextMethodPattern.lastIndex = startMatch.index + startMatch[0].length;
-
-  const nextMatch = nextMethodPattern.exec(source);
-  const endIndex = nextMatch?.index ?? source.length;
-
-  const methodSource = source.slice(startMatch.index, endIndex);
+  if (current.trim()) {
+    args.push(current.trim());
+  }
 
-  return methodSource.includes("type: ContentType.FormData");
+  return args;
 }
 
-function getGeneratedMethods(source) {
-  const methodRegex = /^\s*(\w+)\s*=\s*\(/gm;
-  const matches = [...source.matchAll(methodRegex)];
+function getGeneratedMethodArgumentCount(signatureParams) {
+  const args = splitTopLevelArguments(signatureParams);
 
-  return matches.map((match, index) => {
-    const methodName = match[1];
-    const startIndex = match.index ?? 0;
-    const endIndex =
-      index + 1 < matches.length ? matches[index + 1].index : source.length;
+  if (args.length === 0) {
+    return 0;
+  }
 
-    const methodSource = source.slice(startIndex, endIndex);
+  const lastArg = args[args.length - 1];
 
-    return {
-      methodName,
-      methodSource,
-      isFormData: methodSource.includes("type: ContentType.FormData"),
-    };
-  });
+  if (/\bparams\s*:\s*RequestParams\b/.test(lastArg)) {
+    return args.length - 1;
+  }
+
+  return args.length;
 }
 
 async function createMethodFiles() {
@@ -518,9 +519,9 @@ async function createMethodFiles() {
       }
 
       const params = signatureMatch[1].trim();
+      const methodArgumentCount = getGeneratedMethodArgumentCount(params);
 
       const returnTypeMatch = methodSource.match(/this\.request<([^,>]+)/m);
-
       const returnType = returnTypeMatch?.[1] ?? "";
 
       const isPaginated =
@@ -540,6 +541,7 @@ async function createMethodFiles() {
       nonQueryMethods.push({
         methodName,
         isFormData,
+        methodArgumentCount,
       });
     }
 
@@ -554,9 +556,23 @@ export type ${toQueryName(methodName)} =
       )
       .join("\n\n");
 
-    const hasPaginatedMethods = paginatedMethods.length > 0;
+    const methodOptionTypes = generatedMethods
+      .map(({ methodName }) =>
+        `
+export type ${toOptionsName(methodName)} = {
+  onSuccess?: ApiSuccessHandler<
+    ExtractResponse<ReturnType<${className}["${methodName}"]>>
+  >;
+  onError?: ApiErrorHandler<
+    ExtractError<ReturnType<${className}["${methodName}"]>>
+  >;
+  params?: RequestParams;
+};
+`.trim(),
+      )
+      .join("\n\n");
 
-    const hasNonQueryMethods = nonQueryMethods.length > 0;
+    const hasPaginatedMethods = paginatedMethods.length > 0;
 
     const hasFormDataMethods = nonQueryMethods.some(
       ({ isFormData }) => isFormData,
@@ -578,14 +594,10 @@ export async function ${methodName}(
     ExtractResponse<ReturnType<${className}["${methodName}"]>>
   > | null = null,
   sortDirection?: SortDirection,
-  onSuccess?: ApiSuccessHandler<
-    ExtractResponse<ReturnType<${className}["${methodName}"]>>
-  >,
-  onError?: ApiErrorHandler<
-    ExtractError<ReturnType<${className}["${methodName}"]>>
-  >,
-  params?: RequestParams
+  options: ${toOptionsName(methodName)} = {}
 ): Promise<ApiResult<ExtractResponse<ReturnType<${className}["${methodName}"]>>>> {
+  const { onSuccess, onError, params } = options;
+
   return handleApiResponse(
     () =>
       ${instanceName}.${methodName}(
@@ -608,14 +620,10 @@ export async function ${methodName}(
         return `
 export async function ${methodName}(
   query?: ${toQueryName(methodName)},
-  onSuccess?: ApiSuccessHandler<
-    ExtractResponse<ReturnType<${className}["${methodName}"]>>
-  >,
-  onError?: ApiErrorHandler<
-    ExtractError<ReturnType<${className}["${methodName}"]>>
-  >,
-  params?: RequestParams
+  options: ${toOptionsName(methodName)} = {}
 ): Promise<ApiResult<ExtractResponse<ReturnType<${className}["${methodName}"]>>>> {
+  const { onSuccess, onError, params } = options;
+
   return handleApiResponse(
     () =>
       ${instanceName}.${methodName}(
@@ -634,13 +642,7 @@ export async function ${methodName}(
         `
 export async function ${methodName}(
   query?: ${toQueryName(methodName)},
-  onSuccess?: ApiSuccessHandler<
-    ExtractResponse<ReturnType<${className}["${methodName}"]>>
-  >,
-  onError?: ApiErrorHandler<
-    ExtractError<ReturnType<${className}["${methodName}"]>>
-  >,
-  params?: RequestParams
+  options: ${toOptionsName(methodName)} = {}
 ): Promise<
   ApiResult<
     ExtractResponse<
@@ -650,6 +652,8 @@ export async function ${methodName}(
     >
   >
 > {
+  const { onSuccess, onError, params } = options;
+
   return handleApiResponse(
     () =>
       ${instanceName}.${methodName}(
@@ -664,20 +668,14 @@ export async function ${methodName}(
       .join("\n\n");
 
     const nonQueryMethodWrappers = nonQueryMethods
-      .map(({ methodName, isFormData }) => {
+      .map(({ methodName, isFormData, methodArgumentCount }) => {
         if (isFormData) {
           return `
 export async function ${methodName}(
   data: Parameters<
     ${className}["${methodName}"]
   >[0],
-  onSuccess?: ApiSuccessHandler<
-    ExtractResponse<ReturnType<${className}["${methodName}"]>>
-  >,
-  onError?: ApiErrorHandler<
-    ExtractError<ReturnType<${className}["${methodName}"]>>
-  >,
-  params?: RequestParams
+  options: ${toOptionsName(methodName)} = {}
 ): Promise<
   ApiResult<
     ExtractResponse<
@@ -687,6 +685,7 @@ export async function ${methodName}(
     >
   >
 > {
+  const { onSuccess, onError, params } = options;
   const formData = toFormData(data);
 
   return handleApiResponse(
@@ -705,25 +704,11 @@ export async function ${methodName}(
 
         return `
 export async function ${methodName}(
-  ...argsWithCallbacks: [
+  ...argsWithOptions: [
     ...ApiMethodArguments<
       ${className}["${methodName}"]
     >,
-    ApiSuccessHandler<
-      ExtractResponse<
-        ReturnType<
-          ${className}["${methodName}"]
-        >
-      >
-    >?,
-    ApiErrorHandler<
-      ExtractError<
-        ReturnType<
-          ${className}["${methodName}"]
-        >
-      >
-    >?,
-    RequestParams?
+    ${toOptionsName(methodName)}?
   ]
 ): Promise<
   ApiResult<
@@ -734,26 +719,14 @@ export async function ${methodName}(
     >
   >
 > {
-  const {
-    args,
-    onSuccess,
-    onError,
-    params
-  } = extractArgsCallbacksAndParams<
-    ApiMethodArguments<
-      ${className}["${methodName}"]
-    >,
-    ExtractResponse<
-      ReturnType<
-        ${className}["${methodName}"]
-      >
-    >,
-    ExtractError<
-      ReturnType<
-        ${className}["${methodName}"]
-      >
-    >
-  >(argsWithCallbacks);
+  const args = [...argsWithOptions] as unknown[];
+
+  const options =
+    args.length > ${methodArgumentCount}
+      ? (args.pop() as ${toOptionsName(methodName)})
+      : {};
+
+  const { onSuccess, onError, params } = options ?? {};
 
   const requestArgs = [
     ...args,
@@ -776,10 +749,10 @@ export async function ${methodName}(
 
     const runtimeValueImportNames = [
       ...(hasPaginatedMethods && useFilterFormValues ? ["buildQuery"] : []),
-      ...(hasRegularNonQueryMethods ? ["extractArgsCallbacksAndParams"] : []),
       ...(hasFormDataMethods ? ["toFormData"] : []),
       "handleApiResponse",
     ];
+
     const runtimeTypeImportNames = [
       "ApiResult",
       "ApiSuccessHandler",
@@ -841,16 +814,16 @@ export async function ${methodName}(
 
     const apiMethodArgumentsType = hasRegularNonQueryMethods
       ? `
-    type ApiMethodArguments<
-      TMethod extends (...args: any[]) => unknown
-    > =
-      Parameters<TMethod> extends [
-        ...infer Arguments,
-        unknown?
-      ]
-        ? Arguments
-        : Parameters<TMethod>;
-    `.trim()
+type ApiMethodArguments<
+  TMethod extends (...args: any[]) => unknown
+> =
+  Parameters<TMethod> extends [
+    ...infer Arguments,
+    RequestParams?
+  ]
+    ? Arguments
+    : Parameters<TMethod>;
+`.trim()
       : "";
 
     const content = `
@@ -871,6 +844,11 @@ ${apiMethodArgumentsType}
    ======================= */
 ${queryTypes}
 
+/* =======================
+   Method Option Types
+   ======================= */
+${methodOptionTypes}
+
 /* =======================
    API Instance
    ======================= */