Skip to content

Commit 2970c69

Browse files
mrlubosmrlubos
authored
Merge pull request #2333 from hey-api/fix/tanstack-query-key-base-url
fix(tanstack-query): set query key base url from options if defined
2 parents 100b9f3 + 566c8e9 commit 2970c69

File tree

66 files changed

+75
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+75
-67
lines changed

‎.changeset/two-papayas-laugh.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@hey-api/openapi-ts': patch
3+
---
4+
5+
fix(tanstack-query): set query key base url from options if defined

‎packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export type QueryKey<TOptions extends Options> = [
1515
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): [
1616
QueryKey<TOptions>[0]
1717
] => {
18-
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
18+
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
1919
if (infinite) {
2020
params._infinite = infinite;
2121
}

‎packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export type QueryKey<TOptions extends Options> = [
1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): [
1717
QueryKey<TOptions>[0]
1818
] => {
19-
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: (options?.client ?? _heyApiClient).getConfig().baseURL } as QueryKey<TOptions>[0];
19+
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: options?.baseURL || (options?.client ?? _heyApiClient).getConfig().baseURL } as QueryKey<TOptions>[0];
2020
if (infinite) {
2121
params._infinite = infinite;
2222
}

‎packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export type QueryKey<TOptions extends Options> = [
1515
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): [
1616
QueryKey<TOptions>[0]
1717
] => {
18-
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
18+
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
1919
if (infinite) {
2020
params._infinite = infinite;
2121
}

‎packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export type QueryKey<TOptions extends Options> = [
1515
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): [
1616
QueryKey<TOptions>[0]
1717
] => {
18-
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
18+
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
1919
if (infinite) {
2020
params._infinite = infinite;
2121
}

‎packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export type QueryKey<TOptions extends Options> = [
1515
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): [
1616
QueryKey<TOptions>[0]
1717
] => {
18-
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
18+
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
1919
if (infinite) {
2020
params._infinite = infinite;
2121
}

‎packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export type QueryKey<TOptions extends Options> = [
1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): [
1717
QueryKey<TOptions>[0]
1818
] => {
19-
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: (options?.client ?? _heyApiClient).getConfig().baseURL } as QueryKey<TOptions>[0];
19+
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: options?.baseURL || (options?.client ?? _heyApiClient).getConfig().baseURL } as QueryKey<TOptions>[0];
2020
if (infinite) {
2121
params._infinite = infinite;
2222
}

‎packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export type QueryKey<TOptions extends Options> = [
1515
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): [
1616
QueryKey<TOptions>[0]
1717
] => {
18-
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
18+
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
1919
if (infinite) {
2020
params._infinite = infinite;
2121
}

‎packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export type QueryKey<TOptions extends Options> = [
1515
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): [
1616
QueryKey<TOptions>[0]
1717
] => {
18-
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
18+
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
1919
if (infinite) {
2020
params._infinite = infinite;
2121
}

‎packages/openapi-ts-tests/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export type QueryKey<TOptions extends Options> = [
1515
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): [
1616
QueryKey<TOptions>[0]
1717
] => {
18-
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
18+
const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? _heyApiClient).getConfig().baseUrl } as QueryKey<TOptions>[0];
1919
if (infinite) {
2020
params._infinite = infinite;
2121
}

0 commit comments

Comments
 (0)