typedapi-client-helpers 0.3.4 → 0.3.6

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to `typedapi-client-helpers` are documented in this file.
 
+## [0.3.5] - 2026-07-24
+
+### Added
+
+* Added support for `x-typedapi-filter-form` on non-paginated query endpoints.
+* Added `buildFilterQuery<TQuery>()` for converting `FilterFormValues` without adding pagination or sorting.
+* Generated filter-form methods now group normal query values and typed filter-form values inside a single `filterForm` argument.
+* The `filterForm.query` values are merged with the output of `buildFilterQuery(filterForm.filters)` before sending the request.
+* Optional-query endpoints default the complete `filterForm` argument to an empty object.
+
+### Compatibility notes
+
+* Pair this package with `TypedApi.Swagger` 0.3.2 or newer to use `[TypedApiFilterForm]`.
+* Existing paginated method signatures and `buildQuery()` behaviour are unchanged.
+* Regenerate committed API files because filter-form endpoint signatures have changed.
+
 ## [0.3.4] - 2026-07-22
 
 ### Added

package/README.md

@@ -2,17 +2,120 @@
 
 A small Fetch runtime and OpenAPI 3 TypeScript generator designed to work with `TypedApi.Swagger` on ASP.NET Core.
 
-## Version 0.3.4 highlights
+## Version 0.3.5 highlights
+
+* Supports `[TypedApiFilterForm]` endpoints through the `x-typedapi-filter-form` OpenAPI extension.
+* Generates grouped filter-form arguments containing normal query values and `FilterFormValues`.
+* Provides `buildFilterQuery<TQuery>()` for converting filters without adding pagination or sorting.
+* Reconstructs opted-in closed .NET generic schemas as reusable TypeScript generics.
+* Supports exact generic bindings for direct properties, arrays, collections, and dictionary values.
+* Preserves required-but-nullable properties as required `T | null` instead of optional values.
+* Generates non-cyclic discriminated unions with literal discriminator fields.
+* Consumes readable generic schema IDs such as `ApiPaginationResponseOfProjectModel`.
+* Generates method-specific unions from typed `ProblemDetails` error responses.
+* Validates TypedApi OpenAPI contract version 2.
+
+## Filter-form endpoints
+
+`TypedApi.Swagger` can mark a non-paginated query endpoint with `[TypedApiFilterForm]`.
+
+The attribute can be placed on the query parameter:
+
+```csharp
+[HttpGet("map-items")]
+public async Task<ActionResult<IReadOnlyList<MapItemResponse>>> GetMapItems(
+    [FromQuery, TypedApiFilterForm] ChargePointMapFilter filter,
+    CancellationToken token)
+{
+    return Ok(await service.GetMapItemsAsync(filter, token));
+}
+```
+
+It can also be placed on the endpoint:
+
+```csharp
+[TypedApiFilterForm]
+[HttpGet("map-items")]
+public async Task<ActionResult<IReadOnlyList<MapItemResponse>>> GetMapItems(
+    [FromQuery] ChargePointMapFilter filter,
+    CancellationToken token)
+{
+    return Ok(await service.GetMapItemsAsync(filter, token));
+}
+```
+
+Placing the attribute on the query parameter is preferred because it explicitly identifies which parameter represents the filter form.
+
+The generated frontend method groups normal query values and dynamic filters inside one `filterForm` argument:
+
+```ts
+export async function chargePointGetMapItems(
+  filterForm: {
+    query: ChargePointGetMapItemsQueryParams;
+    filters?: FilterFormValues<ChargePointGetMapItemsQueryParams>[];
+  },
+  options: ApiMethodOptions<
+    MapItemResponse[],
+    HttpValidationProblemDetails | ProblemDetails,
+    RequestParams
+  > = {},
+): Promise<
+  ApiResult<
+    MapItemResponse[],
+    HttpValidationProblemDetails | ProblemDetails
+  >
+>;
+```
+
+Call the generated endpoint with fixed query values and optional filters:
+
+```ts
+await chargePointGetMapItems({
+  query: {
+    west,
+    south,
+    east,
+    north,
+    zoom,
+  },
+  filters: activeFilters,
+});
+```
+
+The generated implementation merges both sources before sending the request:
+
+```ts
+const builtQuery = {
+  ...(filterForm.query ?? {}),
+  ...buildFilterQuery<ChargePointGetMapItemsQueryParams>(
+    filterForm.filters ?? [],
+  ),
+};
+```
 
-- Reconstructs opted-in closed .NET generic schemas as reusable TypeScript generics.
-- Supports exact generic bindings for direct properties, arrays/collections, and dictionary values.
-- Preserves required-but-nullable properties as required `T | null` instead of optional values.
-- Generates non-cyclic discriminated unions with literal discriminator fields.
-- Consumes readable generic schema IDs such as `ApiPaginationResponseOfProjectModel`.
-- Generates method-specific unions from typed `ProblemDetails` error responses.
-- Validates TypedApi OpenAPI contract version 2.
+Values produced by `buildFilterQuery()` are applied after normal query values. This means an active filter with the same property name overrides the value from `filterForm.query`.
 
-### Generic contracts
+Filter-form endpoints do not automatically add pagination or sorting. Paginated endpoints continue to use `buildQuery()`.
+
+For an endpoint where every query property is optional, the generated argument defaults to an empty object:
+
+```ts
+export async function searchItems(
+  filterForm: {
+    query?: SearchItemsQueryParams;
+    filters?: FilterFormValues<SearchItemsQueryParams>[];
+  } = {},
+  options: ApiMethodOptions<
+    SearchResult[],
+    ProblemDetails,
+    RequestParams
+  > = {},
+);
+```
+
+For endpoints containing required query properties, `filterForm` and `filterForm.query` remain required.
+
+## Generic contracts
 
 With `[TypedApiGeneric]` on a backend wrapper, a closed schema such as `ApiEnvelope<ProjectModel>` becomes one reusable declaration:
 
@@ -24,7 +127,9 @@ export interface ApiEnvelope<T> {
 }
 ```
 
-Endpoints then use `ApiEnvelope<ProjectModel>` rather than a repeated `ApiEnvelopeOfProjectModel` interface. Inherited generic wrappers are reconstructed whether Swagger uses `allOf` or emits a flattened schema:
+Endpoints then use `ApiEnvelope<ProjectModel>` rather than a repeated `ApiEnvelopeOfProjectModel` interface.
+
+Inherited generic wrappers are reconstructed whether Swagger uses `allOf` or emits a flattened schema:
 
 ```ts
 export type ApiPaginationSortResponse<T> = ApiPaginationResponse<T> & {
@@ -33,7 +138,7 @@ export type ApiPaginationSortResponse<T> = ApiPaginationResponse<T> & {
 };
 ```
 
-### Required and nullable properties
+## Required and nullable properties
 
 OpenAPI presence and nullability remain separate:
 
@@ -45,12 +150,14 @@ export interface NullabilityContract {
 }
 ```
 
-### Discriminated unions
+## Discriminated unions
 
 Serializer discriminator mappings produce narrowing unions without cyclic inheritance:
 
 ```ts
-export type NotificationModel = EmailNotificationModel | SmsNotificationModel;
+export type NotificationModel =
+  | EmailNotificationModel
+  | SmsNotificationModel;
 
 export type EmailNotificationModel = NotificationModelBase & {
   emailAddress: string;
@@ -58,18 +165,21 @@ export type EmailNotificationModel = NotificationModelBase & {
 };
 ```
 
-### Typed errors
+## Typed errors
 
 When the OpenAPI operation contains typed error response bodies, generated methods expose the union directly:
 
 ```ts
-ApiResult<ProjectModel, HttpValidationProblemDetails | ProblemDetails>
+ApiResult<
+  ProjectModel,
+  HttpValidationProblemDetails | ProblemDetails
+>
 ```
 
 ## Install
 
 ```bash
-npm install typedapi-client-helpers@0.3.4
+npm install typedapi-client-helpers@0.3.5
 ```
 
 The generator expects an OpenAPI 3.x document. Swagger 2.0 documents are rejected with a clear error.
@@ -114,14 +224,18 @@ src/api/
     └── Products.api.ts
 ```
 
-The generator intentionally does not create `src/api/index.ts`. Import generated methods and contracts directly from their files:
+The generator intentionally does not create `src/api/index.ts`.
+
+Import generated methods and contracts directly from their files:
 
 ```ts
 import { getProducts } from "./api/methods/Product.api";
 import type { ProductModel } from "./api/generated/data-contracts";
 ```
 
-When upgrading from an earlier 0.3.0 build, the next generation removes the old generated `src/api/index.ts`. The Swagger backup belongs to the consuming project, not this npm package.
+When upgrading from an earlier 0.3.0 build, the next generation removes the old generated `src/api/index.ts`.
+
+The Swagger backup belongs to the consuming project, not this npm package.
 
 ## Frontend method names
 
@@ -136,10 +250,10 @@ Choose the source of generated function names with `typedApiMethodNameStyle`:
 }
 ```
 
-- `"operationId"` uses the unique OpenAPI operation ID. The controller-prefix setting does not affect this mode.
-- `"action"` uses the original ASP.NET controller action name.
-- `typedApiPrefixMethodNamesWithController: true` is the default in action mode and prefixes the normalized controller name.
-- `typedApiPrefixMethodNamesWithController: false` removes the controller prefix.
+* `"operationId"` uses the unique OpenAPI operation ID. The controller-prefix setting does not affect this mode.
+* `"action"` uses the original ASP.NET controller action name.
+* `typedApiPrefixMethodNamesWithController: true` is the default in action mode and prefixes the normalized controller name.
+* `typedApiPrefixMethodNamesWithController: false` removes the controller prefix.
 
 For an `OrderController` action named `GetOrderById`:
 
@@ -148,15 +262,18 @@ typedApiPrefixMethodNamesWithController: true  -> orderGetOrderById(...)
 typedApiPrefixMethodNamesWithController: false -> getOrderById(...)
 ```
 
-Operation-specific types follow the selected name too:
+Operation-specific types follow the selected name:
 
 ```text
 true  -> OrderGetOrderByIdParams
 false -> GetOrderByIdParams
 ```
 
-Action-name mode requires the matching `TypedApi.Swagger` package, which emits `x-typedapi-operation.actionName`. When the prefix is enabled, the controller name is read from `x-typedapi-operation.controllerName`, the first OpenAPI tag, or the route. If disabling the prefix creates duplicate names across controllers, generation stops with a clear collision error; enable the prefix, rename an action, or use `"operationId"`.
+Action-name mode requires the matching `TypedApi.Swagger` package, which emits `x-typedapi-operation.actionName`.
 
+When the prefix is enabled, the controller name is read from `x-typedapi-operation.controllerName`, the first OpenAPI tag, or the route.
+
+If disabling the prefix creates duplicate names across controllers, generation stops with a clear collision error. Enable the prefix, rename an action, or use `"operationId"`.
 
 ## CI consistency check
 
@@ -169,15 +286,18 @@ This generates in memory and exits with an error when committed generated files
 Other modes:
 
 ```bash
-typedapi-generate --strict   # fail instead of using a backup after a download error
-typedapi-generate --offline  # intentionally generate from the backup
-typedapi-generate --verbose  # print additional diagnostics
+typedapi-generate --strict
+typedapi-generate --offline
+typedapi-generate --verbose
 ```
 
+* `--strict` fails instead of using a backup after a Swagger download error.
+* `--offline` intentionally generates from the configured Swagger backup.
+* `--verbose` prints additional generator diagnostics.
 
 ## Generated property names
 
-Generated interface and parameter members lowercase **only the first character**:
+Generated interface and parameter members lowercase only the first character:
 
 ```ts
 Files -> files
@@ -186,15 +306,33 @@ ProductID -> productID
 snake_case -> snake_case
 ```
 
-The rest of each name is left unchanged. Generated wire metadata converts these local names back to the exact OpenAPI names for JSON, multipart forms, query parameters, headers, cookies, and path parameters. Responses and documented error bodies are converted in the opposite direction.
+The remainder of each property name is preserved.
+
+Generated wire metadata converts local property names back to the exact OpenAPI names for:
+
+* JSON bodies
+* Multipart forms
+* Query parameters
+* Header parameters
+* Cookie parameters
+* Path parameters
+
+Responses and documented error bodies are converted in the opposite direction.
 
 ## Generated method shape
 
-Generated methods keep parameters and request bodies as separate positional groups. Non-body parameters come first, the body comes second, and request options remain last:
+Generated methods keep parameters and request bodies in separate positional groups.
+
+Non-body parameters come first, the body comes second, and request options remain last:
 
 ```ts
 await updateWarehouse(
-  { id: requireId(context.warehouseId, "Warehouse ID") },
+  {
+    id: requireId(
+      context.warehouseId,
+      "Warehouse ID",
+    ),
+  },
   warehouse,
 );
 ```
@@ -205,23 +343,69 @@ The generated signature is:
 export async function updateWarehouse(
   pathParams: UpdateWarehouseParams,
   data: WarehouseRequest,
-  options: ApiMethodOptions<WarehouseModel, ApiHttpError, RequestParams> = {},
+  options: ApiMethodOptions<
+    WarehouseModel,
+    ApiHttpError,
+    RequestParams
+  > = {},
 ): Promise<ApiResult<WarehouseModel, ApiHttpError>>;
 ```
 
 Path operations without a body use only the params object:
 
 ```ts
-await deleteSupplier({ id: requireId(context.supplierId, "Supplier ID") });
+await deleteSupplier({
+  id: requireId(context.supplierId, "Supplier ID"),
+});
 ```
 
 Body-only operations accept their payload directly:
 
 ```ts
-await uploadProductFiles({ files: selectedFiles });
+await uploadProductFiles({
+  files: selectedFiles,
+});
+```
+
+Regular query-only operations use a `query` argument:
+
+```ts
+await searchProducts({
+  search: "charger",
+  limit: 25,
+});
+```
+
+Endpoints marked with `x-typedapi-filter-form` use a grouped `filterForm` argument containing `query` and optional `filters` properties:
+
+```ts
+await searchMapItems({
+  query: {
+    west,
+    south,
+    east,
+    north,
+    zoom,
+  },
+  filters: activeFilters,
+});
+```
+
+Paginated endpoints use their existing filter, page, page-size, and sorting arguments:
+
+```ts
+await getProducts(
+  activeFilters,
+  1,
+  100,
+  "name",
+  SortDirection.Ascending,
+);
 ```
 
-Query-only operations use a `query` argument. Operations involving headers or cookies without path parameters use `requestParams`. All generated parameter interfaces are named `OperationNameParams`; nested `path`, `query`, `headers`, `cookies`, or `body` wrappers are not generated.
+Operations involving headers or cookies without path parameters use `requestParams`.
+
+All generated parameter interfaces are named `OperationNameParams`. Nested `path`, `query`, `headers`, `cookies`, or `body` wrappers are not generated for regular endpoint methods.
 
 Request options are always last:
 
@@ -230,50 +414,145 @@ await updateWarehouse(pathParams, data, {
   params: {
     signal: abortController.signal,
     timeoutMs: 10_000,
-    headers: new Headers({ Authorization: "Bearer ..." }),
+    headers: new Headers({
+      Authorization: "Bearer ...",
+    }),
+  },
+  onSuccess: result => {
+    console.log(result.response);
+  },
+  onError: result => {
+    console.error(result.error);
   },
-  onSuccess: result => console.log(result.response),
-  onError: result => console.error(result.error),
 });
 ```
 
+## Filter conversion
+
+Use `buildFilterQuery()` when filters must be converted without adding pagination or sorting:
+
+```ts
+const query = buildFilterQuery<ProductQueryParams>(
+  activeFilters,
+);
+```
+
+Use `buildQuery()` for paginated endpoints:
+
+```ts
+const query = buildQuery<
+  ProductQueryParams,
+  ProductTableRow
+>(
+  activeFilters,
+  page,
+  pageSize,
+  sortBy,
+  sortDirection,
+);
+```
+
+`buildFilterQuery()` supports the same `FilterFormValues` conversion behavior as `buildQuery()`, including:
+
+* Primitive values
+* Minimum and maximum values
+* Lists
+* `OptionValue` values
+* Booleans
+* Numbers
+* Dates
+* Strings
+
+It does not add:
+
+* `pageNumber`
+* `pageSize`
+* `sortBy`
+* `sortDirection`
+
 ## Typed errors
 
-When the OpenAPI document describes error response bodies, generated methods expose their generated type or union. When no error schema is documented, the method uses `ApiHttpError` instead of `unknown`:
+When the OpenAPI document describes error response bodies, generated methods expose their generated type or union.
+
+When no error schema is documented, the method uses `ApiHttpError` instead of `unknown`:
 
 ```ts
-const result = await cancelOrder({ id, reason });
+const result = await cancelOrder({
+  id,
+  reason,
+});
 
 if (!result.ok) {
   if (result.error.kind === "http") {
-    console.error(result.error.status, result.error.body);
+    console.error(
+      result.error.status,
+      result.error.body,
+    );
   } else {
-    // Structured TypedApi client error: network, aborted, or parse.
     console.error(result.error);
   }
 }
 ```
 
-Malformed JSON is reported as a structured parse error instead of being cast to the expected response type. Consumer callback exceptions are allowed to propagate and are not disguised as API failures.
+Structured client errors include:
+
+* Network errors
+* Aborted requests
+* Timeout errors
+* Malformed response errors
+
+Malformed JSON is reported as a structured parse error instead of being cast to the expected response type.
+
+Exceptions thrown by consumer `onSuccess` and `onError` callbacks propagate normally.
 
 ## Runtime configuration
 
 ```ts
-import { configureApiClient, setSecurityData } from "typedapi-client-helpers";
+import {
+  configureApiClient,
+  setSecurityData,
+} from "typedapi-client-helpers";
 
 configureApiClient({
   baseUrl: "https://api.example.com",
   timeoutMs: 15_000,
-  securityWorker: token => token
-    ? { headers: { Authorization: `Bearer ${token}` } }
-    : undefined
+  securityWorker: token =>
+    token
+      ? {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        }
+      : undefined,
 });
 
 setSecurityData("access-token");
 ```
 
-The runtime also exports `createApiClient`, `request`, `abortRequest`, `mergeHeaders`, `toRequestHeaders`, `toCookieHeader`, `handleApiResponse`, `buildQuery`, `toFormData`.
+The runtime also exports:
+
+* `createApiClient`
+* `request`
+* `abortRequest`
+* `mergeHeaders`
+* `toRequestHeaders`
+* `toCookieHeader`
+* `handleApiResponse`
+* `buildFilterQuery`
+* `buildQuery`
+* `toFormData`
 
 ## Backend pairing
 
-Use `TypedApi.Swagger` 0.3.1 or newer on the backend for generic reconstruction, corrected nullability, discriminators, readable schema IDs, and typed default errors. It emits `x-typedapi.contractVersion = 2`. The generator validates the contract version before replacing generated files.
+Use `TypedApi.Swagger` 0.3.2 or newer on the backend for:
+
+* `[TypedApiFilterForm]`
+* Generic reconstruction
+* Corrected nullability
+* Discriminators
+* Readable schema IDs
+* Typed default errors
+
+The backend package emits `x-typedapi-filter-form` for opted-in filter endpoints.
+
+It also emits `x-typedapi.contractVersion = 2` for contract compatibility. The generator validates the contract version before replacing generated files.

package/dist/cjs/utils/buildQuery.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildFilterQuery = buildFilterQuery;
 exports.buildQuery = buildQuery;
 /**
- * Builds a typed query object from filter form values, pagination, and sorting.
+ * Builds a typed query object from filter form values without adding pagination or sorting.
  *
  * Empty filter values are ignored.
  * List filters are converted item by item.
  * `OptionValue` lists send their `value` fields instead of the display names.
  */
-function buildQuery(filters, page = 1, pageSize = 100, sortBy = null, sortDirection) {
-    const query = filters.reduce((queryResult, filter) => {
+function buildFilterQuery(filters) {
+    return filters.reduce((queryResult, filter) => {
         const { filterName, filterNameMax, type, value, maxValue, isAList } = filter;
         if (isEmptyValue(value) && isEmptyValue(maxValue)) {
             return queryResult;
@@ -31,11 +32,22 @@ function buildQuery(filters, page = 1, pageSize = 100, sortBy = null, sortDirect
         if (filterNameMax && !isEmptyValue(maxValue)) {
             const convertedMaxValue = convertType(type, maxValue);
             if (convertedMaxValue !== null) {
-                queryResult[filterNameMax] = convertedMaxValue;
+                queryResult[filterNameMax] =
+                    convertedMaxValue;
             }
         }
         return queryResult;
     }, {});
+}
+/**
+ * Builds a typed query object from filter form values, pagination, and sorting.
+ *
+ * Empty filter values are ignored.
+ * List filters are converted item by item.
+ * `OptionValue` lists send their `value` fields instead of the display names.
+ */
+function buildQuery(filters, page = 1, pageSize = 100, sortBy = null, sortDirection) {
+    const query = buildFilterQuery(filters);
     query.pageNumber = page;
     if (pageSize > 0) {
         query.pageSize = pageSize;

package/dist/cjs/utils/buildQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildQuery.js","sourceRoot":"","sources":["../../../src/utils/buildQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildQuery.js","sourceRoot":"","sources":["../../../src/utils/buildQuery.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/buildQuery.js

@@ -1,12 +1,12 @@
 /**
- * Builds a typed query object from filter form values, pagination, and sorting.
+ * Builds a typed query object from filter form values without adding pagination or sorting.
  *
  * Empty filter values are ignored.
  * List filters are converted item by item.
  * `OptionValue` lists send their `value` fields instead of the display names.
  */
-export function buildQuery(filters, page = 1, pageSize = 100, sortBy = null, sortDirection) {
-    const query = filters.reduce((queryResult, filter) => {
+export function buildFilterQuery(filters) {
+    return filters.reduce((queryResult, filter) => {
         const { filterName, filterNameMax, type, value, maxValue, isAList } = filter;
         if (isEmptyValue(value) && isEmptyValue(maxValue)) {
             return queryResult;
@@ -28,11 +28,22 @@ export function buildQuery(filters, page = 1, pageSize = 100, sortBy = null, sor
         if (filterNameMax && !isEmptyValue(maxValue)) {
             const convertedMaxValue = convertType(type, maxValue);
             if (convertedMaxValue !== null) {
-                queryResult[filterNameMax] = convertedMaxValue;
+                queryResult[filterNameMax] =
+                    convertedMaxValue;
             }
         }
         return queryResult;
     }, {});
+}
+/**
+ * Builds a typed query object from filter form values, pagination, and sorting.
+ *
+ * Empty filter values are ignored.
+ * List filters are converted item by item.
+ * `OptionValue` lists send their `value` fields instead of the display names.
+ */
+export function buildQuery(filters, page = 1, pageSize = 100, sortBy = null, sortDirection) {
+    const query = buildFilterQuery(filters);
     query.pageNumber = page;
     if (pageSize > 0) {
         query.pageSize = pageSize;

package/dist/esm/utils/buildQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildQuery.js","sourceRoot":"","sources":["../../../src/utils/buildQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildQuery.js","sourceRoot":"","sources":["../../../src/utils/buildQuery.ts"],"names":[],"mappings":"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"}