diff --git a/dev/openapi-ts.config.ts b/dev/openapi-ts.config.ts index d0f3b808e..7c8e9a8b6 100644 --- a/dev/openapi-ts.config.ts +++ b/dev/openapi-ts.config.ts @@ -4,8 +4,16 @@ import path from 'node:path'; // @ts-ignore import { customClientPlugin } from '@hey-api/custom-client/plugin'; -// @ts-ignore -import { defineConfig, reserved, utils } from '@hey-api/openapi-ts'; +import { + defineConfig, + // @ts-ignore + OperationPath, + // @ts-ignore + OperationStrategy, + reserved, + // @ts-ignore + utils, +} from '@hey-api/openapi-ts'; // @ts-ignore import { myClientPlugin } from '../packages/openapi-ts-tests/main/test/custom/client/plugin'; @@ -39,8 +47,8 @@ export default defineConfig(() => { path: path.resolve( getSpecsPath(), // '2.0.x', - // '3.0.x', - '3.1.x', + '3.0.x', + // '3.1.x', // 'circular.yaml', // 'dutchie.json', // 'enum-names-values.yaml', @@ -49,11 +57,11 @@ export default defineConfig(() => { // 'invalid', // 'object-property-names.yaml', // 'openai.yaml', - 'opencode.yaml', + // 'opencode.yaml', // 'pagination-ref.yaml', // 'schema-const.yaml', // 'sdk-instance.yaml', - // 'sdk-method-class-conflict.yaml', + 'sdk-method-class-conflict.yaml', // 'sdk-nested-classes.yaml', // 'sdk-nested-conflict.yaml', // 'string-with-format.yaml', @@ -108,7 +116,7 @@ export default defineConfig(() => { // }, // format: 'prettier', header: null, - // importFileExtension: '.js', + importFileExtension: '.js', // indexFile: false, // lint: 'eslint', // nameConflictResolver({ attempt, baseName }) { @@ -293,18 +301,32 @@ export default defineConfig(() => { // operationId: true, operations: { // container: 'object', - containerName: { - // casing: 'snake_case', - name: 'OpencodeClient', - }, - methodName: { - // casing: 'SCREAMING_SNAKE_CASE', - name: '{{name}}Yummy', - }, - methods: 'static', - nesting: 'id', - segmentName: '{{name}}Seggy', - strategy: 'flat', + // containerName: { + // // casing: 'snake_case', + // name: 'OpencodeClient', + // }, + // methodName: { + // // casing: 'SCREAMING_SNAKE_CASE', + // name: '{{name}}Yummy', + // }, + // methods: 'static', + // nesting: 'operationId', + // segmentName: '{{name}}Seggy', + strategy: 'byTags', + // strategy(operation) { + // const locations = OperationStrategy.byTags({ + // fallback: 'default', + // path: OperationPath.fromOperationId({ + // delimiters: /[./]/, + // }), + // })(operation) + // return locations.map((loc) => { + // if (loc[0] && loc[1] && loc[0] === loc[1]) { + // return loc.slice(1); + // } + // return loc; + // }); + // }, // strategyDefaultTag: 'DaxLikedThis', }, // paramsStructure: 'flat', @@ -314,7 +336,7 @@ export default defineConfig(() => { // signature: 'object', // transformer: '@hey-api/transformers', // transformer: true, - // validator: 'valibot', + validator: 'valibot', // validator: { // request: 'zod', // response: 'zod', @@ -619,13 +641,14 @@ export default defineConfig(() => { exportFromIndex: true, httpRequests: { // enabled: false, - containerName: 'AngularTest', + // containerName: 'AngularTest', segmentName: '{{name}}Seggy', strategy: 'single', }, httpResources: { - // asClass: true, // enabled: false, + segmentName: '{{name}}Seggy', + strategy: 'single', }, name: '@angular/common', }, diff --git a/examples/openapi-ts-angular-common/openapi-ts.config.ts b/examples/openapi-ts-angular-common/openapi-ts.config.ts index f9b24282e..dfd11e54e 100644 --- a/examples/openapi-ts-angular-common/openapi-ts.config.ts +++ b/examples/openapi-ts-angular-common/openapi-ts.config.ts @@ -17,7 +17,8 @@ export default defineConfig({ exportFromIndex: true, httpRequests: true, httpResources: { - asClass: true, + containerName: '{{name}}ServiceResources', + strategy: 'byTags', }, name: '@angular/common', }, diff --git a/examples/openapi-ts-angular-common/src/client/@angular/common.gen.ts b/examples/openapi-ts-angular-common/src/client/@angular/common.gen.ts index 50f07b383..992353f06 100644 --- a/examples/openapi-ts-angular-common/src/client/@angular/common.gen.ts +++ b/examples/openapi-ts-angular-common/src/client/@angular/common.gen.ts @@ -335,7 +335,7 @@ export class PetServiceResources { * * Add a new pet to the store. */ - public addPet( + public static addPet( options: () => Options | undefined, ) { return httpResource(() => { @@ -349,7 +349,7 @@ export class PetServiceResources { * * Update an existing pet by Id. */ - public updatePet( + public static updatePet( options: () => Options | undefined, ) { return httpResource(() => { @@ -363,7 +363,7 @@ export class PetServiceResources { * * Multiple status values can be provided with comma separated strings. */ - public findPetsByStatus( + public static findPetsByStatus( options: () => Options | undefined, ) { return httpResource(() => { @@ -377,7 +377,7 @@ export class PetServiceResources { * * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. */ - public findPetsByTags( + public static findPetsByTags( options: () => Options | undefined, ) { return httpResource(() => { @@ -391,7 +391,7 @@ export class PetServiceResources { * * Delete a pet. */ - public deletePet( + public static deletePet( options: () => Options | undefined, ) { return httpResource(() => { @@ -405,7 +405,7 @@ export class PetServiceResources { * * Returns a single pet. */ - public getPetById( + public static getPetById( options: () => Options | undefined, ) { return httpResource(() => { @@ -419,7 +419,7 @@ export class PetServiceResources { * * Updates a pet resource based on the form data. */ - public updatePetWithForm( + public static updatePetWithForm( options: () => Options | undefined, ) { return httpResource(() => { @@ -433,7 +433,7 @@ export class PetServiceResources { * * Upload image of the pet. */ - public uploadFile( + public static uploadFile( options: () => Options | undefined, ) { return httpResource(() => { @@ -443,14 +443,13 @@ export class PetServiceResources { } } -@Injectable({ providedIn: 'root' }) export class StoreServiceResources { /** * Returns pet inventories by status. * * Returns a map of status codes to quantities. */ - public getInventory( + public static getInventory( options?: () => Options | undefined, ) { return httpResource(() => { @@ -464,7 +463,7 @@ export class StoreServiceResources { * * Place a new order in the store. */ - public placeOrder( + public static placeOrder( options?: () => Options | undefined, ) { return httpResource(() => { @@ -478,7 +477,7 @@ export class StoreServiceResources { * * For valid response try integer IDs with value < 1000. Anything above 1000 or non-integers will generate API errors. */ - public deleteOrder( + public static deleteOrder( options: () => Options | undefined, ) { return httpResource(() => { @@ -492,7 +491,7 @@ export class StoreServiceResources { * * For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions. */ - public getOrderById( + public static getOrderById( options: () => Options | undefined, ) { return httpResource(() => { @@ -502,14 +501,13 @@ export class StoreServiceResources { } } -@Injectable({ providedIn: 'root' }) export class UserServiceResources { /** * Create user. * * This can only be done by the logged in user. */ - public createUser( + public static createUser( options?: () => Options | undefined, ) { return httpResource(() => { @@ -523,7 +521,7 @@ export class UserServiceResources { * * Creates list of users with given input array. */ - public createUsersWithListInput( + public static createUsersWithListInput( options?: () => | Options | undefined, @@ -539,7 +537,7 @@ export class UserServiceResources { * * Log into the system. */ - public loginUser( + public static loginUser( options?: () => Options | undefined, ) { return httpResource(() => { @@ -553,7 +551,7 @@ export class UserServiceResources { * * Log user out of the system. */ - public logoutUser( + public static logoutUser( options?: () => Options | undefined, ) { return httpResource(() => { @@ -567,7 +565,7 @@ export class UserServiceResources { * * This can only be done by the logged in user. */ - public deleteUser( + public static deleteUser( options: () => Options | undefined, ) { return httpResource(() => { @@ -581,7 +579,7 @@ export class UserServiceResources { * * Get user detail based on username. */ - public getUserByName( + public static getUserByName( options: () => Options | undefined, ) { return httpResource(() => { @@ -595,7 +593,7 @@ export class UserServiceResources { * * This can only be done by the logged in user. */ - public updateUser( + public static updateUser( options: () => Options | undefined, ) { return httpResource(() => { diff --git a/examples/openapi-ts-angular/src/client/index.ts b/examples/openapi-ts-angular/src/client/index.ts index 12450a715..b686cfff6 100644 --- a/examples/openapi-ts-angular/src/client/index.ts +++ b/examples/openapi-ts-angular/src/client/index.ts @@ -1,85 +1,85 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, PetService, StoreService, UserService } from './sdk.gen'; -export type { - AddPetData, - AddPetErrors, - AddPetResponse, - AddPetResponses, - ApiResponse, - Category, - ClientOptions, - CreateUserData, - CreateUserErrors, - CreateUserResponse, - CreateUserResponses, - CreateUsersWithListInputData, - CreateUsersWithListInputErrors, - CreateUsersWithListInputResponse, - CreateUsersWithListInputResponses, - DeleteOrderData, - DeleteOrderErrors, - DeleteOrderResponses, - DeletePetData, - DeletePetErrors, - DeletePetResponses, - DeleteUserData, - DeleteUserErrors, - DeleteUserResponses, - FindPetsByStatusData, - FindPetsByStatusErrors, - FindPetsByStatusResponse, - FindPetsByStatusResponses, - FindPetsByTagsData, - FindPetsByTagsErrors, - FindPetsByTagsResponse, - FindPetsByTagsResponses, - GetInventoryData, - GetInventoryErrors, - GetInventoryResponse, - GetInventoryResponses, - GetOrderByIdData, - GetOrderByIdErrors, - GetOrderByIdResponse, - GetOrderByIdResponses, - GetPetByIdData, - GetPetByIdErrors, - GetPetByIdResponse, - GetPetByIdResponses, - GetUserByNameData, - GetUserByNameErrors, - GetUserByNameResponse, - GetUserByNameResponses, - LoginUserData, - LoginUserErrors, - LoginUserResponse, - LoginUserResponses, - LogoutUserData, - LogoutUserErrors, - LogoutUserResponses, - Order, +export { type Options, Store } from './sdk.gen'; +export { + type AddPetData, + type AddPetErrors, + type AddPetResponse, + type AddPetResponses, + type ApiResponse, + type Category, + type ClientOptions, + type CreateUserData, + type CreateUserErrors, + type CreateUserResponse, + type CreateUserResponses, + type CreateUsersWithListInputData, + type CreateUsersWithListInputErrors, + type CreateUsersWithListInputResponse, + type CreateUsersWithListInputResponses, + type DeleteOrderData, + type DeleteOrderErrors, + type DeleteOrderResponses, + type DeletePetData, + type DeletePetErrors, + type DeletePetResponses, + type DeleteUserData, + type DeleteUserErrors, + type DeleteUserResponses, + type FindPetsByStatusData, + type FindPetsByStatusErrors, + type FindPetsByStatusResponse, + type FindPetsByStatusResponses, + type FindPetsByTagsData, + type FindPetsByTagsErrors, + type FindPetsByTagsResponse, + type FindPetsByTagsResponses, + type GetInventoryData, + type GetInventoryErrors, + type GetInventoryResponse, + type GetInventoryResponses, + type GetOrderByIdData, + type GetOrderByIdErrors, + type GetOrderByIdResponse, + type GetOrderByIdResponses, + type GetPetByIdData, + type GetPetByIdErrors, + type GetPetByIdResponse, + type GetPetByIdResponses, + type GetUserByNameData, + type GetUserByNameErrors, + type GetUserByNameResponse, + type GetUserByNameResponses, + type LoginUserData, + type LoginUserErrors, + type LoginUserResponse, + type LoginUserResponses, + type LogoutUserData, + type LogoutUserErrors, + type LogoutUserResponses, + type Order, Pet, - Pet2, - PlaceOrderData, - PlaceOrderErrors, - PlaceOrderResponse, - PlaceOrderResponses, - Tag, - UpdatePetData, - UpdatePetErrors, - UpdatePetResponse, - UpdatePetResponses, - UpdatePetWithFormData, - UpdatePetWithFormErrors, - UpdatePetWithFormResponse, - UpdatePetWithFormResponses, - UpdateUserData, - UpdateUserErrors, - UpdateUserResponses, - UploadFileData, - UploadFileErrors, - UploadFileResponse, - UploadFileResponses, + type Pet2, + type PlaceOrderData, + type PlaceOrderErrors, + type PlaceOrderResponse, + type PlaceOrderResponses, + type Tag, + type UpdatePetData, + type UpdatePetErrors, + type UpdatePetResponse, + type UpdatePetResponses, + type UpdatePetWithFormData, + type UpdatePetWithFormErrors, + type UpdatePetWithFormResponse, + type UpdatePetWithFormResponses, + type UpdateUserData, + type UpdateUserErrors, + type UpdateUserResponses, + type UploadFileData, + type UploadFileErrors, + type UploadFileResponse, + type UploadFileResponses, User, - UserArray, + type UserArray, } from './types.gen'; diff --git a/examples/openapi-ts-angular/src/client/sdk.gen.ts b/examples/openapi-ts-angular/src/client/sdk.gen.ts index d7d470137..104a85812 100644 --- a/examples/openapi-ts-angular/src/client/sdk.gen.ts +++ b/examples/openapi-ts-angular/src/client/sdk.gen.ts @@ -82,7 +82,7 @@ export type Options< }; @Injectable({ providedIn: 'root' }) -export class PetService { +export class Pet { /** * Add a new pet to the store. * @@ -252,8 +252,7 @@ export class PetService { } } -@Injectable({ providedIn: 'root' }) -export class StoreService { +export class Store { /** * Returns pet inventories by status. * @@ -326,8 +325,7 @@ export class StoreService { } } -@Injectable({ providedIn: 'root' }) -export class UserService { +export class User { /** * Create user. * diff --git a/packages/codegen-core/src/files/file.ts b/packages/codegen-core/src/files/file.ts index 514beb626..78e09e41c 100644 --- a/packages/codegen-core/src/files/file.ts +++ b/packages/codegen-core/src/files/file.ts @@ -99,7 +99,8 @@ export class File { const dirs = this._logicalFilePath ? this._logicalFilePath.split('/').slice(0, -1) : []; - return [...dirs, `${this.name}${this.extension ?? ''}`].join('/'); + const extension = this.external ? '' : (this.extension ?? ''); + return [...dirs, `${this.name}${extension}`].join('/'); } /** diff --git a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/angular-query-experimental.gen.ts index a168141eb..71c901e89 100644 --- a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/angular-query-experimental.gen.ts +++ b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/angular-query-experimental.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, queryOptions } from '@tanstack/angular-query-experimental'; import { client } from '../client.gen'; -import { getBar, getFoo, type Options } from '../sdk.gen'; +import { barGet, fooGet, type Options } from '../sdk.gen'; import type { GetBarData, GetFooData } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -63,7 +63,7 @@ export const getBarQueryKey = (options?: Options) => createQueryKey( export const getBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getBar({ + const { data } = await barGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/react-query.gen.ts index 5a6a25034..9c6cc88e9 100644 --- a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/react-query.gen.ts +++ b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/react-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, queryOptions } from '@tanstack/react-query'; import { client } from '../client.gen'; -import { getBar, getFoo, type Options } from '../sdk.gen'; +import { barGet, fooGet, type Options } from '../sdk.gen'; import type { GetBarData, GetFooData } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -63,7 +63,7 @@ export const getBarQueryKey = (options?: Options) => createQueryKey( export const getBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getBar({ + const { data } = await barGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/solid-query.gen.ts index 8b6d32356..7723aa46c 100644 --- a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/solid-query.gen.ts +++ b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/solid-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, queryOptions } from '@tanstack/solid-query'; import { client } from '../client.gen'; -import { getBar, getFoo, type Options } from '../sdk.gen'; +import { barGet, fooGet, type Options } from '../sdk.gen'; import type { GetBarData, GetFooData } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -63,7 +63,7 @@ export const getBarQueryKey = (options?: Options) => createQueryKey( export const getBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getBar({ + const { data } = await barGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/svelte-query.gen.ts index 4c50bd620..7f2a74fbe 100644 --- a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/svelte-query.gen.ts +++ b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/svelte-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, queryOptions } from '@tanstack/svelte-query'; import { client } from '../client.gen'; -import { getBar, getFoo, type Options } from '../sdk.gen'; +import { barGet, fooGet, type Options } from '../sdk.gen'; import type { GetBarData, GetFooData } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -63,7 +63,7 @@ export const getBarQueryKey = (options?: Options) => createQueryKey( export const getBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getBar({ + const { data } = await barGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/vue-query.gen.ts index 4793f41da..9ebea5291 100644 --- a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/vue-query.gen.ts +++ b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/@tanstack/vue-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, queryOptions } from '@tanstack/vue-query'; import { client } from '../client.gen'; -import { getBar, getFoo, type Options } from '../sdk.gen'; +import { barGet, fooGet, type Options } from '../sdk.gen'; import type { GetBarData, GetFooData } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -63,7 +63,7 @@ export const getBarQueryKey = (options?: Options) => createQueryKey( export const getBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getBar({ + const { data } = await barGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/index.ts b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/index.ts index afbfb3822..6fd0ae1e8 100644 --- a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/index.ts +++ b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { getBar, getFoo, type Options } from './sdk.gen'; +export { barGet, fooGet, type Options } from './sdk.gen'; export type { ClientOptions, GetBarData, GetBarResponses, GetFooData, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/sdk.gen.ts b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/sdk.gen.ts index e2081efc5..059319152 100644 --- a/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/sdk.gen.ts +++ b/packages/openapi-ts-tests/__snapshots__/plugins/@tanstack/meta/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const fooGet = (options?: Options) => (options?.client ?? client).get({ security: [{ in: 'query', name: 'foo', @@ -28,7 +28,7 @@ export const getFoo = (options?: Options(options?: Options) => (options?.client ?? client).get({ +export const barGet = (options?: Options) => (options?.client ?? client).get({ security: [{ in: 'cookie', name: 'bar', diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/index.ts index de1daea43..cffa17616 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, postFoo } from './sdk.gen'; +export { fooPost, type Options } from './sdk.gen'; export type { ClientOptions, PostFooData, PostFooResponse, PostFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/sdk.gen.ts index 275283fad..aadd6a1be 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options: Options) => (options.client ?? client).post({ +export const fooPost = (options: Options) => (options.client ?? client).post({ bodySerializer: null, url: '/foo', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/index.ts index 8dc7240b1..e4bb63d5f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, postV1Foo } from './sdk.gen'; +export { type Options, v1FooPost } from './sdk.gen'; export type { ClientOptions, Foo, PostV1FooData, PostV1FooResponse, PostV1FooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/sdk.gen.ts index dc1a7f150..0d29b6201 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const postV1Foo = (options: Options) => (options.client ?? client).post({ +export const v1FooPost = (options: Options) => (options.client ?? client).post({ ...formDataBodySerializer, url: '/v1/foo', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts index 8d12fcbb0..cfa3d8426 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts @@ -1,59 +1,74 @@ // This file is auto-generated by @hey-api/openapi-ts import { type HttpRequest, httpResource } from '@angular/common/http'; -import { inject, Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; import { client } from '../client.gen'; import type { Options } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; -@Injectable({ providedIn: 'root' }) -export class DefaultServiceRequests { - public serviceWithEmptyTag(options?: Options): HttpRequest { +export class No_tagRequests { + public static patch(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', - method: 'GET', + method: 'PATCH', url: '/api/v{api-version}/no+tag', ...options }); } - - public patchApiVbyApiVersionNoTag(options?: Options): HttpRequest { +} + +export class BodyRequests { + /** + * Body should not be unknown + * + * Body should not be unknown + */ + public static post(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/no+tag', + method: 'POST', + url: '/api/v{api-version}/body', ...options }); } +} + +export class VApiVersionRequests { + static 'no+tagRequests' = No_tagRequests; - public fooWow(options?: Options): HttpRequest { + static bodyRequests = BodyRequests; +} + +export class ApiRequests { + static vApiVersionRequests = VApiVersionRequests; +} + +@Injectable({ providedIn: 'root' }) +export class Default { + public static serviceWithEmptyTag(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', - method: 'PUT', + method: 'GET', url: '/api/v{api-version}/no+tag', ...options }); } - /** - * Body should not be unknown - * - * Body should not be unknown - */ - public postApiVbyApiVersionBody(options: Options): HttpRequest { + public static 'foo+Wow'(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/body', + method: 'PUT', + url: '/api/v{api-version}/no+tag', ...options }); } + + static apiRequests = ApiRequests; } -@Injectable({ providedIn: 'root' }) -export class SimpleServiceRequests { - public deleteCallWithoutParametersAndResponse(options?: Options): HttpRequest { +export class Simple { + public static deleteCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'DELETE', @@ -62,7 +77,7 @@ export class SimpleServiceRequests { }); } - public getCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static getCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -71,7 +86,7 @@ export class SimpleServiceRequests { }); } - public headCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static headCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'HEAD', @@ -80,7 +95,7 @@ export class SimpleServiceRequests { }); } - public optionsCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static optionsCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'OPTIONS', @@ -89,7 +104,7 @@ export class SimpleServiceRequests { }); } - public patchCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static patchCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PATCH', @@ -98,7 +113,7 @@ export class SimpleServiceRequests { }); } - public postCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static postCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -107,7 +122,7 @@ export class SimpleServiceRequests { }); } - public putCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static putCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -117,9 +132,8 @@ export class SimpleServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class DescriptionsServiceRequests { - public callWithDescriptions(options?: Options): HttpRequest { +export class Descriptions { + public static callWithDescriptions(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -129,9 +143,8 @@ export class DescriptionsServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class ParametersServiceRequests { - public callWithParameters(options: Options): HttpRequest { +export class Parameters { + public static callWithParameters(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -140,7 +153,7 @@ export class ParametersServiceRequests { }); } - public callWithWeirdParameterNames(options: Options): HttpRequest { + public static callWithWeirdParameterNames(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -150,9 +163,8 @@ export class ParametersServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class DefaultsServiceRequests { - public callWithDefaultParameters(options: Options): HttpRequest { +export class Defaults { + public static callWithDefaultParameters(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -161,7 +173,7 @@ export class DefaultsServiceRequests { }); } - public callWithDefaultOptionalParameters(options?: Options): HttpRequest { + public static callWithDefaultOptionalParameters(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -170,7 +182,7 @@ export class DefaultsServiceRequests { }); } - public callToTestOrderOfParams(options: Options): HttpRequest { + public static callToTestOrderOfParams(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -180,9 +192,8 @@ export class DefaultsServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class DuplicateServiceRequests { - public duplicateName(options?: Options): HttpRequest { +export class Duplicate { + public static duplicateName(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'DELETE', @@ -191,7 +202,7 @@ export class DuplicateServiceRequests { }); } - public duplicateName2(options?: Options): HttpRequest { + public static duplicateName2(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -200,7 +211,7 @@ export class DuplicateServiceRequests { }); } - public duplicateName3(options?: Options): HttpRequest { + public static duplicateName3(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -209,7 +220,7 @@ export class DuplicateServiceRequests { }); } - public duplicateName4(options?: Options): HttpRequest { + public static duplicateName4(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -219,9 +230,8 @@ export class DuplicateServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class NoContentServiceRequests { - public callWithNoContentResponse(options?: Options): HttpRequest { +export class NoContent { + public static callWithNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -230,7 +240,7 @@ export class NoContentServiceRequests { }); } - public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { + public static callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -240,9 +250,8 @@ export class NoContentServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class ResponseServiceRequests { - public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { +export class Response { + public static callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -251,7 +260,7 @@ export class ResponseServiceRequests { }); } - public callWithResponse(options?: Options): HttpRequest { + public static callWithResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -260,7 +269,7 @@ export class ResponseServiceRequests { }); } - public callWithDuplicateResponses(options?: Options): HttpRequest { + public static callWithDuplicateResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -269,7 +278,7 @@ export class ResponseServiceRequests { }); } - public callWithResponses(options?: Options): HttpRequest { + public static callWithResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -279,9 +288,8 @@ export class ResponseServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags1ServiceRequests { - public dummyA(options?: Options): HttpRequest { +export class MultipleTags1 { + public static dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -290,7 +298,7 @@ export class MultipleTags1ServiceRequests { }); } - public dummyB(options?: Options): HttpRequest { + public static dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -300,9 +308,8 @@ export class MultipleTags1ServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags2ServiceRequests { - public dummyA(options?: Options): HttpRequest { +export class MultipleTags2 { + public static dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -311,7 +318,7 @@ export class MultipleTags2ServiceRequests { }); } - public dummyB(options?: Options): HttpRequest { + public static dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -321,9 +328,8 @@ export class MultipleTags2ServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags3ServiceRequests { - public dummyB(options?: Options): HttpRequest { +export class MultipleTags3 { + public static dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -333,9 +339,8 @@ export class MultipleTags3ServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class CollectionFormatServiceRequests { - public collectionFormat(options: Options): HttpRequest { +export class CollectionFormat { + public static collectionFormat(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -345,9 +350,8 @@ export class CollectionFormatServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class TypesServiceRequests { - public types(options: Options): HttpRequest { +export class Types { + public static types(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -357,9 +361,8 @@ export class TypesServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class ComplexServiceRequests { - public complexTypes(options: Options): HttpRequest { +export class Complex { + public static complexTypes(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -369,9 +372,8 @@ export class ComplexServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class HeaderServiceRequests { - public callWithResultFromHeader(options?: Options): HttpRequest { +export class Header { + public static callWithResultFromHeader(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -381,9 +383,8 @@ export class HeaderServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class ErrorServiceRequests { - public testErrorCode(options: Options): HttpRequest { +export class Error_ { + public static testErrorCode(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -393,9 +394,8 @@ export class ErrorServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class NonAsciiÆøåÆøÅöôêÊServiceRequests { - public nonAsciiæøåÆøÅöôêÊ字符串(options: Options): HttpRequest { +export class NonAsciiÆøåÆøÅöôêÊ { + public static nonAsciiæøåÆøÅöôêÊ字符串(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -405,324 +405,323 @@ export class NonAsciiÆøåÆøÅöôêÊServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class DefaultServiceResources { - public serviceWithEmptyTag(options?: () => Options | undefined) { +export class No_tagResources { + public static patch(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultServiceRequests).serviceWithEmptyTag(opts) : undefined; + return opts ? Default.apiRequests.vApiVersionRequests['no+tagRequests'].patch(opts) : undefined; }); } - - public patchApiVbyApiVersionNoTag(options?: () => Options | undefined) { - return httpResource(() => { +} + +export class BodyResources { + /** + * Body should not be unknown + * + * Body should not be unknown + */ + public static post(options: () => Options | undefined) { + return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultServiceRequests).patchApiVbyApiVersionNoTag(opts) : undefined; + return opts ? Default.apiRequests.vApiVersionRequests.bodyRequests.post(opts) : undefined; }); } +} + +export class VApiVersionResources { + static 'no+tagResources' = No_tagResources; - public fooWow(options?: () => Options | undefined) { + static bodyResources = BodyResources; +} + +export class ApiResources { + static vApiVersionResources = VApiVersionResources; +} + +export class Default2 { + public static serviceWithEmptyTag(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultServiceRequests).fooWow(opts) : undefined; + return opts ? Default.serviceWithEmptyTag(opts) : undefined; }); } - /** - * Body should not be unknown - * - * Body should not be unknown - */ - public postApiVbyApiVersionBody(options: () => Options | undefined) { - return httpResource(() => { + public static 'foo+Wow'(options?: () => Options | undefined) { + return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultServiceRequests).postApiVbyApiVersionBody(opts) : undefined; + return opts ? Default['foo+Wow'](opts) : undefined; }); } + + static apiResources = ApiResources; } -@Injectable({ providedIn: 'root' }) -export class SimpleServiceResources { - public deleteCallWithoutParametersAndResponse(options?: () => Options | undefined) { +export class Simple2 { + public static deleteCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).deleteCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.deleteCallWithoutParametersAndResponse(opts) : undefined; }); } - public getCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static getCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).getCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.getCallWithoutParametersAndResponse(opts) : undefined; }); } - public headCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static headCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).headCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.headCallWithoutParametersAndResponse(opts) : undefined; }); } - public optionsCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static optionsCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).optionsCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.optionsCallWithoutParametersAndResponse(opts) : undefined; }); } - public patchCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static patchCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).patchCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.patchCallWithoutParametersAndResponse(opts) : undefined; }); } - public postCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static postCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).postCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.postCallWithoutParametersAndResponse(opts) : undefined; }); } - public putCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static putCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).putCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.putCallWithoutParametersAndResponse(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class DescriptionsServiceResources { - public callWithDescriptions(options?: () => Options | undefined) { +export class Descriptions2 { + public static callWithDescriptions(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DescriptionsServiceRequests).callWithDescriptions(opts) : undefined; + return opts ? Descriptions.callWithDescriptions(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class ParametersServiceResources { - public callWithParameters(options: () => Options | undefined) { +export class Parameters2 { + public static callWithParameters(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ParametersServiceRequests).callWithParameters(opts) : undefined; + return opts ? Parameters.callWithParameters(opts) : undefined; }); } - public callWithWeirdParameterNames(options: () => Options | undefined) { + public static callWithWeirdParameterNames(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ParametersServiceRequests).callWithWeirdParameterNames(opts) : undefined; + return opts ? Parameters.callWithWeirdParameterNames(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class DefaultsServiceResources { - public callWithDefaultParameters(options: () => Options | undefined) { +export class Defaults2 { + public static callWithDefaultParameters(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultsServiceRequests).callWithDefaultParameters(opts) : undefined; + return opts ? Defaults.callWithDefaultParameters(opts) : undefined; }); } - public callWithDefaultOptionalParameters(options?: () => Options | undefined) { + public static callWithDefaultOptionalParameters(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultsServiceRequests).callWithDefaultOptionalParameters(opts) : undefined; + return opts ? Defaults.callWithDefaultOptionalParameters(opts) : undefined; }); } - public callToTestOrderOfParams(options: () => Options | undefined) { + public static callToTestOrderOfParams(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultsServiceRequests).callToTestOrderOfParams(opts) : undefined; + return opts ? Defaults.callToTestOrderOfParams(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class DuplicateServiceResources { - public duplicateName(options?: () => Options | undefined) { +export class Duplicate2 { + public static duplicateName(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DuplicateServiceRequests).duplicateName(opts) : undefined; + return opts ? Duplicate.duplicateName(opts) : undefined; }); } - public duplicateName2(options?: () => Options | undefined) { + public static duplicateName2(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DuplicateServiceRequests).duplicateName2(opts) : undefined; + return opts ? Duplicate.duplicateName2(opts) : undefined; }); } - public duplicateName3(options?: () => Options | undefined) { + public static duplicateName3(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DuplicateServiceRequests).duplicateName3(opts) : undefined; + return opts ? Duplicate.duplicateName3(opts) : undefined; }); } - public duplicateName4(options?: () => Options | undefined) { + public static duplicateName4(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DuplicateServiceRequests).duplicateName4(opts) : undefined; + return opts ? Duplicate.duplicateName4(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class NoContentServiceResources { - public callWithNoContentResponse(options?: () => Options | undefined) { +export class NoContent2 { + public static callWithNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(NoContentServiceRequests).callWithNoContentResponse(opts) : undefined; + return opts ? NoContent.callWithNoContentResponse(opts) : undefined; }); } - public callWithResponseAndNoContentResponse(options?: () => Options | undefined) { + public static callWithResponseAndNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; + return opts ? NoContent.callWithResponseAndNoContentResponse(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class ResponseServiceResources { - public callWithResponseAndNoContentResponse(options?: () => Options | undefined) { +export class Response2 { + public static callWithResponseAndNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; + return opts ? NoContent.callWithResponseAndNoContentResponse(opts) : undefined; }); } - public callWithResponse(options?: () => Options | undefined) { + public static callWithResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithResponse(opts) : undefined; + return opts ? Response.callWithResponse(opts) : undefined; }); } - public callWithDuplicateResponses(options?: () => Options | undefined) { + public static callWithDuplicateResponses(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithDuplicateResponses(opts) : undefined; + return opts ? Response.callWithDuplicateResponses(opts) : undefined; }); } - public callWithResponses(options?: () => Options | undefined) { + public static callWithResponses(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithResponses(opts) : undefined; + return opts ? Response.callWithResponses(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags1ServiceResources { - public dummyA(options?: () => Options | undefined) { +export class MultipleTags12 { + public static dummyA(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; + return opts ? MultipleTags1.dummyA(opts) : undefined; }); } - public dummyB(options?: () => Options | undefined) { + public static dummyB(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; + return opts ? MultipleTags1.dummyB(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags2ServiceResources { - public dummyA(options?: () => Options | undefined) { +export class MultipleTags22 { + public static dummyA(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; + return opts ? MultipleTags1.dummyA(opts) : undefined; }); } - public dummyB(options?: () => Options | undefined) { + public static dummyB(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; + return opts ? MultipleTags1.dummyB(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags3ServiceResources { - public dummyB(options?: () => Options | undefined) { +export class MultipleTags32 { + public static dummyB(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; + return opts ? MultipleTags1.dummyB(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class CollectionFormatServiceResources { - public collectionFormat(options: () => Options | undefined) { +export class CollectionFormat2 { + public static collectionFormat(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(CollectionFormatServiceRequests).collectionFormat(opts) : undefined; + return opts ? CollectionFormat.collectionFormat(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class TypesServiceResources { - public types(options: () => Options | undefined) { +export class Types2 { + public static types(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(TypesServiceRequests).types(opts) : undefined; + return opts ? Types.types(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class ComplexServiceResources { - public complexTypes(options: () => Options | undefined) { +export class Complex2 { + public static complexTypes(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ComplexServiceRequests).complexTypes(opts) : undefined; + return opts ? Complex.complexTypes(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class HeaderServiceResources { - public callWithResultFromHeader(options?: () => Options | undefined) { +export class Header2 { + public static callWithResultFromHeader(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(HeaderServiceRequests).callWithResultFromHeader(opts) : undefined; + return opts ? Header.callWithResultFromHeader(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class ErrorServiceResources { - public testErrorCode(options: () => Options | undefined) { +export class Error2 { + public static testErrorCode(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ErrorServiceRequests).testErrorCode(opts) : undefined; + return opts ? Error_.testErrorCode(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class NonAsciiÆøåÆøÅöôêÊServiceResources { - public nonAsciiæøåÆøÅöôêÊ字符串(options: () => Options | undefined) { +export class NonAsciiÆøåÆøÅöôêÊ2 { + public static nonAsciiæøåÆøÅöôêÊ字符串(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined; + return opts ? NonAsciiÆøåÆøÅöôêÊ.nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined; }); } } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/sdk.gen.ts index 6776488ce..fdc344691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/sdk.gen.ts index 6776488ce..fdc344691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts index fafb8ed66..a1beb0a63 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts @@ -54,6 +54,10 @@ export class Domains extends HeyApiClient { public post(options?: Options) { return (options?.client ?? this.client).post({ url: '/business/providers/domains', ...options }); } + + public put(options?: Options) { + return (options?.client ?? this.client).put({ url: '/business/providers/domains', ...options }); + } } export class Providers extends HeyApiClient { @@ -85,10 +89,6 @@ export class NestedSdkWithInstance extends HeyApiClient { NestedSdkWithInstance.__registry.set(this, args?.key); } - public putBusinessProvidersDomains(options?: Options) { - return (options?.client ?? this.client).put({ url: '/business/providers/domains', ...options }); - } - public get(options?: Options) { return (options?.client ?? this.client).get({ url: '/locations', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts index babd05bc9..505a12a57 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts @@ -74,6 +74,10 @@ export class Domains3 { public static post(options?: Options) { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } + + public static put(options?: Options) { + return (options?.client ?? client).put({ url: '/business/providers/domains', ...options }); + } } export class Providers4 { @@ -85,10 +89,6 @@ export class Business4 { } export class Domains4 { - public static putBusinessProvidersDomains(options?: Options) { - return (options?.client ?? client).put({ url: '/business/providers/domains', ...options }); - } - static business = Business4; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts index 6776488ce..fdc344691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts index af464f9b9..060d7ded1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts @@ -47,6 +47,10 @@ class HeyApiRegistry { } export class Bar extends HeyApiClient { + public get(options?: Options) { + return (options?.client ?? this.client).get({ url: '/foo/bar', ...options }); + } + public post(options?: Options) { return (options?.client ?? this.client).post({ url: '/foo/bar', ...options }); } @@ -57,6 +61,10 @@ export class Bar extends HeyApiClient { } export class Foo extends HeyApiClient { + public get(options?: Options) { + return (options?.client ?? this.client).get({ url: '/foo', ...options }); + } + public post(options?: Options) { return (options?.client ?? this.client).post({ url: '/foo', ...options }); } @@ -82,14 +90,6 @@ export class Sdk extends HeyApiClient { Sdk.__registry.set(this, args?.key); } - public getFoo(options?: Options) { - return (options?.client ?? this.client).get({ url: '/foo', ...options }); - } - - public getFooBar(options?: Options) { - return (options?.client ?? this.client).get({ url: '/foo/bar', ...options }); - } - private _foo?: Foo; get foo(): Foo { return this._foo ??= new Foo({ client: this.client }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts index 9cfe2097f..bca22f7cc 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/index.ts index 8dc6d0499..61e4b126b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, postFoo } from './sdk.gen'; +export { fooPost, type Options } from './sdk.gen'; export type { Bar, ClientOptions, Foo, PostFooData, PostFooResponse, PostFooResponses, TypeID, UserId } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/sdk.gen.ts index b443e6ac2..8d5af124b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/sdk.gen.ts @@ -22,7 +22,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const fooPost = (options?: Options) => (options?.client ?? client).post({ requestValidator: async (data) => await v.parseAsync(vPostFooData, data), responseTransformer: postFooResponseTransformer, responseValidator: async (data) => await v.parseAsync(vPostFooResponse, data), diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/index.ts index 8dc6d0499..61e4b126b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, postFoo } from './sdk.gen'; +export { fooPost, type Options } from './sdk.gen'; export type { Bar, ClientOptions, Foo, PostFooData, PostFooResponse, PostFooResponses, TypeID, UserId } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/sdk.gen.ts index db455df67..56a6a3fd7 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/sdk.gen.ts @@ -20,7 +20,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const fooPost = (options?: Options) => (options?.client ?? client).post({ requestValidator: async (data) => await zPostFooData.parseAsync(data), responseTransformer: postFooResponseTransformer, responseValidator: async (data) => await zPostFooResponse.parseAsync(data), diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts index 3aeed5221..84f186999 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts @@ -47,7 +47,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooQuery = defineQueryOptions((options?: Options) => ({ key: getFooQueryKey(options), query: async (context) => { - const { data } = await FooBazService.getFoo({ + const { data } = await FooBazService.fooService.get({ ...options, ...context, throwOnError: true @@ -83,7 +83,7 @@ export const getFooBarQueryKey = (options?: Options) => createQue export const getFooBarQuery = defineQueryOptions((options?: Options) => ({ key: getFooBarQueryKey(options), query: async (context) => { - const { data } = await BarBazService.getFooBar({ + const { data } = await BarBazService.fooService.barService.get({ ...options, ...context, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts index 81b7e79ea..951c71fca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts @@ -29,6 +29,10 @@ export class BarService { } export class FooService { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo', ...options }); } @@ -41,14 +45,14 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { - return (options?.client ?? client).get({ url: '/foo', ...options }); - } - static fooService = FooService; } export class BarService2 { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo/bar', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } @@ -63,9 +67,5 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { - return (options?.client ?? client).get({ url: '/foo/bar', ...options }); - } - static fooService = FooService2; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts index 14aff2882..6d802c7a7 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts @@ -4,7 +4,7 @@ import { type _JSONValue, defineQueryOptions, type UseMutationOptions } from '@p import { serializeQueryKeyValue } from '../client'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData } from '../types.gen'; export type QueryKey = [ @@ -58,7 +58,7 @@ export const serviceWithEmptyTagQuery = defineQueryOptions((options?: Options>): UseMutationOptions, Error> => ({ mutation: async (vars) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...vars, throwOnError: true @@ -69,7 +69,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions, Error> => ({ mutation: async (vars) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...vars, throwOnError: true @@ -426,7 +426,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< */ export const postApiVbyApiVersionBodyMutation = (options?: Partial>): UseMutationOptions, PostApiVbyApiVersionBodyError> => ({ mutation: async (vars) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...vars, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts index 6776488ce..fdc344691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts index 6f71bcc40..72bb39e1a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await FooBazService.getFoo({ + const { data } = await FooBazService.fooService.get({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarQueryKey = (options?: Options) => createQue export const getFooBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await BarBazService.getFooBar({ + const { data } = await BarBazService.fooService.barService.get({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts index 81b7e79ea..951c71fca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts @@ -29,6 +29,10 @@ export class BarService { } export class FooService { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo', ...options }); } @@ -41,14 +45,14 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { - return (options?.client ?? client).get({ url: '/foo', ...options }); - } - static fooService = FooService; } export class BarService2 { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo/bar', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } @@ -63,9 +67,5 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { - return (options?.client ?? client).get({ url: '/foo/bar', ...options }); - } - static fooService = FooService2; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts index cef8fd363..b8871211a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts @@ -4,7 +4,7 @@ import { type DefaultError, type MutationOptions, queryOptions } from '@tanstack import type { AxiosError } from 'axios'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -58,7 +58,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): MutationOptions, Options> => { const mutationOptions: MutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -72,7 +72,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): MutationOptions, Options> => { const mutationOptions: MutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -494,7 +494,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): MutationOptions, Options> => { const mutationOptions: MutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/sdk.gen.ts index 9359ba9fe..fae730b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -155,7 +155,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/body', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts index 5087360ef..36c7f22f5 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, type MutationOptions, queryOptions } from '@tanstack/angular-query-experimental'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -57,7 +57,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): MutationOptions> => { const mutationOptions: MutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -71,7 +71,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): MutationOptions> => { const mutationOptions: MutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -493,7 +493,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): MutationOptions> => { const mutationOptions: MutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/sdk.gen.ts index 6776488ce..fdc344691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts index b144ed7a2..1f27d6e82 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, type MutationOptions, queryOptions } from '@tanstack/angular-query-experimental'; import { client } from '../client.gen'; -import { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from '../sdk.gen'; +import { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from '../sdk.gen'; import type { FooBarPostData, FooBarPostResponse, FooBarPutData, FooBarPutResponse, FooPostData, FooPostResponse, FooPutData, FooPutResponse, GetFooBarData, GetFooBarResponse, GetFooData, GetFooResponse } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooD = (options?: Options) => createQueryKey('getFoo export const getFooE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarD = (options?: Options) => createQueryKey(' export const getFooBarE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFooBar({ + const { data } = await fooBarGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/index.ts index b3d19ebcd..e42ffea2a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from './sdk.gen'; +export { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from './sdk.gen'; export type { ClientOptions, FooBarPostData, FooBarPostResponse, FooBarPostResponses, FooBarPutData, FooBarPutResponse, FooBarPutResponses, FooPostData, FooPostResponse, FooPostResponses, FooPutData, FooPutResponse, FooPutResponses, GetFooBarData, GetFooBarResponse, GetFooBarResponses, GetFooData, GetFooResponse, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/sdk.gen.ts index a70249590..a52716c48 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/sdk.gen.ts @@ -18,13 +18,13 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const fooGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); export const fooPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo', ...options }); export const fooPut = (options?: Options) => (options?.client ?? client).put({ url: '/foo', ...options }); -export const getFooBar = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); +export const fooBarGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); export const fooBarPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo/bar', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts index 74f3f999f..8971e2a33 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await FooBazService.getFoo({ + const { data } = await FooBazService.fooService.get({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarQueryKey = (options?: Options) => createQue export const getFooBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await BarBazService.getFooBar({ + const { data } = await BarBazService.fooService.barService.get({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts index 81b7e79ea..951c71fca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts @@ -29,6 +29,10 @@ export class BarService { } export class FooService { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo', ...options }); } @@ -41,14 +45,14 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { - return (options?.client ?? client).get({ url: '/foo', ...options }); - } - static fooService = FooService; } export class BarService2 { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo/bar', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } @@ -63,9 +67,5 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { - return (options?.client ?? client).get({ url: '/foo/bar', ...options }); - } - static fooService = FooService2; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts index da398d170..0749df981 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts @@ -4,7 +4,7 @@ import { type DefaultError, queryOptions, type UseMutationOptions } from '@tanst import type { AxiosError } from 'axios'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -58,7 +58,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): UseMutationOptions, Options> => { const mutationOptions: UseMutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -72,7 +72,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions, Options> => { const mutationOptions: UseMutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -494,7 +494,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): UseMutationOptions, Options> => { const mutationOptions: UseMutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/sdk.gen.ts index 9359ba9fe..fae730b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -155,7 +155,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/body', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts index ef023fe2c..946c6f502 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, queryOptions, type UseMutationOptions } from '@tanstack/react-query'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -57,7 +57,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -71,7 +71,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -493,7 +493,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/sdk.gen.ts index 6776488ce..fdc344691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts index 43c90277c..f6cb04a06 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, queryOptions, type UseMutationOptions } from '@tanstack/react-query'; import { client } from '../client.gen'; -import { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from '../sdk.gen'; +import { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from '../sdk.gen'; import type { FooBarPostData, FooBarPostResponse, FooBarPutData, FooBarPutResponse, FooPostData, FooPostResponse, FooPutData, FooPutResponse, GetFooBarData, GetFooBarResponse, GetFooData, GetFooResponse } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooD = (options?: Options) => createQueryKey('getFoo export const getFooE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarD = (options?: Options) => createQueryKey(' export const getFooBarE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFooBar({ + const { data } = await fooBarGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/index.ts index b3d19ebcd..e42ffea2a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from './sdk.gen'; +export { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from './sdk.gen'; export type { ClientOptions, FooBarPostData, FooBarPostResponse, FooBarPostResponses, FooBarPutData, FooBarPutResponse, FooBarPutResponses, FooPostData, FooPostResponse, FooPostResponses, FooPutData, FooPutResponse, FooPutResponses, GetFooBarData, GetFooBarResponse, GetFooBarResponses, GetFooData, GetFooResponse, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/sdk.gen.ts index a70249590..a52716c48 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/sdk.gen.ts @@ -18,13 +18,13 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const fooGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); export const fooPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo', ...options }); export const fooPut = (options?: Options) => (options?.client ?? client).put({ url: '/foo', ...options }); -export const getFooBar = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); +export const fooBarGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); export const fooBarPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo/bar', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts index 908344e1b..94993b462 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await FooBazService.getFoo({ + const { data } = await FooBazService.fooService.get({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarQueryKey = (options?: Options) => createQue export const getFooBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await BarBazService.getFooBar({ + const { data } = await BarBazService.fooService.barService.get({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts index 81b7e79ea..951c71fca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts @@ -29,6 +29,10 @@ export class BarService { } export class FooService { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo', ...options }); } @@ -41,14 +45,14 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { - return (options?.client ?? client).get({ url: '/foo', ...options }); - } - static fooService = FooService; } export class BarService2 { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo/bar', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } @@ -63,9 +67,5 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { - return (options?.client ?? client).get({ url: '/foo/bar', ...options }); - } - static fooService = FooService2; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts index 7a51e436a..5d2514fea 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts @@ -4,7 +4,7 @@ import { type DefaultError, type MutationOptions, queryOptions } from '@tanstack import type { AxiosError } from 'axios'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -58,7 +58,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): MutationOptions, Options> => { const mutationOptions: MutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -72,7 +72,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): MutationOptions, Options> => { const mutationOptions: MutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -494,7 +494,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): MutationOptions, Options> => { const mutationOptions: MutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/sdk.gen.ts index 9359ba9fe..fae730b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -155,7 +155,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/body', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts index c4092a30b..14c5d1367 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, type MutationOptions, queryOptions } from '@tanstack/solid-query'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -57,7 +57,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): MutationOptions> => { const mutationOptions: MutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -71,7 +71,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): MutationOptions> => { const mutationOptions: MutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -493,7 +493,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): MutationOptions> => { const mutationOptions: MutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/sdk.gen.ts index 6776488ce..fdc344691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts index ba1febdda..f01de6af2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, type MutationOptions, queryOptions } from '@tanstack/solid-query'; import { client } from '../client.gen'; -import { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from '../sdk.gen'; +import { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from '../sdk.gen'; import type { FooBarPostData, FooBarPostResponse, FooBarPutData, FooBarPutResponse, FooPostData, FooPostResponse, FooPutData, FooPutResponse, GetFooBarData, GetFooBarResponse, GetFooData, GetFooResponse } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooD = (options?: Options) => createQueryKey('getFoo export const getFooE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarD = (options?: Options) => createQueryKey(' export const getFooBarE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFooBar({ + const { data } = await fooBarGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/index.ts index b3d19ebcd..e42ffea2a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from './sdk.gen'; +export { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from './sdk.gen'; export type { ClientOptions, FooBarPostData, FooBarPostResponse, FooBarPostResponses, FooBarPutData, FooBarPutResponse, FooBarPutResponses, FooPostData, FooPostResponse, FooPostResponses, FooPutData, FooPutResponse, FooPutResponses, GetFooBarData, GetFooBarResponse, GetFooBarResponses, GetFooData, GetFooResponse, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/sdk.gen.ts index a70249590..a52716c48 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/sdk.gen.ts @@ -18,13 +18,13 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const fooGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); export const fooPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo', ...options }); export const fooPut = (options?: Options) => (options?.client ?? client).put({ url: '/foo', ...options }); -export const getFooBar = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); +export const fooBarGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); export const fooBarPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo/bar', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts index 4f7ad47a7..00aec8126 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await FooBazService.getFoo({ + const { data } = await FooBazService.fooService.get({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarQueryKey = (options?: Options) => createQue export const getFooBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await BarBazService.getFooBar({ + const { data } = await BarBazService.fooService.barService.get({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts index 81b7e79ea..951c71fca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts @@ -29,6 +29,10 @@ export class BarService { } export class FooService { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo', ...options }); } @@ -41,14 +45,14 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { - return (options?.client ?? client).get({ url: '/foo', ...options }); - } - static fooService = FooService; } export class BarService2 { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo/bar', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } @@ -63,9 +67,5 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { - return (options?.client ?? client).get({ url: '/foo/bar', ...options }); - } - static fooService = FooService2; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts index 8900d4a58..e2c388b63 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts @@ -4,7 +4,7 @@ import { type DefaultError, type MutationOptions, queryOptions } from '@tanstack import type { AxiosError } from 'axios'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -58,7 +58,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): MutationOptions, Options> => { const mutationOptions: MutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -72,7 +72,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): MutationOptions, Options> => { const mutationOptions: MutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -494,7 +494,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): MutationOptions, Options> => { const mutationOptions: MutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/sdk.gen.ts index 9359ba9fe..fae730b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -155,7 +155,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/body', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts index e14c0d70c..8495eca14 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, type MutationOptions, queryOptions } from '@tanstack/svelte-query'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -57,7 +57,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): MutationOptions> => { const mutationOptions: MutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -71,7 +71,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): MutationOptions> => { const mutationOptions: MutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -493,7 +493,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): MutationOptions> => { const mutationOptions: MutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/sdk.gen.ts index 6776488ce..fdc344691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts index 6a831b5b3..1de44f6db 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, type MutationOptions, queryOptions } from '@tanstack/svelte-query'; import { client } from '../client.gen'; -import { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from '../sdk.gen'; +import { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from '../sdk.gen'; import type { FooBarPostData, FooBarPostResponse, FooBarPutData, FooBarPutResponse, FooPostData, FooPostResponse, FooPutData, FooPutResponse, GetFooBarData, GetFooBarResponse, GetFooData, GetFooResponse } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooD = (options?: Options) => createQueryKey('getFoo export const getFooE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarD = (options?: Options) => createQueryKey(' export const getFooBarE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFooBar({ + const { data } = await fooBarGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/index.ts index b3d19ebcd..e42ffea2a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from './sdk.gen'; +export { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from './sdk.gen'; export type { ClientOptions, FooBarPostData, FooBarPostResponse, FooBarPostResponses, FooBarPutData, FooBarPutResponse, FooBarPutResponses, FooPostData, FooPostResponse, FooPostResponses, FooPutData, FooPutResponse, FooPutResponses, GetFooBarData, GetFooBarResponse, GetFooBarResponses, GetFooData, GetFooResponse, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/sdk.gen.ts index a70249590..a52716c48 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/sdk.gen.ts @@ -18,13 +18,13 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const fooGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); export const fooPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo', ...options }); export const fooPut = (options?: Options) => (options?.client ?? client).put({ url: '/foo', ...options }); -export const getFooBar = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); +export const fooBarGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); export const fooBarPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo/bar', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts index 767635c77..1c0b7cb8c 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts @@ -43,7 +43,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await FooBazService.getFoo({ + const { data } = await FooBazService.fooService.get({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarQueryKey = (options?: Options) => createQue export const getFooBarOptions = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await BarBazService.getFooBar({ + const { data } = await BarBazService.fooService.barService.get({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts index 81b7e79ea..951c71fca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts @@ -29,6 +29,10 @@ export class BarService { } export class FooService { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo', ...options }); } @@ -41,14 +45,14 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { - return (options?.client ?? client).get({ url: '/foo', ...options }); - } - static fooService = FooService; } export class BarService2 { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo/bar', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } @@ -63,9 +67,5 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { - return (options?.client ?? client).get({ url: '/foo/bar', ...options }); - } - static fooService = FooService2; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts index 5a5ce3b11..68a9133d8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts @@ -4,7 +4,7 @@ import { type DefaultError, queryOptions, type UseMutationOptions } from '@tanst import type { AxiosError } from 'axios'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -58,7 +58,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): UseMutationOptions, Options> => { const mutationOptions: UseMutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -72,7 +72,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions, Options> => { const mutationOptions: UseMutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -494,7 +494,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): UseMutationOptions, Options> => { const mutationOptions: UseMutationOptions, Options> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/sdk.gen.ts index 9359ba9fe..fae730b98 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -155,7 +155,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ responseType: 'json', url: '/api/v{api-version}/body', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts index b545d1817..e161cdaf0 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, queryOptions, type UseMutationOptions } from '@tanstack/vue-query'; import { client } from '../client.gen'; -import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; +import { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen'; import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData, TypesResponse } from '../types.gen'; export type QueryKey = [ @@ -57,7 +57,7 @@ export const serviceWithEmptyTagOptions = (options?: Options>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...fnOptions, throwOnError: true @@ -71,7 +71,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...fnOptions, throwOnError: true @@ -493,7 +493,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial< export const postApiVbyApiVersionBodyMutation = (options?: Partial>): UseMutationOptions> => { const mutationOptions: UseMutationOptions> = { mutationFn: async (fnOptions) => { - const { data } = await postApiVbyApiVersionBody({ + const { data } = await apiVApiVersionBodyPost({ ...options, ...fnOptions, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/index.ts index e45478b1d..c6833c00d 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; +export { apiVApiVersionBodyPost, apiVApiVersionNo_tagPatch, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, foo_Wow, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from './sdk.gen'; export type { ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, Date, Default, DeleteCallWithoutParametersAndResponseData, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithStrings, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, FailureFailure, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ModelThatExtends, ModelThatExtendsExtends, ModelWithArray, ModelWithBoolean, ModelWithCircularReference, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithInteger, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableString, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, OptionsCallWithoutParametersAndResponseData, ParameterActivityParams, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ResponsePostActivityResponse, ServiceWithEmptyTagData, SimpleBoolean, SimpleFile, SimpleInteger, SimpleReference, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/sdk.gen.ts index 6776488ce..fdc344691 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/sdk.gen.ts @@ -20,9 +20,9 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); -export const fooWow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -117,7 +117,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = (options: Options) => (options.client ?? client).post({ +export const apiVApiVersionBodyPost = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/body', ...options, headers: { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts index bfd35f1d6..720c42465 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts @@ -3,7 +3,7 @@ import { type DefaultError, queryOptions, type UseMutationOptions } from '@tanstack/vue-query'; import { client } from '../client.gen'; -import { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from '../sdk.gen'; +import { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from '../sdk.gen'; import type { FooBarPostData, FooBarPostResponse, FooBarPutData, FooBarPutResponse, FooPostData, FooPostResponse, FooPutData, FooPutResponse, GetFooBarData, GetFooBarResponse, GetFooData, GetFooResponse } from '../types.gen'; export type QueryKey = [ @@ -43,7 +43,7 @@ export const getFooD = (options?: Options) => createQueryKey('getFoo export const getFooE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFoo({ + const { data } = await fooGet({ ...options, ...queryKey[0], signal, @@ -86,7 +86,7 @@ export const getFooBarD = (options?: Options) => createQueryKey(' export const getFooBarE = (options?: Options) => queryOptions>({ queryFn: async ({ queryKey, signal }) => { - const { data } = await getFooBar({ + const { data } = await fooBarGet({ ...options, ...queryKey[0], signal, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/index.ts index b3d19ebcd..e42ffea2a 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { fooBarPost, fooBarPut, fooPost, fooPut, getFoo, getFooBar, type Options } from './sdk.gen'; +export { fooBarGet, fooBarPost, fooBarPut, fooGet, fooPost, fooPut, type Options } from './sdk.gen'; export type { ClientOptions, FooBarPostData, FooBarPostResponse, FooBarPostResponses, FooBarPutData, FooBarPutResponse, FooBarPutResponses, FooPostData, FooPostResponse, FooPostResponses, FooPutData, FooPutResponse, FooPutResponses, GetFooBarData, GetFooBarResponse, GetFooBarResponses, GetFooData, GetFooResponse, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/sdk.gen.ts index a70249590..a52716c48 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/sdk.gen.ts @@ -18,13 +18,13 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const fooGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); export const fooPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo', ...options }); export const fooPut = (options?: Options) => (options?.client ?? client).put({ url: '/foo', ...options }); -export const getFooBar = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); +export const fooBarGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo/bar', ...options }); export const fooBarPost = (options?: Options) => (options?.client ?? client).post({ url: '/foo/bar', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/index.ts index 14b322279..be3520b11 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { getFoo, type Options } from './sdk.gen'; +export { fooGet, type Options } from './sdk.gen'; export type { ClientOptions, GetFooData, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/sdk.gen.ts index 5bc66f5a1..109acae08 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const fooGet = (options?: Options) => (options?.client ?? client).get({ security: [{ in: 'query', name: 'foo', diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/index.ts index 14b322279..be3520b11 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { getFoo, type Options } from './sdk.gen'; +export { fooGet, type Options } from './sdk.gen'; export type { ClientOptions, GetFooData, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/sdk.gen.ts index 8a29a51e2..96b60f170 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const fooGet = (options?: Options) => (options?.client ?? client).get({ security: [{ scheme: 'basic', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/index.ts index 14b322279..be3520b11 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { getFoo, type Options } from './sdk.gen'; +export { fooGet, type Options } from './sdk.gen'; export type { ClientOptions, GetFooData, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/sdk.gen.ts index ab8ff3b10..4b61145cf 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/sdk.gen.ts @@ -18,4 +18,4 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); +export const fooGet = (options?: Options) => (options?.client ?? client).get({ url: '/foo', ...options }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/index.ts index 14b322279..be3520b11 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { getFoo, type Options } from './sdk.gen'; +export { fooGet, type Options } from './sdk.gen'; export type { ClientOptions, GetFooData, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/sdk.gen.ts index 491c86a21..9ae405876 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const fooGet = (options?: Options) => (options?.client ?? client).get({ security: [{ scheme: 'bearer', type: 'http' }], url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/index.ts index de1daea43..cffa17616 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, postFoo } from './sdk.gen'; +export { fooPost, type Options } from './sdk.gen'; export type { ClientOptions, PostFooData, PostFooResponse, PostFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/sdk.gen.ts index 275283fad..aadd6a1be 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options: Options) => (options.client ?? client).post({ +export const fooPost = (options: Options) => (options.client ?? client).post({ bodySerializer: null, url: '/foo', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/index.ts index b8bd9b308..0fd2c35c2 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { getFoo, type Options } from './sdk.gen'; +export { fooGet, type Options } from './sdk.gen'; export type { ClientOptions, GetFooData, GetFooResponse, GetFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/sdk.gen.ts index bd418b635..497898597 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/content-types/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const getFoo = (options?: Options) => (options?.client ?? client).get({ +export const fooGet = (options?: Options) => (options?.client ?? client).get({ responseType: 'json', url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/index.ts index 878d240fe..b7d647ad4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, postFoo } from './sdk.gen'; +export { fooPost, type Options } from './sdk.gen'; export type { ClientOptions, PostFooData, PostFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/sdk.gen.ts index 11ce35052..7f967b14f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false-axios/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const fooPost = (options?: Options) => (options?.client ?? client).post({ querySerializer: { parameters: { foo: { array: { explode: false } } } }, url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/index.ts index 878d240fe..b7d647ad4 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, postFoo } from './sdk.gen'; +export { fooPost, type Options } from './sdk.gen'; export type { ClientOptions, PostFooData, PostFooResponses } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/sdk.gen.ts index 11ce35052..7f967b14f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/sdk.gen.ts @@ -18,7 +18,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const fooPost = (options?: Options) => (options?.client ?? client).post({ querySerializer: { parameters: { foo: { array: { explode: false } } } }, url: '/foo', ...options diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts index 2cb208158..bd7df901f 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts @@ -1,62 +1,78 @@ // This file is auto-generated by @hey-api/openapi-ts import { type HttpRequest, httpResource } from '@angular/common/http'; -import { inject, Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; import { client } from '../client.gen'; import type { Options } from '../sdk.gen'; import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationResponse, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, TypesResponse, UploadFileData, UploadFileResponse } from '../types.gen'; -@Injectable({ providedIn: 'root' }) -export class DefaultServiceRequests { - public export(options?: Options): HttpRequest { +export class No_tagRequests { + public static patch(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', - method: 'GET', + method: 'PATCH', url: '/api/v{api-version}/no+tag', ...options }); } - - public patchApiVbyApiVersionNoTag(options?: Options): HttpRequest { +} + +export class SimpleOperationRequests { + public static get(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/no+tag', + method: 'GET', + url: '/api/v{api-version}/simple:operation', ...options }); } +} + +export class VApiVersionRequests { + static 'no+tagRequests' = No_tagRequests; - public import(options: Options): HttpRequest { + static simpleOperationRequests = SimpleOperationRequests; +} + +export class ApiRequests { + static vApiVersionRequests = VApiVersionRequests; +} + +@Injectable({ providedIn: 'root' }) +export class Default { + public static export(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', - method: 'POST', + method: 'GET', url: '/api/v{api-version}/no+tag', ...options }); } - public fooWow(options?: Options): HttpRequest { + public static import(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', - method: 'PUT', + method: 'POST', url: '/api/v{api-version}/no+tag', ...options }); } - public getApiVbyApiVersionSimpleOperation(options: Options): HttpRequest { + public static 'foo+Wow'(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple:operation', + method: 'PUT', + url: '/api/v{api-version}/no+tag', ...options }); } + + static apiRequests = ApiRequests; } -export class ODataControllerServiceRequests { - public apiVVersionODataControllerCount(options?: Options): HttpRequest { +export class ODataControllerRequests { + public static $count(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -66,17 +82,16 @@ export class ODataControllerServiceRequests { } } -export class VVersionServiceRequests { - oDataControllerService = new ODataControllerServiceRequests(); +export class VVersionRequests { + static oDataControllerRequests = ODataControllerRequests; } -export class ApiServiceRequests { - vVersionService = new VVersionServiceRequests(); +export class ApiRequests2 { + static vVersionRequests = VVersionRequests; } -@Injectable({ providedIn: 'root' }) -export class SimpleServiceRequests { - public deleteCallWithoutParametersAndResponse(options?: Options): HttpRequest { +export class Simple { + public static deleteCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'DELETE', @@ -85,7 +100,7 @@ export class SimpleServiceRequests { }); } - public getCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static getCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -94,7 +109,7 @@ export class SimpleServiceRequests { }); } - public headCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static headCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'HEAD', @@ -103,7 +118,7 @@ export class SimpleServiceRequests { }); } - public optionsCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static optionsCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'OPTIONS', @@ -112,7 +127,7 @@ export class SimpleServiceRequests { }); } - public patchCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static patchCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PATCH', @@ -121,7 +136,7 @@ export class SimpleServiceRequests { }); } - public postCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static postCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -130,7 +145,7 @@ export class SimpleServiceRequests { }); } - public putCallWithoutParametersAndResponse(options?: Options): HttpRequest { + public static putCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -138,12 +153,12 @@ export class SimpleServiceRequests { ...options }); } - apiService = new ApiServiceRequests(); + + static apiRequests = ApiRequests2; } -@Injectable({ providedIn: 'root' }) -export class ParametersServiceRequests { - public deleteFoo(options: Options): HttpRequest { +export class Parameters { + public static deleteFoo(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'DELETE', @@ -152,7 +167,7 @@ export class ParametersServiceRequests { }); } - public callWithParameters(options: Options): HttpRequest { + public static callWithParameters(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -161,7 +176,7 @@ export class ParametersServiceRequests { }); } - public callWithWeirdParameterNames(options: Options): HttpRequest { + public static callWithWeirdParameterNames(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -170,7 +185,7 @@ export class ParametersServiceRequests { }); } - public getCallWithOptionalParam(options: Options): HttpRequest { + public static getCallWithOptionalParam(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -179,7 +194,7 @@ export class ParametersServiceRequests { }); } - public postCallWithOptionalParam(options: Options): HttpRequest { + public static postCallWithOptionalParam(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -189,9 +204,8 @@ export class ParametersServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class DescriptionsServiceRequests { - public callWithDescriptions(options?: Options): HttpRequest { +export class Descriptions { + public static callWithDescriptions(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -201,12 +215,11 @@ export class DescriptionsServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class DeprecatedServiceRequests { +export class Deprecated { /** * @deprecated */ - public deprecatedCall(options: Options): HttpRequest { + public static deprecatedCall(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -216,9 +229,8 @@ export class DeprecatedServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class RequestBodyServiceRequests { - public postApiVbyApiVersionRequestBody(options?: Options): HttpRequest { +export class RequestBodyRequests { + public static post(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -228,9 +240,20 @@ export class RequestBodyServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class FormDataServiceRequests { - public postApiVbyApiVersionFormData(options?: Options): HttpRequest { +export class VApiVersionRequests2 { + static requestBodyRequests = RequestBodyRequests; +} + +export class ApiRequests3 { + static vApiVersionRequests = VApiVersionRequests2; +} + +export class RequestBody { + static apiRequests = ApiRequests3; +} + +export class FormDataRequests { + public static post(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -240,9 +263,20 @@ export class FormDataServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class DefaultsServiceRequests { - public callWithDefaultParameters(options?: Options): HttpRequest { +export class VApiVersionRequests3 { + static formDataRequests = FormDataRequests; +} + +export class ApiRequests4 { + static vApiVersionRequests = VApiVersionRequests3; +} + +export class FormData { + static apiRequests = ApiRequests4; +} + +export class Defaults { + public static callWithDefaultParameters(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -251,7 +285,7 @@ export class DefaultsServiceRequests { }); } - public callWithDefaultOptionalParameters(options?: Options): HttpRequest { + public static callWithDefaultOptionalParameters(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -260,7 +294,7 @@ export class DefaultsServiceRequests { }); } - public callToTestOrderOfParams(options: Options): HttpRequest { + public static callToTestOrderOfParams(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -270,9 +304,8 @@ export class DefaultsServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class DuplicateServiceRequests { - public duplicateName(options?: Options): HttpRequest { +export class Duplicate { + public static duplicateName(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'DELETE', @@ -281,7 +314,7 @@ export class DuplicateServiceRequests { }); } - public duplicateName2(options?: Options): HttpRequest { + public static duplicateName2(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -290,7 +323,7 @@ export class DuplicateServiceRequests { }); } - public duplicateName3(options?: Options): HttpRequest { + public static duplicateName3(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -299,7 +332,7 @@ export class DuplicateServiceRequests { }); } - public duplicateName4(options?: Options): HttpRequest { + public static duplicateName4(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -309,9 +342,8 @@ export class DuplicateServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class NoContentServiceRequests { - public callWithNoContentResponse(options?: Options): HttpRequest { +export class NoContent { + public static callWithNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -320,7 +352,7 @@ export class NoContentServiceRequests { }); } - public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { + public static callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -330,9 +362,8 @@ export class NoContentServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class ResponseServiceRequests { - public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { +export class Response { + public static callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -341,7 +372,7 @@ export class ResponseServiceRequests { }); } - public callWithResponse(options?: Options): HttpRequest { + public static callWithResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -350,7 +381,7 @@ export class ResponseServiceRequests { }); } - public callWithDuplicateResponses(options?: Options): HttpRequest { + public static callWithDuplicateResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -359,7 +390,7 @@ export class ResponseServiceRequests { }); } - public callWithResponses(options?: Options): HttpRequest { + public static callWithResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -369,9 +400,8 @@ export class ResponseServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags1ServiceRequests { - public dummyA(options?: Options): HttpRequest { +export class MultipleTags1 { + public static dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -380,7 +410,7 @@ export class MultipleTags1ServiceRequests { }); } - public dummyB(options?: Options): HttpRequest { + public static dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -390,9 +420,8 @@ export class MultipleTags1ServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags2ServiceRequests { - public dummyA(options?: Options): HttpRequest { +export class MultipleTags2 { + public static dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -401,7 +430,7 @@ export class MultipleTags2ServiceRequests { }); } - public dummyB(options?: Options): HttpRequest { + public static dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -411,9 +440,8 @@ export class MultipleTags2ServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags3ServiceRequests { - public dummyB(options?: Options): HttpRequest { +export class MultipleTags3 { + public static dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -423,9 +451,8 @@ export class MultipleTags3ServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class CollectionFormatServiceRequests { - public collectionFormat(options: Options): HttpRequest { +export class CollectionFormat { + public static collectionFormat(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -435,9 +462,8 @@ export class CollectionFormatServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class TypesServiceRequests { - public types(options: Options): HttpRequest { +export class Types { + public static types(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -447,9 +473,8 @@ export class TypesServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class UploadServiceRequests { - public uploadFile(options: Options): HttpRequest { +export class Upload { + public static uploadFile(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -459,9 +484,8 @@ export class UploadServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class FileResponseServiceRequests { - public fileResponse(options: Options): HttpRequest { +export class FileResponse { + public static fileResponse(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -471,9 +495,8 @@ export class FileResponseServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class ComplexServiceRequests { - public complexTypes(options: Options): HttpRequest { +export class Complex { + public static complexTypes(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -482,7 +505,7 @@ export class ComplexServiceRequests { }); } - public complexParams(options: Options): HttpRequest { + public static complexParams(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -492,9 +515,8 @@ export class ComplexServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class MultipartServiceRequests { - public multipartResponse(options?: Options): HttpRequest { +export class Multipart { + public static multipartResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'GET', @@ -503,7 +525,7 @@ export class MultipartServiceRequests { }); } - public multipartRequest(options?: Options): HttpRequest { + public static multipartRequest(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -513,9 +535,8 @@ export class MultipartServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class HeaderServiceRequests { - public callWithResultFromHeader(options?: Options): HttpRequest { +export class Header { + public static callWithResultFromHeader(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -525,9 +546,8 @@ export class HeaderServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class ErrorServiceRequests { - public testErrorCode(options: Options): HttpRequest { +export class Error_ { + public static testErrorCode(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -537,9 +557,8 @@ export class ErrorServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class NonAsciiÆøåÆøÅöôêÊServiceRequests { - public nonAsciiæøåÆøÅöôêÊ字符串(options: Options): HttpRequest { +export class NonAsciiÆøåÆøÅöôêÊ { + public static nonAsciiæøåÆøÅöôêÊ字符串(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'POST', @@ -551,7 +570,7 @@ export class NonAsciiÆøåÆøÅöôêÊServiceRequests { /** * Login User */ - public putWithFormUrlEncoded(options: Options): HttpRequest { + public static putWithFormUrlEncoded(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ responseStyle: 'data', method: 'PUT', @@ -561,452 +580,470 @@ export class NonAsciiÆøåÆøÅöôêÊServiceRequests { } } -@Injectable({ providedIn: 'root' }) -export class DefaultServiceResources { - public export(options?: () => Options | undefined) { +export class No_tagResources { + public static patch(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultServiceRequests).export(opts) : undefined; + return opts ? Default.apiRequests.vApiVersionRequests['no+tagRequests'].patch(opts) : undefined; + }); + } +} + +export class SimpleOperationResources { + public static get(options: () => Options | undefined) { + return httpResource(() => { + const opts = options ? options() : undefined; + return opts ? Default.apiRequests.vApiVersionRequests.simpleOperationRequests.get(opts) : undefined; }); } +} + +export class VApiVersionResources { + static 'no+tagResources' = No_tagResources; - public patchApiVbyApiVersionNoTag(options?: () => Options | undefined) { + static simpleOperationResources = SimpleOperationResources; +} + +export class ApiResources { + static vApiVersionResources = VApiVersionResources; +} + +export class Default2 { + public static export(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultServiceRequests).patchApiVbyApiVersionNoTag(opts) : undefined; + return opts ? Default.export(opts) : undefined; }); } - public import(options: () => Options | undefined) { + public static import(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultServiceRequests).import(opts) : undefined; + return opts ? Default.import(opts) : undefined; }); } - public fooWow(options?: () => Options | undefined) { + public static 'foo+Wow'(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultServiceRequests).fooWow(opts) : undefined; + return opts ? Default['foo+Wow'](opts) : undefined; }); } - public getApiVbyApiVersionSimpleOperation(options: () => Options | undefined) { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? inject(DefaultServiceRequests).getApiVbyApiVersionSimpleOperation(opts) : undefined; - }); - } + static apiResources = ApiResources; } -export class ODataControllerServiceResources { - public apiVVersionODataControllerCount(options?: () => Options | undefined) { +export class ODataControllerResources { + public static $count(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).apiService.vVersionService.oDataControllerService.apiVVersionODataControllerCount(opts) : undefined; + return opts ? Simple.apiRequests.vVersionRequests.oDataControllerRequests.$count(opts) : undefined; }); } } -export class VVersionServiceResources { - oDataControllerService = new ODataControllerServiceResources(); +export class VVersionResources { + static oDataControllerResources = ODataControllerResources; } -export class ApiServiceResources { - vVersionService = new VVersionServiceResources(); +export class ApiResources2 { + static vVersionResources = VVersionResources; } -@Injectable({ providedIn: 'root' }) -export class SimpleServiceResources { - public deleteCallWithoutParametersAndResponse(options?: () => Options | undefined) { +export class Simple2 { + public static deleteCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).deleteCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.deleteCallWithoutParametersAndResponse(opts) : undefined; }); } - public getCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static getCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).getCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.getCallWithoutParametersAndResponse(opts) : undefined; }); } - public headCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static headCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).headCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.headCallWithoutParametersAndResponse(opts) : undefined; }); } - public optionsCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static optionsCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).optionsCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.optionsCallWithoutParametersAndResponse(opts) : undefined; }); } - public patchCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static patchCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).patchCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.patchCallWithoutParametersAndResponse(opts) : undefined; }); } - public postCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static postCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).postCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.postCallWithoutParametersAndResponse(opts) : undefined; }); } - public putCallWithoutParametersAndResponse(options?: () => Options | undefined) { + public static putCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(SimpleServiceRequests).putCallWithoutParametersAndResponse(opts) : undefined; + return opts ? Simple.putCallWithoutParametersAndResponse(opts) : undefined; }); } - apiService = new ApiServiceResources(); + + static apiResources = ApiResources2; } -@Injectable({ providedIn: 'root' }) -export class ParametersServiceResources { - public deleteFoo(options: () => Options | undefined) { +export class Parameters2 { + public static deleteFoo(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ParametersServiceRequests).deleteFoo(opts) : undefined; + return opts ? Parameters.deleteFoo(opts) : undefined; }); } - public callWithParameters(options: () => Options | undefined) { + public static callWithParameters(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ParametersServiceRequests).callWithParameters(opts) : undefined; + return opts ? Parameters.callWithParameters(opts) : undefined; }); } - public callWithWeirdParameterNames(options: () => Options | undefined) { + public static callWithWeirdParameterNames(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ParametersServiceRequests).callWithWeirdParameterNames(opts) : undefined; + return opts ? Parameters.callWithWeirdParameterNames(opts) : undefined; }); } - public getCallWithOptionalParam(options: () => Options | undefined) { + public static getCallWithOptionalParam(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ParametersServiceRequests).getCallWithOptionalParam(opts) : undefined; + return opts ? Parameters.getCallWithOptionalParam(opts) : undefined; }); } - public postCallWithOptionalParam(options: () => Options | undefined) { + public static postCallWithOptionalParam(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ParametersServiceRequests).postCallWithOptionalParam(opts) : undefined; + return opts ? Parameters.postCallWithOptionalParam(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class DescriptionsServiceResources { - public callWithDescriptions(options?: () => Options | undefined) { +export class Descriptions2 { + public static callWithDescriptions(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DescriptionsServiceRequests).callWithDescriptions(opts) : undefined; + return opts ? Descriptions.callWithDescriptions(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class DeprecatedServiceResources { +export class Deprecated2 { /** * @deprecated */ - public deprecatedCall(options: () => Options | undefined) { + public static deprecatedCall(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DeprecatedServiceRequests).deprecatedCall(opts) : undefined; + return opts ? Deprecated.deprecatedCall(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class RequestBodyServiceResources { - public postApiVbyApiVersionRequestBody(options?: () => Options | undefined) { +export class RequestBodyResources { + public static post(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(RequestBodyServiceRequests).postApiVbyApiVersionRequestBody(opts) : undefined; + return opts ? RequestBody.apiRequests.vApiVersionRequests.requestBodyRequests.post(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class FormDataServiceResources { - public postApiVbyApiVersionFormData(options?: () => Options | undefined) { +export class VApiVersionResources2 { + static requestBodyResources = RequestBodyResources; +} + +export class ApiResources3 { + static vApiVersionResources = VApiVersionResources2; +} + +export class RequestBody2 { + static apiResources = ApiResources3; +} + +export class FormDataResources { + public static post(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(FormDataServiceRequests).postApiVbyApiVersionFormData(opts) : undefined; + return opts ? FormData.apiRequests.vApiVersionRequests.formDataRequests.post(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class DefaultsServiceResources { - public callWithDefaultParameters(options?: () => Options | undefined) { +export class VApiVersionResources3 { + static formDataResources = FormDataResources; +} + +export class ApiResources4 { + static vApiVersionResources = VApiVersionResources3; +} + +export class FormData2 { + static apiResources = ApiResources4; +} + +export class Defaults2 { + public static callWithDefaultParameters(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultsServiceRequests).callWithDefaultParameters(opts) : undefined; + return opts ? Defaults.callWithDefaultParameters(opts) : undefined; }); } - public callWithDefaultOptionalParameters(options?: () => Options | undefined) { + public static callWithDefaultOptionalParameters(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultsServiceRequests).callWithDefaultOptionalParameters(opts) : undefined; + return opts ? Defaults.callWithDefaultOptionalParameters(opts) : undefined; }); } - public callToTestOrderOfParams(options: () => Options | undefined) { + public static callToTestOrderOfParams(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DefaultsServiceRequests).callToTestOrderOfParams(opts) : undefined; + return opts ? Defaults.callToTestOrderOfParams(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class DuplicateServiceResources { - public duplicateName(options?: () => Options | undefined) { +export class Duplicate2 { + public static duplicateName(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DuplicateServiceRequests).duplicateName(opts) : undefined; + return opts ? Duplicate.duplicateName(opts) : undefined; }); } - public duplicateName2(options?: () => Options | undefined) { + public static duplicateName2(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DuplicateServiceRequests).duplicateName2(opts) : undefined; + return opts ? Duplicate.duplicateName2(opts) : undefined; }); } - public duplicateName3(options?: () => Options | undefined) { + public static duplicateName3(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DuplicateServiceRequests).duplicateName3(opts) : undefined; + return opts ? Duplicate.duplicateName3(opts) : undefined; }); } - public duplicateName4(options?: () => Options | undefined) { + public static duplicateName4(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(DuplicateServiceRequests).duplicateName4(opts) : undefined; + return opts ? Duplicate.duplicateName4(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class NoContentServiceResources { - public callWithNoContentResponse(options?: () => Options | undefined) { +export class NoContent2 { + public static callWithNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(NoContentServiceRequests).callWithNoContentResponse(opts) : undefined; + return opts ? NoContent.callWithNoContentResponse(opts) : undefined; }); } - public callWithResponseAndNoContentResponse(options?: () => Options | undefined) { + public static callWithResponseAndNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; + return opts ? NoContent.callWithResponseAndNoContentResponse(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class ResponseServiceResources { - public callWithResponseAndNoContentResponse(options?: () => Options | undefined) { +export class Response2 { + public static callWithResponseAndNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; + return opts ? NoContent.callWithResponseAndNoContentResponse(opts) : undefined; }); } - public callWithResponse(options?: () => Options | undefined) { + public static callWithResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithResponse(opts) : undefined; + return opts ? Response.callWithResponse(opts) : undefined; }); } - public callWithDuplicateResponses(options?: () => Options | undefined) { + public static callWithDuplicateResponses(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithDuplicateResponses(opts) : undefined; + return opts ? Response.callWithDuplicateResponses(opts) : undefined; }); } - public callWithResponses(options?: () => Options | undefined) { + public static callWithResponses(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ResponseServiceRequests).callWithResponses(opts) : undefined; + return opts ? Response.callWithResponses(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags1ServiceResources { - public dummyA(options?: () => Options | undefined) { +export class MultipleTags12 { + public static dummyA(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; + return opts ? MultipleTags1.dummyA(opts) : undefined; }); } - public dummyB(options?: () => Options | undefined) { + public static dummyB(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; + return opts ? MultipleTags1.dummyB(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags2ServiceResources { - public dummyA(options?: () => Options | undefined) { +export class MultipleTags22 { + public static dummyA(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; + return opts ? MultipleTags1.dummyA(opts) : undefined; }); } - public dummyB(options?: () => Options | undefined) { + public static dummyB(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; + return opts ? MultipleTags1.dummyB(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class MultipleTags3ServiceResources { - public dummyB(options?: () => Options | undefined) { +export class MultipleTags32 { + public static dummyB(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; + return opts ? MultipleTags1.dummyB(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class CollectionFormatServiceResources { - public collectionFormat(options: () => Options | undefined) { +export class CollectionFormat2 { + public static collectionFormat(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(CollectionFormatServiceRequests).collectionFormat(opts) : undefined; + return opts ? CollectionFormat.collectionFormat(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class TypesServiceResources { - public types(options: () => Options | undefined) { +export class Types2 { + public static types(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(TypesServiceRequests).types(opts) : undefined; + return opts ? Types.types(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class UploadServiceResources { - public uploadFile(options: () => Options | undefined) { +export class Upload2 { + public static uploadFile(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(UploadServiceRequests).uploadFile(opts) : undefined; + return opts ? Upload.uploadFile(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class FileResponseServiceResources { - public fileResponse(options: () => Options | undefined) { +export class FileResponse2 { + public static fileResponse(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(FileResponseServiceRequests).fileResponse(opts) : undefined; + return opts ? FileResponse.fileResponse(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class ComplexServiceResources { - public complexTypes(options: () => Options | undefined) { +export class Complex2 { + public static complexTypes(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ComplexServiceRequests).complexTypes(opts) : undefined; + return opts ? Complex.complexTypes(opts) : undefined; }); } - public complexParams(options: () => Options | undefined) { + public static complexParams(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ComplexServiceRequests).complexParams(opts) : undefined; + return opts ? Complex.complexParams(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class MultipartServiceResources { - public multipartResponse(options?: () => Options | undefined) { +export class Multipart2 { + public static multipartResponse(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipartServiceRequests).multipartResponse(opts) : undefined; + return opts ? Multipart.multipartResponse(opts) : undefined; }); } - public multipartRequest(options?: () => Options | undefined) { + public static multipartRequest(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(MultipartServiceRequests).multipartRequest(opts) : undefined; + return opts ? Multipart.multipartRequest(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class HeaderServiceResources { - public callWithResultFromHeader(options?: () => Options | undefined) { +export class Header2 { + public static callWithResultFromHeader(options?: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(HeaderServiceRequests).callWithResultFromHeader(opts) : undefined; + return opts ? Header.callWithResultFromHeader(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class ErrorServiceResources { - public testErrorCode(options: () => Options | undefined) { +export class Error2 { + public static testErrorCode(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(ErrorServiceRequests).testErrorCode(opts) : undefined; + return opts ? Error_.testErrorCode(opts) : undefined; }); } } -@Injectable({ providedIn: 'root' }) -export class NonAsciiÆøåÆøÅöôêÊServiceResources { - public nonAsciiæøåÆøÅöôêÊ字符串(options: () => Options | undefined) { +export class NonAsciiÆøåÆøÅöôêÊ2 { + public static nonAsciiæøåÆøÅöôêÊ字符串(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined; + return opts ? NonAsciiÆøåÆøÅöôêÊ.nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined; }); } /** * Login User */ - public putWithFormUrlEncoded(options: () => Options | undefined) { + public static putWithFormUrlEncoded(options: () => Options | undefined) { return httpResource(() => { const opts = options ? options() : undefined; - return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).putWithFormUrlEncoded(opts) : undefined; + return opts ? NonAsciiÆøåÆøÅöôêÊ.putWithFormUrlEncoded(opts) : undefined; }); } } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/index.ts index 62e4bbff0..ae3813b44 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from './sdk.gen'; +export { apiVApiVersionFormDataPost, apiVApiVersionNo_tagPatch, apiVApiVersionRequestBodyPost, apiVApiVersionSimpleOperationGet, apiVVersionODataController__count, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, foo_Wow, getCallWithOptionalParam, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from './sdk.gen'; export type { _3eNum1Период, _400, AdditionalPropertiesIntegerIssue, AdditionalPropertiesUnknownIssue, AdditionalPropertiesUnknownIssue2, AdditionalPropertiesUnknownIssue3, AdditionalPropertiesUnknownIssueWritable, AnyOfAnyAndNull, AnyOfArrays, ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, ArrayWithAnyOfProperties, ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CamelCaseCommentWithBreaks, CharactersInDescription, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, CompositionBaseModel, CompositionExtendedModel, CompositionWithAllOfAndNullable, CompositionWithAnyOf, CompositionWithAnyOfAndNullable, CompositionWithAnyOfAnonymous, CompositionWithNestedAnyAndTypeNull, CompositionWithNestedAnyOfAndNull, CompositionWithOneOf, CompositionWithOneOfAndComplexArrayDictionary, CompositionWithOneOfAndNullable, CompositionWithOneOfAndProperties, CompositionWithOneOfAndSimpleArrayDictionary, CompositionWithOneOfAndSimpleDictionary, CompositionWithOneOfAnonymous, CompositionWithOneOfDiscriminator, ConstValue, Default, DeleteCallWithoutParametersAndResponseData, DeleteFooData, DeleteFooData2, DeleteFooData3, DeprecatedCallData, DeprecatedModel, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithPropertiesAndAdditionalProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithReplacedCharacters, EnumWithStrings, EnumWithXEnumNames, ExportData, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, File, FileResponseData, FileResponseResponse, FileResponseResponses, FileWritable, FooWowData, FooWowResponses, FreeFormObjectWithAdditionalPropertiesEqEmptyObject, FreeFormObjectWithAdditionalPropertiesEqTrue, FreeFormObjectWithoutAdditionalProperties, GenericSchemaDuplicateIssue1SystemBoolean, GenericSchemaDuplicateIssue1SystemBooleanWritable, GenericSchemaDuplicateIssue1SystemString, GenericSchemaDuplicateIssue1SystemStringWritable, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, Import, ImportData, ImportResponse, ImportResponses, IoK8sApimachineryPkgApisMetaV1DeleteOptions, IoK8sApimachineryPkgApisMetaV1Preconditions, ModelCircle, ModelFromZendesk, ModelSquare, ModelThatExtends, ModelThatExtendsExtends, ModelWithAdditionalPropertiesEqTrue, ModelWithAnyOfConstantSizeArray, ModelWithAnyOfConstantSizeArrayAndIntersect, ModelWithAnyOfConstantSizeArrayNullable, ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions, ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable, ModelWithArray, ModelWithArrayReadOnlyAndWriteOnly, ModelWithArrayReadOnlyAndWriteOnlyWritable, ModelWithBackticksInDescription, ModelWithBoolean, ModelWithCircularReference, ModelWithConst, ModelWithConstantSizeArray, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithEnumWithHyphen, ModelWithInteger, ModelWithNestedArrayEnums, ModelWithNestedArrayEnumsData, ModelWithNestedArrayEnumsDataBar, ModelWithNestedArrayEnumsDataFoo, ModelWithNestedCompositionEnums, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableObject, ModelWithNullableString, ModelWithNumericEnumUnion, ModelWithOneOfAndProperties, ModelWithOneOfEnum, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithPrefixItemsConstantSizeArray, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReadOnlyAndWriteOnly, ModelWithReadOnlyAndWriteOnlyWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NestedAnyOfArraysNullable, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, NullableObject, OneOfAllOfIssue, OneOfAllOfIssueWritable, OptionsCallWithoutParametersAndResponseData, Pageable, ParameterSimpleParameterUnused, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PostServiceWithEmptyTagResponse, PostServiceWithEmptyTagResponse2, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, SchemaWithFormRestrictedKeys, SimpleBoolean, SimpleFile, SimpleFormData, SimpleInteger, SimpleParameter, SimpleReference, SimpleRequestBody, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses, XFooBar } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/sdk.gen.ts index e48dcff8c..277bf8ef3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/sdk.gen.ts @@ -20,7 +20,7 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); export const import_ = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', @@ -31,11 +31,11 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataController__count = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const apiVApiVersionSimpleOperationGet = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const apiVApiVersionRequestBodyPost = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const apiVApiVersionFormDataPost = (options?: Options) => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/index.ts index 62e4bbff0..ae3813b44 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from './sdk.gen'; +export { apiVApiVersionFormDataPost, apiVApiVersionNo_tagPatch, apiVApiVersionRequestBodyPost, apiVApiVersionSimpleOperationGet, apiVVersionODataController__count, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, foo_Wow, getCallWithOptionalParam, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from './sdk.gen'; export type { _3eNum1Период, _400, AdditionalPropertiesIntegerIssue, AdditionalPropertiesUnknownIssue, AdditionalPropertiesUnknownIssue2, AdditionalPropertiesUnknownIssue3, AdditionalPropertiesUnknownIssueWritable, AnyOfAnyAndNull, AnyOfArrays, ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, ArrayWithAnyOfProperties, ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CamelCaseCommentWithBreaks, CharactersInDescription, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, CompositionBaseModel, CompositionExtendedModel, CompositionWithAllOfAndNullable, CompositionWithAnyOf, CompositionWithAnyOfAndNullable, CompositionWithAnyOfAnonymous, CompositionWithNestedAnyAndTypeNull, CompositionWithNestedAnyOfAndNull, CompositionWithOneOf, CompositionWithOneOfAndComplexArrayDictionary, CompositionWithOneOfAndNullable, CompositionWithOneOfAndProperties, CompositionWithOneOfAndSimpleArrayDictionary, CompositionWithOneOfAndSimpleDictionary, CompositionWithOneOfAnonymous, CompositionWithOneOfDiscriminator, ConstValue, Default, DeleteCallWithoutParametersAndResponseData, DeleteFooData, DeleteFooData2, DeleteFooData3, DeprecatedCallData, DeprecatedModel, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithPropertiesAndAdditionalProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithReplacedCharacters, EnumWithStrings, EnumWithXEnumNames, ExportData, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, File, FileResponseData, FileResponseResponse, FileResponseResponses, FileWritable, FooWowData, FooWowResponses, FreeFormObjectWithAdditionalPropertiesEqEmptyObject, FreeFormObjectWithAdditionalPropertiesEqTrue, FreeFormObjectWithoutAdditionalProperties, GenericSchemaDuplicateIssue1SystemBoolean, GenericSchemaDuplicateIssue1SystemBooleanWritable, GenericSchemaDuplicateIssue1SystemString, GenericSchemaDuplicateIssue1SystemStringWritable, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, Import, ImportData, ImportResponse, ImportResponses, IoK8sApimachineryPkgApisMetaV1DeleteOptions, IoK8sApimachineryPkgApisMetaV1Preconditions, ModelCircle, ModelFromZendesk, ModelSquare, ModelThatExtends, ModelThatExtendsExtends, ModelWithAdditionalPropertiesEqTrue, ModelWithAnyOfConstantSizeArray, ModelWithAnyOfConstantSizeArrayAndIntersect, ModelWithAnyOfConstantSizeArrayNullable, ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions, ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable, ModelWithArray, ModelWithArrayReadOnlyAndWriteOnly, ModelWithArrayReadOnlyAndWriteOnlyWritable, ModelWithBackticksInDescription, ModelWithBoolean, ModelWithCircularReference, ModelWithConst, ModelWithConstantSizeArray, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithEnumWithHyphen, ModelWithInteger, ModelWithNestedArrayEnums, ModelWithNestedArrayEnumsData, ModelWithNestedArrayEnumsDataBar, ModelWithNestedArrayEnumsDataFoo, ModelWithNestedCompositionEnums, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableObject, ModelWithNullableString, ModelWithNumericEnumUnion, ModelWithOneOfAndProperties, ModelWithOneOfEnum, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithPrefixItemsConstantSizeArray, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReadOnlyAndWriteOnly, ModelWithReadOnlyAndWriteOnlyWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NestedAnyOfArraysNullable, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, NullableObject, OneOfAllOfIssue, OneOfAllOfIssueWritable, OptionsCallWithoutParametersAndResponseData, Pageable, ParameterSimpleParameterUnused, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PostServiceWithEmptyTagResponse, PostServiceWithEmptyTagResponse2, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, SchemaWithFormRestrictedKeys, SimpleBoolean, SimpleFile, SimpleFormData, SimpleInteger, SimpleParameter, SimpleReference, SimpleRequestBody, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses, XFooBar } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/sdk.gen.ts index e48dcff8c..277bf8ef3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/sdk.gen.ts @@ -20,7 +20,7 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); export const import_ = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', @@ -31,11 +31,11 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataController__count = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const apiVApiVersionSimpleOperationGet = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const apiVApiVersionRequestBodyPost = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const apiVApiVersionFormDataPost = (options?: Options) => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts index fafb8ed66..a1beb0a63 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts @@ -54,6 +54,10 @@ export class Domains extends HeyApiClient { public post(options?: Options) { return (options?.client ?? this.client).post({ url: '/business/providers/domains', ...options }); } + + public put(options?: Options) { + return (options?.client ?? this.client).put({ url: '/business/providers/domains', ...options }); + } } export class Providers extends HeyApiClient { @@ -85,10 +89,6 @@ export class NestedSdkWithInstance extends HeyApiClient { NestedSdkWithInstance.__registry.set(this, args?.key); } - public putBusinessProvidersDomains(options?: Options) { - return (options?.client ?? this.client).put({ url: '/business/providers/domains', ...options }); - } - public get(options?: Options) { return (options?.client ?? this.client).get({ url: '/locations', ...options }); } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts index babd05bc9..505a12a57 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts @@ -74,6 +74,10 @@ export class Domains3 { public static post(options?: Options) { return (options?.client ?? client).post({ url: '/business/providers/domains', ...options }); } + + public static put(options?: Options) { + return (options?.client ?? client).put({ url: '/business/providers/domains', ...options }); + } } export class Providers4 { @@ -85,10 +89,6 @@ export class Business4 { } export class Domains4 { - public static putBusinessProvidersDomains(options?: Options) { - return (options?.client ?? client).put({ url: '/business/providers/domains', ...options }); - } - static business = Business4; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/index.ts index 62e4bbff0..ae3813b44 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from './sdk.gen'; +export { apiVApiVersionFormDataPost, apiVApiVersionNo_tagPatch, apiVApiVersionRequestBodyPost, apiVApiVersionSimpleOperationGet, apiVVersionODataController__count, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, foo_Wow, getCallWithOptionalParam, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from './sdk.gen'; export type { _3eNum1Период, _400, AdditionalPropertiesIntegerIssue, AdditionalPropertiesUnknownIssue, AdditionalPropertiesUnknownIssue2, AdditionalPropertiesUnknownIssue3, AdditionalPropertiesUnknownIssueWritable, AnyOfAnyAndNull, AnyOfArrays, ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, ArrayWithAnyOfProperties, ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CamelCaseCommentWithBreaks, CharactersInDescription, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, CompositionBaseModel, CompositionExtendedModel, CompositionWithAllOfAndNullable, CompositionWithAnyOf, CompositionWithAnyOfAndNullable, CompositionWithAnyOfAnonymous, CompositionWithNestedAnyAndTypeNull, CompositionWithNestedAnyOfAndNull, CompositionWithOneOf, CompositionWithOneOfAndComplexArrayDictionary, CompositionWithOneOfAndNullable, CompositionWithOneOfAndProperties, CompositionWithOneOfAndSimpleArrayDictionary, CompositionWithOneOfAndSimpleDictionary, CompositionWithOneOfAnonymous, CompositionWithOneOfDiscriminator, ConstValue, Default, DeleteCallWithoutParametersAndResponseData, DeleteFooData, DeleteFooData2, DeleteFooData3, DeprecatedCallData, DeprecatedModel, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithPropertiesAndAdditionalProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithReplacedCharacters, EnumWithStrings, EnumWithXEnumNames, ExportData, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, File, FileResponseData, FileResponseResponse, FileResponseResponses, FileWritable, FooWowData, FooWowResponses, FreeFormObjectWithAdditionalPropertiesEqEmptyObject, FreeFormObjectWithAdditionalPropertiesEqTrue, FreeFormObjectWithoutAdditionalProperties, GenericSchemaDuplicateIssue1SystemBoolean, GenericSchemaDuplicateIssue1SystemBooleanWritable, GenericSchemaDuplicateIssue1SystemString, GenericSchemaDuplicateIssue1SystemStringWritable, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, Import, ImportData, ImportResponse, ImportResponses, IoK8sApimachineryPkgApisMetaV1DeleteOptions, IoK8sApimachineryPkgApisMetaV1Preconditions, ModelCircle, ModelFromZendesk, ModelSquare, ModelThatExtends, ModelThatExtendsExtends, ModelWithAdditionalPropertiesEqTrue, ModelWithAnyOfConstantSizeArray, ModelWithAnyOfConstantSizeArrayAndIntersect, ModelWithAnyOfConstantSizeArrayNullable, ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions, ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable, ModelWithArray, ModelWithArrayReadOnlyAndWriteOnly, ModelWithArrayReadOnlyAndWriteOnlyWritable, ModelWithBackticksInDescription, ModelWithBoolean, ModelWithCircularReference, ModelWithConst, ModelWithConstantSizeArray, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithEnumWithHyphen, ModelWithInteger, ModelWithNestedArrayEnums, ModelWithNestedArrayEnumsData, ModelWithNestedArrayEnumsDataBar, ModelWithNestedArrayEnumsDataFoo, ModelWithNestedCompositionEnums, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableObject, ModelWithNullableString, ModelWithNumericEnumUnion, ModelWithOneOfAndProperties, ModelWithOneOfEnum, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithPrefixItemsConstantSizeArray, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReadOnlyAndWriteOnly, ModelWithReadOnlyAndWriteOnlyWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NestedAnyOfArraysNullable, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, NullableObject, OneOfAllOfIssue, OneOfAllOfIssueWritable, OptionsCallWithoutParametersAndResponseData, Pageable, ParameterSimpleParameterUnused, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PostServiceWithEmptyTagResponse, PostServiceWithEmptyTagResponse2, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, SchemaWithFormRestrictedKeys, SimpleBoolean, SimpleFile, SimpleFormData, SimpleInteger, SimpleParameter, SimpleReference, SimpleRequestBody, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses, XFooBar } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts index e48dcff8c..277bf8ef3 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/sdk.gen.ts @@ -20,7 +20,7 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); export const import_ = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', @@ -31,11 +31,11 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataController__count = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const apiVApiVersionSimpleOperationGet = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = ( } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const apiVApiVersionRequestBodyPost = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const apiVApiVersionFormDataPost = (options?: Options) => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts index af464f9b9..060d7ded1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts @@ -47,6 +47,10 @@ class HeyApiRegistry { } export class Bar extends HeyApiClient { + public get(options?: Options) { + return (options?.client ?? this.client).get({ url: '/foo/bar', ...options }); + } + public post(options?: Options) { return (options?.client ?? this.client).post({ url: '/foo/bar', ...options }); } @@ -57,6 +61,10 @@ export class Bar extends HeyApiClient { } export class Foo extends HeyApiClient { + public get(options?: Options) { + return (options?.client ?? this.client).get({ url: '/foo', ...options }); + } + public post(options?: Options) { return (options?.client ?? this.client).post({ url: '/foo', ...options }); } @@ -82,14 +90,6 @@ export class Sdk extends HeyApiClient { Sdk.__registry.set(this, args?.key); } - public getFoo(options?: Options) { - return (options?.client ?? this.client).get({ url: '/foo', ...options }); - } - - public getFooBar(options?: Options) { - return (options?.client ?? this.client).get({ url: '/foo/bar', ...options }); - } - private _foo?: Foo; get foo(): Foo { return this._foo ??= new Foo({ client: this.client }); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/index.ts index 62e4bbff0..ae3813b44 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from './sdk.gen'; +export { apiVApiVersionFormDataPost, apiVApiVersionNo_tagPatch, apiVApiVersionRequestBodyPost, apiVApiVersionSimpleOperationGet, apiVVersionODataController__count, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, foo_Wow, getCallWithOptionalParam, getCallWithoutParametersAndResponse, headCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, optionsCallWithoutParametersAndResponse, patchCallWithoutParametersAndResponse, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from './sdk.gen'; export type { _3eNum1Период, _400, AdditionalPropertiesIntegerIssue, AdditionalPropertiesUnknownIssue, AdditionalPropertiesUnknownIssue2, AdditionalPropertiesUnknownIssue3, AdditionalPropertiesUnknownIssueWritable, AnyOfAnyAndNull, AnyOfArrays, ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, ApiVVersionODataControllerCountResponses, ArrayWithAnyOfProperties, ArrayWithArray, ArrayWithBooleans, ArrayWithNumbers, ArrayWithProperties, ArrayWithReferences, ArrayWithStrings, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponse, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesError, CallWithResponsesErrors, CallWithResponsesResponse, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CamelCaseCommentWithBreaks, CharactersInDescription, ClientOptions, CollectionFormatData, CommentWithBackticks, CommentWithBackticksAndQuotes, CommentWithBreaks, CommentWithExpressionPlaceholders, CommentWithQuotes, CommentWithReservedCharacters, CommentWithSlashes, ComplexParamsData, ComplexParamsResponse, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponse, ComplexTypesResponses, CompositionBaseModel, CompositionExtendedModel, CompositionWithAllOfAndNullable, CompositionWithAnyOf, CompositionWithAnyOfAndNullable, CompositionWithAnyOfAnonymous, CompositionWithNestedAnyAndTypeNull, CompositionWithNestedAnyOfAndNull, CompositionWithOneOf, CompositionWithOneOfAndComplexArrayDictionary, CompositionWithOneOfAndNullable, CompositionWithOneOfAndProperties, CompositionWithOneOfAndSimpleArrayDictionary, CompositionWithOneOfAndSimpleDictionary, CompositionWithOneOfAnonymous, CompositionWithOneOfDiscriminator, ConstValue, Default, DeleteCallWithoutParametersAndResponseData, DeleteFooData, DeleteFooData2, DeleteFooData3, DeprecatedCallData, DeprecatedModel, DictionaryWithArray, DictionaryWithDictionary, DictionaryWithProperties, DictionaryWithPropertiesAndAdditionalProperties, DictionaryWithReference, DictionaryWithString, DummyAData, DummyAResponse, DummyAResponses, DummyBData, DummyBResponse, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, EnumFromDescription, EnumWithExtensions, EnumWithNumbers, EnumWithReplacedCharacters, EnumWithStrings, EnumWithXEnumNames, ExportData, ExternalRefA, ExternalRefB, ExternalSharedExternalSharedModel, File, FileResponseData, FileResponseResponse, FileResponseResponses, FileWritable, FooWowData, FooWowResponses, FreeFormObjectWithAdditionalPropertiesEqEmptyObject, FreeFormObjectWithAdditionalPropertiesEqTrue, FreeFormObjectWithoutAdditionalProperties, GenericSchemaDuplicateIssue1SystemBoolean, GenericSchemaDuplicateIssue1SystemBooleanWritable, GenericSchemaDuplicateIssue1SystemString, GenericSchemaDuplicateIssue1SystemStringWritable, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, Import, ImportData, ImportResponse, ImportResponses, IoK8sApimachineryPkgApisMetaV1DeleteOptions, IoK8sApimachineryPkgApisMetaV1Preconditions, ModelCircle, ModelFromZendesk, ModelSquare, ModelThatExtends, ModelThatExtendsExtends, ModelWithAdditionalPropertiesEqTrue, ModelWithAnyOfConstantSizeArray, ModelWithAnyOfConstantSizeArrayAndIntersect, ModelWithAnyOfConstantSizeArrayNullable, ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions, ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable, ModelWithArray, ModelWithArrayReadOnlyAndWriteOnly, ModelWithArrayReadOnlyAndWriteOnlyWritable, ModelWithBackticksInDescription, ModelWithBoolean, ModelWithCircularReference, ModelWithConst, ModelWithConstantSizeArray, ModelWithDictionary, ModelWithDuplicateImports, ModelWithDuplicateProperties, ModelWithEnum, ModelWithEnumFromDescription, ModelWithEnumWithHyphen, ModelWithInteger, ModelWithNestedArrayEnums, ModelWithNestedArrayEnumsData, ModelWithNestedArrayEnumsDataBar, ModelWithNestedArrayEnumsDataFoo, ModelWithNestedCompositionEnums, ModelWithNestedEnums, ModelWithNestedProperties, ModelWithNullableObject, ModelWithNullableString, ModelWithNumericEnumUnion, ModelWithOneOfAndProperties, ModelWithOneOfEnum, ModelWithOrderedProperties, ModelWithPattern, ModelWithPatternWritable, ModelWithPrefixItemsConstantSizeArray, ModelWithProperties, ModelWithPropertiesWritable, ModelWithReadOnlyAndWriteOnly, ModelWithReadOnlyAndWriteOnlyWritable, ModelWithReference, ModelWithReferenceWritable, ModelWithString, ModelWithStringError, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, MultipartResponseResponses, NestedAnyOfArraysNullable, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, NonAsciiæøåÆøÅöôêÊ字符串Responses, NonAsciiStringæøåÆøÅöôêÊ字符串, NullableObject, OneOfAllOfIssue, OneOfAllOfIssueWritable, OptionsCallWithoutParametersAndResponseData, Pageable, ParameterSimpleParameterUnused, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PostServiceWithEmptyTagResponse, PostServiceWithEmptyTagResponse2, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, SchemaWithFormRestrictedKeys, SimpleBoolean, SimpleFile, SimpleFormData, SimpleInteger, SimpleParameter, SimpleReference, SimpleRequestBody, SimpleString, SimpleStringWithPattern, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponse, TypesResponses, UploadFileData, UploadFileResponse, UploadFileResponses, XFooBar } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts index 8d362960f..a805c6bc1 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/sdk.gen.ts @@ -20,7 +20,7 @@ export type Options(options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/no+tag', ...options }); -export const patchApiVbyApiVersionNoTag = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); +export const apiVApiVersionNo_tagPatch = (options?: Options) => (options?.client ?? client).patch({ url: '/api/v{api-version}/no+tag', ...options }); export const import_ = (options: Options) => (options.client ?? client).post({ url: '/api/v{api-version}/no+tag', @@ -31,11 +31,11 @@ export const import_ = (options: Options(options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); +export const foo_Wow = (options?: Options) => (options?.client ?? client).put({ url: '/api/v{api-version}/no+tag', ...options }); -export const apiVVersionODataControllerCount = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); +export const apiVVersionODataController__count = (options?: Options) => (options?.client ?? client).get({ url: '/api/v{api-version}/simple/$count', ...options }); -export const getApiVbyApiVersionSimpleOperation = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); +export const apiVApiVersionSimpleOperationGet = (options: Options) => (options.client ?? client).get({ url: '/api/v{api-version}/simple:operation', ...options }); export const deleteCallWithoutParametersAndResponse = (options?: Options) => (options?.client ?? client).delete({ url: '/api/v{api-version}/simple', ...options }); @@ -96,7 +96,7 @@ export const postCallWithOptionalParam = (o } }); -export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const apiVApiVersionRequestBodyPost = (options?: Options) => (options?.client ?? client).post({ url: '/api/v{api-version}/requestBody', ...options, headers: { @@ -105,7 +105,7 @@ export const postApiVbyApiVersionRequestBody = (options?: Options) => (options?.client ?? client).post({ +export const apiVApiVersionFormDataPost = (options?: Options) => (options?.client ?? client).post({ ...formDataBodySerializer, url: '/api/v{api-version}/formData', ...options, diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/index.ts index 8dc6d0499..61e4b126b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, postFoo } from './sdk.gen'; +export { fooPost, type Options } from './sdk.gen'; export type { Bar, ClientOptions, Foo, PostFooData, PostFooResponse, PostFooResponses, TypeID, UserId } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/sdk.gen.ts index b443e6ac2..8d5af124b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/sdk.gen.ts @@ -22,7 +22,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const fooPost = (options?: Options) => (options?.client ?? client).post({ requestValidator: async (data) => await v.parseAsync(vPostFooData, data), responseTransformer: postFooResponseTransformer, responseValidator: async (data) => await v.parseAsync(vPostFooResponse, data), diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/index.ts index 8dc6d0499..61e4b126b 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/index.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/index.ts @@ -1,4 +1,4 @@ // This file is auto-generated by @hey-api/openapi-ts -export { type Options, postFoo } from './sdk.gen'; +export { fooPost, type Options } from './sdk.gen'; export type { Bar, ClientOptions, Foo, PostFooData, PostFooResponse, PostFooResponses, TypeID, UserId } from './types.gen'; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/sdk.gen.ts index db455df67..56a6a3fd7 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/sdk.gen.ts @@ -20,7 +20,7 @@ export type Options; }; -export const postFoo = (options?: Options) => (options?.client ?? client).post({ +export const fooPost = (options?: Options) => (options?.client ?? client).post({ requestValidator: async (data) => await zPostFooData.parseAsync(data), responseTransformer: postFooResponseTransformer, responseValidator: async (data) => await zPostFooResponse.parseAsync(data), diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts index 3aeed5221..84f186999 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts @@ -47,7 +47,7 @@ export const getFooQueryKey = (options?: Options) => createQueryKey( export const getFooQuery = defineQueryOptions((options?: Options) => ({ key: getFooQueryKey(options), query: async (context) => { - const { data } = await FooBazService.getFoo({ + const { data } = await FooBazService.fooService.get({ ...options, ...context, throwOnError: true @@ -83,7 +83,7 @@ export const getFooBarQueryKey = (options?: Options) => createQue export const getFooBarQuery = defineQueryOptions((options?: Options) => ({ key: getFooBarQueryKey(options), query: async (context) => { - const { data } = await BarBazService.getFooBar({ + const { data } = await BarBazService.fooService.barService.get({ ...options, ...context, throwOnError: true diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts index 81b7e79ea..951c71fca 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts @@ -29,6 +29,10 @@ export class BarService { } export class FooService { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo', ...options }); } @@ -41,14 +45,14 @@ export class FooService { } export class FooBazService { - public static getFoo(options?: Options) { - return (options?.client ?? client).get({ url: '/foo', ...options }); - } - static fooService = FooService; } export class BarService2 { + public static get(options?: Options) { + return (options?.client ?? client).get({ url: '/foo/bar', ...options }); + } + public static post(options?: Options) { return (options?.client ?? client).post({ url: '/foo/bar', ...options }); } @@ -63,9 +67,5 @@ export class FooService2 { } export class BarBazService { - public static getFooBar(options?: Options) { - return (options?.client ?? client).get({ url: '/foo/bar', ...options }); - } - static fooService = FooService2; } diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts index 81651e8f9..6eba11388 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts @@ -4,7 +4,7 @@ import { type _JSONValue, defineQueryOptions, type UseMutationOptions } from '@p import { serializeQueryKeyValue } from '../client'; import { client } from '../client.gen'; -import { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from '../sdk.gen'; +import { apiVApiVersionFormDataPost, apiVApiVersionNo_tagPatch, apiVApiVersionRequestBodyPost, apiVApiVersionSimpleOperationGet, apiVVersionODataController__count, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, foo_Wow, getCallWithOptionalParam, getCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchCallWithoutParametersAndResponse, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from '../sdk.gen'; import type { ApiVVersionODataControllerCountData, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, UploadFileData, UploadFileResponse } from '../types.gen'; export type QueryKey = [ @@ -58,7 +58,7 @@ export const exportQuery = defineQueryOptions((options?: Options) => export const patchApiVbyApiVersionNoTagMutation = (options?: Partial>): UseMutationOptions, Error> => ({ mutation: async (vars) => { - const { data } = await patchApiVbyApiVersionNoTag({ + const { data } = await apiVApiVersionNo_tagPatch({ ...options, ...vars, throwOnError: true @@ -80,7 +80,7 @@ export const importMutation = (options?: Partial>): UseMutat export const fooWowMutation = (options?: Partial>): UseMutationOptions, Error> => ({ mutation: async (vars) => { - const { data } = await fooWow({ + const { data } = await foo_Wow({ ...options, ...vars, throwOnError: true @@ -94,7 +94,7 @@ export const apiVVersionODataControllerCountQueryKey = (options?: Options) => ({ key: apiVVersionODataControllerCountQueryKey(options), query: async (context) => { - const { data } = await apiVVersionODataControllerCount({ + const { data } = await apiVVersionODataController__count({ ...options, ...context, throwOnError: true @@ -108,7 +108,7 @@ export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options) => ({ key: getApiVbyApiVersionSimpleOperationQueryKey(options), query: async (context) => { - const { data } = await getApiVbyApiVersionSimpleOperation({ + const { data } = await apiVApiVersionSimpleOperationGet({ ...options, ...context, throwOnError: true @@ -260,7 +260,7 @@ export const postCallWithOptionalParamMutation = (options?: Partial>): UseMutationOptions, Error> => ({ mutation: async (vars) => { - const { data } = await postApiVbyApiVersionRequestBody({ + const { data } = await apiVApiVersionRequestBodyPost({ ...options, ...vars, throwOnError: true @@ -271,7 +271,7 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial