diff --git a/dev/openapi-ts.config.ts b/dev/openapi-ts.config.ts index 89688a853..893084527 100644 --- a/dev/openapi-ts.config.ts +++ b/dev/openapi-ts.config.ts @@ -33,32 +33,32 @@ export default defineConfig(() => { // openapi: '3.1.0', // paths: {}, // }, - path: path.resolve( - getSpecsPath(), - // '3.0.x', - '3.1.x', - // 'circular.yaml', - // 'dutchie.json', - // 'invalid', - 'full.yaml', - // 'object-property-names.yaml', - // 'openai.yaml', - // 'opencode.yaml', - // 'pagination-ref.yaml', - // 'sdk-instance.yaml', - // 'string-with-format.yaml', - // 'transformers.json', - // 'type-format.yaml', - // 'validators.yaml', - // 'validators-circular-ref.json', - // 'validators-circular-ref-2.yaml', - // 'zoom-video-sdk.json', - ), + // path: path.resolve( + // getSpecsPath(), + // // '3.0.x', + // '3.1.x', + // // 'circular.yaml', + // // 'dutchie.json', + // // 'invalid', + // 'full.yaml', + // // 'object-property-names.yaml', + // // 'openai.yaml', + // // 'opencode.yaml', + // // 'pagination-ref.yaml', + // // 'sdk-instance.yaml', + // // 'string-with-format.yaml', + // // 'transformers.json', + // // 'type-format.yaml', + // // 'validators.yaml', + // // 'validators-circular-ref.json', + // // 'validators-circular-ref-2.yaml', + // // 'zoom-video-sdk.json', + // ), // path: 'https://get.heyapi.dev/hey-api/backend?branch=main&version=1.0.0', // path: 'http://localhost:4000/', // path: 'http://localhost:8000/openapi.json', // path: 'https://mongodb-mms-prod-build-server.s3.amazonaws.com/openapi/2caffd88277a4e27c95dcefc7e3b6a63a3b03297-v2-2023-11-15.json', - // path: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', + path: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml', // watch: { // enabled: true, // interval: 500, @@ -217,11 +217,11 @@ export default defineConfig(() => { { // baseUrl: false, // exportFromIndex: true, - name: '@hey-api/client-fetch', + name: '@hey-api/client-angular', // runtimeConfigPath: path.resolve(__dirname, 'hey-api.ts'), // runtimeConfigPath: './src/hey-api.ts', // strictBaseUrl: true, - // throwOnError: true, + throwOnError: true, }, { // case: 'snake_case', @@ -255,7 +255,7 @@ export default defineConfig(() => { // classNameBuilder: '{{name}}', // classNameBuilder: '{{name}}Service', // classStructure: 'off', - client: false, + // client: false, // getSignature: ({ fields, signature, operation }) => { // // ... // fields.unwrap('path') @@ -265,7 +265,7 @@ export default defineConfig(() => { name: '@hey-api/sdk', // operationId: false, // paramsStructure: 'flat', - // responseStyle: 'data', + responseStyle: 'data', // signature: 'auto', // signature: 'client', // signature: 'object', @@ -517,12 +517,12 @@ export default defineConfig(() => { { exportFromIndex: true, httpRequests: { - // asClass: true, + asClass: true, }, httpResources: { - // asClass: true, + asClass: true, }, - // name: '@angular/common', + name: '@angular/common', }, { exportFromIndex: true, 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 e063c5925..50f07b383 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 @@ -328,9 +328,7 @@ export const updateUserRequest = ( ...options, }); -@Injectable({ - providedIn: 'root', -}) +@Injectable({ providedIn: 'root' }) export class PetServiceResources { /** * Add a new pet to the store. @@ -445,9 +443,7 @@ export class PetServiceResources { } } -@Injectable({ - providedIn: 'root', -}) +@Injectable({ providedIn: 'root' }) export class StoreServiceResources { /** * Returns pet inventories by status. @@ -506,9 +502,7 @@ export class StoreServiceResources { } } -@Injectable({ - providedIn: 'root', -}) +@Injectable({ providedIn: 'root' }) export class UserServiceResources { /** * Create user. 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 a160cfa9f..67d0d5505 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 @@ -7,33 +7,31 @@ 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' -}) +@Injectable({ providedIn: "root" }) export class DefaultServiceRequests { public serviceWithEmptyTag(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no+tag", ...options }); } public patchApiVbyApiVersionNoTag(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/no+tag", ...options }); } public fooWow(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/no+tag", ...options }); } @@ -45,403 +43,369 @@ export class DefaultServiceRequests { */ public postApiVbyApiVersionBody(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/body', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/body", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class SimpleServiceRequests { public deleteCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/simple", ...options }); } public getCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple", ...options }); } public headCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'HEAD', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "HEAD", + url: "/api/v{api-version}/simple", ...options }); } public optionsCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'OPTIONS', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "OPTIONS", + url: "/api/v{api-version}/simple", ...options }); } public patchCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/simple", ...options }); } public postCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/simple", ...options }); } public putCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/simple", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DescriptionsServiceRequests { public callWithDescriptions(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/descriptions/', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/descriptions/", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ParametersServiceRequests { public callWithParameters(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameterPath}', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameterPath}", ...options }); } public callWithWeirdParameterNames(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DefaultsServiceRequests { public callWithDefaultParameters(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/defaults', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/defaults", ...options }); } public callWithDefaultOptionalParameters(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/defaults', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/defaults", ...options }); } public callToTestOrderOfParams(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/defaults', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/defaults", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DuplicateServiceRequests { public duplicateName(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/duplicate", ...options }); } public duplicateName2(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/duplicate", ...options }); } public duplicateName3(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/duplicate", ...options }); } public duplicateName4(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/duplicate", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NoContentServiceRequests { public callWithNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no-content', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no-content", ...options }); } public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/response-and-no-content', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/response-and-no-content", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ResponseServiceRequests { public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/response-and-no-content', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/response-and-no-content", ...options }); } public callWithResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/response', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/response", ...options }); } public callWithDuplicateResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/response', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/response", ...options }); } public callWithResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/response', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/response", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags1ServiceRequests { public dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/a', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/a", ...options }); } public dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags2ServiceRequests { public dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/a', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/a", ...options }); } public dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags3ServiceRequests { public dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class CollectionFormatServiceRequests { public collectionFormat(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/collectionFormat', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/collectionFormat", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class TypesServiceRequests { public types(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/types', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/types", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ComplexServiceRequests { public complexTypes(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/complex', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/complex", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class HeaderServiceRequests { public callWithResultFromHeader(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/header', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/header", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ErrorServiceRequests { public testErrorCode(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/error', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/error", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NonAsciiÆøåÆøÅöôêÊServiceRequests { public nonAsciiæøåÆøÅöôêÊ字符串(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DefaultServiceResources { public serviceWithEmptyTag(options?: () => Options | undefined) { return httpResource(() => { @@ -477,9 +441,7 @@ export class DefaultServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class SimpleServiceResources { public deleteCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -531,9 +493,7 @@ export class SimpleServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DescriptionsServiceResources { public callWithDescriptions(options?: () => Options | undefined) { return httpResource(() => { @@ -543,9 +503,7 @@ export class DescriptionsServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ParametersServiceResources { public callWithParameters(options: () => Options | undefined) { return httpResource(() => { @@ -562,9 +520,7 @@ export class ParametersServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DefaultsServiceResources { public callWithDefaultParameters(options: () => Options | undefined) { return httpResource(() => { @@ -588,9 +544,7 @@ export class DefaultsServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DuplicateServiceResources { public duplicateName(options?: () => Options | undefined) { return httpResource(() => { @@ -621,9 +575,7 @@ export class DuplicateServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NoContentServiceResources { public callWithNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -640,9 +592,7 @@ export class NoContentServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ResponseServiceResources { public callWithResponseAndNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -673,9 +623,7 @@ export class ResponseServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags1ServiceResources { public dummyA(options?: () => Options | undefined) { return httpResource(() => { @@ -692,9 +640,7 @@ export class MultipleTags1ServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags2ServiceResources { public dummyA(options?: () => Options | undefined) { return httpResource(() => { @@ -711,9 +657,7 @@ export class MultipleTags2ServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags3ServiceResources { public dummyB(options?: () => Options | undefined) { return httpResource(() => { @@ -723,9 +667,7 @@ export class MultipleTags3ServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class CollectionFormatServiceResources { public collectionFormat(options: () => Options | undefined) { return httpResource(() => { @@ -735,9 +677,7 @@ export class CollectionFormatServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class TypesServiceResources { public types(options: () => Options | undefined) { return httpResource(() => { @@ -747,9 +687,7 @@ export class TypesServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ComplexServiceResources { public complexTypes(options: () => Options | undefined) { return httpResource(() => { @@ -759,9 +697,7 @@ export class ComplexServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class HeaderServiceResources { public callWithResultFromHeader(options?: () => Options | undefined) { return httpResource(() => { @@ -771,9 +707,7 @@ export class HeaderServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ErrorServiceResources { public testErrorCode(options: () => Options | undefined) { return httpResource(() => { @@ -783,9 +717,7 @@ export class ErrorServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NonAsciiÆøåÆøÅöôêÊServiceResources { public nonAsciiæøåÆøÅöôêÊ字符串(options: () => Options | undefined) { return httpResource(() => { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/@angular/common.gen.ts index e41cb4ade..9f9951470 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/@angular/common.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/@angular/common.gen.ts @@ -6,556 +6,420 @@ 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'; -export const serviceWithEmptyTagRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const patchApiVbyApiVersionNoTagRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const fooWowRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const deleteCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const getCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const headCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'HEAD', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const optionsCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'OPTIONS', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const patchCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const postCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const putCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const callWithDescriptionsRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/descriptions/', - ...options - }); -}; - -export const callWithParametersRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameterPath}', - ...options - }); -}; - -export const callWithWeirdParameterNamesRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', - ...options - }); -}; - -export const callWithDefaultParametersRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/defaults', - ...options - }); -}; - -export const callWithDefaultOptionalParametersRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/defaults', - ...options - }); -}; - -export const callToTestOrderOfParamsRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/defaults', - ...options - }); -}; - -export const duplicateNameRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const duplicateName2Request = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const duplicateName3Request = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const duplicateName4Request = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const callWithNoContentResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no-content', - ...options - }); -}; - -export const callWithResponseAndNoContentResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/response-and-no-content', - ...options - }); -}; - -export const dummyARequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/a', - ...options - }); -}; - -export const dummyBRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', - ...options - }); -}; - -export const callWithResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/response', - ...options - }); -}; - -export const callWithDuplicateResponsesRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/response', - ...options - }); -}; - -export const callWithResponsesRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/response', - ...options - }); -}; - -export const collectionFormatRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/collectionFormat', - ...options - }); -}; - -export const typesRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/types', - ...options - }); -}; - -export const complexTypesRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/complex', - ...options - }); -}; - -export const callWithResultFromHeaderRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/header', - ...options - }); -}; - -export const testErrorCodeRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/error', - ...options - }); -}; - -export const nonAsciiæøåÆøÅöôêÊ字符串Request = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', - ...options - }); -}; +export const serviceWithEmptyTagRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const patchApiVbyApiVersionNoTagRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const fooWowRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const deleteCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/simple", + ...options +}); + +export const getCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple", + ...options +}); + +export const headCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "HEAD", + url: "/api/v{api-version}/simple", + ...options +}); + +export const optionsCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "OPTIONS", + url: "/api/v{api-version}/simple", + ...options +}); + +export const patchCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/simple", + ...options +}); + +export const postCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/simple", + ...options +}); + +export const putCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/simple", + ...options +}); + +export const callWithDescriptionsRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/descriptions/", + ...options +}); + +export const callWithParametersRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameterPath}", + ...options +}); + +export const callWithWeirdParameterNamesRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}", + ...options +}); + +export const callWithDefaultParametersRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/defaults", + ...options +}); + +export const callWithDefaultOptionalParametersRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/defaults", + ...options +}); + +export const callToTestOrderOfParamsRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/defaults", + ...options +}); + +export const duplicateNameRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const duplicateName2Request = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const duplicateName3Request = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const duplicateName4Request = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const callWithNoContentResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no-content", + ...options +}); + +export const callWithResponseAndNoContentResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/response-and-no-content", + ...options +}); + +export const dummyARequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/a", + ...options +}); + +export const dummyBRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", + ...options +}); + +export const callWithResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/response", + ...options +}); + +export const callWithDuplicateResponsesRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/response", + ...options +}); + +export const callWithResponsesRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/response", + ...options +}); + +export const collectionFormatRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/collectionFormat", + ...options +}); + +export const typesRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/types", + ...options +}); + +export const complexTypesRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/complex", + ...options +}); + +export const callWithResultFromHeaderRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/header", + ...options +}); + +export const testErrorCodeRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/error", + ...options +}); + +export const nonAsciiæøåÆøÅöôêÊ字符串Request = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", + ...options +}); /** * Body should not be unknown * * Body should not be unknown */ -export const postApiVbyApiVersionBodyRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/body', - ...options - }); -}; - -export const serviceWithEmptyTagResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? serviceWithEmptyTagRequest(opts) : undefined; - }); -}; - -export const patchApiVbyApiVersionNoTagResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined; - }); -}; - -export const fooWowResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? fooWowRequest(opts) : undefined; - }); -}; - -export const deleteCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const getCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const headCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const optionsCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const patchCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const postCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const putCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const callWithDescriptionsResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDescriptionsRequest(opts) : undefined; - }); -}; - -export const callWithParametersResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithParametersRequest(opts) : undefined; - }); -}; - -export const callWithWeirdParameterNamesResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithWeirdParameterNamesRequest(opts) : undefined; - }); -}; - -export const callWithDefaultParametersResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDefaultParametersRequest(opts) : undefined; - }); -}; - -export const callWithDefaultOptionalParametersResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined; - }); -}; - -export const callToTestOrderOfParamsResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callToTestOrderOfParamsRequest(opts) : undefined; - }); -}; - -export const duplicateNameResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateNameRequest(opts) : undefined; - }); -}; - -export const duplicateName2Resource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateName2Request(opts) : undefined; - }); -}; - -export const duplicateName3Resource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateName3Request(opts) : undefined; - }); -}; - -export const duplicateName4Resource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateName4Request(opts) : undefined; - }); -}; - -export const callWithNoContentResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithNoContentResponseRequest(opts) : undefined; - }); -}; - -export const callWithResponseAndNoContentResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined; - }); -}; - -export const dummyAResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? dummyARequest(opts) : undefined; - }); -}; - -export const dummyBResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? dummyBRequest(opts) : undefined; - }); -}; - -export const callWithResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResponseRequest(opts) : undefined; - }); -}; - -export const callWithDuplicateResponsesResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDuplicateResponsesRequest(opts) : undefined; - }); -}; - -export const callWithResponsesResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResponsesRequest(opts) : undefined; - }); -}; - -export const collectionFormatResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? collectionFormatRequest(opts) : undefined; - }); -}; - -export const typesResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? typesRequest(opts) : undefined; - }); -}; - -export const complexTypesResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? complexTypesRequest(opts) : undefined; - }); -}; - -export const callWithResultFromHeaderResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResultFromHeaderRequest(opts) : undefined; - }); -}; - -export const testErrorCodeResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? testErrorCodeRequest(opts) : undefined; - }); -}; - -export const nonAsciiæøåÆøÅöôêÊ字符串Resource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined; - }); -}; +export const postApiVbyApiVersionBodyRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/body", + ...options +}); + +export const serviceWithEmptyTagResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? serviceWithEmptyTagRequest(opts) : undefined; +}); + +export const patchApiVbyApiVersionNoTagResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined; +}); + +export const fooWowResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? fooWowRequest(opts) : undefined; +}); + +export const deleteCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const getCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const headCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const optionsCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const patchCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const postCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const putCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const callWithDescriptionsResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDescriptionsRequest(opts) : undefined; +}); + +export const callWithParametersResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithParametersRequest(opts) : undefined; +}); + +export const callWithWeirdParameterNamesResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithWeirdParameterNamesRequest(opts) : undefined; +}); + +export const callWithDefaultParametersResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDefaultParametersRequest(opts) : undefined; +}); + +export const callWithDefaultOptionalParametersResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined; +}); + +export const callToTestOrderOfParamsResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callToTestOrderOfParamsRequest(opts) : undefined; +}); + +export const duplicateNameResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateNameRequest(opts) : undefined; +}); + +export const duplicateName2Resource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateName2Request(opts) : undefined; +}); + +export const duplicateName3Resource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateName3Request(opts) : undefined; +}); + +export const duplicateName4Resource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateName4Request(opts) : undefined; +}); + +export const callWithNoContentResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithNoContentResponseRequest(opts) : undefined; +}); + +export const callWithResponseAndNoContentResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined; +}); + +export const dummyAResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? dummyARequest(opts) : undefined; +}); + +export const dummyBResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? dummyBRequest(opts) : undefined; +}); + +export const callWithResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResponseRequest(opts) : undefined; +}); + +export const callWithDuplicateResponsesResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDuplicateResponsesRequest(opts) : undefined; +}); + +export const callWithResponsesResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResponsesRequest(opts) : undefined; +}); + +export const collectionFormatResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? collectionFormatRequest(opts) : undefined; +}); + +export const typesResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? typesRequest(opts) : undefined; +}); + +export const complexTypesResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? complexTypesRequest(opts) : undefined; +}); + +export const callWithResultFromHeaderResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResultFromHeaderRequest(opts) : undefined; +}); + +export const testErrorCodeResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? testErrorCodeRequest(opts) : undefined; +}); + +export const nonAsciiæøåÆøÅöôêÊ字符串Resource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined; +}); /** * Body should not be unknown * * Body should not be unknown */ -export const postApiVbyApiVersionBodyResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postApiVbyApiVersionBodyRequest(opts) : undefined; - }); -}; +export const postApiVbyApiVersionBodyResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postApiVbyApiVersionBodyRequest(opts) : undefined; +}); 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 04865a9fa..6f090bcf8 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 @@ -7,51 +7,49 @@ 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' -}) +@Injectable({ providedIn: "root" }) export class DefaultServiceRequests { public export(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no+tag", ...options }); } public patchApiVbyApiVersionNoTag(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/no+tag", ...options }); } public import(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/no+tag", ...options }); } public fooWow(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/no+tag", ...options }); } public getApiVbyApiVersionSimpleOperation(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple:operation', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple:operation", ...options }); } @@ -60,9 +58,9 @@ export class DefaultServiceRequests { export class ODataControllerServiceRequests { public apiVVersionODataControllerCount(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple/$count', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple/$count", ...options }); } @@ -76,520 +74,476 @@ export class ApiServiceRequests { vVersionService = new VVersionServiceRequests(); } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class SimpleServiceRequests { public deleteCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/simple", ...options }); } public getCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple", ...options }); } public headCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'HEAD', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "HEAD", + url: "/api/v{api-version}/simple", ...options }); } public optionsCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'OPTIONS', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "OPTIONS", + url: "/api/v{api-version}/simple", ...options }); } public patchCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/simple", ...options }); } public postCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/simple", ...options }); } public putCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/simple", ...options }); } apiService = new ApiServiceRequests(); } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ParametersServiceRequests { public deleteFoo(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/foo/{foo_param}/bar/{BarParam}", ...options }); } public callWithParameters(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameterPath}', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameterPath}", ...options }); } public callWithWeirdParameterNames(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}", ...options }); } public getCallWithOptionalParam(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/parameters', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/parameters", ...options }); } public postCallWithOptionalParam(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DescriptionsServiceRequests { public callWithDescriptions(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/descriptions', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/descriptions", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DeprecatedServiceRequests { /** * @deprecated */ public deprecatedCall(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/deprecated', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/deprecated", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class RequestBodyServiceRequests { public postApiVbyApiVersionRequestBody(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/requestBody', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/requestBody", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class FormDataServiceRequests { public postApiVbyApiVersionFormData(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/formData', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/formData", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DefaultsServiceRequests { public callWithDefaultParameters(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/defaults', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/defaults", ...options }); } public callWithDefaultOptionalParameters(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/defaults', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/defaults", ...options }); } public callToTestOrderOfParams(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/defaults', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/defaults", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DuplicateServiceRequests { public duplicateName(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/duplicate", ...options }); } public duplicateName2(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/duplicate", ...options }); } public duplicateName3(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/duplicate", ...options }); } public duplicateName4(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/duplicate", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NoContentServiceRequests { public callWithNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no-content', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no-content", ...options }); } public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/response-and-no-content', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/response-and-no-content", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ResponseServiceRequests { public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/response-and-no-content', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/response-and-no-content", ...options }); } public callWithResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/response', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/response", ...options }); } public callWithDuplicateResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/response', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/response", ...options }); } public callWithResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/response', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/response", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags1ServiceRequests { public dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/a', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/a", ...options }); } public dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags2ServiceRequests { public dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/a', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/a", ...options }); } public dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags3ServiceRequests { public dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class CollectionFormatServiceRequests { public collectionFormat(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/collectionFormat', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/collectionFormat", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class TypesServiceRequests { public types(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/types', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/types", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class UploadServiceRequests { public uploadFile(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/upload', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/upload", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class FileResponseServiceRequests { public fileResponse(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/file/{id}', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/file/{id}", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ComplexServiceRequests { public complexTypes(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/complex', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/complex", ...options }); } public complexParams(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/complex/{id}', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/complex/{id}", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipartServiceRequests { public multipartResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multipart', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multipart", ...options }); } public multipartRequest(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/multipart', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/multipart", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class HeaderServiceRequests { public callWithResultFromHeader(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/header', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/header", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ErrorServiceRequests { public testErrorCode(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/error', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/error", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NonAsciiÆøåÆøÅöôêÊServiceRequests { public nonAsciiæøåÆøÅöôêÊ字符串(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", ...options }); } @@ -599,17 +553,15 @@ export class NonAsciiÆøåÆøÅöôêÊServiceRequests { */ public putWithFormUrlEncoded(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DefaultServiceResources { public export(options?: () => Options | undefined) { return httpResource(() => { @@ -664,9 +616,7 @@ export class ApiServiceResources { vVersionService = new VVersionServiceResources(); } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class SimpleServiceResources { public deleteCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -719,9 +669,7 @@ export class SimpleServiceResources { apiService = new ApiServiceResources(); } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ParametersServiceResources { public deleteFoo(options: () => Options | undefined) { return httpResource(() => { @@ -759,9 +707,7 @@ export class ParametersServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DescriptionsServiceResources { public callWithDescriptions(options?: () => Options | undefined) { return httpResource(() => { @@ -771,9 +717,7 @@ export class DescriptionsServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DeprecatedServiceResources { /** * @deprecated @@ -786,9 +730,7 @@ export class DeprecatedServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class RequestBodyServiceResources { public postApiVbyApiVersionRequestBody(options?: () => Options | undefined) { return httpResource(() => { @@ -798,9 +740,7 @@ export class RequestBodyServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class FormDataServiceResources { public postApiVbyApiVersionFormData(options?: () => Options | undefined) { return httpResource(() => { @@ -810,9 +750,7 @@ export class FormDataServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DefaultsServiceResources { public callWithDefaultParameters(options?: () => Options | undefined) { return httpResource(() => { @@ -836,9 +774,7 @@ export class DefaultsServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DuplicateServiceResources { public duplicateName(options?: () => Options | undefined) { return httpResource(() => { @@ -869,9 +805,7 @@ export class DuplicateServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NoContentServiceResources { public callWithNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -888,9 +822,7 @@ export class NoContentServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ResponseServiceResources { public callWithResponseAndNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -921,9 +853,7 @@ export class ResponseServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags1ServiceResources { public dummyA(options?: () => Options | undefined) { return httpResource(() => { @@ -940,9 +870,7 @@ export class MultipleTags1ServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags2ServiceResources { public dummyA(options?: () => Options | undefined) { return httpResource(() => { @@ -959,9 +887,7 @@ export class MultipleTags2ServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags3ServiceResources { public dummyB(options?: () => Options | undefined) { return httpResource(() => { @@ -971,9 +897,7 @@ export class MultipleTags3ServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class CollectionFormatServiceResources { public collectionFormat(options: () => Options | undefined) { return httpResource(() => { @@ -983,9 +907,7 @@ export class CollectionFormatServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class TypesServiceResources { public types(options: () => Options | undefined) { return httpResource(() => { @@ -995,9 +917,7 @@ export class TypesServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class UploadServiceResources { public uploadFile(options: () => Options | undefined) { return httpResource(() => { @@ -1007,9 +927,7 @@ export class UploadServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class FileResponseServiceResources { public fileResponse(options: () => Options | undefined) { return httpResource(() => { @@ -1019,9 +937,7 @@ export class FileResponseServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ComplexServiceResources { public complexTypes(options: () => Options | undefined) { return httpResource(() => { @@ -1038,9 +954,7 @@ export class ComplexServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipartServiceResources { public multipartResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -1057,9 +971,7 @@ export class MultipartServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class HeaderServiceResources { public callWithResultFromHeader(options?: () => Options | undefined) { return httpResource(() => { @@ -1069,9 +981,7 @@ export class HeaderServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ErrorServiceResources { public testErrorCode(options: () => Options | undefined) { return httpResource(() => { @@ -1081,9 +991,7 @@ export class ErrorServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NonAsciiÆøåÆøÅöôêÊServiceResources { public nonAsciiæøåÆøÅöôêÊ字符串(options: () => Options | undefined) { return httpResource(() => { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/@angular/common.gen.ts index 75dce0843..64404c369 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/@angular/common.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/@angular/common.gen.ts @@ -6,782 +6,590 @@ 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'; -export const exportRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const patchApiVbyApiVersionNoTagRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const importRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const fooWowRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const apiVVersionODataControllerCountRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple/$count', - ...options - }); -}; - -export const getApiVbyApiVersionSimpleOperationRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple:operation', - ...options - }); -}; - -export const deleteCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const getCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const headCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'HEAD', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const optionsCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'OPTIONS', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const patchCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const postCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const putCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const deleteFooRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', - ...options - }); -}; - -export const callWithDescriptionsRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/descriptions', - ...options - }); -}; +export const exportRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const patchApiVbyApiVersionNoTagRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const importRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const fooWowRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const apiVVersionODataControllerCountRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple/$count", + ...options +}); + +export const getApiVbyApiVersionSimpleOperationRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple:operation", + ...options +}); + +export const deleteCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/simple", + ...options +}); + +export const getCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple", + ...options +}); + +export const headCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "HEAD", + url: "/api/v{api-version}/simple", + ...options +}); + +export const optionsCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "OPTIONS", + url: "/api/v{api-version}/simple", + ...options +}); + +export const patchCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/simple", + ...options +}); + +export const postCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/simple", + ...options +}); + +export const putCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/simple", + ...options +}); + +export const deleteFooRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/foo/{foo_param}/bar/{BarParam}", + ...options +}); + +export const callWithDescriptionsRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/descriptions", + ...options +}); /** * @deprecated */ -export const deprecatedCallRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/deprecated', - ...options - }); -}; - -export const callWithParametersRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameterPath}', - ...options - }); -}; - -export const callWithWeirdParameterNamesRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', - ...options - }); -}; - -export const getCallWithOptionalParamRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/parameters', - ...options - }); -}; - -export const postCallWithOptionalParamRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters', - ...options - }); -}; - -export const postApiVbyApiVersionRequestBodyRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/requestBody', - ...options - }); -}; - -export const postApiVbyApiVersionFormDataRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/formData', - ...options - }); -}; - -export const callWithDefaultParametersRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/defaults', - ...options - }); -}; - -export const callWithDefaultOptionalParametersRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/defaults', - ...options - }); -}; - -export const callToTestOrderOfParamsRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/defaults', - ...options - }); -}; - -export const duplicateNameRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const duplicateName2Request = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const duplicateName3Request = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const duplicateName4Request = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const callWithNoContentResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no-content', - ...options - }); -}; - -export const callWithResponseAndNoContentResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/response-and-no-content', - ...options - }); -}; - -export const dummyARequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/a', - ...options - }); -}; - -export const dummyBRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', - ...options - }); -}; - -export const callWithResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/response', - ...options - }); -}; - -export const callWithDuplicateResponsesRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/response', - ...options - }); -}; - -export const callWithResponsesRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/response', - ...options - }); -}; - -export const collectionFormatRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/collectionFormat', - ...options - }); -}; - -export const typesRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/types', - ...options - }); -}; - -export const uploadFileRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/upload', - ...options - }); -}; - -export const fileResponseRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/file/{id}', - ...options - }); -}; - -export const complexTypesRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/complex', - ...options - }); -}; - -export const multipartResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multipart', - ...options - }); -}; - -export const multipartRequestRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/multipart', - ...options - }); -}; - -export const complexParamsRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/complex/{id}', - ...options - }); -}; - -export const callWithResultFromHeaderRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/header', - ...options - }); -}; - -export const testErrorCodeRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/error', - ...options - }); -}; - -export const nonAsciiæøåÆøÅöôêÊ字符串Request = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', - ...options - }); -}; +export const deprecatedCallRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/deprecated", + ...options +}); + +export const callWithParametersRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameterPath}", + ...options +}); + +export const callWithWeirdParameterNamesRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}", + ...options +}); + +export const getCallWithOptionalParamRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/parameters", + ...options +}); + +export const postCallWithOptionalParamRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters", + ...options +}); + +export const postApiVbyApiVersionRequestBodyRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/requestBody", + ...options +}); + +export const postApiVbyApiVersionFormDataRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/formData", + ...options +}); + +export const callWithDefaultParametersRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/defaults", + ...options +}); + +export const callWithDefaultOptionalParametersRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/defaults", + ...options +}); + +export const callToTestOrderOfParamsRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/defaults", + ...options +}); + +export const duplicateNameRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const duplicateName2Request = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const duplicateName3Request = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const duplicateName4Request = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const callWithNoContentResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no-content", + ...options +}); + +export const callWithResponseAndNoContentResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/response-and-no-content", + ...options +}); + +export const dummyARequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/a", + ...options +}); + +export const dummyBRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", + ...options +}); + +export const callWithResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/response", + ...options +}); + +export const callWithDuplicateResponsesRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/response", + ...options +}); + +export const callWithResponsesRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/response", + ...options +}); + +export const collectionFormatRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/collectionFormat", + ...options +}); + +export const typesRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/types", + ...options +}); + +export const uploadFileRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/upload", + ...options +}); + +export const fileResponseRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/file/{id}", + ...options +}); + +export const complexTypesRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/complex", + ...options +}); + +export const multipartResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multipart", + ...options +}); + +export const multipartRequestRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/multipart", + ...options +}); + +export const complexParamsRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/complex/{id}", + ...options +}); + +export const callWithResultFromHeaderRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/header", + ...options +}); + +export const testErrorCodeRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/error", + ...options +}); + +export const nonAsciiæøåÆøÅöôêÊ字符串Request = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", + ...options +}); /** * Login User */ -export const putWithFormUrlEncodedRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', - ...options - }); -}; - -export const exportResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? exportRequest(opts) : undefined; - }); -}; - -export const patchApiVbyApiVersionNoTagResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined; - }); -}; - -export const importResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? importRequest(opts) : undefined; - }); -}; - -export const fooWowResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? fooWowRequest(opts) : undefined; - }); -}; - -export const apiVVersionODataControllerCountResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? apiVVersionODataControllerCountRequest(opts) : undefined; - }); -}; - -export const getApiVbyApiVersionSimpleOperationResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? getApiVbyApiVersionSimpleOperationRequest(opts) : undefined; - }); -}; - -export const deleteCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const getCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const headCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const optionsCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const patchCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const postCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const putCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const deleteFooResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? deleteFooRequest(opts) : undefined; - }); -}; - -export const callWithDescriptionsResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDescriptionsRequest(opts) : undefined; - }); -}; +export const putWithFormUrlEncodedRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", + ...options +}); + +export const exportResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? exportRequest(opts) : undefined; +}); + +export const patchApiVbyApiVersionNoTagResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined; +}); + +export const importResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? importRequest(opts) : undefined; +}); + +export const fooWowResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? fooWowRequest(opts) : undefined; +}); + +export const apiVVersionODataControllerCountResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? apiVVersionODataControllerCountRequest(opts) : undefined; +}); + +export const getApiVbyApiVersionSimpleOperationResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? getApiVbyApiVersionSimpleOperationRequest(opts) : undefined; +}); + +export const deleteCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const getCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const headCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const optionsCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const patchCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const postCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const putCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const deleteFooResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? deleteFooRequest(opts) : undefined; +}); + +export const callWithDescriptionsResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDescriptionsRequest(opts) : undefined; +}); /** * @deprecated */ -export const deprecatedCallResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? deprecatedCallRequest(opts) : undefined; - }); -}; - -export const callWithParametersResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithParametersRequest(opts) : undefined; - }); -}; - -export const callWithWeirdParameterNamesResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithWeirdParameterNamesRequest(opts) : undefined; - }); -}; - -export const getCallWithOptionalParamResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? getCallWithOptionalParamRequest(opts) : undefined; - }); -}; - -export const postCallWithOptionalParamResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postCallWithOptionalParamRequest(opts) : undefined; - }); -}; - -export const postApiVbyApiVersionRequestBodyResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postApiVbyApiVersionRequestBodyRequest(opts) : undefined; - }); -}; - -export const postApiVbyApiVersionFormDataResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postApiVbyApiVersionFormDataRequest(opts) : undefined; - }); -}; - -export const callWithDefaultParametersResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDefaultParametersRequest(opts) : undefined; - }); -}; - -export const callWithDefaultOptionalParametersResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined; - }); -}; - -export const callToTestOrderOfParamsResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callToTestOrderOfParamsRequest(opts) : undefined; - }); -}; - -export const duplicateNameResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateNameRequest(opts) : undefined; - }); -}; - -export const duplicateName2Resource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateName2Request(opts) : undefined; - }); -}; - -export const duplicateName3Resource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateName3Request(opts) : undefined; - }); -}; - -export const duplicateName4Resource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateName4Request(opts) : undefined; - }); -}; - -export const callWithNoContentResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithNoContentResponseRequest(opts) : undefined; - }); -}; - -export const callWithResponseAndNoContentResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined; - }); -}; - -export const dummyAResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? dummyARequest(opts) : undefined; - }); -}; - -export const dummyBResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? dummyBRequest(opts) : undefined; - }); -}; - -export const callWithResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResponseRequest(opts) : undefined; - }); -}; - -export const callWithDuplicateResponsesResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDuplicateResponsesRequest(opts) : undefined; - }); -}; - -export const callWithResponsesResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResponsesRequest(opts) : undefined; - }); -}; - -export const collectionFormatResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? collectionFormatRequest(opts) : undefined; - }); -}; - -export const typesResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? typesRequest(opts) : undefined; - }); -}; - -export const uploadFileResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? uploadFileRequest(opts) : undefined; - }); -}; - -export const fileResponseResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? fileResponseRequest(opts) : undefined; - }); -}; - -export const complexTypesResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? complexTypesRequest(opts) : undefined; - }); -}; - -export const multipartResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? multipartResponseRequest(opts) : undefined; - }); -}; - -export const multipartRequestResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? multipartRequestRequest(opts) : undefined; - }); -}; - -export const complexParamsResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? complexParamsRequest(opts) : undefined; - }); -}; - -export const callWithResultFromHeaderResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResultFromHeaderRequest(opts) : undefined; - }); -}; - -export const testErrorCodeResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? testErrorCodeRequest(opts) : undefined; - }); -}; - -export const nonAsciiæøåÆøÅöôêÊ字符串Resource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined; - }); -}; +export const deprecatedCallResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? deprecatedCallRequest(opts) : undefined; +}); + +export const callWithParametersResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithParametersRequest(opts) : undefined; +}); + +export const callWithWeirdParameterNamesResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithWeirdParameterNamesRequest(opts) : undefined; +}); + +export const getCallWithOptionalParamResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? getCallWithOptionalParamRequest(opts) : undefined; +}); + +export const postCallWithOptionalParamResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postCallWithOptionalParamRequest(opts) : undefined; +}); + +export const postApiVbyApiVersionRequestBodyResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postApiVbyApiVersionRequestBodyRequest(opts) : undefined; +}); + +export const postApiVbyApiVersionFormDataResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postApiVbyApiVersionFormDataRequest(opts) : undefined; +}); + +export const callWithDefaultParametersResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDefaultParametersRequest(opts) : undefined; +}); + +export const callWithDefaultOptionalParametersResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined; +}); + +export const callToTestOrderOfParamsResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callToTestOrderOfParamsRequest(opts) : undefined; +}); + +export const duplicateNameResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateNameRequest(opts) : undefined; +}); + +export const duplicateName2Resource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateName2Request(opts) : undefined; +}); + +export const duplicateName3Resource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateName3Request(opts) : undefined; +}); + +export const duplicateName4Resource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateName4Request(opts) : undefined; +}); + +export const callWithNoContentResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithNoContentResponseRequest(opts) : undefined; +}); + +export const callWithResponseAndNoContentResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined; +}); + +export const dummyAResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? dummyARequest(opts) : undefined; +}); + +export const dummyBResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? dummyBRequest(opts) : undefined; +}); + +export const callWithResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResponseRequest(opts) : undefined; +}); + +export const callWithDuplicateResponsesResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDuplicateResponsesRequest(opts) : undefined; +}); + +export const callWithResponsesResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResponsesRequest(opts) : undefined; +}); + +export const collectionFormatResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? collectionFormatRequest(opts) : undefined; +}); + +export const typesResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? typesRequest(opts) : undefined; +}); + +export const uploadFileResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? uploadFileRequest(opts) : undefined; +}); + +export const fileResponseResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? fileResponseRequest(opts) : undefined; +}); + +export const complexTypesResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? complexTypesRequest(opts) : undefined; +}); + +export const multipartResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? multipartResponseRequest(opts) : undefined; +}); + +export const multipartRequestResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? multipartRequestRequest(opts) : undefined; +}); + +export const complexParamsResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? complexParamsRequest(opts) : undefined; +}); + +export const callWithResultFromHeaderResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResultFromHeaderRequest(opts) : undefined; +}); + +export const testErrorCodeResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? testErrorCodeRequest(opts) : undefined; +}); + +export const nonAsciiæøåÆøÅöôêÊ字符串Resource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined; +}); /** * Login User */ -export const putWithFormUrlEncodedResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? putWithFormUrlEncodedRequest(opts) : undefined; - }); -}; +export const putWithFormUrlEncodedResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? putWithFormUrlEncodedRequest(opts) : undefined; +}); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts index 04865a9fa..6f090bcf8 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts @@ -7,51 +7,49 @@ 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' -}) +@Injectable({ providedIn: "root" }) export class DefaultServiceRequests { public export(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no+tag", ...options }); } public patchApiVbyApiVersionNoTag(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/no+tag", ...options }); } public import(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/no+tag", ...options }); } public fooWow(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/no+tag', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/no+tag", ...options }); } public getApiVbyApiVersionSimpleOperation(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple:operation', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple:operation", ...options }); } @@ -60,9 +58,9 @@ export class DefaultServiceRequests { export class ODataControllerServiceRequests { public apiVVersionODataControllerCount(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple/$count', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple/$count", ...options }); } @@ -76,520 +74,476 @@ export class ApiServiceRequests { vVersionService = new VVersionServiceRequests(); } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class SimpleServiceRequests { public deleteCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/simple", ...options }); } public getCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple", ...options }); } public headCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'HEAD', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "HEAD", + url: "/api/v{api-version}/simple", ...options }); } public optionsCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'OPTIONS', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "OPTIONS", + url: "/api/v{api-version}/simple", ...options }); } public patchCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/simple", ...options }); } public postCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/simple", ...options }); } public putCallWithoutParametersAndResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/simple', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/simple", ...options }); } apiService = new ApiServiceRequests(); } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ParametersServiceRequests { public deleteFoo(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/foo/{foo_param}/bar/{BarParam}", ...options }); } public callWithParameters(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameterPath}', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameterPath}", ...options }); } public callWithWeirdParameterNames(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}", ...options }); } public getCallWithOptionalParam(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/parameters', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/parameters", ...options }); } public postCallWithOptionalParam(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DescriptionsServiceRequests { public callWithDescriptions(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/descriptions', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/descriptions", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DeprecatedServiceRequests { /** * @deprecated */ public deprecatedCall(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/deprecated', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/deprecated", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class RequestBodyServiceRequests { public postApiVbyApiVersionRequestBody(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/requestBody', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/requestBody", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class FormDataServiceRequests { public postApiVbyApiVersionFormData(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/formData', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/formData", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DefaultsServiceRequests { public callWithDefaultParameters(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/defaults', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/defaults", ...options }); } public callWithDefaultOptionalParameters(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/defaults', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/defaults", ...options }); } public callToTestOrderOfParams(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/defaults', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/defaults", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DuplicateServiceRequests { public duplicateName(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/duplicate", ...options }); } public duplicateName2(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/duplicate", ...options }); } public duplicateName3(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/duplicate", ...options }); } public duplicateName4(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/duplicate', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/duplicate", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NoContentServiceRequests { public callWithNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no-content', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no-content", ...options }); } public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/response-and-no-content', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/response-and-no-content", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ResponseServiceRequests { public callWithResponseAndNoContentResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/response-and-no-content', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/response-and-no-content", ...options }); } public callWithResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/response', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/response", ...options }); } public callWithDuplicateResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/response', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/response", ...options }); } public callWithResponses(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/response', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/response", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags1ServiceRequests { public dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/a', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/a", ...options }); } public dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags2ServiceRequests { public dummyA(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/a', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/a", ...options }); } public dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags3ServiceRequests { public dummyB(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class CollectionFormatServiceRequests { public collectionFormat(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/collectionFormat', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/collectionFormat", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class TypesServiceRequests { public types(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/types', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/types", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class UploadServiceRequests { public uploadFile(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/upload', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/upload", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class FileResponseServiceRequests { public fileResponse(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/file/{id}', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/file/{id}", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ComplexServiceRequests { public complexTypes(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/complex', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/complex", ...options }); } public complexParams(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/complex/{id}', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/complex/{id}", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipartServiceRequests { public multipartResponse(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multipart', + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multipart", ...options }); } public multipartRequest(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/multipart', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/multipart", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class HeaderServiceRequests { public callWithResultFromHeader(options?: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/header', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/header", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ErrorServiceRequests { public testErrorCode(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/error', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/error", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NonAsciiÆøåÆøÅöôêÊServiceRequests { public nonAsciiæøåÆøÅöôêÊ字符串(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", ...options }); } @@ -599,17 +553,15 @@ export class NonAsciiÆøåÆøÅöôêÊServiceRequests { */ public putWithFormUrlEncoded(options: Options): HttpRequest { return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", ...options }); } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DefaultServiceResources { public export(options?: () => Options | undefined) { return httpResource(() => { @@ -664,9 +616,7 @@ export class ApiServiceResources { vVersionService = new VVersionServiceResources(); } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class SimpleServiceResources { public deleteCallWithoutParametersAndResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -719,9 +669,7 @@ export class SimpleServiceResources { apiService = new ApiServiceResources(); } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ParametersServiceResources { public deleteFoo(options: () => Options | undefined) { return httpResource(() => { @@ -759,9 +707,7 @@ export class ParametersServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DescriptionsServiceResources { public callWithDescriptions(options?: () => Options | undefined) { return httpResource(() => { @@ -771,9 +717,7 @@ export class DescriptionsServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DeprecatedServiceResources { /** * @deprecated @@ -786,9 +730,7 @@ export class DeprecatedServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class RequestBodyServiceResources { public postApiVbyApiVersionRequestBody(options?: () => Options | undefined) { return httpResource(() => { @@ -798,9 +740,7 @@ export class RequestBodyServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class FormDataServiceResources { public postApiVbyApiVersionFormData(options?: () => Options | undefined) { return httpResource(() => { @@ -810,9 +750,7 @@ export class FormDataServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DefaultsServiceResources { public callWithDefaultParameters(options?: () => Options | undefined) { return httpResource(() => { @@ -836,9 +774,7 @@ export class DefaultsServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class DuplicateServiceResources { public duplicateName(options?: () => Options | undefined) { return httpResource(() => { @@ -869,9 +805,7 @@ export class DuplicateServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NoContentServiceResources { public callWithNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -888,9 +822,7 @@ export class NoContentServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ResponseServiceResources { public callWithResponseAndNoContentResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -921,9 +853,7 @@ export class ResponseServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags1ServiceResources { public dummyA(options?: () => Options | undefined) { return httpResource(() => { @@ -940,9 +870,7 @@ export class MultipleTags1ServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags2ServiceResources { public dummyA(options?: () => Options | undefined) { return httpResource(() => { @@ -959,9 +887,7 @@ export class MultipleTags2ServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipleTags3ServiceResources { public dummyB(options?: () => Options | undefined) { return httpResource(() => { @@ -971,9 +897,7 @@ export class MultipleTags3ServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class CollectionFormatServiceResources { public collectionFormat(options: () => Options | undefined) { return httpResource(() => { @@ -983,9 +907,7 @@ export class CollectionFormatServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class TypesServiceResources { public types(options: () => Options | undefined) { return httpResource(() => { @@ -995,9 +917,7 @@ export class TypesServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class UploadServiceResources { public uploadFile(options: () => Options | undefined) { return httpResource(() => { @@ -1007,9 +927,7 @@ export class UploadServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class FileResponseServiceResources { public fileResponse(options: () => Options | undefined) { return httpResource(() => { @@ -1019,9 +937,7 @@ export class FileResponseServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ComplexServiceResources { public complexTypes(options: () => Options | undefined) { return httpResource(() => { @@ -1038,9 +954,7 @@ export class ComplexServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class MultipartServiceResources { public multipartResponse(options?: () => Options | undefined) { return httpResource(() => { @@ -1057,9 +971,7 @@ export class MultipartServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class HeaderServiceResources { public callWithResultFromHeader(options?: () => Options | undefined) { return httpResource(() => { @@ -1069,9 +981,7 @@ export class HeaderServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class ErrorServiceResources { public testErrorCode(options: () => Options | undefined) { return httpResource(() => { @@ -1081,9 +991,7 @@ export class ErrorServiceResources { } } -@Injectable({ - providedIn: 'root' -}) +@Injectable({ providedIn: "root" }) export class NonAsciiÆøåÆøÅöôêÊServiceResources { public nonAsciiæøåÆøÅöôêÊ字符串(options: () => Options | undefined) { return httpResource(() => { diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/@angular/common.gen.ts index 75dce0843..64404c369 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/@angular/common.gen.ts +++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/@angular/common.gen.ts @@ -6,782 +6,590 @@ 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'; -export const exportRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const patchApiVbyApiVersionNoTagRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const importRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const fooWowRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/no+tag', - ...options - }); -}; - -export const apiVVersionODataControllerCountRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple/$count', - ...options - }); -}; - -export const getApiVbyApiVersionSimpleOperationRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple:operation', - ...options - }); -}; - -export const deleteCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const getCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const headCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'HEAD', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const optionsCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'OPTIONS', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const patchCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PATCH', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const postCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const putCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/simple', - ...options - }); -}; - -export const deleteFooRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}', - ...options - }); -}; - -export const callWithDescriptionsRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/descriptions', - ...options - }); -}; +export const exportRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const patchApiVbyApiVersionNoTagRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const importRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const fooWowRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/no+tag", + ...options +}); + +export const apiVVersionODataControllerCountRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple/$count", + ...options +}); + +export const getApiVbyApiVersionSimpleOperationRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple:operation", + ...options +}); + +export const deleteCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/simple", + ...options +}); + +export const getCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/simple", + ...options +}); + +export const headCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "HEAD", + url: "/api/v{api-version}/simple", + ...options +}); + +export const optionsCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "OPTIONS", + url: "/api/v{api-version}/simple", + ...options +}); + +export const patchCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PATCH", + url: "/api/v{api-version}/simple", + ...options +}); + +export const postCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/simple", + ...options +}); + +export const putCallWithoutParametersAndResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/simple", + ...options +}); + +export const deleteFooRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/foo/{foo_param}/bar/{BarParam}", + ...options +}); + +export const callWithDescriptionsRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/descriptions", + ...options +}); /** * @deprecated */ -export const deprecatedCallRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/deprecated', - ...options - }); -}; - -export const callWithParametersRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameterPath}', - ...options - }); -}; - -export const callWithWeirdParameterNamesRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', - ...options - }); -}; - -export const getCallWithOptionalParamRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/parameters', - ...options - }); -}; - -export const postCallWithOptionalParamRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/parameters', - ...options - }); -}; - -export const postApiVbyApiVersionRequestBodyRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/requestBody', - ...options - }); -}; - -export const postApiVbyApiVersionFormDataRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/formData', - ...options - }); -}; - -export const callWithDefaultParametersRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/defaults', - ...options - }); -}; - -export const callWithDefaultOptionalParametersRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/defaults', - ...options - }); -}; - -export const callToTestOrderOfParamsRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/defaults', - ...options - }); -}; - -export const duplicateNameRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'DELETE', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const duplicateName2Request = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const duplicateName3Request = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const duplicateName4Request = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/duplicate', - ...options - }); -}; - -export const callWithNoContentResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/no-content', - ...options - }); -}; - -export const callWithResponseAndNoContentResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/response-and-no-content', - ...options - }); -}; - -export const dummyARequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/a', - ...options - }); -}; - -export const dummyBRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multiple-tags/b', - ...options - }); -}; - -export const callWithResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/response', - ...options - }); -}; - -export const callWithDuplicateResponsesRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/response', - ...options - }); -}; - -export const callWithResponsesRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/response', - ...options - }); -}; - -export const collectionFormatRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/collectionFormat', - ...options - }); -}; - -export const typesRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/types', - ...options - }); -}; - -export const uploadFileRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/upload', - ...options - }); -}; - -export const fileResponseRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/file/{id}', - ...options - }); -}; - -export const complexTypesRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/complex', - ...options - }); -}; - -export const multipartResponseRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'GET', - url: '/api/v{api-version}/multipart', - ...options - }); -}; - -export const multipartRequestRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/multipart', - ...options - }); -}; - -export const complexParamsRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/complex/{id}', - ...options - }); -}; - -export const callWithResultFromHeaderRequest = (options?: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/header', - ...options - }); -}; - -export const testErrorCodeRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/error', - ...options - }); -}; - -export const nonAsciiæøåÆøÅöôêÊ字符串Request = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'POST', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', - ...options - }); -}; +export const deprecatedCallRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/deprecated", + ...options +}); + +export const callWithParametersRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameterPath}", + ...options +}); + +export const callWithWeirdParameterNamesRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}", + ...options +}); + +export const getCallWithOptionalParamRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/parameters", + ...options +}); + +export const postCallWithOptionalParamRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/parameters", + ...options +}); + +export const postApiVbyApiVersionRequestBodyRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/requestBody", + ...options +}); + +export const postApiVbyApiVersionFormDataRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/formData", + ...options +}); + +export const callWithDefaultParametersRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/defaults", + ...options +}); + +export const callWithDefaultOptionalParametersRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/defaults", + ...options +}); + +export const callToTestOrderOfParamsRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/defaults", + ...options +}); + +export const duplicateNameRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "DELETE", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const duplicateName2Request = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const duplicateName3Request = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const duplicateName4Request = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/duplicate", + ...options +}); + +export const callWithNoContentResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/no-content", + ...options +}); + +export const callWithResponseAndNoContentResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/response-and-no-content", + ...options +}); + +export const dummyARequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/a", + ...options +}); + +export const dummyBRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multiple-tags/b", + ...options +}); + +export const callWithResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/response", + ...options +}); + +export const callWithDuplicateResponsesRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/response", + ...options +}); + +export const callWithResponsesRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/response", + ...options +}); + +export const collectionFormatRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/collectionFormat", + ...options +}); + +export const typesRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/types", + ...options +}); + +export const uploadFileRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/upload", + ...options +}); + +export const fileResponseRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/file/{id}", + ...options +}); + +export const complexTypesRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/complex", + ...options +}); + +export const multipartResponseRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "GET", + url: "/api/v{api-version}/multipart", + ...options +}); + +export const multipartRequestRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/multipart", + ...options +}); + +export const complexParamsRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/complex/{id}", + ...options +}); + +export const callWithResultFromHeaderRequest = (options?: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/header", + ...options +}); + +export const testErrorCodeRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/error", + ...options +}); + +export const nonAsciiæøåÆøÅöôêÊ字符串Request = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "POST", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", + ...options +}); /** * Login User */ -export const putWithFormUrlEncodedRequest = (options: Options): HttpRequest => { - return (options?.client ?? client).requestOptions({ - responseStyle: 'data', - method: 'PUT', - url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', - ...options - }); -}; - -export const exportResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? exportRequest(opts) : undefined; - }); -}; - -export const patchApiVbyApiVersionNoTagResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined; - }); -}; - -export const importResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? importRequest(opts) : undefined; - }); -}; - -export const fooWowResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? fooWowRequest(opts) : undefined; - }); -}; - -export const apiVVersionODataControllerCountResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? apiVVersionODataControllerCountRequest(opts) : undefined; - }); -}; - -export const getApiVbyApiVersionSimpleOperationResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? getApiVbyApiVersionSimpleOperationRequest(opts) : undefined; - }); -}; - -export const deleteCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const getCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const headCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const optionsCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const patchCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const postCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const putCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined; - }); -}; - -export const deleteFooResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? deleteFooRequest(opts) : undefined; - }); -}; - -export const callWithDescriptionsResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDescriptionsRequest(opts) : undefined; - }); -}; +export const putWithFormUrlEncodedRequest = (options: Options): HttpRequest => (options?.client ?? client).requestOptions({ + responseStyle: "data", + method: "PUT", + url: "/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串", + ...options +}); + +export const exportResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? exportRequest(opts) : undefined; +}); + +export const patchApiVbyApiVersionNoTagResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined; +}); + +export const importResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? importRequest(opts) : undefined; +}); + +export const fooWowResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? fooWowRequest(opts) : undefined; +}); + +export const apiVVersionODataControllerCountResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? apiVVersionODataControllerCountRequest(opts) : undefined; +}); + +export const getApiVbyApiVersionSimpleOperationResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? getApiVbyApiVersionSimpleOperationRequest(opts) : undefined; +}); + +export const deleteCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const getCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const headCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const optionsCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const patchCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const postCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const putCallWithoutParametersAndResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined; +}); + +export const deleteFooResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? deleteFooRequest(opts) : undefined; +}); + +export const callWithDescriptionsResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDescriptionsRequest(opts) : undefined; +}); /** * @deprecated */ -export const deprecatedCallResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? deprecatedCallRequest(opts) : undefined; - }); -}; - -export const callWithParametersResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithParametersRequest(opts) : undefined; - }); -}; - -export const callWithWeirdParameterNamesResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithWeirdParameterNamesRequest(opts) : undefined; - }); -}; - -export const getCallWithOptionalParamResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? getCallWithOptionalParamRequest(opts) : undefined; - }); -}; - -export const postCallWithOptionalParamResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postCallWithOptionalParamRequest(opts) : undefined; - }); -}; - -export const postApiVbyApiVersionRequestBodyResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postApiVbyApiVersionRequestBodyRequest(opts) : undefined; - }); -}; - -export const postApiVbyApiVersionFormDataResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? postApiVbyApiVersionFormDataRequest(opts) : undefined; - }); -}; - -export const callWithDefaultParametersResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDefaultParametersRequest(opts) : undefined; - }); -}; - -export const callWithDefaultOptionalParametersResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined; - }); -}; - -export const callToTestOrderOfParamsResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callToTestOrderOfParamsRequest(opts) : undefined; - }); -}; - -export const duplicateNameResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateNameRequest(opts) : undefined; - }); -}; - -export const duplicateName2Resource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateName2Request(opts) : undefined; - }); -}; - -export const duplicateName3Resource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateName3Request(opts) : undefined; - }); -}; - -export const duplicateName4Resource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? duplicateName4Request(opts) : undefined; - }); -}; - -export const callWithNoContentResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithNoContentResponseRequest(opts) : undefined; - }); -}; - -export const callWithResponseAndNoContentResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined; - }); -}; - -export const dummyAResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? dummyARequest(opts) : undefined; - }); -}; - -export const dummyBResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? dummyBRequest(opts) : undefined; - }); -}; - -export const callWithResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResponseRequest(opts) : undefined; - }); -}; - -export const callWithDuplicateResponsesResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithDuplicateResponsesRequest(opts) : undefined; - }); -}; - -export const callWithResponsesResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResponsesRequest(opts) : undefined; - }); -}; - -export const collectionFormatResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? collectionFormatRequest(opts) : undefined; - }); -}; - -export const typesResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? typesRequest(opts) : undefined; - }); -}; - -export const uploadFileResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? uploadFileRequest(opts) : undefined; - }); -}; - -export const fileResponseResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? fileResponseRequest(opts) : undefined; - }); -}; - -export const complexTypesResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? complexTypesRequest(opts) : undefined; - }); -}; - -export const multipartResponseResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? multipartResponseRequest(opts) : undefined; - }); -}; - -export const multipartRequestResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? multipartRequestRequest(opts) : undefined; - }); -}; - -export const complexParamsResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? complexParamsRequest(opts) : undefined; - }); -}; - -export const callWithResultFromHeaderResource = (options?: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? callWithResultFromHeaderRequest(opts) : undefined; - }); -}; - -export const testErrorCodeResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? testErrorCodeRequest(opts) : undefined; - }); -}; - -export const nonAsciiæøåÆøÅöôêÊ字符串Resource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined; - }); -}; +export const deprecatedCallResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? deprecatedCallRequest(opts) : undefined; +}); + +export const callWithParametersResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithParametersRequest(opts) : undefined; +}); + +export const callWithWeirdParameterNamesResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithWeirdParameterNamesRequest(opts) : undefined; +}); + +export const getCallWithOptionalParamResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? getCallWithOptionalParamRequest(opts) : undefined; +}); + +export const postCallWithOptionalParamResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postCallWithOptionalParamRequest(opts) : undefined; +}); + +export const postApiVbyApiVersionRequestBodyResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postApiVbyApiVersionRequestBodyRequest(opts) : undefined; +}); + +export const postApiVbyApiVersionFormDataResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? postApiVbyApiVersionFormDataRequest(opts) : undefined; +}); + +export const callWithDefaultParametersResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDefaultParametersRequest(opts) : undefined; +}); + +export const callWithDefaultOptionalParametersResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined; +}); + +export const callToTestOrderOfParamsResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callToTestOrderOfParamsRequest(opts) : undefined; +}); + +export const duplicateNameResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateNameRequest(opts) : undefined; +}); + +export const duplicateName2Resource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateName2Request(opts) : undefined; +}); + +export const duplicateName3Resource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateName3Request(opts) : undefined; +}); + +export const duplicateName4Resource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? duplicateName4Request(opts) : undefined; +}); + +export const callWithNoContentResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithNoContentResponseRequest(opts) : undefined; +}); + +export const callWithResponseAndNoContentResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined; +}); + +export const dummyAResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? dummyARequest(opts) : undefined; +}); + +export const dummyBResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? dummyBRequest(opts) : undefined; +}); + +export const callWithResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResponseRequest(opts) : undefined; +}); + +export const callWithDuplicateResponsesResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithDuplicateResponsesRequest(opts) : undefined; +}); + +export const callWithResponsesResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResponsesRequest(opts) : undefined; +}); + +export const collectionFormatResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? collectionFormatRequest(opts) : undefined; +}); + +export const typesResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? typesRequest(opts) : undefined; +}); + +export const uploadFileResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? uploadFileRequest(opts) : undefined; +}); + +export const fileResponseResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? fileResponseRequest(opts) : undefined; +}); + +export const complexTypesResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? complexTypesRequest(opts) : undefined; +}); + +export const multipartResponseResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? multipartResponseRequest(opts) : undefined; +}); + +export const multipartRequestResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? multipartRequestRequest(opts) : undefined; +}); + +export const complexParamsResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? complexParamsRequest(opts) : undefined; +}); + +export const callWithResultFromHeaderResource = (options?: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? callWithResultFromHeaderRequest(opts) : undefined; +}); + +export const testErrorCodeResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? testErrorCodeRequest(opts) : undefined; +}); + +export const nonAsciiæøåÆøÅöôêÊ字符串Resource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined; +}); /** * Login User */ -export const putWithFormUrlEncodedResource = (options: () => Options | undefined) => { - return httpResource(() => { - const opts = options ? options() : undefined; - return opts ? putWithFormUrlEncodedRequest(opts) : undefined; - }); -}; +export const putWithFormUrlEncodedResource = (options: () => Options | undefined) => httpResource(() => { + const opts = options ? options() : undefined; + return opts ? putWithFormUrlEncodedRequest(opts) : undefined; +}); diff --git a/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts b/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts index 6390a68e1..a49399f63 100644 --- a/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts +++ b/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts @@ -1,5 +1,4 @@ import type { Symbol } from '@hey-api/codegen-core'; -import type ts from 'typescript'; import type { IR } from '~/ir/types'; import { buildName } from '~/openApi/shared/utils/name'; @@ -8,7 +7,7 @@ import { createOperationComment, isOperationOptionsRequired, } from '~/plugins/shared/utils/operation'; -import { tsc } from '~/tsc'; +import { $ } from '~/ts-dsl'; import { stringCase } from '~/utils/stringCase'; import type { AngularCommonPlugin } from './types'; @@ -17,7 +16,7 @@ interface AngularRequestClassEntry { className: string; classes: Set; methods: Set; - nodes: Array; + nodes: Array>; root: boolean; } @@ -88,8 +87,7 @@ const generateAngularClassRequests = ({ if (!currentClass.nodes.length) { currentClass.nodes.push(methodNode); } else { - // @ts-expect-error - currentClass.nodes.push(tsc.identifier({ text: '\n' }), methodNode); + currentClass.nodes.push($.newline(), methodNode); } currentClass.methods.add(requestMethodName); @@ -113,24 +111,19 @@ const generateAngularClassRequests = ({ generateClass(childClass); currentClass.nodes.push( - tsc.propertyDeclaration({ - initializer: tsc.newExpression({ - argumentsArray: [], - expression: tsc.identifier({ - text: buildName({ - config: { - case: 'preserve', - name: plugin.config.httpRequests.classNameBuilder, - }, - name: childClass.className, - }), + $.field( + stringCase({ case: 'camelCase', value: childClass.className }), + ).assign( + $.new( + buildName({ + config: { + case: 'preserve', + name: plugin.config.httpRequests.classNameBuilder, + }, + name: childClass.className, }), - }), - name: stringCase({ - case: 'camelCase', - value: childClass.className, - }), - }), + ), + ), ); } } @@ -155,17 +148,15 @@ const generateAngularClassRequests = ({ name: currentClass.className, }), }); - const node = tsc.classDeclaration({ - decorator: currentClass.root - ? { - args: [{ providedIn: 'root' }], - name: symbolInjectable.placeholder, - } - : undefined, - exportClass: symbolClass.exported, - name: symbolClass.placeholder, - nodes: currentClass.nodes, - }); + const node = $.class(symbolClass.placeholder) + .export(symbolClass.exported) + .$if(currentClass.root, (c) => + c.decorator( + symbolInjectable.placeholder, + $.object().prop('providedIn', $.literal('root')), + ), + ) + .do(...currentClass.nodes); plugin.setSymbolValue(symbolClass, node); generatedClasses.add(currentClass.className); @@ -225,52 +216,20 @@ const generateRequestCallExpression = ({ category: 'client', }); - const optionsClient = tsc.propertyAccessExpression({ - expression: tsc.identifier({ text: 'options' }), - isOptional: true, - name: 'client', - }); - - let clientExpression: ts.Expression; - if (symbolClient) { - clientExpression = tsc.binaryExpression({ - left: optionsClient, - operator: '??', - right: symbolClient.placeholder, - }); - } else { - clientExpression = optionsClient; - } - - return tsc.callExpression({ - functionName: tsc.propertyAccessExpression({ - expression: clientExpression, - name: 'requestOptions', - }), - parameters: [ - tsc.objectExpression({ - obj: [ - { - key: 'responseStyle', - value: tsc.identifier({ text: "'data'" }), - }, - { - key: 'method', - value: tsc.identifier({ - text: `'${operation.method.toUpperCase()}'`, - }), - }, - { - key: 'url', - value: tsc.identifier({ text: `'${operation.path}'` }), - }, - { - spread: 'options', - }, - ], - }), - ], - }); + const optionsClient = $('options') + .attr('client') + .optional() + .$if(symbolClient, (c, s) => c.coalesce(s.placeholder)); + + return optionsClient + .attr('requestOptions') + .call( + $.object() + .prop('responseStyle', $.literal('data')) + .prop('method', $.literal(operation.method.toUpperCase())) + .prop('url', $.literal(operation.path)) + .spread('options'), + ); }; const generateAngularRequestMethod = ({ @@ -304,34 +263,26 @@ const generateAngularRequestMethod = ({ }); const dataType = symbolDataType?.placeholder || 'unknown'; - return tsc.methodDeclaration({ - accessLevel: 'public', - comment: createOperationComment({ operation }), - name: methodName, - parameters: [ - { - isRequired: isRequiredOptions, - name: 'options', - type: `${symbolOptions.placeholder}<${dataType}, ThrowOnError>`, - }, - ], - returnType: `${symbolHttpRequest.placeholder}`, - statements: [ - tsc.returnStatement({ - expression: generateRequestCallExpression({ + return $.method(methodName) + .public() + .$if(createOperationComment({ operation }), (c, v) => + c.doc(v as ReadonlyArray), + ) + .param('options', (p) => + p + .optional(!isRequiredOptions) + .type(`${symbolOptions.placeholder}<${dataType}, ThrowOnError>`), + ) + .generic('ThrowOnError', (g) => g.extends('boolean').default(false)) + .returns(`${symbolHttpRequest.placeholder}`) + .do( + $.return( + generateRequestCallExpression({ operation, plugin, }), - }), - ], - types: [ - { - default: false, - extends: 'boolean', - name: 'ThrowOnError', - }, - ], - }); + ), + ); }; const generateAngularRequestFunction = ({ @@ -365,36 +316,29 @@ const generateAngularRequestFunction = ({ }); const dataType = symbolDataType?.placeholder || 'unknown'; - return tsc.constVariable({ - comment: createOperationComment({ operation }), - exportConst: symbol.exported, - expression: tsc.arrowFunction({ - parameters: [ - { - isRequired: isRequiredOptions, - name: 'options', - type: `${symbolOptions.placeholder}<${dataType}, ThrowOnError>`, - }, - ], - returnType: `${symbolHttpRequest.placeholder}`, - statements: [ - tsc.returnStatement({ - expression: generateRequestCallExpression({ - operation, - plugin, - }), - }), - ], - types: [ - { - default: false, - extends: 'boolean', - name: 'ThrowOnError', - }, - ], - }), - name: symbol.placeholder, - }); + return $.const(symbol.placeholder) + .export(symbol.exported) + .$if(createOperationComment({ operation }), (c, v) => + c.doc(v as ReadonlyArray), + ) + .assign( + $.func() + .param('options', (p) => + p + .optional(!isRequiredOptions) + .type(`${symbolOptions.placeholder}<${dataType}, ThrowOnError>`), + ) + .generic('ThrowOnError', (g) => g.extends('boolean').default(false)) + .returns(`${symbolHttpRequest.placeholder}`) + .do( + $.return( + generateRequestCallExpression({ + operation, + plugin, + }), + ), + ), + ); }; export const createHttpRequests: AngularCommonPlugin['Handler'] = ({ diff --git a/packages/openapi-ts/src/plugins/@angular/common/httpResources.ts b/packages/openapi-ts/src/plugins/@angular/common/httpResources.ts index 9e668a46a..79e65ce06 100644 --- a/packages/openapi-ts/src/plugins/@angular/common/httpResources.ts +++ b/packages/openapi-ts/src/plugins/@angular/common/httpResources.ts @@ -1,5 +1,4 @@ import type { Symbol } from '@hey-api/codegen-core'; -import type ts from 'typescript'; import type { IR } from '~/ir/types'; import { buildName } from '~/openApi/shared/utils/name'; @@ -8,7 +7,7 @@ import { createOperationComment, isOperationOptionsRequired, } from '~/plugins/shared/utils/operation'; -import { tsc } from '~/tsc'; +import { $ } from '~/ts-dsl'; import { stringCase } from '~/utils/stringCase'; import type { AngularCommonPlugin } from './types'; @@ -17,7 +16,7 @@ interface AngularServiceClassEntry { className: string; classes: Set; methods: Set; - nodes: Array; + nodes: Array>; root: boolean; } @@ -88,8 +87,7 @@ const generateAngularClassServices = ({ if (!currentClass.nodes.length) { currentClass.nodes.push(methodNode); } else { - // @ts-expect-error - currentClass.nodes.push(tsc.identifier({ text: '\n' }), methodNode); + currentClass.nodes.push($.newline(), methodNode); } currentClass.methods.add(resourceMethodName); @@ -113,24 +111,22 @@ const generateAngularClassServices = ({ generateClass(childClass); currentClass.nodes.push( - tsc.propertyDeclaration({ - initializer: tsc.newExpression({ - argumentsArray: [], - expression: tsc.identifier({ - text: buildName({ - config: { - case: 'preserve', - name: plugin.config.httpResources.classNameBuilder, - }, - name: childClass.className, - }), - }), - }), - name: stringCase({ + $.field( + stringCase({ case: 'camelCase', value: childClass.className, }), - }), + ).assign( + $.new( + buildName({ + config: { + case: 'preserve', + name: plugin.config.httpResources.classNameBuilder, + }, + name: childClass.className, + }), + ), + ), ); } } @@ -149,17 +145,15 @@ const generateAngularClassServices = ({ name: currentClass.className, }), }); - const node = tsc.classDeclaration({ - decorator: currentClass.root - ? { - args: [{ providedIn: 'root' }], - name: symbolInjectable.placeholder, - } - : undefined, - exportClass: symbolClass.exported, - name: symbolClass.placeholder, - nodes: currentClass.nodes, - }); + const node = $.class(symbolClass.placeholder) + .export(symbolClass.exported) + .$if(currentClass.root, (c) => + c.decorator( + symbolInjectable.placeholder, + $.object().prop('providedIn', $.literal('root')), + ), + ) + .do(...currentClass.nodes); plugin.setSymbolValue(symbolClass, node); generatedClasses.add(currentClass.className); @@ -247,62 +241,43 @@ const generateResourceCallExpression = ({ category: 'external', resource: '@angular/core.inject', }); - let methodAccess: ts.Expression = tsc.callExpression({ - functionName: symbolInject.placeholder, - parameters: [tsc.identifier({ text: symbolClass.placeholder })], - }); + let methodAccess: ReturnType = $( + symbolInject.placeholder, + ).call(symbolClass.placeholder); // Navigate through the class hierarchy for (let i = 1; i < firstEntry.path.length; i++) { const className = firstEntry.path[i]; if (className) { - methodAccess = tsc.propertyAccessExpression({ - expression: methodAccess, - name: stringCase({ + methodAccess = methodAccess.attr( + stringCase({ case: 'camelCase', value: className, }), - }); + ); } } - methodAccess = tsc.propertyAccessExpression({ - expression: methodAccess, - name: plugin.config.httpRequests.methodNameBuilder(operation), - }); - - return tsc.callExpression({ - functionName: symbolHttpResource.placeholder, - parameters: [ - tsc.arrowFunction({ - parameters: [], - statements: [ - tsc.constVariable({ - expression: tsc.conditionalExpression({ - condition: tsc.identifier({ text: 'options' }), - whenFalse: tsc.identifier({ text: 'undefined' }), - whenTrue: tsc.callExpression({ - functionName: 'options', - parameters: [], - }), - }), - name: 'opts', - }), - tsc.returnStatement({ - expression: tsc.conditionalExpression({ - condition: tsc.identifier({ text: 'opts' }), - whenFalse: tsc.identifier({ text: 'undefined' }), - whenTrue: tsc.callExpression({ - functionName: methodAccess, - parameters: [tsc.identifier({ text: 'opts' })], - }), - }), - }), - ], - }), - ], - types: [tsc.typeNode(responseType)], - }); + methodAccess = methodAccess.attr( + plugin.config.httpRequests.methodNameBuilder(operation), + ); + + return $(symbolHttpResource.placeholder) + .call( + $.func().do( + $.const('opts').assign( + $.ternary('options') + .do($('options').call()) + .otherwise($.id('undefined')), + ), + $.return( + $.ternary('opts') + .do(methodAccess.call('opts')) + .otherwise($.id('undefined')), + ), + ), + ) + .generic(responseType); } } else { const symbolHttpRequest = plugin.referenceSymbol({ @@ -313,55 +288,30 @@ const generateResourceCallExpression = ({ tool: 'angular', }); - return tsc.callExpression({ - functionName: symbolHttpResource.placeholder, - parameters: [ - tsc.arrowFunction({ - parameters: [], - statements: [ - tsc.constVariable({ - expression: tsc.conditionalExpression({ - condition: tsc.identifier({ text: 'options' }), - whenFalse: tsc.identifier({ text: 'undefined' }), - whenTrue: tsc.callExpression({ - functionName: 'options', - parameters: [], - }), - }), - name: 'opts', - }), - tsc.returnStatement({ - expression: tsc.conditionalExpression({ - condition: tsc.identifier({ text: 'opts' }), - whenFalse: tsc.identifier({ text: 'undefined' }), - whenTrue: tsc.callExpression({ - functionName: symbolHttpRequest.placeholder, - parameters: [tsc.identifier({ text: 'opts' })], - }), - }), - }), - ], - }), - ], - types: [tsc.typeNode(responseType)], - }); + return $(symbolHttpResource.placeholder) + .call( + $.func().do( + $.const('opts').assign( + $.ternary('options') + .do($('options').call()) + .otherwise($.id('undefined')), + ), + $.return( + $.ternary('opts') + .do($(symbolHttpRequest.placeholder).call('opts')) + .otherwise($.id('undefined')), + ), + ), + ) + .generic(responseType); } // Fallback return (should not reach here) - return tsc.callExpression({ - functionName: symbolHttpResource.placeholder, - parameters: [ - tsc.arrowFunction({ - parameters: [], - statements: [ - tsc.returnStatement({ - expression: tsc.identifier({ text: 'undefined' }), - }), - ], - }), - ], - types: [tsc.typeNode(responseType)], - }); + return $(symbolHttpResource.placeholder).call( + $.func() + .do($.return($.id('undefined'))) + .generic(responseType), + ); }; const generateAngularResourceMethod = ({ @@ -390,34 +340,27 @@ const generateAngularResourceMethod = ({ }); const dataType = symbolDataType?.placeholder || 'unknown'; - return tsc.methodDeclaration({ - accessLevel: 'public', - comment: createOperationComment({ operation }), - name: methodName, - parameters: [ - { - isRequired: isRequiredOptions, - name: 'options', - type: `() => ${symbolOptions.placeholder}<${dataType}, ThrowOnError> | undefined`, - }, - ], - returnType: undefined, - statements: [ - tsc.returnStatement({ - expression: generateResourceCallExpression({ + return $.method(methodName) + .public() + .$if(createOperationComment({ operation }), (c, v) => + c.doc(v as ReadonlyArray), + ) + .param('options', (p) => + p + .optional(!isRequiredOptions) + .type( + `() => ${symbolOptions.placeholder}<${dataType}, ThrowOnError> | undefined`, + ), + ) + .generic('ThrowOnError', (g) => g.extends('boolean').default(false)) + .do( + $.return( + generateResourceCallExpression({ operation, plugin, }), - }), - ], - types: [ - { - default: false, - extends: 'boolean', - name: 'ThrowOnError', - }, - ], - }); + ), + ); }; const generateAngularResourceFunction = ({ @@ -446,35 +389,30 @@ const generateAngularResourceFunction = ({ }); const dataType = symbolDataType?.placeholder || 'unknown'; - return tsc.constVariable({ - comment: createOperationComment({ operation }), - exportConst: symbol.exported, - expression: tsc.arrowFunction({ - parameters: [ - { - isRequired: isRequiredOptions, - name: 'options', - type: `() => ${symbolOptions.placeholder}<${dataType}, ThrowOnError> | undefined`, - }, - ], - statements: [ - tsc.returnStatement({ - expression: generateResourceCallExpression({ - operation, - plugin, - }), - }), - ], - types: [ - { - default: false, - extends: 'boolean', - name: 'ThrowOnError', - }, - ], - }), - name: symbol.placeholder, - }); + return $.const(symbol.placeholder) + .export(symbol.exported) + .$if(createOperationComment({ operation }), (c, v) => + c.doc(v as ReadonlyArray), + ) + .assign( + $.func() + .param('options', (p) => + p + .optional(!isRequiredOptions) + .type( + `() => ${symbolOptions.placeholder}<${dataType}, ThrowOnError> | undefined`, + ), + ) + .generic('ThrowOnError', (g) => g.extends('boolean').default(false)) + .do( + $.return( + generateResourceCallExpression({ + operation, + plugin, + }), + ), + ), + ); }; export const createHttpResources: AngularCommonPlugin['Handler'] = ({ diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/meta.ts b/packages/openapi-ts/src/plugins/@pinia/colada/meta.ts index b07ba694c..f4022fdaf 100644 --- a/packages/openapi-ts/src/plugins/@pinia/colada/meta.ts +++ b/packages/openapi-ts/src/plugins/@pinia/colada/meta.ts @@ -1,7 +1,5 @@ -import type ts from 'typescript'; - import type { IR } from '~/ir/types'; -import { tsc } from '~/tsc'; +import { $ } from '~/ts-dsl'; import type { PiniaColadaPlugin } from './types'; @@ -9,12 +7,12 @@ export const handleMeta = ( plugin: PiniaColadaPlugin['Instance'], operation: IR.OperationObject, configPath: 'queryOptions' | 'mutationOptions', -): ts.Expression | undefined => { +): ReturnType | undefined => { const metaFn = plugin.config[configPath].meta; if (!metaFn) return; const metaObject = metaFn(operation); if (!Object.keys(metaObject).length) return; - return tsc.valueToExpression({ value: metaObject }); + return $.fromValue(metaObject); }; diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts index 9b56c749f..118d33d63 100644 --- a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts +++ b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts @@ -106,7 +106,7 @@ export const createMutationOptions = ({ if (meta) { mutationOptionsObj.push({ key: 'meta', - value: meta, + value: meta.$render(), }); } diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts index 1cc2a0829..ddc51c863 100644 --- a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts +++ b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts @@ -153,7 +153,7 @@ export const createQueryOptions = ({ if (meta) { queryOptionsObj.push({ key: 'meta', - value: meta, + value: meta.$render(), }); } diff --git a/packages/openapi-ts/src/ts-dsl/decl/pattern.ts b/packages/openapi-ts/src/ts-dsl/decl/pattern.ts index 06b09d515..83a7b37ec 100644 --- a/packages/openapi-ts/src/ts-dsl/decl/pattern.ts +++ b/packages/openapi-ts/src/ts-dsl/decl/pattern.ts @@ -2,6 +2,7 @@ import ts from 'typescript'; import type { MaybeArray } from '../base'; import { TsDsl } from '../base'; +import { IdTsDsl } from '../expr/id'; import { TokenTsDsl } from '../token'; /** @@ -83,7 +84,7 @@ export class PatternTsDsl extends TsDsl { ? ts.factory.createBindingElement( this.$node(new TokenTsDsl().spread()), undefined, - ts.factory.createIdentifier(this._spread), + this.$node(new IdTsDsl(this._spread)), ) : undefined; } diff --git a/packages/openapi-ts/src/ts-dsl/expr/id.ts b/packages/openapi-ts/src/ts-dsl/expr/id.ts new file mode 100644 index 000000000..a4da00e5b --- /dev/null +++ b/packages/openapi-ts/src/ts-dsl/expr/id.ts @@ -0,0 +1,16 @@ +import ts from 'typescript'; + +import { TsDsl } from '../base'; + +export class IdTsDsl extends TsDsl { + protected name: string; + + constructor(name: string) { + super(); + this.name = name; + } + + $render(): ts.Identifier { + return ts.factory.createIdentifier(this.name); + } +} diff --git a/packages/openapi-ts/src/ts-dsl/index.ts b/packages/openapi-ts/src/ts-dsl/index.ts index b0dd8c083..23df6a92e 100644 --- a/packages/openapi-ts/src/ts-dsl/index.ts +++ b/packages/openapi-ts/src/ts-dsl/index.ts @@ -18,6 +18,7 @@ import { BinaryTsDsl } from './expr/binary'; import { CallTsDsl } from './expr/call'; import { ExprTsDsl } from './expr/expr'; import { fromValue as exprValue } from './expr/fromValue'; +import { IdTsDsl } from './expr/id'; import { LiteralTsDsl } from './expr/literal'; import { NewTsDsl } from './expr/new'; import { ObjectTsDsl } from './expr/object'; @@ -134,6 +135,9 @@ const base = { hint: (...args: ConstructorParameters) => new HintTsDsl(...args), + /** Creates an identifier (e.g. `foo`). */ + id: (...args: ConstructorParameters) => new IdTsDsl(...args), + /** Creates an if statement. */ if: (...args: ConstructorParameters) => new IfTsDsl(...args), diff --git a/packages/openapi-ts/src/ts-dsl/layout/doc.ts b/packages/openapi-ts/src/ts-dsl/layout/doc.ts index 5a02a4365..9845dcf03 100644 --- a/packages/openapi-ts/src/ts-dsl/layout/doc.ts +++ b/packages/openapi-ts/src/ts-dsl/layout/doc.ts @@ -2,6 +2,7 @@ import ts from 'typescript'; import type { MaybeArray } from '../base'; import { TsDsl } from '../base'; +import { IdTsDsl } from '../expr/id'; export class DocTsDsl extends TsDsl { protected _lines: Array = []; @@ -61,6 +62,6 @@ export class DocTsDsl extends TsDsl { // this class does not build a standalone node; // it modifies other nodes via `apply()`. // Return a dummy comment node for compliance. - return ts.factory.createIdentifier(''); + return this.$node(new IdTsDsl('')); } } diff --git a/packages/openapi-ts/src/ts-dsl/layout/hint.ts b/packages/openapi-ts/src/ts-dsl/layout/hint.ts index 9388b9ff6..1d7eadbc8 100644 --- a/packages/openapi-ts/src/ts-dsl/layout/hint.ts +++ b/packages/openapi-ts/src/ts-dsl/layout/hint.ts @@ -2,6 +2,7 @@ import ts from 'typescript'; import type { MaybeArray } from '../base'; import { TsDsl } from '../base'; +import { IdTsDsl } from '../expr/id'; export class HintTsDsl extends TsDsl { protected _lines: Array = []; @@ -43,6 +44,6 @@ export class HintTsDsl extends TsDsl { // this class does not build a standalone node; // it modifies other nodes via `apply()`. // Return a dummy comment node for compliance. - return ts.factory.createIdentifier(''); + return this.$node(new IdTsDsl('')); } } diff --git a/packages/openapi-ts/src/ts-dsl/layout/newline.ts b/packages/openapi-ts/src/ts-dsl/layout/newline.ts index 8a448c31b..64df6f21c 100644 --- a/packages/openapi-ts/src/ts-dsl/layout/newline.ts +++ b/packages/openapi-ts/src/ts-dsl/layout/newline.ts @@ -1,9 +1,10 @@ -import ts from 'typescript'; +import type ts from 'typescript'; import { TsDsl } from '../base'; +import { IdTsDsl } from '../expr/id'; export class NewlineTsDsl extends TsDsl { $render(): ts.Identifier { - return ts.factory.createIdentifier('\n'); + return this.$node(new IdTsDsl('\n')); } } diff --git a/packages/openapi-ts/src/ts-dsl/layout/note.ts b/packages/openapi-ts/src/ts-dsl/layout/note.ts index cc4cfe94d..5c264ef96 100644 --- a/packages/openapi-ts/src/ts-dsl/layout/note.ts +++ b/packages/openapi-ts/src/ts-dsl/layout/note.ts @@ -2,6 +2,7 @@ import ts from 'typescript'; import type { MaybeArray } from '../base'; import { TsDsl } from '../base'; +import { IdTsDsl } from '../expr/id'; export class NoteTsDsl extends TsDsl { protected _lines: Array = []; @@ -41,6 +42,6 @@ export class NoteTsDsl extends TsDsl { // this class does not build a standalone node; // it modifies other nodes via `apply()`. // Return a dummy comment node for compliance. - return ts.factory.createIdentifier(''); + return this.$node(new IdTsDsl('')); } }