fix(api-connection): fix options proxy query filter type error with tanstack query v5.74.3 (#149)

TanStack Query v5.74.3 removed the data and error type parameters from the QueryFilters type. We
therefore do not include them in the generated code.

Fixes #147

Author: cogwirrel

package.json

@@ -35,7 +35,7 @@
     "@phenomnomnominal/tsquery": "6.1.3",
     "@quantco/pnpm-licenses": "^2.2.1",
     "@tailwindcss/vite": "^4.0.16",
-    "@tanstack/react-query": "^5.69.0",
+    "@tanstack/react-query": "^5.74.3",
     "@testing-library/react": "^16.2.0",
     "@ts-morph/bootstrap": "^0.26.1",
     "@types/fs-extra": "^11.0.4",

packages/nx-plugin/src/open-api/ts-hooks/__snapshots__/generator.spec.tsx.snap

@@ -98,9 +98,7 @@ export class TestApiOptionsProxy {
       ...options,
     };
   }
-  private _getTestQueryFilter(
-    filter?: QueryFilters<GetTest200Response, GetTestError>,
-  ): QueryFilters<GetTest200Response, GetTestError> {
+  private _getTestQueryFilter(filter?: QueryFilters): QueryFilters {
     return {
       queryKey: this._getTestQueryKey(),
       ...filter,
@@ -173,8 +171,8 @@ export class TestApiOptionsProxy {
   }
   private _getItemsQueryFilter(
     input: GetItemsRequest,
-    filter?: QueryFilters<GetItems200Response, GetItemsError>,
-  ): QueryFilters<GetItems200Response, GetItemsError> {
+    filter?: QueryFilters,
+  ): QueryFilters {
     return {
       queryKey: this._getItemsQueryKey(input),
       ...filter,
@@ -338,8 +336,8 @@ export class TestApiOptionsProxy {
   }
   private _searchDataQueryFilter(
     input: SearchDataRequest,
-    filter?: QueryFilters<SearchData200Response, SearchDataError>,
-  ): QueryFilters<SearchData200Response, SearchDataError> {
+    filter?: QueryFilters,
+  ): QueryFilters {
     return {
       queryKey: this._searchDataQueryKey(input),
       ...filter,
@@ -412,8 +410,8 @@ export class TestApiOptionsProxy {
   }
   private _getItemsQueryFilter(
     input: GetItemsRequest,
-    filter?: QueryFilters<GetItems200Response, GetItemsError>,
-  ): QueryFilters<GetItems200Response, GetItemsError> {
+    filter?: QueryFilters,
+  ): QueryFilters {
     return {
       queryKey: this._getItemsQueryKey(input),
       ...filter,
@@ -529,8 +527,8 @@ export class TestApiOptionsProxy {
   }
   private _listRecordsQueryFilter(
     input: ListRecordsRequest,
-    filter?: QueryFilters<ListRecords200Response, ListRecordsError>,
-  ): QueryFilters<ListRecords200Response, ListRecordsError> {
+    filter?: QueryFilters,
+  ): QueryFilters {
     return {
       queryKey: this._listRecordsQueryKey(input),
       ...filter,
@@ -687,9 +685,7 @@ export class TestApiOptionsProxy {
       ...options,
     };
   }
-  private _getErrorQueryFilter(
-    filter?: QueryFilters<GetError200Response, GetErrorError>,
-  ): QueryFilters<GetError200Response, GetErrorError> {
+  private _getErrorQueryFilter(filter?: QueryFilters): QueryFilters {
     return {
       queryKey: this._getErrorQueryKey(),
       ...filter,
@@ -809,8 +805,8 @@ export class TestApiOptionsProxy {
   }
   private _streamLogsQueryFilter(
     input: StreamLogsRequest,
-    filter?: QueryFilters<StreamLogs200Response[], StreamLogsError>,
-  ): QueryFilters<StreamLogs200Response[], StreamLogsError> {
+    filter?: QueryFilters,
+  ): QueryFilters {
     return {
       queryKey: this._streamLogsQueryKey(input),
       ...filter,
@@ -1074,8 +1070,8 @@ export class TestApiOptionsProxy {
   }
   private _streamEventsQueryFilter(
     input: StreamEventsRequest,
-    filter?: QueryFilters<StreamEvents200Response[], StreamEventsError>,
-  ): QueryFilters<StreamEvents200Response[], StreamEventsError> {
+    filter?: QueryFilters,
+  ): QueryFilters {
     return {
       queryKey: this._streamEventsQueryKey(input),
       ...filter,

packages/nx-plugin/src/open-api/ts-hooks/files/options-proxy.gen.ts.template

@@ -133,7 +133,7 @@ export class <%- className %>OptionsProxy {
       ...options,
     };
   }
-  private _<%- op.uniqueName %>QueryFilter(<%- input %><% if (op.parameters.length > 0) { %>, <% } %>filter?: QueryFilters<<%- queryResultType %>, <%- errorType %>>): QueryFilters<<%- queryResultType %>, <%- errorType %>> {
+  private _<%- op.uniqueName %>QueryFilter(<%- input %><% if (op.parameters.length > 0) { %>, <% } %>filter?: QueryFilters): QueryFilters {
     return {
       queryKey: this._<%- op.uniqueName %>QueryKey(<% if (op.parameters.length > 0) { %>input<% } %>),
       ...filter,

packages/nx-plugin/src/utils/versions.ts

@@ -17,7 +17,7 @@ export const VERSIONS = {
   '@cloudscape-design/board-components': '^3.0.94',
   '@cloudscape-design/components': '^3.0.928',
   '@cloudscape-design/global-styles': '^1.0.38',
-  '@tanstack/react-query': '5.74.2', // TODO: https://github.com/awslabs/nx-plugin-for-aws/issues/147
+  '@tanstack/react-query': '^5.74.3',
   '@trpc/tanstack-react-query': '11.0.0',
   '@trpc/client': '11.0.0',
   '@trpc/server': '11.0.0',